diff --git a/extensions/theme-abyss/themes/Abyss.tmTheme b/extensions/theme-abyss/themes/Abyss.tmTheme
index c2b146dec21..953fd645afb 100644
--- a/extensions/theme-abyss/themes/Abyss.tmTheme
+++ b/extensions/theme-abyss/themes/Abyss.tmTheme
@@ -132,7 +132,7 @@
 			<key>name</key>
 			<string>Class name</string>
 			<key>scope</key>
-			<string>entity.name.type.class</string>
+			<string>entity.name.class, entity.name.type</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
diff --git a/extensions/theme-kimbie-dark/themes/Kimbie_dark.tmTheme b/extensions/theme-kimbie-dark/themes/Kimbie_dark.tmTheme
index 0ed0b9bddc6..6f978635ef9 100644
--- a/extensions/theme-kimbie-dark/themes/Kimbie_dark.tmTheme
+++ b/extensions/theme-kimbie-dark/themes/Kimbie_dark.tmTheme
@@ -146,7 +146,7 @@
 			<key>name</key>
 			<string>Classes</string>
 			<key>scope</key>
-			<string>support.class, entity.name.class, entity.name.type.class</string>
+			<string>support.class, entity.name.class, entity.name.type</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
@@ -350,7 +350,7 @@
 			<key>name</key>
 			<string>Code</string>
 			<key>scope</key>
-			<string>markup.raw.inline</string>
+			<string>markup.inline.raw</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
diff --git a/extensions/theme-monokai-dimmed/themes/dimmed-monokai.tmTheme b/extensions/theme-monokai-dimmed/themes/dimmed-monokai.tmTheme
index 347aba650a5..83284b286ca 100644
--- a/extensions/theme-monokai-dimmed/themes/dimmed-monokai.tmTheme
+++ b/extensions/theme-monokai-dimmed/themes/dimmed-monokai.tmTheme
@@ -165,7 +165,7 @@
 			<key>name</key>
 			<string>Class name</string>
 			<key>scope</key>
-			<string>entity.name.class, entity.name.type.class, entity.name.type.module</string>
+			<string>entity.name.class, entity.name.type</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
diff --git a/extensions/theme-monokai/themes/Monokai.tmTheme b/extensions/theme-monokai/themes/Monokai.tmTheme
index e8050b94db2..1b6076cc6ba 100644
--- a/extensions/theme-monokai/themes/Monokai.tmTheme
+++ b/extensions/theme-monokai/themes/Monokai.tmTheme
@@ -154,7 +154,7 @@
 			<key>name</key>
 			<string>Class name</string>
 			<key>scope</key>
-			<string>entity.name.type.class</string>
+			<string>entity.name.type, entity.name.class</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
diff --git a/extensions/theme-solarized-dark/themes/Solarized-dark.tmTheme b/extensions/theme-solarized-dark/themes/Solarized-dark.tmTheme
index a798c8d67f9..d20626a5ebb 100644
--- a/extensions/theme-solarized-dark/themes/Solarized-dark.tmTheme
+++ b/extensions/theme-solarized-dark/themes/Solarized-dark.tmTheme
@@ -108,7 +108,7 @@
 			<key>name</key>
 			<string>Class name</string>
 			<key>scope</key>
-			<string>entity.name.class, entity.name.type.class</string>
+			<string>entity.name.class, entity.name.type</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>
diff --git a/extensions/theme-solarized-light/themes/Solarized-light.tmTheme b/extensions/theme-solarized-light/themes/Solarized-light.tmTheme
index 675ff9698c8..83103e7a24a 100644
--- a/extensions/theme-solarized-light/themes/Solarized-light.tmTheme
+++ b/extensions/theme-solarized-light/themes/Solarized-light.tmTheme
@@ -106,7 +106,7 @@
 			<key>name</key>
 			<string>Class name</string>
 			<key>scope</key>
-			<string>entity.name.class, entity.name.type.class</string>
+			<string>entity.name.class, entity.name.type</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
diff --git a/extensions/theme-tomorrow-night-blue/themes/Tomorrow-Night-Blue.tmTheme b/extensions/theme-tomorrow-night-blue/themes/Tomorrow-Night-Blue.tmTheme
index 806b35bdfa5..977629f72a8 100644
--- a/extensions/theme-tomorrow-night-blue/themes/Tomorrow-Night-Blue.tmTheme
+++ b/extensions/theme-tomorrow-night-blue/themes/Tomorrow-Night-Blue.tmTheme
@@ -77,7 +77,7 @@
 			<key>name</key>
 			<string>Class, Support</string>
 			<key>scope</key>
-			<string>entity.name.class, entity.name.type.class, support.type, support.class</string>
+			<string>entity.name.class, entity.name.type, support.type, support.class</string>
 			<key>settings</key>
 			<dict>
 				<key>fontStyle</key>