diff --git a/Themes/Brilliance Black.tmTheme b/Themes/Brilliance Black.tmTheme
index d52dd57..f75d8f1 100644
--- a/Themes/Brilliance Black.tmTheme	
+++ b/Themes/Brilliance Black.tmTheme	
@@ -8,6 +8,8 @@
 	<string>Thomas Aylott ㊷ subtleGradient.com</string>
 	<key>name</key>
 	<string>Brilliance Black</string>
+	<key>semanticClass</key>
+	<string>theme.dark.brilliance-black</string>
 	<key>settings</key>
 	<array>
 		<dict>
@@ -813,7 +815,7 @@ meta.brace.round</string>
 			<key>name</key>
 			<string>✘ Tag Doctype</string>
 			<key>scope</key>
-			<string>meta.doctype, meta.tag.sgml-declaration.doctype, meta.tag.sgml.doctype</string>
+			<string>meta.tag.metadata.doctype</string>
 			<key>settings</key>
 			<dict>
 				<key>background</key>
@@ -887,7 +889,7 @@ meta.brace.round</string>
 			<key>name</key>
 			<string>✘ Tag Other</string>
 			<key>scope</key>
-			<string>meta.tag.other, entity.name.tag.style, entity.name.tag.script, meta.tag.block.script, source.js.embedded punctuation.definition.tag.html, source.css.embedded punctuation.definition.tag.html</string>
+			<string>meta.tag.other, meta.tag.metadata.style entity.name.tag, meta.tag.metadata.script entity.name.tag, meta.tag.metadata.script, source.js.embedded punctuation.definition.tag.html, source.css.embedded punctuation.definition.tag.html</string>
 			<key>settings</key>
 			<dict>
 				<key>background</key>
@@ -900,7 +902,7 @@ meta.brace.round</string>
 			<key>name</key>
 			<string>✘ Tag Form</string>
 			<key>scope</key>
-			<string>meta.tag.form, meta.tag.block.form, meta.tag.inline.form</string>
+			<string>meta.tag.structure.form, meta.tag.block.form, meta.tag.inline.form</string>
 			<key>settings</key>
 			<dict>
 				<key>background</key>
@@ -913,7 +915,7 @@ meta.brace.round</string>
 			<key>name</key>
 			<string>✘ Tag Void</string>
 			<key>scope</key>
-			<string>meta.tag.inline.any.void, meta.tag.form.any.void</string>
+			<string>meta.tag.*.*.void, meta.tag.*.*.*.void</string>
 			<key>settings</key>
 			<dict>
 				<key>background</key>
diff --git a/Themes/Brilliance Dull.tmTheme b/Themes/Brilliance Dull.tmTheme
index 00e814a..1ad1a61 100644
--- a/Themes/Brilliance Dull.tmTheme	
+++ b/Themes/Brilliance Dull.tmTheme	
@@ -8,6 +8,8 @@
 	<string>Thomas Aylott ㊷ subtleGradient.com</string>
 	<key>name</key>
 	<string>Brilliance Dull</string>
+	<key>semanticClass</key>
+	<string>theme.dark.brilliance-dull</string>
 	<key>settings</key>
 	<array>
 		<dict>
@@ -826,7 +828,7 @@ meta.brace.round</string>
 			<key>name</key>
 			<string>✘ Tag Doctype</string>
 			<key>scope</key>
-			<string>meta.doctype, meta.tag.sgml-declaration.doctype, meta.tag.sgml.doctype</string>
+			<string>meta.tag.metadata.doctype</string>
 			<key>settings</key>
 			<dict>
 				<key>background</key>
@@ -900,7 +902,7 @@ meta.brace.round</string>
 			<key>name</key>
 			<string>✘ Tag Other</string>
 			<key>scope</key>
-			<string>meta.tag.other, entity.name.tag.style, entity.name.tag.script, meta.tag.block.script, source.js.embedded punctuation.definition.tag.html, source.css.embedded punctuation.definition.tag.html</string>
+			<string>meta.tag.other, meta.tag.metadata.style entity.name.tag, meta.tag.metadata.script entity.name.tag, meta.tag.metadata.script, source.js.embedded punctuation.definition.tag.html, source.css.embedded punctuation.definition.tag.html</string>
 			<key>settings</key>
 			<dict>
 				<key>background</key>
@@ -913,7 +915,7 @@ meta.brace.round</string>
 			<key>name</key>
 			<string>✘ Tag Form</string>
 			<key>scope</key>
-			<string>meta.tag.form, meta.tag.block.form, meta.tag.inline.form</string>
+			<string>meta.tag.structure.form, meta.tag.block.form, meta.tag.inline.form</string>
 			<key>settings</key>
 			<dict>
 				<key>background</key>
@@ -926,7 +928,7 @@ meta.brace.round</string>
 			<key>name</key>
 			<string>✘ Tag Void</string>
 			<key>scope</key>
-			<string>meta.tag.inline.any.void, meta.tag.form.any.void</string>
+			<string>meta.tag.*.*.void, meta.tag.*.*.*.void</string>
 			<key>settings</key>
 			<dict>
 				<key>background</key>
diff --git a/Themes/Brilliance White.tmTheme b/Themes/Brilliance White.tmTheme
index c58a415..c9ef5cd 100644
--- a/Themes/Brilliance White.tmTheme	
+++ b/Themes/Brilliance White.tmTheme	
@@ -8,6 +8,8 @@
 	<string>Thomas Aylott ㊷ subtleGradient.com</string>
 	<key>name</key>
 	<string>Brilliance White</string>
+	<key>semanticClass</key>
+	<string>theme.light.brilliance-white</string>
 	<key>settings</key>
 	<array>
 		<dict>
@@ -821,7 +823,7 @@ meta.brace.round</string>
 			<key>name</key>
 			<string>✘ Tag Doctype</string>
 			<key>scope</key>
-			<string>meta.doctype, meta.tag.sgml-declaration.doctype, meta.tag.sgml.doctype</string>
+			<string>meta.tag.metadata.doctype</string>
 			<key>settings</key>
 			<dict>
 				<key>background</key>
@@ -1047,7 +1049,7 @@ meta.brace.round</string>
 			<key>name</key>
 			<string>✘ Tag Other</string>
 			<key>scope</key>
-			<string>meta.tag.other, entity.name.tag.style, entity.name.tag.script, meta.tag.block.script, source.js.embedded punctuation.definition.tag.html, source.css.embedded punctuation.definition.tag.html</string>
+			<string>meta.tag.other, meta.tag.metadata.style entity.name.tag, meta.tag.metadata.script entity.name.tag, meta.tag.metadata.script, source.js.embedded punctuation.definition.tag.html, source.css.embedded punctuation.definition.tag.html</string>
 			<key>settings</key>
 			<dict>
 				<key>background</key>
@@ -1073,7 +1075,7 @@ meta.brace.round</string>
 			<key>name</key>
 			<string>✘ Tag Form</string>
 			<key>scope</key>
-			<string>meta.tag.form, meta.tag.block.form, meta.tag.inline.form</string>
+			<string>meta.tag.structure.form, meta.tag.block.form, meta.tag.inline.form</string>
 			<key>settings</key>
 			<dict>
 				<key>background</key>
@@ -1112,7 +1114,7 @@ meta.brace.round</string>
 			<key>name</key>
 			<string>✘ Tag Input</string>
 			<key>scope</key>
-			<string>meta.tag.inline.any.void, meta.tag.form.any.void</string>
+			<string>meta.tag.*.*.void, meta.tag.*.*.*.void</string>
 			<key>settings</key>
 			<dict>
 				<key>background</key>