diff --git a/extensions/theme-abyss/package.json b/extensions/theme-abyss/package.json
index bdeb6a2a643..9543824f331 100644
--- a/extensions/theme-abyss/package.json
+++ b/extensions/theme-abyss/package.json
@@ -9,10 +9,11 @@
 	"contributes": {
 		"themes": [
 			{
-				"label": "Abyss",
+				"id": "Abyss",
+				"label": "%themeLabel%",
 				"uiTheme": "vs-dark",
 				"path": "./themes/abyss-color-theme.json"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/extensions/theme-abyss/package.nls.json b/extensions/theme-abyss/package.nls.json
index 48fbcd8583a..a25492d706d 100644
--- a/extensions/theme-abyss/package.nls.json
+++ b/extensions/theme-abyss/package.nls.json
@@ -1,4 +1,5 @@
 {
 	"displayName": "Abyss Theme",
-	"description": "Abyss theme for Visual Studio Code"
-}
\ No newline at end of file
+	"description": "Abyss theme for Visual Studio Code",
+	"themeLabel": "Abyss"
+}
diff --git a/extensions/theme-defaults/package.json b/extensions/theme-defaults/package.json
index 56d5fa3f4b1..75e1583428e 100644
--- a/extensions/theme-defaults/package.json
+++ b/extensions/theme-defaults/package.json
@@ -11,31 +11,31 @@
 		"themes": [
 			{
 				"id": "Default Dark+",
-				"label": "Dark+ (default dark)",
+				"label": "%darkPlusColorThemeLabel%",
 				"uiTheme": "vs-dark",
 				"path": "./themes/dark_plus.json"
 			},
 			{
 				"id": "Default Light+",
-				"label": "Light+ (default light)",
+				"label": "%lightPlusColorThemeLabel%",
 				"uiTheme": "vs",
 				"path": "./themes/light_plus.json"
 			},
 			{
 				"id": "Visual Studio Dark",
-				"label": "Dark (Visual Studio)",
+				"label": "%darkColorThemeLabel%",
 				"uiTheme": "vs-dark",
 				"path": "./themes/dark_vs.json"
 			},
 			{
 				"id": "Visual Studio Light",
-				"label": "Light (Visual Studio)",
+				"label": "%lightColorThemeLabel%",
 				"uiTheme": "vs",
 				"path": "./themes/light_vs.json"
 			},
 			{
 				"id": "Default High Contrast",
-				"label": "High Contrast",
+				"label": "%hcColorThemeLabel%",
 				"uiTheme": "hc-black",
 				"path": "./themes/hc_black.json"
 			}
@@ -43,9 +43,9 @@
 		"iconThemes": [
 			{
 				"id": "vs-minimal",
-				"label": "Minimal (Visual Studio Code)",
+				"label": "%minimalIconThemeLabel%",
 				"path": "./fileicons/vs_minimal-icon-theme.json"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/extensions/theme-defaults/package.nls.json b/extensions/theme-defaults/package.nls.json
index f03211eed2b..50827f1f442 100644
--- a/extensions/theme-defaults/package.nls.json
+++ b/extensions/theme-defaults/package.nls.json
@@ -1,4 +1,10 @@
 {
 	"displayName": "Default Themes",
-	"description": "The default Visual Studio light and dark themes"
-}
\ No newline at end of file
+	"description": "The default Visual Studio light and dark themes",
+	"darkPlusColorThemeLabel": "Dark+ (default dark)",
+	"lightPlusColorThemeLabel": "Light+ (default light)",
+	"darkColorThemeLabel": "Dark (Visual Studio)",
+	"lightColorThemeLabel": "Light (Visual Studio)",
+	"hcColorThemeLabel": "High Contrast",
+	"minimalIconThemeLabel": "Minimal (Visual Studio Code)",
+}
diff --git a/extensions/theme-kimbie-dark/package.json b/extensions/theme-kimbie-dark/package.json
index 1031c34d2e7..7c7ff5ea76c 100644
--- a/extensions/theme-kimbie-dark/package.json
+++ b/extensions/theme-kimbie-dark/package.json
@@ -9,10 +9,11 @@
 	"contributes": {
 		"themes": [
 			{
-				"label": "Kimbie Dark",
+				"id": "Kimbie Dark",
+				"label": "%themeLabel%",
 				"uiTheme": "vs-dark",
 				"path": "./themes/kimbie-dark-color-theme.json"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/extensions/theme-kimbie-dark/package.nls.json b/extensions/theme-kimbie-dark/package.nls.json
index 85c736cee8b..0d96b6f4a81 100644
--- a/extensions/theme-kimbie-dark/package.nls.json
+++ b/extensions/theme-kimbie-dark/package.nls.json
@@ -1,4 +1,5 @@
 {
 	"displayName": "Kimbie Dark Theme",
-	"description": "Kimbie dark theme for Visual Studio Code"
-}
\ No newline at end of file
+	"description": "Kimbie dark theme for Visual Studio Code",
+	"themeLabel": "Kimbie Dark"
+}
diff --git a/extensions/theme-monokai-dimmed/package.json b/extensions/theme-monokai-dimmed/package.json
index 66c4711d9ab..43d950eb8c1 100644
--- a/extensions/theme-monokai-dimmed/package.json
+++ b/extensions/theme-monokai-dimmed/package.json
@@ -11,10 +11,11 @@
 	"contributes": {
 		"themes": [
 			{
-				"label": "Monokai Dimmed",
+				"id": "Monokai Dimmed",
+				"label": "%themeLabel%",
 				"uiTheme": "vs-dark",
 				"path": "./themes/dimmed-monokai-color-theme.json"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/extensions/theme-monokai-dimmed/package.nls.json b/extensions/theme-monokai-dimmed/package.nls.json
index 3d93898e2ca..47baa226750 100644
--- a/extensions/theme-monokai-dimmed/package.nls.json
+++ b/extensions/theme-monokai-dimmed/package.nls.json
@@ -1,4 +1,5 @@
 {
 	"displayName": "Monokai Dimmed Theme",
-	"description": "Monokai dimmed theme for Visual Studio Code"
-}
\ No newline at end of file
+	"description": "Monokai dimmed theme for Visual Studio Code",
+	"themeLabel": "Monokai Dimmed"
+}
diff --git a/extensions/theme-monokai/package.json b/extensions/theme-monokai/package.json
index 13b2db10d00..b21aded1b49 100644
--- a/extensions/theme-monokai/package.json
+++ b/extensions/theme-monokai/package.json
@@ -11,10 +11,11 @@
 	"contributes": {
 		"themes": [
 			{
-				"label": "Monokai",
+				"id": "Monokai",
+				"label": "%themeLabel%",
 				"uiTheme": "vs-dark",
 				"path": "./themes/monokai-color-theme.json"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/extensions/theme-monokai/package.nls.json b/extensions/theme-monokai/package.nls.json
index 8e8d73c7568..a5a17dc5717 100644
--- a/extensions/theme-monokai/package.nls.json
+++ b/extensions/theme-monokai/package.nls.json
@@ -1,4 +1,5 @@
 {
 	"displayName": "Monokai Theme",
-	"description": "Monokai theme for Visual Studio Code"
-}
\ No newline at end of file
+	"description": "Monokai theme for Visual Studio Code",
+	"themeLabel": "Monokai"
+}
diff --git a/extensions/theme-quietlight/package.json b/extensions/theme-quietlight/package.json
index 0263925eee8..f2e66e7a95d 100644
--- a/extensions/theme-quietlight/package.json
+++ b/extensions/theme-quietlight/package.json
@@ -11,10 +11,11 @@
 	"contributes": {
 		"themes": [
 			{
-				"label": "Quiet Light",
+				"id": "Quiet Light",
+				"label": "%themeLabel%",
 				"uiTheme": "vs",
 				"path": "./themes/quietlight-color-theme.json"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/extensions/theme-quietlight/package.nls.json b/extensions/theme-quietlight/package.nls.json
index 1873df058e7..30354d62952 100644
--- a/extensions/theme-quietlight/package.nls.json
+++ b/extensions/theme-quietlight/package.nls.json
@@ -1,4 +1,5 @@
 {
 	"displayName": "Quiet Light Theme",
-	"description": "Quiet light theme for Visual Studio Code"
-}
\ No newline at end of file
+	"description": "Quiet light theme for Visual Studio Code",
+	"themeLabel": "Quiet Light"
+}
diff --git a/extensions/theme-red/package.json b/extensions/theme-red/package.json
index ba751a33e42..a9920fdfd0e 100644
--- a/extensions/theme-red/package.json
+++ b/extensions/theme-red/package.json
@@ -9,10 +9,11 @@
 	"contributes": {
 		"themes": [
 			{
-				"label": "Red",
+				"id": "Red",
+				"label": "%themeLabel%",
 				"uiTheme": "vs-dark",
 				"path": "./themes/Red-color-theme.json"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/extensions/theme-red/package.nls.json b/extensions/theme-red/package.nls.json
index 680fde603ec..d58a547e8a3 100644
--- a/extensions/theme-red/package.nls.json
+++ b/extensions/theme-red/package.nls.json
@@ -1,4 +1,5 @@
 {
 	"displayName": "Red Theme",
-	"description": "Red theme for Visual Studio Code"
-}
\ No newline at end of file
+	"description": "Red theme for Visual Studio Code",
+	"themeLabel": "Red"
+}
diff --git a/extensions/theme-seti/package.json b/extensions/theme-seti/package.json
index a9721611a6f..bcdbb3209e6 100644
--- a/extensions/theme-seti/package.json
+++ b/extensions/theme-seti/package.json
@@ -15,7 +15,7 @@
 		"iconThemes": [
 			{
 				"id": "vs-seti",
-				"label": "Seti (Visual Studio Code)",
+				"label": "%themeLabel%",
 				"path": "./icons/vs-seti-icon-theme.json"
 			}
 		]
diff --git a/extensions/theme-seti/package.nls.json b/extensions/theme-seti/package.nls.json
index 173d99ddaa8..779302d7319 100644
--- a/extensions/theme-seti/package.nls.json
+++ b/extensions/theme-seti/package.nls.json
@@ -1,4 +1,5 @@
 {
 	"displayName": "Seti File Icon Theme",
-	"description": "A file icon theme made out of the Seti UI file icons"
-}
\ No newline at end of file
+	"description": "A file icon theme made out of the Seti UI file icons",
+	"themeLabel": "Seti (Visual Studio Code)"
+}
diff --git a/extensions/theme-solarized-dark/package.json b/extensions/theme-solarized-dark/package.json
index 427b50fe482..eb7dc5ff943 100644
--- a/extensions/theme-solarized-dark/package.json
+++ b/extensions/theme-solarized-dark/package.json
@@ -9,10 +9,11 @@
 	"contributes": {
 		"themes": [
 			{
-				"label": "Solarized Dark",
+				"id": "Solarized Dark",
+				"label": "%themeLabel%",
 				"uiTheme": "vs-dark",
 				"path": "./themes/solarized-dark-color-theme.json"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/extensions/theme-solarized-dark/package.nls.json b/extensions/theme-solarized-dark/package.nls.json
index c226e15f3ef..46228484d4f 100644
--- a/extensions/theme-solarized-dark/package.nls.json
+++ b/extensions/theme-solarized-dark/package.nls.json
@@ -1,4 +1,5 @@
 {
 	"displayName": "Solarized Dark Theme",
-	"description": "Solarized dark theme for Visual Studio Code"
-}
\ No newline at end of file
+	"description": "Solarized dark theme for Visual Studio Code",
+	"themeLabel": "Solarized Dark"
+}
diff --git a/extensions/theme-solarized-light/package.json b/extensions/theme-solarized-light/package.json
index 3afb2b7ed9d..421aa7a825a 100644
--- a/extensions/theme-solarized-light/package.json
+++ b/extensions/theme-solarized-light/package.json
@@ -9,10 +9,11 @@
 	"contributes": {
 		"themes": [
 			{
-				"label": "Solarized Light",
+				"id": "Solarized Light",
+				"label": "%themeLabel%",
 				"uiTheme": "vs",
 				"path": "./themes/solarized-light-color-theme.json"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/extensions/theme-solarized-light/package.nls.json b/extensions/theme-solarized-light/package.nls.json
index f7a3d0cee33..a2e9c31f30b 100644
--- a/extensions/theme-solarized-light/package.nls.json
+++ b/extensions/theme-solarized-light/package.nls.json
@@ -1,4 +1,5 @@
 {
 	"displayName": "Solarized Light Theme",
-	"description": "Solarized light theme for Visual Studio Code"
-}
\ No newline at end of file
+	"description": "Solarized light theme for Visual Studio Code",
+	"themeLabel": "Solarized Light"
+}
diff --git a/extensions/theme-tomorrow-night-blue/package.json b/extensions/theme-tomorrow-night-blue/package.json
index 1266ac58ca4..e9caeabb640 100644
--- a/extensions/theme-tomorrow-night-blue/package.json
+++ b/extensions/theme-tomorrow-night-blue/package.json
@@ -9,10 +9,11 @@
 	"contributes": {
 		"themes": [
 			{
-				"label": "Tomorrow Night Blue",
+				"id": "Tomorrow Night Blue",
+				"label": "%themeLabel%",
 				"uiTheme": "vs-dark",
 				"path": "./themes/tomorrow-night-blue-theme.json"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/extensions/theme-tomorrow-night-blue/package.nls.json b/extensions/theme-tomorrow-night-blue/package.nls.json
index 044df352eaf..a37a31b282d 100644
--- a/extensions/theme-tomorrow-night-blue/package.nls.json
+++ b/extensions/theme-tomorrow-night-blue/package.nls.json
@@ -1,4 +1,5 @@
 {
 	"displayName": "Tomorrow Night Blue Theme",
-	"description": "Tomorrow night blue theme for Visual Studio Code"
-}
\ No newline at end of file
+	"description": "Tomorrow night blue theme for Visual Studio Code",
+	"themeLabel": "Quiet Light"
+}