diff --git a/extensions/theme-abyss/themes/abyss-color-theme.json b/extensions/theme-abyss/themes/abyss-color-theme.json
index 642a9e3d97b3ebd02c52d461ddce7243a8e40e6d..8e97bbb6dc1f2390736ca3a74b7c6279b955e911 100644
--- a/extensions/theme-abyss/themes/abyss-color-theme.json
+++ b/extensions/theme-abyss/themes/abyss-color-theme.json
@@ -172,14 +172,14 @@
 			"scope": "invalid",
 			"settings": {
 				"fontStyle": "",
-				"foreground": "#F8F8F0"
+				"foreground": "#A22D44"
 			}
 		},
 		{
 			"name": "Invalid deprecated",
 			"scope": "invalid.deprecated",
 			"settings": {
-				"foreground": "#F8F8F0"
+				"foreground": "#A22D44"
 			}
 		},
 		{
diff --git a/extensions/theme-kimbie-dark/themes/kimbie-dark-color-theme.json b/extensions/theme-kimbie-dark/themes/kimbie-dark-color-theme.json
index 8997b80df556546f3512c2c6284d4d0f4255c7b9..3453c53dc2b9188eedd1b885d289874af5994f6a 100644
--- a/extensions/theme-kimbie-dark/themes/kimbie-dark-color-theme.json
+++ b/extensions/theme-kimbie-dark/themes/kimbie-dark-color-theme.json
@@ -390,7 +390,7 @@
 		},
 		{
 			"name": "Invalid",
-			"scope": "invalid.illegal",
+			"scope": "invalid",
 			"settings": {
 				"foreground": "#dc3958"
 			}
diff --git a/extensions/theme-monokai/themes/monokai-color-theme.json b/extensions/theme-monokai/themes/monokai-color-theme.json
index aa30b85b130584d52d0250947ddc9845a43bd82f..2e520d15bdb11a61d10cd5fba2bdb2cd16eaaa69 100644
--- a/extensions/theme-monokai/themes/monokai-color-theme.json
+++ b/extensions/theme-monokai/themes/monokai-color-theme.json
@@ -284,14 +284,14 @@
 			"scope": "invalid",
 			"settings": {
 				"fontStyle": "",
-				"foreground": "#F8F8F0"
+				"foreground": "#F44747"
 			}
 		},
 		{
 			"name": "Invalid deprecated",
 			"scope": "invalid.deprecated",
 			"settings": {
-				"foreground": "#F8F8F0"
+				"foreground": "#F44747"
 			}
 		},
 		{
diff --git a/extensions/theme-quietlight/themes/quietlight-color-theme.json b/extensions/theme-quietlight/themes/quietlight-color-theme.json
index 2a12b3698854c0e41b7688bf546a10583dc879a4..6156e6542a75a3a2ca2d69bf324653e024705d79 100644
--- a/extensions/theme-quietlight/themes/quietlight-color-theme.json
+++ b/extensions/theme-quietlight/themes/quietlight-color-theme.json
@@ -45,6 +45,13 @@
 				"foreground": "#448C27"
 			}
 		},
