diff --git a/extensions/html/syntaxes/html.json b/extensions/html/syntaxes/html.json
index 9c574011324..66eacb26486 100644
--- a/extensions/html/syntaxes/html.json
+++ b/extensions/html/syntaxes/html.json
@@ -10,7 +10,7 @@
 	],
 	"firstLineMatch": "<(?i:(!DOCTYPE\\s*)?html)",
 	"injections": {
-		"R:text.html - comment.block": {
+		"R:text.html - (comment.block, text.html source)": {
 			"comment": "Use R: to ensure this matches after any other injections.",
 			"patterns": [
 				{
@@ -24,7 +24,7 @@
 	"name": "HTML",
 	"patterns": [
 		{
-			"begin": "(<)([a-zA-Z0-9:\\-]++)(?=[^>]*></\\2>)",
+			"begin": "(<)([a-zA-Z][a-zA-Z0-9:-]*)(?=[^>]*></\\2>)",
 			"beginCaptures": {
 				"1": {
 					"name": "punctuation.definition.tag.html"
@@ -139,104 +139,256 @@
 			"include": "#embedded-code"
 		},
 		{
-			"begin": "(?:^\\s+)?(<)((?i:style))\\b(?![^>]*/>)",
-			"captures": {
-				"1": {
-					"name": "punctuation.definition.tag.html"
-				},
-				"2": {
-					"name": "entity.name.tag.style.html"
-				},
-				"3": {
-					"name": "punctuation.definition.tag.html"
-				}
-			},
-			"end": "(</)((?i:style))(>)(?:\\s*\\n)?",
-			"patterns": [
-				{
-					"include": "#tag-stuff"
-				},
-				{
-					"contentName": "source.css.embedded.html",
-					"begin": "(>)",
-					"beginCaptures": {
-						"1": {
-							"name": "punctuation.definition.tag.html"
-						}
-					},
-					"end": "(?=</(?i:style))",
-					"patterns": [
-						{
-							"include": "#embedded-code"
-						},
-						{
-							"include": "source.css"
-						}
-					]
-				}
-			]
-		},
-		{
-			"begin": "(?:^\\s+)?(<)((?i:script))\\b(?![^>]*/>)(?![^>]*(?i:type.?=.?text/((?!javascript).*)))",
+			"begin": "(^[ \\t]+)?(?=<(?i:style))",
 			"beginCaptures": {
 				"1": {
-					"name": "punctuation.definition.tag.html"
-				},
-				"2": {
-					"name": "entity.name.tag.script.html"
+					"name": "punctuation.whitespace.embedded.leading.html"
 				}
 			},
-			"end": "(?<=</(script|SCRIPT))(>)(?:\\s*\\n)?",
+			"end": "(?!\\G)([ \\t]*$\\n?)?",
 			"endCaptures": {
-				"2": {
-					"name": "punctuation.definition.tag.html"
+				"1": {
+					"name": "punctuation.whitespace.embedded.trailing.html"
 				}
 			},
 			"patterns": [
 				{
-					"include": "#tag-stuff"
-				},
-				{
-					"contentName": "source.js.embedded.html",
-					"begin": "(?<!</(?:script|SCRIPT))(>)",
-					"captures": {
+					"begin": "(<)((?i:style))\\b",
+					"beginCaptures": {
+						"0": {
+							"name": "meta.tag.metadata.style.html"
+						},
 						"1": {
-							"name": "punctuation.definition.tag.html"
+							"name": "punctuation.definition.tag.begin.html"
 						},
 						"2": {
-							"name": "entity.name.tag.script.html"
+							"name": "entity.name.tag.html"
 						}
 					},
-					"end": "(</)((?i:script))",
+					"end": "(/>)|((<)/)((?i:style))(>)",
+					"endCaptures": {
+						"0": {
+							"name": "meta.tag.metadata.style.html"
+						},
+						"1": {
+							"name": "punctuation.definition.tag.end.html"
+						},
+						"2": {
+							"name": "punctuation.definition.tag.begin.html"
+						},
+						"3": {
+							"name": "source.css"
+						},
+						"4": {
+							"name": "entity.name.tag.html"
+						},
+						"5": {
+							"name": "punctuation.definition.tag.end.html"
+						}
+					},
+					"name": "meta.embedded.block.html",
 					"patterns": [
 						{
+							"begin": "\\G",
 							"captures": {
 								"1": {
-									"name": "punctuation.definition.comment.js"
+									"name": "punctuation.definition.tag.end.html"
 								}
 							},
-							"match": "(//).*?((?=</script)|$\\n?)",
-							"name": "comment.line.double-slash.js"
-						},
-						{
-							"begin": "/\\*",
-							"captures": {
-								"0": {
-									"name": "punctuation.definition.comment.js"
+							"end": "(?=/>)|(>)",
+							"name": "meta.tag.metadata.style.html",
+							"patterns": [
+								{
+									"include": "#tag-stuff"
 								}
-							},
-							"end": "\\*/|(?=</script)",
-							"name": "comment.block.js"
+							]
 						},
 						{
-							"include": "source.js"
+							"begin": "(?!\\G)",
+							"end": "(?=</(?i:style))",
+							"name": "source.css",
+							"patterns": [
+								{
+									"include": "#embedded-code"
+								},
+								{
+									"include": "source.css"
+								}
+							]
 						}
 					]
 				}
 			]
 		},
 		{
-			"begin": "(</?)((?i:body|head|html)(?=\\s|\\\\|>))",
+			"begin": "(^[ \\t]+)?(?=<(?i:script))",
+			"beginCaptures": {
+				"1": {
+					"name": "punctuation.whitespace.embedded.leading.html"
+				}
+			},
+			"end": "(?!\\G)([ \\t]*$\\n?)?",
+			"endCaptures": {
+				"1": {
+					"name": "punctuation.whitespace.embedded.trailing.html"
+				}
+			},
+			"patterns": [
+				{
+					"begin": "(<)((?i:script))\\b",
+					"beginCaptures": {
+						"0": {
+							"name": "meta.tag.metadata.script.html"
+						},
+						"1": {
+							"name": "punctuation.definition.tag.begin.html"
+						},
+						"2": {
+							"name": "entity.name.tag.html"
+						}
+					},
+					"end": "(/>)|(/)((?i:script))(>)",
+					"endCaptures": {
+						"0": {
+							"name": "meta.tag.metadata.script.html"
+						},
+						"1": {
+							"name": "punctuation.definition.tag.end.html"
+						},
+						"2": {
+							"name": "punctuation.definition.tag.begin.html"
+						},
+						"3": {
+							"name": "entity.name.tag.html"
+						},
+						"4": {
+							"name": "punctuation.definition.tag.end.html"
+						}
+					},
+					"name": "meta.embedded.block.html",
+					"patterns": [
+						{
+							"begin": "\\G",
+							"end": "(?=/>|/)",
+							"patterns": [
+								{
+									"begin": "(>)",
+									"beginCaptures": {
+										"0": {
+											"name": "meta.tag.metadata.script.html"
+										},
+										"1": {
+											"name": "punctuation.definition.tag.end.html"
+										}
+									},
+									"end": "((<))(?=/(?i:script))",
+									"endCaptures": {
+										"0": {
+											"name": "meta.tag.metadata.script.html"
+										},
+										"1": {
+											"name": "punctuation.definition.tag.begin.html"
+										},
+										"2": {
+											"name": "source.js"
+										}
+									},
+									"patterns": [
+										{
+											"begin": "\\G",
+											"end": "(?=</(?i:script))",
+											"name": "source.js",
+											"patterns": [
+												{
+													"begin": "(^[ \\t]+)?(?=//)",
+													"beginCaptures": {
+														"1": {
+															"name": "punctuation.whitespace.comment.leading.js"
+														}
+													},
+													"end": "(?!\\G)",
+													"patterns": [
+														{
+															"begin": "//",
+															"beginCaptures": {
+																"0": {
+																	"name": "punctuation.definition.comment.js"
+																}
+															},
+															"end": "(?=</script)|\\n",
+															"name": "comment.line.double-slash.js"
+														}
+													]
+												},
+												{
+													"begin": "/\\*",
+													"captures": {
+														"0": {
+															"name": "punctuation.definition.comment.js"
+														}
+													},
+													"end": "\\*/|(?=</script)",
+													"name": "comment.block.js"
+												},
+												{
+													"include": "source.js"
+												}
+											]
+										}
+									]
+								},
+								{
+									"begin": "\\G",
+									"end": "(?i:(?=/?>|type\\s*=\\s*('|\"|)(?!text/(javascript|ecmascript)|application/((x-)?javascript|ecmascript))\\b))",
+									"name": "meta.tag.metadata.script.html",
+									"patterns": [
+										{
+											"include": "#tag-stuff"
+										}
+									]
+								},
+								{
+									"begin": "(?=(?i:type))",
+									"end": "(<)(?=/(?i:script))",
+									"endCaptures": {
+										"0": {
+											"name": "meta.tag.metadata.script.html"
+										},
+										"1": {
+											"name": "punctuation.definition.tag.begin.html"
+										}
+									},
+									"patterns": [
+										{
+											"begin": "\\G",
+											"end": "(>)|(?=/>)",
+											"endCaptures": {
+												"1": {
+													"name": "punctuation.definition.tag.end.html"
+												}
+											},
+											"name": "meta.tag.metadata.script.html",
+											"patterns": [
+												{
+													"include": "#tag-stuff"
+												}
+											]
+										},
+										{
+											"begin": "(?!\\G)",
+											"end": "(?=</(?i:script))",
+											"name": "source.unknown"
+										}
+									]
+								}
+							]
+						}
+					]
+				}
+			]
+		},
+		{
+			"begin": "(</?)((?i:body|head|html)\\b)",
 			"captures": {
 				"1": {
 					"name": "punctuation.definition.tag.html"
@@ -254,7 +406,7 @@
 			]
 		},
 		{
-			"begin": "(</?)((?i:address|blockquote|dd|div|section|article|aside|header|footer|nav|menu|dl|dt|fieldset|form|frame|frameset|h1|h2|h3|h4|h5|h6|iframe|noframes|object|ol|p|ul|applet|center|dir|hr|pre)(?=\\s|\\\\|>))",
+			"begin": "(</?)((?i:address|blockquote|dd|div|section|article|aside|header|footer|nav|menu|dl|dt|fieldset|form|frame|frameset|h1|h2|h3|h4|h5|h6|iframe|noframes|object|ol|p|ul|applet|center|dir|hr|pre)\\b)",
 			"beginCaptures": {
 				"1": {
 					"name": "punctuation.definition.tag.begin.html"
@@ -277,7 +429,7 @@
 			]
 		},
 		{
-			"begin": "(</?)((?i:a|abbr|acronym|area|b|base|basefont|bdo|big|br|button|caption|cite|code|col|colgroup|del|dfn|em|font|head|html|i|img|input|ins|isindex|kbd|label|legend|li|link|map|meta|noscript|optgroup|option|param|q|s|samp|script|select|small|span|strike|strong|style|sub|sup|table|tbody|td|textarea|tfoot|th|thead|title|tr|tt|u|var)(?=\\s|\\\\|>))",
+			"begin": "(</?)((?i:a|abbr|acronym|area|b|base|basefont|bdo|big|br|button|caption|cite|code|col|colgroup|del|dfn|em|font|head|html|i|img|input|ins|isindex|kbd|label|legend|li|link|map|meta|noscript|optgroup|option|param|q|s|samp|script|select|small|span|strike|strong|style|sub|sup|table|tbody|td|textarea|tfoot|th|thead|title|tr|tt|u|var)\\b(?!-))",
 			"beginCaptures": {
 				"1": {
 					"name": "punctuation.definition.tag.begin.html"
@@ -300,7 +452,7 @@
 			]
 		},
 		{
-			"begin": "(</?)([a-zA-Z0-9:\\-]+)",
+			"begin": "(</?)([a-zA-Z][a-zA-Z0-9:-]*)",
 			"beginCaptures": {
 				"1": {
 					"name": "punctuation.definition.tag.begin.html"
@@ -309,7 +461,7 @@
 					"name": "entity.name.tag.other.html"
 				}
 			},
-			"end": "(>)",
+			"end": "(/?>)",
 			"endCaptures": {
 				"1": {
 					"name": "punctuation.definition.tag.end.html"
@@ -364,7 +516,7 @@
 		"python": {
 			"begin": "(?:^\\s*)<\\?python(?!.*\\?>)",
 			"end": "\\?>(?:\\s*$\\n)?",
-			"contentName": "source.python.embedded.html",
+			"name": "source.python.embedded.html",
 			"patterns": [
 				{
 					"include": "source.python"
@@ -389,7 +541,7 @@
 					"begin": "{{|{",
 					"disabled": 1,
 					"end": "}}|}",
-					"contentName": "source.smarty.embedded.html",
+					"name": "source.smarty.embedded.html",
 					"patterns": [
 						{
 							"include": "source.smarty"
@@ -549,5 +701,5 @@
 	},
 	"scopeName": "text.html.basic",
 	"uuid": "17994EC8-6B1D-11D9-AC3A-000D93589AF6",
-	"version": "https://github.com/textmate/html.tmbundle/commit/9f812c89f4990a98391701caa77824c94860538f"
+	"version": "https://github.com/textmate/html.tmbundle/commit/d66526c5f6b6080358d7bf648654165a4fabf713"
 }
\ No newline at end of file
diff --git a/extensions/html/test/colorize-results/12750_html.json b/extensions/html/test/colorize-results/12750_html.json
index 03eb0cea272..32171a664c3 100644
--- a/extensions/html/test/colorize-results/12750_html.json
+++ b/extensions/html/test/colorize-results/12750_html.json
@@ -1,7 +1,7 @@
 [
 	{
 		"c": "<",
-		"t": "text.html.basic punctuation.definition.tag.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html punctuation.definition.tag.begin.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -12,7 +12,7 @@
 	},
 	{
 		"c": "script",
-		"t": "text.html.basic entity.name.tag.script.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html entity.name.tag.html",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -23,7 +23,7 @@
 	},
 	{
 		"c": " ",
-		"t": "text.html.basic",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -34,7 +34,7 @@
 	},
 	{
 		"c": "type",
-		"t": "text.html.basic entity.other.attribute-name.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html entity.other.attribute-name.html",
 		"r": {
 			"dark_plus": "entity.other.attribute-name: #9CDCFE",
 			"light_plus": "entity.other.attribute-name: #FF0000",
@@ -45,7 +45,7 @@
 	},
 	{
 		"c": "=",
-		"t": "text.html.basic",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -56,7 +56,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "text.html.basic string.quoted.double.html punctuation.definition.string.begin.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html string.quoted.double.html punctuation.definition.string.begin.html",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.double.html: #0000FF",
@@ -67,7 +67,7 @@
 	},
 	{
 		"c": "text/javascript",
-		"t": "text.html.basic string.quoted.double.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html string.quoted.double.html",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.double.html: #0000FF",
@@ -78,7 +78,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "text.html.basic string.quoted.double.html punctuation.definition.string.end.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html string.quoted.double.html punctuation.definition.string.end.html",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.double.html: #0000FF",
@@ -89,7 +89,7 @@
 	},
 	{
 		"c": ">",
-		"t": "text.html.basic punctuation.definition.tag.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html punctuation.definition.tag.end.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -100,7 +100,7 @@
 	},
 	{
 		"c": "\t",
-		"t": "text.html.basic source.js.embedded.html",
+		"t": "text.html.basic meta.embedded.block.html source.js",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -111,7 +111,7 @@
 	},
 	{
 		"c": "window",
-		"t": "text.html.basic source.js.embedded.html support.variable.dom.js",
+		"t": "text.html.basic meta.embedded.block.html source.js support.variable.dom.js",
 		"r": {
 			"dark_plus": "support.variable: #9CDCFE",
 			"light_plus": "support.variable: #001080",
@@ -122,7 +122,7 @@
 	},
 	{
 		"c": ".",
-		"t": "text.html.basic source.js.embedded.html punctuation.accessor.js",
+		"t": "text.html.basic meta.embedded.block.html source.js punctuation.accessor.js",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -133,7 +133,7 @@
 	},
 	{
 		"c": "alert",
-		"t": "text.html.basic source.js.embedded.html support.function.js",
+		"t": "text.html.basic meta.embedded.block.html source.js support.function.js",
 		"r": {
 			"dark_plus": "support.function: #DCDCAA",
 			"light_plus": "support.function: #795E26",
@@ -144,7 +144,7 @@
 	},
 	{
 		"c": "(",
-		"t": "text.html.basic source.js.embedded.html meta.brace.round.js",
+		"t": "text.html.basic meta.embedded.block.html source.js meta.brace.round.js",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -155,7 +155,7 @@
 	},
 	{
 		"c": "'",
-		"t": "text.html.basic source.js.embedded.html string.quoted.single.js punctuation.definition.string.begin.js",
+		"t": "text.html.basic meta.embedded.block.html source.js string.quoted.single.js punctuation.definition.string.begin.js",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -166,7 +166,7 @@
 	},
 	{
 		"c": "hello",
-		"t": "text.html.basic source.js.embedded.html string.quoted.single.js",
+		"t": "text.html.basic meta.embedded.block.html source.js string.quoted.single.js",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -177,7 +177,7 @@
 	},
 	{
 		"c": "'",
-		"t": "text.html.basic source.js.embedded.html string.quoted.single.js punctuation.definition.string.end.js",
+		"t": "text.html.basic meta.embedded.block.html source.js string.quoted.single.js punctuation.definition.string.end.js",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -188,7 +188,7 @@
 	},
 	{
 		"c": ")",
-		"t": "text.html.basic source.js.embedded.html meta.brace.round.js",
+		"t": "text.html.basic meta.embedded.block.html source.js meta.brace.round.js",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -199,7 +199,7 @@
 	},
 	{
 		"c": ";",
-		"t": "text.html.basic source.js.embedded.html punctuation.terminator.statement.js",
+		"t": "text.html.basic meta.embedded.block.html source.js punctuation.terminator.statement.js",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -209,8 +209,19 @@
 		}
 	},
 	{
-		"c": "</",
-		"t": "text.html.basic punctuation.definition.tag.html",
+		"c": "<",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html punctuation.definition.tag.begin.html source.js",
+		"r": {
+			"dark_plus": "punctuation.definition.tag: #808080",
+			"light_plus": "punctuation.definition.tag: #800000",
+			"dark_vs": "punctuation.definition.tag: #808080",
+			"light_vs": "punctuation.definition.tag: #800000",
+			"hc_black": "punctuation.definition.tag: #808080"
+		}
+	},
+	{
+		"c": "/",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html punctuation.definition.tag.begin.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -221,7 +232,7 @@
 	},
 	{
 		"c": "script",
-		"t": "text.html.basic entity.name.tag.script.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html entity.name.tag.html",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -232,7 +243,7 @@
 	},
 	{
 		"c": ">",
-		"t": "text.html.basic punctuation.definition.tag.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html punctuation.definition.tag.end.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -243,7 +254,7 @@
 	},
 	{
 		"c": "<",
-		"t": "text.html.basic punctuation.definition.tag.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html punctuation.definition.tag.begin.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -254,7 +265,7 @@
 	},
 	{
 		"c": "script",
-		"t": "text.html.basic entity.name.tag.script.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html entity.name.tag.html",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -265,7 +276,7 @@
 	},
 	{
 		"c": ">",
-		"t": "text.html.basic punctuation.definition.tag.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html punctuation.definition.tag.end.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -276,7 +287,7 @@
 	},
 	{
 		"c": "\t",
-		"t": "text.html.basic source.js.embedded.html",
+		"t": "text.html.basic meta.embedded.block.html source.js",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -287,7 +298,7 @@
 	},
 	{
 		"c": "window",
-		"t": "text.html.basic source.js.embedded.html support.variable.dom.js",
+		"t": "text.html.basic meta.embedded.block.html source.js support.variable.dom.js",
 		"r": {
 			"dark_plus": "support.variable: #9CDCFE",
 			"light_plus": "support.variable: #001080",
@@ -298,7 +309,7 @@
 	},
 	{
 		"c": ".",
-		"t": "text.html.basic source.js.embedded.html punctuation.accessor.js",
+		"t": "text.html.basic meta.embedded.block.html source.js punctuation.accessor.js",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -309,7 +320,7 @@
 	},
 	{
 		"c": "alert",
-		"t": "text.html.basic source.js.embedded.html support.function.js",
+		"t": "text.html.basic meta.embedded.block.html source.js support.function.js",
 		"r": {
 			"dark_plus": "support.function: #DCDCAA",
 			"light_plus": "support.function: #795E26",
@@ -320,7 +331,7 @@
 	},
 	{
 		"c": "(",
-		"t": "text.html.basic source.js.embedded.html meta.brace.round.js",
+		"t": "text.html.basic meta.embedded.block.html source.js meta.brace.round.js",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -331,7 +342,7 @@
 	},
 	{
 		"c": "'",
-		"t": "text.html.basic source.js.embedded.html string.quoted.single.js punctuation.definition.string.begin.js",
+		"t": "text.html.basic meta.embedded.block.html source.js string.quoted.single.js punctuation.definition.string.begin.js",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -342,7 +353,7 @@
 	},
 	{
 		"c": "hello",
-		"t": "text.html.basic source.js.embedded.html string.quoted.single.js",
+		"t": "text.html.basic meta.embedded.block.html source.js string.quoted.single.js",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -353,7 +364,7 @@
 	},
 	{
 		"c": "'",
-		"t": "text.html.basic source.js.embedded.html string.quoted.single.js punctuation.definition.string.end.js",
+		"t": "text.html.basic meta.embedded.block.html source.js string.quoted.single.js punctuation.definition.string.end.js",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -364,7 +375,7 @@
 	},
 	{
 		"c": ")",
-		"t": "text.html.basic source.js.embedded.html meta.brace.round.js",
+		"t": "text.html.basic meta.embedded.block.html source.js meta.brace.round.js",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -375,7 +386,7 @@
 	},
 	{
 		"c": ";",
-		"t": "text.html.basic source.js.embedded.html punctuation.terminator.statement.js",
+		"t": "text.html.basic meta.embedded.block.html source.js punctuation.terminator.statement.js",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -385,8 +396,19 @@
 		}
 	},
 	{
-		"c": "</",
-		"t": "text.html.basic punctuation.definition.tag.html",
+		"c": "<",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html punctuation.definition.tag.begin.html source.js",
+		"r": {
+			"dark_plus": "punctuation.definition.tag: #808080",
+			"light_plus": "punctuation.definition.tag: #800000",
+			"dark_vs": "punctuation.definition.tag: #808080",
+			"light_vs": "punctuation.definition.tag: #800000",
+			"hc_black": "punctuation.definition.tag: #808080"
+		}
+	},
+	{
+		"c": "/",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html punctuation.definition.tag.begin.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -397,7 +419,7 @@
 	},
 	{
 		"c": "script",
-		"t": "text.html.basic entity.name.tag.script.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html entity.name.tag.html",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -408,7 +430,7 @@
 	},
 	{
 		"c": ">",
-		"t": "text.html.basic punctuation.definition.tag.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html punctuation.definition.tag.end.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
diff --git a/extensions/html/test/colorize-results/13448_html.json b/extensions/html/test/colorize-results/13448_html.json
index f313c06deb3..1a442d66c0b 100644
--- a/extensions/html/test/colorize-results/13448_html.json
+++ b/extensions/html/test/colorize-results/13448_html.json
@@ -55,18 +55,7 @@
 		}
 	},
 	{
-		"c": "/",
-		"t": "text.html.basic meta.tag.other.html",
-		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF"
-		}
-	},
-	{
-		"c": ">",
+		"c": "/>",
 		"t": "text.html.basic meta.tag.other.html punctuation.definition.tag.end.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
diff --git a/extensions/html/test/colorize-results/test_html.json b/extensions/html/test/colorize-results/test_html.json
index 3cd79b78c48..fbdff11c023 100644
--- a/extensions/html/test/colorize-results/test_html.json
+++ b/extensions/html/test/colorize-results/test_html.json
@@ -441,7 +441,7 @@
 	},
 	{
 		"c": "\t",
-		"t": "text.html.basic",
+		"t": "text.html.basic punctuation.whitespace.embedded.leading.html",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -452,7 +452,7 @@
 	},
 	{
 		"c": "<",
-		"t": "text.html.basic punctuation.definition.tag.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.style.html punctuation.definition.tag.begin.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -463,7 +463,7 @@
 	},
 	{
 		"c": "style",
-		"t": "text.html.basic entity.name.tag.style.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.style.html entity.name.tag.html",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -474,7 +474,7 @@
 	},
 	{
 		"c": " ",
-		"t": "text.html.basic",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.style.html",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -485,7 +485,7 @@
 	},
 	{
 		"c": "type",
-		"t": "text.html.basic entity.other.attribute-name.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.style.html entity.other.attribute-name.html",
 		"r": {
 			"dark_plus": "entity.other.attribute-name: #9CDCFE",
 			"light_plus": "entity.other.attribute-name: #FF0000",
@@ -496,7 +496,7 @@
 	},
 	{
 		"c": "=",
-		"t": "text.html.basic",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.style.html",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -507,7 +507,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "text.html.basic string.quoted.double.html punctuation.definition.string.begin.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.style.html string.quoted.double.html punctuation.definition.string.begin.html",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.double.html: #0000FF",
@@ -518,7 +518,7 @@
 	},
 	{
 		"c": "text/css",
-		"t": "text.html.basic string.quoted.double.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.style.html string.quoted.double.html",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.double.html: #0000FF",
@@ -529,7 +529,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "text.html.basic string.quoted.double.html punctuation.definition.string.end.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.style.html string.quoted.double.html punctuation.definition.string.end.html",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.double.html: #0000FF",
@@ -540,7 +540,7 @@
 	},
 	{
 		"c": ">",
-		"t": "text.html.basic punctuation.definition.tag.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.style.html punctuation.definition.tag.end.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -551,7 +551,7 @@
 	},
 	{
 		"c": "\t\t",
-		"t": "text.html.basic source.css.embedded.html",
+		"t": "text.html.basic meta.embedded.block.html source.css",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -562,7 +562,7 @@
 	},
 	{
 		"c": "body",
-		"t": "text.html.basic source.css.embedded.html meta.selector.css entity.name.tag.css",
+		"t": "text.html.basic meta.embedded.block.html source.css meta.selector.css entity.name.tag.css",
 		"r": {
 			"dark_plus": "entity.name.tag.css: #D7BA7D",
 			"light_plus": "entity.name.tag: #800000",
@@ -573,7 +573,7 @@
 	},
 	{
 		"c": " ",
-		"t": "text.html.basic source.css.embedded.html",
+		"t": "text.html.basic meta.embedded.block.html source.css",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -584,7 +584,7 @@
 	},
 	{
 		"c": "{",
-		"t": "text.html.basic source.css.embedded.html meta.property-list.css punctuation.section.property-list.begin.bracket.curly.css",
+		"t": "text.html.basic meta.embedded.block.html source.css meta.property-list.css punctuation.section.property-list.begin.bracket.curly.css",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -595,7 +595,7 @@
 	},
 	{
 		"c": "\t\t\t",
-		"t": "text.html.basic source.css.embedded.html meta.property-list.css",
+		"t": "text.html.basic meta.embedded.block.html source.css meta.property-list.css",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -606,7 +606,7 @@
 	},
 	{
 		"c": "color",
-		"t": "text.html.basic source.css.embedded.html meta.property-list.css meta.property-name.css support.type.property-name.css",
+		"t": "text.html.basic meta.embedded.block.html source.css meta.property-list.css meta.property-name.css support.type.property-name.css",
 		"r": {
 			"dark_plus": "support.type.property-name: #9CDCFE",
 			"light_plus": "support.type.property-name: #FF0000",
@@ -617,7 +617,7 @@
 	},
 	{
 		"c": ":",
-		"t": "text.html.basic source.css.embedded.html meta.property-list.css punctuation.separator.key-value.css",
+		"t": "text.html.basic meta.embedded.block.html source.css meta.property-list.css punctuation.separator.key-value.css",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -628,7 +628,7 @@
 	},
 	{
 		"c": " ",
-		"t": "text.html.basic source.css.embedded.html meta.property-list.css",
+		"t": "text.html.basic meta.embedded.block.html source.css meta.property-list.css",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -639,7 +639,7 @@
 	},
 	{
 		"c": "purple",
-		"t": "text.html.basic source.css.embedded.html meta.property-list.css meta.property-value.css support.constant.color.w3c-standard-color-name.css",
+		"t": "text.html.basic meta.embedded.block.html source.css meta.property-list.css meta.property-value.css support.constant.color.w3c-standard-color-name.css",
 		"r": {
 			"dark_plus": "support.constant.color: #CE9178",
 			"light_plus": "support.constant.color: #0451A5",
@@ -650,7 +650,7 @@
 	},
 	{
 		"c": ";",
-		"t": "text.html.basic source.css.embedded.html meta.property-list.css punctuation.terminator.rule.css",
+		"t": "text.html.basic meta.embedded.block.html source.css meta.property-list.css punctuation.terminator.rule.css",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -661,7 +661,7 @@
 	},
 	{
 		"c": "\t\t\t",
-		"t": "text.html.basic source.css.embedded.html meta.property-list.css",
+		"t": "text.html.basic meta.embedded.block.html source.css meta.property-list.css",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -672,7 +672,7 @@
 	},
 	{
 		"c": "background-color",
-		"t": "text.html.basic source.css.embedded.html meta.property-list.css meta.property-name.css support.type.property-name.css",
+		"t": "text.html.basic meta.embedded.block.html source.css meta.property-list.css meta.property-name.css support.type.property-name.css",
 		"r": {
 			"dark_plus": "support.type.property-name: #9CDCFE",
 			"light_plus": "support.type.property-name: #FF0000",
@@ -683,7 +683,7 @@
 	},
 	{
 		"c": ":",
-		"t": "text.html.basic source.css.embedded.html meta.property-list.css punctuation.separator.key-value.css",
+		"t": "text.html.basic meta.embedded.block.html source.css meta.property-list.css punctuation.separator.key-value.css",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -694,7 +694,7 @@
 	},
 	{
 		"c": " ",
-		"t": "text.html.basic source.css.embedded.html meta.property-list.css",
+		"t": "text.html.basic meta.embedded.block.html source.css meta.property-list.css",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -705,7 +705,7 @@
 	},
 	{
 		"c": "#",
-		"t": "text.html.basic source.css.embedded.html meta.property-list.css meta.property-value.css constant.other.color.rgb-value.hex.css punctuation.definition.constant.css",
+		"t": "text.html.basic meta.embedded.block.html source.css meta.property-list.css meta.property-value.css constant.other.color.rgb-value.hex.css punctuation.definition.constant.css",
 		"r": {
 			"dark_plus": "constant.other.color.rgb-value: #CE9178",
 			"light_plus": "constant.other.color.rgb-value: #0451A5",
@@ -716,7 +716,7 @@
 	},
 	{
 		"c": "d8da3d",
-		"t": "text.html.basic source.css.embedded.html meta.property-list.css meta.property-value.css constant.other.color.rgb-value.hex.css",
+		"t": "text.html.basic meta.embedded.block.html source.css meta.property-list.css meta.property-value.css constant.other.color.rgb-value.hex.css",
 		"r": {
 			"dark_plus": "constant.other.color.rgb-value: #CE9178",
 			"light_plus": "constant.other.color.rgb-value: #0451A5",
@@ -727,7 +727,7 @@
 	},
 	{
 		"c": ";",
-		"t": "text.html.basic source.css.embedded.html meta.property-list.css punctuation.terminator.rule.css",
+		"t": "text.html.basic meta.embedded.block.html source.css meta.property-list.css punctuation.terminator.rule.css",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -738,7 +738,7 @@
 	},
 	{
 		"c": "\t\t",
-		"t": "text.html.basic source.css.embedded.html meta.property-list.css",
+		"t": "text.html.basic meta.embedded.block.html source.css meta.property-list.css",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -749,7 +749,7 @@
 	},
 	{
 		"c": "}",
-		"t": "text.html.basic source.css.embedded.html meta.property-list.css punctuation.section.property-list.end.bracket.curly.css",
+		"t": "text.html.basic meta.embedded.block.html source.css meta.property-list.css punctuation.section.property-list.end.bracket.curly.css",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -760,7 +760,7 @@
 	},
 	{
 		"c": "\t",
-		"t": "text.html.basic source.css.embedded.html",
+		"t": "text.html.basic meta.embedded.block.html source.css",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -770,8 +770,19 @@
 		}
 	},
 	{
-		"c": "</",
-		"t": "text.html.basic punctuation.definition.tag.html",
+		"c": "<",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.style.html punctuation.definition.tag.begin.html source.css",
+		"r": {
+			"dark_plus": "punctuation.definition.tag: #808080",
+			"light_plus": "punctuation.definition.tag: #800000",
+			"dark_vs": "punctuation.definition.tag: #808080",
+			"light_vs": "punctuation.definition.tag: #800000",
+			"hc_black": "punctuation.definition.tag: #808080"
+		}
+	},
+	{
+		"c": "/",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.style.html punctuation.definition.tag.begin.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -782,7 +793,7 @@
 	},
 	{
 		"c": "style",
-		"t": "text.html.basic entity.name.tag.style.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.style.html entity.name.tag.html",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -793,7 +804,7 @@
 	},
 	{
 		"c": ">",
-		"t": "text.html.basic punctuation.definition.tag.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.style.html punctuation.definition.tag.end.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -1079,7 +1090,7 @@
 	},
 	{
 		"c": "\t",
-		"t": "text.html.basic",
+		"t": "text.html.basic punctuation.whitespace.embedded.leading.html",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1090,7 +1101,7 @@
 	},
 	{
 		"c": "<",
-		"t": "text.html.basic punctuation.definition.tag.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html punctuation.definition.tag.begin.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -1101,7 +1112,7 @@
 	},
 	{
 		"c": "script",
-		"t": "text.html.basic entity.name.tag.script.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html entity.name.tag.html",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -1112,7 +1123,7 @@
 	},
 	{
 		"c": " ",
-		"t": "text.html.basic",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1123,7 +1134,7 @@
 	},
 	{
 		"c": "src",
-		"t": "text.html.basic entity.other.attribute-name.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html entity.other.attribute-name.html",
 		"r": {
 			"dark_plus": "entity.other.attribute-name: #9CDCFE",
 			"light_plus": "entity.other.attribute-name: #FF0000",
@@ -1134,7 +1145,7 @@
 	},
 	{
 		"c": "=",
-		"t": "text.html.basic",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1145,7 +1156,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "text.html.basic string.quoted.double.html punctuation.definition.string.begin.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html string.quoted.double.html punctuation.definition.string.begin.html",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.double.html: #0000FF",
@@ -1156,7 +1167,7 @@
 	},
 	{
 		"c": "/out/vs/loader.js",
-		"t": "text.html.basic string.quoted.double.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html string.quoted.double.html",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.double.html: #0000FF",
@@ -1167,7 +1178,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "text.html.basic string.quoted.double.html punctuation.definition.string.end.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html string.quoted.double.html punctuation.definition.string.end.html",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.double.html: #0000FF",
@@ -1177,8 +1188,30 @@
 		}
 	},
 	{
-		"c": "></",
-		"t": "text.html.basic punctuation.definition.tag.html",
+		"c": ">",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html punctuation.definition.tag.end.html",
+		"r": {
+			"dark_plus": "punctuation.definition.tag: #808080",
+			"light_plus": "punctuation.definition.tag: #800000",
+			"dark_vs": "punctuation.definition.tag: #808080",
+			"light_vs": "punctuation.definition.tag: #800000",
+			"hc_black": "punctuation.definition.tag: #808080"
+		}
+	},
+	{
+		"c": "<",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html punctuation.definition.tag.begin.html source.js",
+		"r": {
+			"dark_plus": "punctuation.definition.tag: #808080",
+			"light_plus": "punctuation.definition.tag: #800000",
+			"dark_vs": "punctuation.definition.tag: #808080",
+			"light_vs": "punctuation.definition.tag: #800000",
+			"hc_black": "punctuation.definition.tag: #808080"
+		}
+	},
+	{
+		"c": "/",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html punctuation.definition.tag.begin.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -1189,7 +1222,7 @@
 	},
 	{
 		"c": "script",
-		"t": "text.html.basic entity.name.tag.script.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html entity.name.tag.html",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -1200,7 +1233,7 @@
 	},
 	{
 		"c": ">",
-		"t": "text.html.basic punctuation.definition.tag.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html punctuation.definition.tag.end.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -1211,7 +1244,7 @@
 	},
 	{
 		"c": "\t",
-		"t": "text.html.basic",
+		"t": "text.html.basic punctuation.whitespace.embedded.leading.html",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1222,7 +1255,7 @@
 	},
 	{
 		"c": "<",
-		"t": "text.html.basic punctuation.definition.tag.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html punctuation.definition.tag.begin.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -1233,7 +1266,7 @@
 	},
 	{
 		"c": "script",
-		"t": "text.html.basic entity.name.tag.script.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html entity.name.tag.html",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -1244,7 +1277,7 @@
 	},
 	{
 		"c": " ",
-		"t": "text.html.basic",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1255,7 +1288,7 @@
 	},
 	{
 		"c": "src",
-		"t": "text.html.basic entity.other.attribute-name.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html entity.other.attribute-name.html",
 		"r": {
 			"dark_plus": "entity.other.attribute-name: #9CDCFE",
 			"light_plus": "entity.other.attribute-name: #FF0000",
@@ -1266,7 +1299,7 @@
 	},
 	{
 		"c": "=",
-		"t": "text.html.basic",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1277,7 +1310,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "text.html.basic string.quoted.double.html punctuation.definition.string.begin.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html string.quoted.double.html punctuation.definition.string.begin.html",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.double.html: #0000FF",
@@ -1288,7 +1321,7 @@
 	},
 	{
 		"c": "https://cdn.rawgit.com/mochajs/mocha/2.2.5/mocha.js",
-		"t": "text.html.basic string.quoted.double.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html string.quoted.double.html",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.double.html: #0000FF",
@@ -1299,7 +1332,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "text.html.basic string.quoted.double.html punctuation.definition.string.end.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html string.quoted.double.html punctuation.definition.string.end.html",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.double.html: #0000FF",
@@ -1309,8 +1342,30 @@
 		}
 	},
 	{
-		"c": "></",
-		"t": "text.html.basic punctuation.definition.tag.html",
+		"c": ">",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html punctuation.definition.tag.end.html",
+		"r": {
+			"dark_plus": "punctuation.definition.tag: #808080",
+			"light_plus": "punctuation.definition.tag: #800000",
+			"dark_vs": "punctuation.definition.tag: #808080",
+			"light_vs": "punctuation.definition.tag: #800000",
+			"hc_black": "punctuation.definition.tag: #808080"
+		}
+	},
+	{
+		"c": "<",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html punctuation.definition.tag.begin.html source.js",
+		"r": {
+			"dark_plus": "punctuation.definition.tag: #808080",
+			"light_plus": "punctuation.definition.tag: #800000",
+			"dark_vs": "punctuation.definition.tag: #808080",
+			"light_vs": "punctuation.definition.tag: #800000",
+			"hc_black": "punctuation.definition.tag: #808080"
+		}
+	},
+	{
+		"c": "/",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html punctuation.definition.tag.begin.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -1321,7 +1376,7 @@
 	},
 	{
 		"c": "script",
-		"t": "text.html.basic entity.name.tag.script.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html entity.name.tag.html",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -1332,7 +1387,7 @@
 	},
 	{
 		"c": ">",
-		"t": "text.html.basic punctuation.definition.tag.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html punctuation.definition.tag.end.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -1343,7 +1398,7 @@
 	},
 	{
 		"c": "\t",
-		"t": "text.html.basic",
+		"t": "text.html.basic punctuation.whitespace.embedded.leading.html",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1354,7 +1409,7 @@
 	},
 	{
 		"c": "<",
-		"t": "text.html.basic punctuation.definition.tag.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html punctuation.definition.tag.begin.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -1365,7 +1420,7 @@
 	},
 	{
 		"c": "script",
-		"t": "text.html.basic entity.name.tag.script.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html entity.name.tag.html",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -1376,7 +1431,7 @@
 	},
 	{
 		"c": ">",
-		"t": "text.html.basic punctuation.definition.tag.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html punctuation.definition.tag.end.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -1387,7 +1442,7 @@
 	},
 	{
 		"c": "\t\t",
-		"t": "text.html.basic source.js.embedded.html",
+		"t": "text.html.basic meta.embedded.block.html source.js",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1398,7 +1453,7 @@
 	},
 	{
 		"c": "mocha",
-		"t": "text.html.basic source.js.embedded.html variable.other.object.js",
+		"t": "text.html.basic meta.embedded.block.html source.js variable.other.object.js",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -1409,7 +1464,7 @@
 	},
 	{
 		"c": ".",
-		"t": "text.html.basic source.js.embedded.html punctuation.accessor.js",
+		"t": "text.html.basic meta.embedded.block.html source.js punctuation.accessor.js",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1420,7 +1475,7 @@
 	},
 	{
 		"c": "setup",
-		"t": "text.html.basic source.js.embedded.html entity.name.function.js",
+		"t": "text.html.basic meta.embedded.block.html source.js entity.name.function.js",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -1431,7 +1486,7 @@
 	},
 	{
 		"c": "(",
-		"t": "text.html.basic source.js.embedded.html meta.brace.round.js",
+		"t": "text.html.basic meta.embedded.block.html source.js meta.brace.round.js",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1442,7 +1497,7 @@
 	},
 	{
 		"c": "'",
-		"t": "text.html.basic source.js.embedded.html string.quoted.single.js punctuation.definition.string.begin.js",
+		"t": "text.html.basic meta.embedded.block.html source.js string.quoted.single.js punctuation.definition.string.begin.js",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -1453,7 +1508,7 @@
 	},
 	{
 		"c": "tdd",
-		"t": "text.html.basic source.js.embedded.html string.quoted.single.js",
+		"t": "text.html.basic meta.embedded.block.html source.js string.quoted.single.js",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -1464,7 +1519,7 @@
 	},
 	{
 		"c": "'",
-		"t": "text.html.basic source.js.embedded.html string.quoted.single.js punctuation.definition.string.end.js",
+		"t": "text.html.basic meta.embedded.block.html source.js string.quoted.single.js punctuation.definition.string.end.js",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -1475,7 +1530,7 @@
 	},
 	{
 		"c": ")",
-		"t": "text.html.basic source.js.embedded.html meta.brace.round.js",
+		"t": "text.html.basic meta.embedded.block.html source.js meta.brace.round.js",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1486,7 +1541,7 @@
 	},
 	{
 		"c": ";",
-		"t": "text.html.basic source.js.embedded.html punctuation.terminator.statement.js",
+		"t": "text.html.basic meta.embedded.block.html source.js punctuation.terminator.statement.js",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1497,7 +1552,7 @@
 	},
 	{
 		"c": "\t\t",
-		"t": "text.html.basic source.js.embedded.html",
+		"t": "text.html.basic meta.embedded.block.html source.js",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1508,7 +1563,7 @@
 	},
 	{
 		"c": "require",
-		"t": "text.html.basic source.js.embedded.html variable.other.object.js",
+		"t": "text.html.basic meta.embedded.block.html source.js variable.other.object.js",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -1519,7 +1574,7 @@
 	},
 	{
 		"c": ".",
-		"t": "text.html.basic source.js.embedded.html punctuation.accessor.js",
+		"t": "text.html.basic meta.embedded.block.html source.js punctuation.accessor.js",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1530,7 +1585,7 @@
 	},
 	{
 		"c": "config",
-		"t": "text.html.basic source.js.embedded.html entity.name.function.js",
+		"t": "text.html.basic meta.embedded.block.html source.js entity.name.function.js",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -1541,7 +1596,7 @@
 	},
 	{
 		"c": "(",
-		"t": "text.html.basic source.js.embedded.html meta.brace.round.js",
+		"t": "text.html.basic meta.embedded.block.html source.js meta.brace.round.js",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1552,7 +1607,7 @@
 	},
 	{
 		"c": "{",
-		"t": "text.html.basic source.js.embedded.html meta.objectliteral.js punctuation.definition.block.js",
+		"t": "text.html.basic meta.embedded.block.html source.js meta.objectliteral.js punctuation.definition.block.js",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1563,7 +1618,7 @@
 	},
 	{
 		"c": "\t\t\t",
-		"t": "text.html.basic source.js.embedded.html meta.objectliteral.js",
+		"t": "text.html.basic meta.embedded.block.html source.js meta.objectliteral.js",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1574,7 +1629,7 @@
 	},
 	{
 		"c": "baseUrl",
-		"t": "text.html.basic source.js.embedded.html meta.objectliteral.js meta.object.member.js meta.object-literal.key.js",
+		"t": "text.html.basic meta.embedded.block.html source.js meta.objectliteral.js meta.object.member.js meta.object-literal.key.js",
 		"r": {
 			"dark_plus": "meta.object-literal.key: #9CDCFE",
 			"light_plus": "meta.object-literal.key: #001080",
@@ -1585,7 +1640,7 @@
 	},
 	{
 		"c": ":",
-		"t": "text.html.basic source.js.embedded.html meta.objectliteral.js meta.object.member.js meta.object-literal.key.js punctuation.separator.key-value.js",
+		"t": "text.html.basic meta.embedded.block.html source.js meta.objectliteral.js meta.object.member.js meta.object-literal.key.js punctuation.separator.key-value.js",
 		"r": {
 			"dark_plus": "meta.object-literal.key: #9CDCFE",
 			"light_plus": "meta.object-literal.key: #001080",
@@ -1596,7 +1651,7 @@
 	},
 	{
 		"c": " ",
-		"t": "text.html.basic source.js.embedded.html meta.objectliteral.js meta.object.member.js",
+		"t": "text.html.basic meta.embedded.block.html source.js meta.objectliteral.js meta.object.member.js",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1607,7 +1662,7 @@
 	},
 	{
 		"c": "'",
-		"t": "text.html.basic source.js.embedded.html meta.objectliteral.js meta.object.member.js string.quoted.single.js punctuation.definition.string.begin.js",
+		"t": "text.html.basic meta.embedded.block.html source.js meta.objectliteral.js meta.object.member.js string.quoted.single.js punctuation.definition.string.begin.js",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -1618,7 +1673,7 @@
 	},
 	{
 		"c": "/out",
-		"t": "text.html.basic source.js.embedded.html meta.objectliteral.js meta.object.member.js string.quoted.single.js",
+		"t": "text.html.basic meta.embedded.block.html source.js meta.objectliteral.js meta.object.member.js string.quoted.single.js",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -1629,7 +1684,7 @@
 	},
 	{
 		"c": "'",
-		"t": "text.html.basic source.js.embedded.html meta.objectliteral.js meta.object.member.js string.quoted.single.js punctuation.definition.string.end.js",
+		"t": "text.html.basic meta.embedded.block.html source.js meta.objectliteral.js meta.object.member.js string.quoted.single.js punctuation.definition.string.end.js",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -1640,7 +1695,7 @@
 	},
 	{
 		"c": ",",
-		"t": "text.html.basic source.js.embedded.html meta.objectliteral.js punctuation.separator.comma.js",
+		"t": "text.html.basic meta.embedded.block.html source.js meta.objectliteral.js punctuation.separator.comma.js",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1651,7 +1706,7 @@
 	},
 	{
 		"c": "\t\t\t",
-		"t": "text.html.basic source.js.embedded.html meta.objectliteral.js",
+		"t": "text.html.basic meta.embedded.block.html source.js meta.objectliteral.js",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1662,7 +1717,7 @@
 	},
 	{
 		"c": "paths",
-		"t": "text.html.basic source.js.embedded.html meta.objectliteral.js meta.object.member.js meta.object-literal.key.js",
+		"t": "text.html.basic meta.embedded.block.html source.js meta.objectliteral.js meta.object.member.js meta.object-literal.key.js",
 		"r": {
 			"dark_plus": "meta.object-literal.key: #9CDCFE",
 			"light_plus": "meta.object-literal.key: #001080",
@@ -1673,7 +1728,7 @@
 	},
 	{
 		"c": ":",
-		"t": "text.html.basic source.js.embedded.html meta.objectliteral.js meta.object.member.js meta.object-literal.key.js punctuation.separator.key-value.js",
+		"t": "text.html.basic meta.embedded.block.html source.js meta.objectliteral.js meta.object.member.js meta.object-literal.key.js punctuation.separator.key-value.js",
 		"r": {
 			"dark_plus": "meta.object-literal.key: #9CDCFE",
 			"light_plus": "meta.object-literal.key: #001080",
@@ -1684,7 +1739,7 @@
 	},
 	{
 		"c": " ",
-		"t": "text.html.basic source.js.embedded.html meta.objectliteral.js meta.object.member.js",
+		"t": "text.html.basic meta.embedded.block.html source.js meta.objectliteral.js meta.object.member.js",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1695,7 +1750,7 @@
 	},
 	{
 		"c": "{",
-		"t": "text.html.basic source.js.embedded.html meta.objectliteral.js meta.object.member.js meta.objectliteral.js punctuation.definition.block.js",
+		"t": "text.html.basic meta.embedded.block.html source.js meta.objectliteral.js meta.object.member.js meta.objectliteral.js punctuation.definition.block.js",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1706,7 +1761,7 @@
 	},
 	{
 		"c": "\t\t\t\t",
-		"t": "text.html.basic source.js.embedded.html meta.objectliteral.js meta.object.member.js meta.objectliteral.js",
+		"t": "text.html.basic meta.embedded.block.html source.js meta.objectliteral.js meta.object.member.js meta.objectliteral.js",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1717,7 +1772,7 @@
 	},
 	{
 		"c": "assert",
-		"t": "text.html.basic source.js.embedded.html meta.objectliteral.js meta.object.member.js meta.objectliteral.js meta.object.member.js meta.object-literal.key.js",
+		"t": "text.html.basic meta.embedded.block.html source.js meta.objectliteral.js meta.object.member.js meta.objectliteral.js meta.object.member.js meta.object-literal.key.js",
 		"r": {
 			"dark_plus": "meta.object-literal.key: #9CDCFE",
 			"light_plus": "meta.object-literal.key: #001080",
@@ -1728,7 +1783,7 @@
 	},
 	{
 		"c": ":",
-		"t": "text.html.basic source.js.embedded.html meta.objectliteral.js meta.object.member.js meta.objectliteral.js meta.object.member.js meta.object-literal.key.js punctuation.separator.key-value.js",
+		"t": "text.html.basic meta.embedded.block.html source.js meta.objectliteral.js meta.object.member.js meta.objectliteral.js meta.object.member.js meta.object-literal.key.js punctuation.separator.key-value.js",
 		"r": {
 			"dark_plus": "meta.object-literal.key: #9CDCFE",
 			"light_plus": "meta.object-literal.key: #001080",
@@ -1739,7 +1794,7 @@
 	},
 	{
 		"c": " ",
-		"t": "text.html.basic source.js.embedded.html meta.objectliteral.js meta.object.member.js meta.objectliteral.js meta.object.member.js",
+		"t": "text.html.basic meta.embedded.block.html source.js meta.objectliteral.js meta.object.member.js meta.objectliteral.js meta.object.member.js",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1750,7 +1805,7 @@
 	},
 	{
 		"c": "'",
-		"t": "text.html.basic source.js.embedded.html meta.objectliteral.js meta.object.member.js meta.objectliteral.js meta.object.member.js string.quoted.single.js punctuation.definition.string.begin.js",
+		"t": "text.html.basic meta.embedded.block.html source.js meta.objectliteral.js meta.object.member.js meta.objectliteral.js meta.object.member.js string.quoted.single.js punctuation.definition.string.begin.js",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -1761,7 +1816,7 @@
 	},
 	{
 		"c": "/test/assert.js",
-		"t": "text.html.basic source.js.embedded.html meta.objectliteral.js meta.object.member.js meta.objectliteral.js meta.object.member.js string.quoted.single.js",
+		"t": "text.html.basic meta.embedded.block.html source.js meta.objectliteral.js meta.object.member.js meta.objectliteral.js meta.object.member.js string.quoted.single.js",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -1772,7 +1827,7 @@
 	},
 	{
 		"c": "'",
-		"t": "text.html.basic source.js.embedded.html meta.objectliteral.js meta.object.member.js meta.objectliteral.js meta.object.member.js string.quoted.single.js punctuation.definition.string.end.js",
+		"t": "text.html.basic meta.embedded.block.html source.js meta.objectliteral.js meta.object.member.js meta.objectliteral.js meta.object.member.js string.quoted.single.js punctuation.definition.string.end.js",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -1783,7 +1838,7 @@
 	},
 	{
 		"c": "\t\t\t",
-		"t": "text.html.basic source.js.embedded.html meta.objectliteral.js meta.object.member.js meta.objectliteral.js meta.object.member.js",
+		"t": "text.html.basic meta.embedded.block.html source.js meta.objectliteral.js meta.object.member.js meta.objectliteral.js meta.object.member.js",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1794,7 +1849,7 @@
 	},
 	{
 		"c": "}",
-		"t": "text.html.basic source.js.embedded.html meta.objectliteral.js meta.object.member.js meta.objectliteral.js punctuation.definition.block.js",
+		"t": "text.html.basic meta.embedded.block.html source.js meta.objectliteral.js meta.object.member.js meta.objectliteral.js punctuation.definition.block.js",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1805,7 +1860,7 @@
 	},
 	{
 		"c": "\t\t",
-		"t": "text.html.basic source.js.embedded.html meta.objectliteral.js meta.object.member.js",
+		"t": "text.html.basic meta.embedded.block.html source.js meta.objectliteral.js meta.object.member.js",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1816,7 +1871,7 @@
 	},
 	{
 		"c": "}",
-		"t": "text.html.basic source.js.embedded.html meta.objectliteral.js punctuation.definition.block.js",
+		"t": "text.html.basic meta.embedded.block.html source.js meta.objectliteral.js punctuation.definition.block.js",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1827,7 +1882,7 @@
 	},
 	{
 		"c": ")",
-		"t": "text.html.basic source.js.embedded.html meta.brace.round.js",
+		"t": "text.html.basic meta.embedded.block.html source.js meta.brace.round.js",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1838,7 +1893,7 @@
 	},
 	{
 		"c": ";",
-		"t": "text.html.basic source.js.embedded.html punctuation.terminator.statement.js",
+		"t": "text.html.basic meta.embedded.block.html source.js punctuation.terminator.statement.js",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1849,7 +1904,7 @@
 	},
 	{
 		"c": "\t\t",
-		"t": "text.html.basic source.js.embedded.html",
+		"t": "text.html.basic meta.embedded.block.html source.js",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1860,7 +1915,7 @@
 	},
 	{
 		"c": "require",
-		"t": "text.html.basic source.js.embedded.html support.function.js",
+		"t": "text.html.basic meta.embedded.block.html source.js support.function.js",
 		"r": {
 			"dark_plus": "support.function: #DCDCAA",
 			"light_plus": "support.function: #795E26",
@@ -1871,7 +1926,7 @@
 	},
 	{
 		"c": "(",
-		"t": "text.html.basic source.js.embedded.html meta.brace.round.js",
+		"t": "text.html.basic meta.embedded.block.html source.js meta.brace.round.js",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1882,7 +1937,7 @@
 	},
 	{
 		"c": "{",
-		"t": "text.html.basic source.js.embedded.html meta.objectliteral.js punctuation.definition.block.js",
+		"t": "text.html.basic meta.embedded.block.html source.js meta.objectliteral.js punctuation.definition.block.js",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1893,7 +1948,7 @@
 	},
 	{
 		"c": "{ ",
-		"t": "text.html.basic source.js.embedded.html meta.objectliteral.js",
+		"t": "text.html.basic meta.embedded.block.html source.js meta.objectliteral.js",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1904,7 +1959,7 @@
 	},
 	{
 		"c": "modules",
-		"t": "text.html.basic source.js.embedded.html meta.objectliteral.js meta.object.member.js variable.other.readwrite.js",
+		"t": "text.html.basic meta.embedded.block.html source.js meta.objectliteral.js meta.object.member.js variable.other.readwrite.js",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -1915,7 +1970,7 @@
 	},
 	{
 		"c": " ",
-		"t": "text.html.basic source.js.embedded.html meta.objectliteral.js meta.object.member.js",
+		"t": "text.html.basic meta.embedded.block.html source.js meta.objectliteral.js meta.object.member.js",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1926,7 +1981,7 @@
 	},
 	{
 		"c": "}",
-		"t": "text.html.basic source.js.embedded.html meta.objectliteral.js punctuation.definition.block.js",
+		"t": "text.html.basic meta.embedded.block.html source.js meta.objectliteral.js punctuation.definition.block.js",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1937,7 +1992,7 @@
 	},
 	{
 		"c": "}",
-		"t": "text.html.basic source.js.embedded.html",
+		"t": "text.html.basic meta.embedded.block.html source.js",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1948,7 +2003,7 @@
 	},
 	{
 		"c": ",",
-		"t": "text.html.basic source.js.embedded.html punctuation.separator.comma.js",
+		"t": "text.html.basic meta.embedded.block.html source.js punctuation.separator.comma.js",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1959,7 +2014,7 @@
 	},
 	{
 		"c": " ",
-		"t": "text.html.basic source.js.embedded.html",
+		"t": "text.html.basic meta.embedded.block.html source.js",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1970,7 +2025,7 @@
 	},
 	{
 		"c": "function",
-		"t": "text.html.basic source.js.embedded.html meta.function.expression.js storage.type.function.js",
+		"t": "text.html.basic meta.embedded.block.html source.js meta.function.expression.js storage.type.function.js",
 		"r": {
 			"dark_plus": "storage.type: #569CD6",
 			"light_plus": "storage.type: #0000FF",
@@ -1981,7 +2036,7 @@
 	},
 	{
 		"c": " ",
-		"t": "text.html.basic source.js.embedded.html meta.function.expression.js",
+		"t": "text.html.basic meta.embedded.block.html source.js meta.function.expression.js",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1992,7 +2047,7 @@
 	},
 	{
 		"c": "(",
-		"t": "text.html.basic source.js.embedded.html meta.function.expression.js meta.parameters.js punctuation.definition.parameters.begin.js",
+		"t": "text.html.basic meta.embedded.block.html source.js meta.function.expression.js meta.parameters.js punctuation.definition.parameters.begin.js",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2003,7 +2058,7 @@
 	},
 	{
 		"c": ")",
-		"t": "text.html.basic source.js.embedded.html meta.function.expression.js meta.parameters.js punctuation.definition.parameters.end.js",
+		"t": "text.html.basic meta.embedded.block.html source.js meta.function.expression.js meta.parameters.js punctuation.definition.parameters.end.js",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2014,7 +2069,7 @@
 	},
 	{
 		"c": " ",
-		"t": "text.html.basic source.js.embedded.html meta.function.expression.js",
+		"t": "text.html.basic meta.embedded.block.html source.js meta.function.expression.js",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2025,7 +2080,7 @@
 	},
 	{
 		"c": "{",
-		"t": "text.html.basic source.js.embedded.html meta.function.expression.js meta.block.js punctuation.definition.block.js",
+		"t": "text.html.basic meta.embedded.block.html source.js meta.function.expression.js meta.block.js punctuation.definition.block.js",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2036,7 +2091,7 @@
 	},
 	{
 		"c": "\t\t\t",
-		"t": "text.html.basic source.js.embedded.html meta.function.expression.js meta.block.js",
+		"t": "text.html.basic meta.embedded.block.html source.js meta.function.expression.js meta.block.js",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2047,7 +2102,7 @@
 	},
 	{
 		"c": "mocha",
-		"t": "text.html.basic source.js.embedded.html meta.function.expression.js meta.block.js variable.other.object.js",
+		"t": "text.html.basic meta.embedded.block.html source.js meta.function.expression.js meta.block.js variable.other.object.js",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -2058,7 +2113,7 @@
 	},
 	{
 		"c": ".",
-		"t": "text.html.basic source.js.embedded.html meta.function.expression.js meta.block.js punctuation.accessor.js",
+		"t": "text.html.basic meta.embedded.block.html source.js meta.function.expression.js meta.block.js punctuation.accessor.js",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2069,7 +2124,7 @@
 	},
 	{
 		"c": "run",
-		"t": "text.html.basic source.js.embedded.html meta.function.expression.js meta.block.js entity.name.function.js",
+		"t": "text.html.basic meta.embedded.block.html source.js meta.function.expression.js meta.block.js entity.name.function.js",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -2080,7 +2135,7 @@
 	},
 	{
 		"c": "()",
-		"t": "text.html.basic source.js.embedded.html meta.function.expression.js meta.block.js meta.brace.round.js",
+		"t": "text.html.basic meta.embedded.block.html source.js meta.function.expression.js meta.block.js meta.brace.round.js",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2091,7 +2146,7 @@
 	},
 	{
 		"c": ";",
-		"t": "text.html.basic source.js.embedded.html meta.function.expression.js meta.block.js punctuation.terminator.statement.js",
+		"t": "text.html.basic meta.embedded.block.html source.js meta.function.expression.js meta.block.js punctuation.terminator.statement.js",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2102,7 +2157,7 @@
 	},
 	{
 		"c": "\t\t",
-		"t": "text.html.basic source.js.embedded.html meta.function.expression.js meta.block.js",
+		"t": "text.html.basic meta.embedded.block.html source.js meta.function.expression.js meta.block.js",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2113,7 +2168,7 @@
 	},
 	{
 		"c": "}",
-		"t": "text.html.basic source.js.embedded.html meta.function.expression.js meta.block.js punctuation.definition.block.js",
+		"t": "text.html.basic meta.embedded.block.html source.js meta.function.expression.js meta.block.js punctuation.definition.block.js",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2124,7 +2179,7 @@
 	},
 	{
 		"c": ")",
-		"t": "text.html.basic source.js.embedded.html meta.brace.round.js",
+		"t": "text.html.basic meta.embedded.block.html source.js meta.brace.round.js",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2135,7 +2190,7 @@
 	},
 	{
 		"c": ";",
-		"t": "text.html.basic source.js.embedded.html punctuation.terminator.statement.js",
+		"t": "text.html.basic meta.embedded.block.html source.js punctuation.terminator.statement.js",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2146,7 +2201,7 @@
 	},
 	{
 		"c": "\t",
-		"t": "text.html.basic source.js.embedded.html",
+		"t": "text.html.basic meta.embedded.block.html source.js",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2156,8 +2211,19 @@
 		}
 	},
 	{
-		"c": "</",
-		"t": "text.html.basic punctuation.definition.tag.html",
+		"c": "<",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html punctuation.definition.tag.begin.html source.js",
+		"r": {
+			"dark_plus": "punctuation.definition.tag: #808080",
+			"light_plus": "punctuation.definition.tag: #800000",
+			"dark_vs": "punctuation.definition.tag: #808080",
+			"light_vs": "punctuation.definition.tag: #800000",
+			"hc_black": "punctuation.definition.tag: #808080"
+		}
+	},
+	{
+		"c": "/",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html punctuation.definition.tag.begin.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -2168,7 +2234,7 @@
 	},
 	{
 		"c": "script",
-		"t": "text.html.basic entity.name.tag.script.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html entity.name.tag.html",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -2179,7 +2245,7 @@
 	},
 	{
 		"c": ">",
-		"t": "text.html.basic punctuation.definition.tag.html",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html punctuation.definition.tag.end.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
diff --git a/extensions/markdown/test/colorize-results/test_md.json b/extensions/markdown/test/colorize-results/test_md.json
index 4e5b3dacac6..c40d5536256 100644
--- a/extensions/markdown/test/colorize-results/test_md.json
+++ b/extensions/markdown/test/colorize-results/test_md.json
@@ -617,7 +617,7 @@
 	},
 	{
 		"c": "  ",
-		"t": "text.html.markdown",
+		"t": "text.html.markdown punctuation.whitespace.embedded.leading.html",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -628,7 +628,7 @@
 	},
 	{
 		"c": "<",
-		"t": "text.html.markdown meta.tag.inline.any.html punctuation.definition.tag.begin.html",
+		"t": "text.html.markdown meta.embedded.block.html meta.tag.metadata.script.html punctuation.definition.tag.begin.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -639,7 +639,7 @@
 	},
 	{
 		"c": "script",
-		"t": "text.html.markdown meta.tag.inline.any.html entity.name.tag.inline.any.html",
+		"t": "text.html.markdown meta.embedded.block.html meta.tag.metadata.script.html entity.name.tag.html",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -650,7 +650,7 @@
 	},
 	{
 		"c": " ",
-		"t": "text.html.markdown meta.tag.inline.any.html",
+		"t": "text.html.markdown meta.embedded.block.html meta.tag.metadata.script.html",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -661,7 +661,7 @@
 	},
 	{
 		"c": "type",
-		"t": "text.html.markdown meta.tag.inline.any.html entity.other.attribute-name.html",
+		"t": "text.html.markdown meta.embedded.block.html meta.tag.metadata.script.html entity.other.attribute-name.html",
 		"r": {
 			"dark_plus": "entity.other.attribute-name: #9CDCFE",
 			"light_plus": "entity.other.attribute-name: #FF0000",
@@ -672,7 +672,7 @@
 	},
 	{
 		"c": "=",
-		"t": "text.html.markdown meta.tag.inline.any.html",
+		"t": "text.html.markdown meta.embedded.block.html meta.tag.metadata.script.html",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -683,7 +683,7 @@
 	},
 	{
 		"c": "'",
-		"t": "text.html.markdown meta.tag.inline.any.html string.quoted.single.html punctuation.definition.string.begin.html",
+		"t": "text.html.markdown meta.embedded.block.html meta.tag.metadata.script.html string.quoted.single.html punctuation.definition.string.begin.html",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.single.html: #0000FF",
@@ -694,7 +694,7 @@
 	},
 	{
 		"c": "text/x-koka",
-		"t": "text.html.markdown meta.tag.inline.any.html string.quoted.single.html",
+		"t": "text.html.markdown meta.embedded.block.html meta.tag.metadata.script.html string.quoted.single.html",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.single.html: #0000FF",
@@ -705,7 +705,7 @@
 	},
 	{
 		"c": "'",
-		"t": "text.html.markdown meta.tag.inline.any.html string.quoted.single.html punctuation.definition.string.end.html",
+		"t": "text.html.markdown meta.embedded.block.html meta.tag.metadata.script.html string.quoted.single.html punctuation.definition.string.end.html",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.single.html: #0000FF",
@@ -716,7 +716,7 @@
 	},
 	{
 		"c": ">",
-		"t": "text.html.markdown meta.tag.inline.any.html punctuation.definition.tag.end.html",
+		"t": "text.html.markdown meta.embedded.block.html meta.tag.metadata.script.html punctuation.definition.tag.end.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -727,7 +727,7 @@
 	},
 	{
 		"c": "    function( x: int ) { return x*x; }",
-		"t": "text.html.markdown",
+		"t": "text.html.markdown meta.embedded.block.html source.unknown",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -738,7 +738,7 @@
 	},
 	{
 		"c": "  ",
-		"t": "text.html.markdown",
+		"t": "text.html.markdown meta.embedded.block.html source.unknown",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -749,7 +749,7 @@
 	},
 	{
 		"c": "</",
-		"t": "text.html.markdown meta.tag.inline.any.html punctuation.definition.tag.begin.html",
+		"t": "text.html.markdown meta.embedded.block.html meta.tag.metadata.script.html punctuation.definition.tag.begin.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -760,7 +760,7 @@
 	},
 	{
 		"c": "script",
-		"t": "text.html.markdown meta.tag.inline.any.html entity.name.tag.inline.any.html",
+		"t": "text.html.markdown meta.embedded.block.html meta.tag.metadata.script.html entity.name.tag.html",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -771,7 +771,7 @@
 	},
 	{
 		"c": ">",
-		"t": "text.html.markdown meta.tag.inline.any.html punctuation.definition.tag.end.html",
+		"t": "text.html.markdown meta.embedded.block.html meta.tag.metadata.script.html punctuation.definition.tag.end.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -980,7 +980,7 @@
 	},
 	{
 		"c": "  ",
-		"t": "text.html.markdown",
+		"t": "text.html.markdown punctuation.whitespace.embedded.leading.html",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -991,7 +991,7 @@
 	},
 	{
 		"c": "<",
-		"t": "text.html.markdown punctuation.definition.tag.html",
+		"t": "text.html.markdown meta.embedded.block.html meta.tag.metadata.style.html punctuation.definition.tag.begin.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -1002,7 +1002,7 @@
 	},
 	{
 		"c": "style",
-		"t": "text.html.markdown entity.name.tag.style.html",
+		"t": "text.html.markdown meta.embedded.block.html meta.tag.metadata.style.html entity.name.tag.html",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -1013,7 +1013,7 @@
 	},
 	{
 		"c": ">",
-		"t": "text.html.markdown punctuation.definition.tag.html",
+		"t": "text.html.markdown meta.embedded.block.html meta.tag.metadata.style.html punctuation.definition.tag.end.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -1024,7 +1024,7 @@
 	},
 	{
 		"c": "    ",
-		"t": "text.html.markdown source.css.embedded.html",
+		"t": "text.html.markdown meta.embedded.block.html source.css",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1035,7 +1035,7 @@
 	},
 	{
 		"c": "body",
-		"t": "text.html.markdown source.css.embedded.html meta.selector.css entity.name.tag.css",
+		"t": "text.html.markdown meta.embedded.block.html source.css meta.selector.css entity.name.tag.css",
 		"r": {
 			"dark_plus": "entity.name.tag.css: #D7BA7D",
 			"light_plus": "entity.name.tag: #800000",
@@ -1046,7 +1046,7 @@
 	},
 	{
 		"c": " ",
-		"t": "text.html.markdown source.css.embedded.html",
+		"t": "text.html.markdown meta.embedded.block.html source.css",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1057,7 +1057,7 @@
 	},
 	{
 		"c": "{",
-		"t": "text.html.markdown source.css.embedded.html meta.property-list.css punctuation.section.property-list.begin.bracket.curly.css",
+		"t": "text.html.markdown meta.embedded.block.html source.css meta.property-list.css punctuation.section.property-list.begin.bracket.curly.css",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1068,7 +1068,7 @@
 	},
 	{
 		"c": " ",
-		"t": "text.html.markdown source.css.embedded.html meta.property-list.css",
+		"t": "text.html.markdown meta.embedded.block.html source.css meta.property-list.css",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1079,7 +1079,7 @@
 	},
 	{
 		"c": "font",
-		"t": "text.html.markdown source.css.embedded.html meta.property-list.css meta.property-name.css support.type.property-name.css",
+		"t": "text.html.markdown meta.embedded.block.html source.css meta.property-list.css meta.property-name.css support.type.property-name.css",
 		"r": {
 			"dark_plus": "support.type.property-name: #9CDCFE",
 			"light_plus": "support.type.property-name: #FF0000",
@@ -1090,7 +1090,7 @@
 	},
 	{
 		"c": ":",
-		"t": "text.html.markdown source.css.embedded.html meta.property-list.css punctuation.separator.key-value.css",
+		"t": "text.html.markdown meta.embedded.block.html source.css meta.property-list.css punctuation.separator.key-value.css",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1101,7 +1101,7 @@
 	},
 	{
 		"c": " ",
-		"t": "text.html.markdown source.css.embedded.html meta.property-list.css",
+		"t": "text.html.markdown meta.embedded.block.html source.css meta.property-list.css",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1112,7 +1112,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "text.html.markdown source.css.embedded.html meta.property-list.css meta.property-value.css string.quoted.double.css punctuation.definition.string.begin.css",
+		"t": "text.html.markdown meta.embedded.block.html source.css meta.property-list.css meta.property-value.css string.quoted.double.css punctuation.definition.string.begin.css",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -1123,7 +1123,7 @@
 	},
 	{
 		"c": "Consolas",
-		"t": "text.html.markdown source.css.embedded.html meta.property-list.css meta.property-value.css string.quoted.double.css",
+		"t": "text.html.markdown meta.embedded.block.html source.css meta.property-list.css meta.property-value.css string.quoted.double.css",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -1134,7 +1134,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "text.html.markdown source.css.embedded.html meta.property-list.css meta.property-value.css string.quoted.double.css punctuation.definition.string.end.css",
+		"t": "text.html.markdown meta.embedded.block.html source.css meta.property-list.css meta.property-value.css string.quoted.double.css punctuation.definition.string.end.css",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -1145,7 +1145,7 @@
 	},
 	{
 		"c": " ",
-		"t": "text.html.markdown source.css.embedded.html meta.property-list.css",
+		"t": "text.html.markdown meta.embedded.block.html source.css meta.property-list.css",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1156,7 +1156,7 @@
 	},
 	{
 		"c": "}",
-		"t": "text.html.markdown source.css.embedded.html meta.property-list.css punctuation.section.property-list.end.bracket.curly.css",
+		"t": "text.html.markdown meta.embedded.block.html source.css meta.property-list.css punctuation.section.property-list.end.bracket.curly.css",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1167,7 +1167,7 @@
 	},
 	{
 		"c": "  ",
-		"t": "text.html.markdown source.css.embedded.html",
+		"t": "text.html.markdown meta.embedded.block.html source.css",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1177,8 +1177,19 @@
 		}
 	},
 	{
-		"c": "</",
-		"t": "text.html.markdown punctuation.definition.tag.html",
+		"c": "<",
+		"t": "text.html.markdown meta.embedded.block.html meta.tag.metadata.style.html punctuation.definition.tag.begin.html source.css",
+		"r": {
+			"dark_plus": "punctuation.definition.tag: #808080",
+			"light_plus": "punctuation.definition.tag: #800000",
+			"dark_vs": "punctuation.definition.tag: #808080",
+			"light_vs": "punctuation.definition.tag: #800000",
+			"hc_black": "punctuation.definition.tag: #808080"
+		}
+	},
+	{
+		"c": "/",
+		"t": "text.html.markdown meta.embedded.block.html meta.tag.metadata.style.html punctuation.definition.tag.begin.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -1189,7 +1200,7 @@
 	},
 	{
 		"c": "style",
-		"t": "text.html.markdown entity.name.tag.style.html",
+		"t": "text.html.markdown meta.embedded.block.html meta.tag.metadata.style.html entity.name.tag.html",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -1200,7 +1211,7 @@
 	},
 	{
 		"c": ">",
-		"t": "text.html.markdown punctuation.definition.tag.html",
+		"t": "text.html.markdown meta.embedded.block.html meta.tag.metadata.style.html punctuation.definition.tag.end.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",