diff --git a/extensions/html/syntaxes/html.json b/extensions/html/syntaxes/html.json
index be1113e583a..cc2d9fd17ea 100644
--- a/extensions/html/syntaxes/html.json
+++ b/extensions/html/syntaxes/html.json
@@ -339,7 +339,7 @@
 								},
 								{
 									"begin": "\\G",
-									"end": "(?i:(?=/?>|type\\s*=\\s*('|\"|)(?!text/(javascript|ecmascript)|application/((x-)?javascript|ecmascript)|module)\\b))",
+									"end": "(?i:(?=/?>|type(?=[\\s=])(?!\\s*=\\s*('|\"|)(text/(javascript|ecmascript|babel)|application/((x-)?javascript|ecmascript|babel)|module)[\\s\"'>])))",
 									"name": "meta.tag.metadata.script.html",
 									"patterns": [
 										{
@@ -348,14 +348,17 @@
 									]
 								},
 								{
-									"begin": "(?=(?i:type\\s*=\\s*('|\"|)(?=text/(x-handlebars|(x-(handlebars-)?|ng-)?template|html))\\b))",
-									"end": "(<)(?=/(?i:script))",
+									"begin": "(?=(?i:type\\s*=\\s*('|\"|)(text/(x-handlebars|(x-(handlebars-)?|ng-)?template|html)[\\s\"'>])))",
+									"end": "((<))(?=/(?i:script))",
 									"endCaptures": {
 										"0": {
 											"name": "meta.tag.metadata.script.html"
 										},
 										"1": {
 											"name": "punctuation.definition.tag.begin.html"
+										},
+										"2": {
+											"name": "text.html.basic"
 										}
 									},
 									"patterns": [
@@ -377,6 +380,7 @@
 										{
 											"begin": "(?!\\G)",
 											"end": "(?=</(?i:script))",
+											"name": "text.html.basic",
 											"patterns": [
 												{
 													"include": "text.html.basic"
@@ -739,5 +743,5 @@
 	},
 	"scopeName": "text.html.basic",
 	"uuid": "17994EC8-6B1D-11D9-AC3A-000D93589AF6",
-	"version": "https://github.com/textmate/html.tmbundle/commit/d66526c5f6b6080358d7bf648654165a4fabf713"
+	"version": "https://github.com/textmate/html.tmbundle/commit/a723f08ebd49c67c22aca08dd8f17d0bf836ec93"
 }
\ No newline at end of file
diff --git a/extensions/html/test/colorize-results/25920_html.json b/extensions/html/test/colorize-results/25920_html.json
index d8cf7ad33df..697937acdbd 100644
--- a/extensions/html/test/colorize-results/25920_html.json
+++ b/extensions/html/test/colorize-results/25920_html.json
@@ -133,7 +133,7 @@
 	},
 	{
 		"c": "\t",
-		"t": "text.html.basic meta.embedded.block.html",
+		"t": "text.html.basic meta.embedded.block.html text.html.basic",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -144,7 +144,7 @@
 	},
 	{
 		"c": "<",
-		"t": "text.html.basic meta.embedded.block.html meta.tag.any.html punctuation.definition.tag.html",
+		"t": "text.html.basic meta.embedded.block.html text.html.basic meta.tag.any.html punctuation.definition.tag.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -155,7 +155,7 @@
 	},
 	{
 		"c": "div",
-		"t": "text.html.basic meta.embedded.block.html meta.tag.any.html entity.name.tag.html",
+		"t": "text.html.basic meta.embedded.block.html text.html.basic meta.tag.any.html entity.name.tag.html",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -166,7 +166,7 @@
 	},
 	{
 		"c": " ",
-		"t": "text.html.basic meta.embedded.block.html meta.tag.any.html",
+		"t": "text.html.basic meta.embedded.block.html text.html.basic meta.tag.any.html",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -177,7 +177,7 @@
 	},
 	{
 		"c": "class",
-		"t": "text.html.basic meta.embedded.block.html meta.tag.any.html entity.other.attribute-name.html",
+		"t": "text.html.basic meta.embedded.block.html text.html.basic meta.tag.any.html entity.other.attribute-name.html",
 		"r": {
 			"dark_plus": "entity.other.attribute-name: #9CDCFE",
 			"light_plus": "entity.other.attribute-name: #FF0000",
@@ -188,7 +188,7 @@
 	},
 	{
 		"c": "=",
-		"t": "text.html.basic meta.embedded.block.html meta.tag.any.html",
+		"t": "text.html.basic meta.embedded.block.html text.html.basic meta.tag.any.html",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -199,7 +199,7 @@
 	},
 	{
 		"c": "'",
-		"t": "text.html.basic meta.embedded.block.html meta.tag.any.html string.quoted.single.html punctuation.definition.string.begin.html",
+		"t": "text.html.basic meta.embedded.block.html text.html.basic meta.tag.any.html string.quoted.single.html punctuation.definition.string.begin.html",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.single.html: #0000FF",
@@ -210,7 +210,7 @@
 	},
 	{
 		"c": "foo",
-		"t": "text.html.basic meta.embedded.block.html meta.tag.any.html string.quoted.single.html",
+		"t": "text.html.basic meta.embedded.block.html text.html.basic meta.tag.any.html string.quoted.single.html",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.single.html: #0000FF",
@@ -221,7 +221,7 @@
 	},
 	{
 		"c": "'",
-		"t": "text.html.basic meta.embedded.block.html meta.tag.any.html string.quoted.single.html punctuation.definition.string.end.html",
+		"t": "text.html.basic meta.embedded.block.html text.html.basic meta.tag.any.html string.quoted.single.html punctuation.definition.string.end.html",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.single.html: #0000FF",
@@ -232,7 +232,7 @@
 	},
 	{
 		"c": ">",
-		"t": "text.html.basic meta.embedded.block.html meta.tag.any.html punctuation.definition.tag.html",
+		"t": "text.html.basic meta.embedded.block.html text.html.basic meta.tag.any.html punctuation.definition.tag.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -243,7 +243,7 @@
 	},
 	{
 		"c": "<",
-		"t": "text.html.basic meta.embedded.block.html meta.tag.any.html punctuation.definition.tag.html meta.scope.between-tag-pair.html",
+		"t": "text.html.basic meta.embedded.block.html text.html.basic meta.tag.any.html punctuation.definition.tag.html meta.scope.between-tag-pair.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -254,7 +254,7 @@
 	},
 	{
 		"c": "/",
-		"t": "text.html.basic meta.embedded.block.html meta.tag.any.html punctuation.definition.tag.html",
+		"t": "text.html.basic meta.embedded.block.html text.html.basic meta.tag.any.html punctuation.definition.tag.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -265,7 +265,7 @@
 	},
 	{
 		"c": "div",
-		"t": "text.html.basic meta.embedded.block.html meta.tag.any.html entity.name.tag.html",
+		"t": "text.html.basic meta.embedded.block.html text.html.basic meta.tag.any.html entity.name.tag.html",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -276,7 +276,7 @@
 	},
 	{
 		"c": ">",
-		"t": "text.html.basic meta.embedded.block.html meta.tag.any.html punctuation.definition.tag.html",
+		"t": "text.html.basic meta.embedded.block.html text.html.basic meta.tag.any.html punctuation.definition.tag.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -286,7 +286,18 @@
 		}
 	},
 	{
-		"c": "</",
+		"c": "<",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html punctuation.definition.tag.begin.html text.html.basic",
+		"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",
@@ -661,7 +672,7 @@
 	},
 	{
 		"c": "\t",
-		"t": "text.html.basic meta.embedded.block.html",
+		"t": "text.html.basic meta.embedded.block.html text.html.basic",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -672,7 +683,7 @@
 	},
 	{
 		"c": "<",
-		"t": "text.html.basic meta.embedded.block.html meta.tag.any.html punctuation.definition.tag.html",
+		"t": "text.html.basic meta.embedded.block.html text.html.basic meta.tag.any.html punctuation.definition.tag.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -683,7 +694,7 @@
 	},
 	{
 		"c": "div",
-		"t": "text.html.basic meta.embedded.block.html meta.tag.any.html entity.name.tag.html",
+		"t": "text.html.basic meta.embedded.block.html text.html.basic meta.tag.any.html entity.name.tag.html",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -694,7 +705,7 @@
 	},
 	{
 		"c": " ",
-		"t": "text.html.basic meta.embedded.block.html meta.tag.any.html",
+		"t": "text.html.basic meta.embedded.block.html text.html.basic meta.tag.any.html",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -705,7 +716,7 @@
 	},
 	{
 		"c": "class",
-		"t": "text.html.basic meta.embedded.block.html meta.tag.any.html entity.other.attribute-name.html",
+		"t": "text.html.basic meta.embedded.block.html text.html.basic meta.tag.any.html entity.other.attribute-name.html",
 		"r": {
 			"dark_plus": "entity.other.attribute-name: #9CDCFE",
 			"light_plus": "entity.other.attribute-name: #FF0000",
@@ -716,7 +727,7 @@
 	},
 	{
 		"c": "=",
-		"t": "text.html.basic meta.embedded.block.html meta.tag.any.html",
+		"t": "text.html.basic meta.embedded.block.html text.html.basic meta.tag.any.html",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -727,7 +738,7 @@
 	},
 	{
 		"c": "'",
-		"t": "text.html.basic meta.embedded.block.html meta.tag.any.html string.quoted.single.html punctuation.definition.string.begin.html",
+		"t": "text.html.basic meta.embedded.block.html text.html.basic meta.tag.any.html string.quoted.single.html punctuation.definition.string.begin.html",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.single.html: #0000FF",
@@ -738,7 +749,7 @@
 	},
 	{
 		"c": "foo",
-		"t": "text.html.basic meta.embedded.block.html meta.tag.any.html string.quoted.single.html",
+		"t": "text.html.basic meta.embedded.block.html text.html.basic meta.tag.any.html string.quoted.single.html",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.single.html: #0000FF",
@@ -749,7 +760,7 @@
 	},
 	{
 		"c": "'",
-		"t": "text.html.basic meta.embedded.block.html meta.tag.any.html string.quoted.single.html punctuation.definition.string.end.html",
+		"t": "text.html.basic meta.embedded.block.html text.html.basic meta.tag.any.html string.quoted.single.html punctuation.definition.string.end.html",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.single.html: #0000FF",
@@ -760,7 +771,7 @@
 	},
 	{
 		"c": ">",
-		"t": "text.html.basic meta.embedded.block.html meta.tag.any.html punctuation.definition.tag.html",
+		"t": "text.html.basic meta.embedded.block.html text.html.basic meta.tag.any.html punctuation.definition.tag.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -771,7 +782,7 @@
 	},
 	{
 		"c": "<",
-		"t": "text.html.basic meta.embedded.block.html meta.tag.any.html punctuation.definition.tag.html meta.scope.between-tag-pair.html",
+		"t": "text.html.basic meta.embedded.block.html text.html.basic meta.tag.any.html punctuation.definition.tag.html meta.scope.between-tag-pair.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -782,7 +793,7 @@
 	},
 	{
 		"c": "/",
-		"t": "text.html.basic meta.embedded.block.html meta.tag.any.html punctuation.definition.tag.html",
+		"t": "text.html.basic meta.embedded.block.html text.html.basic meta.tag.any.html punctuation.definition.tag.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -793,7 +804,7 @@
 	},
 	{
 		"c": "div",
-		"t": "text.html.basic meta.embedded.block.html meta.tag.any.html entity.name.tag.html",
+		"t": "text.html.basic meta.embedded.block.html text.html.basic meta.tag.any.html entity.name.tag.html",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -804,7 +815,7 @@
 	},
 	{
 		"c": ">",
-		"t": "text.html.basic meta.embedded.block.html meta.tag.any.html punctuation.definition.tag.html",
+		"t": "text.html.basic meta.embedded.block.html text.html.basic meta.tag.any.html punctuation.definition.tag.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -814,7 +825,18 @@
 		}
 	},
 	{
-		"c": "</",
+		"c": "<",
+		"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html punctuation.definition.tag.begin.html text.html.basic",
+		"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",