+		{
+			"name": "Invalid",
+			"scope": "invalid",
+			"settings": {
+				"foreground": "#cd3131"
+			}
+		},
 		{
 			"name": "Invalid - Illegal",
 			"scope": "invalid.illegal",
diff --git a/extensions/theme-solarized-dark/themes/solarized-dark-color-theme.json b/extensions/theme-solarized-dark/themes/solarized-dark-color-theme.json
index 9289f6946546d67a899d7144eac07b946d6b53ac..8a9deb0cd4b640b9384dd3dd034f7c2c45d1e5a3 100644
--- a/extensions/theme-solarized-dark/themes/solarized-dark-color-theme.json
+++ b/extensions/theme-solarized-dark/themes/solarized-dark-color-theme.json
@@ -210,7 +210,9 @@
 		{
 			"name": "Invalid",
 			"scope": "invalid",
-			"settings": {}
+			"settings": {
+				"foreground": "#D30102"
+			}
 		},
 		{
 			"name": "diff: header",
diff --git a/extensions/theme-solarized-light/themes/solarized-light-color-theme.json b/extensions/theme-solarized-light/themes/solarized-light-color-theme.json
index 52a096b5fc51b030dbddda9ad0fb200e1962e5c5..427b7c3c3590a57496fb28d8e92c8a5003db9325 100644
--- a/extensions/theme-solarized-light/themes/solarized-light-color-theme.json
+++ b/extensions/theme-solarized-light/themes/solarized-light-color-theme.json
@@ -213,7 +213,9 @@
 		{
 			"name": "Invalid",
 			"scope": "invalid",
-			"settings": {}
+			"settings": {
+				"foreground": "#cd3131"
+			}
 		},
 		{
 			"name": "diff: header",
diff --git a/extensions/theme-tomorrow-night-blue/package.json b/extensions/theme-tomorrow-night-blue/package.json
index e9caeabb640312a0ee5ddfac69a1e174e36169ee..e03f05d8a5ae9b6578932f972d377c3e13a9e599 100644
--- a/extensions/theme-tomorrow-night-blue/package.json
+++ b/extensions/theme-tomorrow-night-blue/package.json
@@ -12,7 +12,7 @@
 				"id": "Tomorrow Night Blue",
 				"label": "%themeLabel%",
 				"uiTheme": "vs-dark",
-				"path": "./themes/tomorrow-night-blue-theme.json"
+				"path": "./themes/tomorrow-night-blue-color-theme.json"
 			}
 		]
 	}
diff --git a/extensions/theme-tomorrow-night-blue/themes/tomorrow-night-blue-theme.json b/extensions/theme-tomorrow-night-blue/themes/tomorrow-night-blue-color-theme.json
similarity index 96%
rename from extensions/theme-tomorrow-night-blue/themes/tomorrow-night-blue-theme.json
rename to extensions/theme-tomorrow-night-blue/themes/tomorrow-night-blue-color-theme.json
index b5f836bf620e0db34f823fe3007d0f48d0d56a48..91c135342f192179affce725fca4a0f2d16dd1b8 100644
--- a/extensions/theme-tomorrow-night-blue/themes/tomorrow-night-blue-theme.json
+++ b/extensions/theme-tomorrow-night-blue/themes/tomorrow-night-blue-color-theme.json
@@ -27,7 +27,6 @@
 		"editorGroup.dropBackground": "#25375daa",
 		"peekViewResult.background": "#001c40",
 		"tab.inactiveBackground": "#001c40",
-		"tab.modifiedBorder": "#FFEEAD",
 		"tab.lastPinnedBorder": "#007acc80",
 		"debugToolBar.background": "#001c40",
 		"titleBar.activeBackground": "#001126",
@@ -67,7 +66,7 @@
 		{
 			"scope": ["meta.embedded", "source.groovy.embedded"],
 			"settings": {
-				"background": "#002451",
+				//"background": "#002451",
 				"foreground": "#FFFFFF"
 			}
 		},
@@ -144,16 +143,16 @@
 			"name": "Invalid",
 			"scope": "invalid",
 			"settings": {
-				"background": "#F99DA5",
+				//"background": "#F99DA5",
 				"fontStyle": "",
-				"foreground": "#FFFFFF"
+				"foreground": "#a92049"
 			}
 		},
 		{
 			"name": "Separator",
 			"scope": "meta.separator",
 			"settings": {
-				"background": "#BBDAFE",
+				//"background": "#BBDAFE",
 				"foreground": "#FFFFFF"
 			}
 		},
@@ -161,9 +160,9 @@
 			"name": "Deprecated",
 			"scope": "invalid.deprecated",
 			"settings": {
-				"background": "#EBBBFF",
+				//"background": "#EBBBFF",
 				"fontStyle": "",
-				"foreground": "#FFFFFF"
+				"foreground": "#cd9731"
 			}
 		},
 		{
@@ -191,8 +190,7 @@
 			"name": "Diff header",
 			"scope": "meta.diff.header.from-file, meta.diff.header.to-file",
 			"settings": {
-				"foreground": "#FFFFFF",
-				"background": "#4271ae"
+				"foreground": "#4271ae"
 			}
 		},
 		{