From a0da123688597d67e6ebb3a9a5063f3c1f851c14 Mon Sep 17 00:00:00 2001
From: Takeshi Kurosawa <taken.spc@gmail.com>
Date: Sun, 12 Jul 2020 18:10:47 +0900
Subject: [PATCH] Add support for <style> and <script> inside <svg>Port syntax
 highlighting of html's style and script

---
 Syntaxes/HTML.plist | 1950 ++++++++++++++++++++++---------------------
 1 file changed, 984 insertions(+), 966 deletions(-)

diff --git a/Syntaxes/HTML.plist b/Syntaxes/HTML.plist
index 228353f..74bf234 100644
--- a/Syntaxes/HTML.plist
+++ b/Syntaxes/HTML.plist
@@ -1678,19 +1678,39 @@
 				</dict>
 			</dict>
 		</dict>
-		<key>svg</key>
+		<key>script</key>
 		<dict>
+			<key>begin</key>
+			<string>(^[ \t]+)?(?=&lt;(?i:script)\b(?!-))</string>
+			<key>beginCaptures</key>
+			<dict>
+				<key>1</key>
+				<dict>
+					<key>name</key>
+					<string>punctuation.whitespace.embedded.leading.html</string>
+				</dict>
+			</dict>
+			<key>end</key>
+			<string>(?!\G)([ \t]*$\n?)?</string>
+			<key>endCaptures</key>
+			<dict>
+				<key>1</key>
+				<dict>
+					<key>name</key>
+					<string>punctuation.whitespace.embedded.trailing.html</string>
+				</dict>
+			</dict>
 			<key>patterns</key>
 			<array>
 				<dict>
 					<key>begin</key>
-					<string>(?i)(&lt;)(svg)(?=\s|/?&gt;)(?:(([^"'&gt;]|"[^"]*"|'[^']*')*)(&gt;))?</string>
+					<string>(&lt;)((?i:script))\b</string>
 					<key>beginCaptures</key>
 					<dict>
 						<key>0</key>
 						<dict>
 							<key>name</key>
-							<string>meta.tag.structure.$2.start.html</string>
+							<string>meta.tag.metadata.script.start.html</string>
 						</dict>
 						<key>1</key>
 						<dict>
@@ -1702,30 +1722,15 @@
 							<key>name</key>
 							<string>entity.name.tag.html</string>
 						</dict>
-						<key>3</key>
-						<dict>
-							<key>patterns</key>
-							<array>
-								<dict>
-									<key>include</key>
-									<string>#attribute</string>
-								</dict>
-							</array>
-						</dict>
-						<key>5</key>
-						<dict>
-							<key>name</key>
-							<string>punctuation.definition.tag.end.html</string>
-						</dict>
 					</dict>
 					<key>end</key>
-					<string>(?i)(&lt;/)(\2)\s*(&gt;)</string>
+					<string>(/)((?i:script))(&gt;)</string>
 					<key>endCaptures</key>
 					<dict>
 						<key>0</key>
 						<dict>
 							<key>name</key>
-							<string>meta.tag.structure.$2.end.html</string>
+							<string>meta.tag.metadata.script.end.html</string>
 						</dict>
 						<key>1</key>
 						<dict>
@@ -1744,312 +1749,157 @@
 						</dict>
 					</dict>
 					<key>name</key>
-					<string>meta.element.structure.$2.html</string>
-					<key>patterns</key>
-					<array>
-						<dict>
-							<key>begin</key>
-							<string>(?&lt;!&gt;)\G</string>
-							<key>end</key>
-							<string>&gt;</string>
-							<key>endCaptures</key>
-							<dict>
-								<key>0</key>
-								<dict>
-									<key>name</key>
-									<string>punctuation.definition.tag.end.html</string>
-								</dict>
-							</dict>
-							<key>name</key>
-							<string>meta.tag.structure.start.html</string>
-							<key>patterns</key>
-							<array>
-								<dict>
-									<key>include</key>
-									<string>#attribute</string>
-								</dict>
-							</array>
-						</dict>
-						<dict>
-							<key>include</key>
-							<string>#tags</string>
-						</dict>
-					</array>
-				</dict>
-			</array>
-			<key>repository</key>
-			<dict>
-				<key>attribute</key>
-				<dict>
+					<string>meta.embedded.block.html</string>
 					<key>patterns</key>
 					<array>
 						<dict>
 							<key>begin</key>
-							<string>(s(hape-rendering|ystemLanguage|cale|t(yle|itchTiles|op-(color|opacity)|dDeviation|em(h|v)|artOffset|r(i(ng|kethrough-(thickness|position))|oke(-(opacity|dash(offset|array)|width|line(cap|join)|miterlimit))?))|urfaceScale|p(e(cular(Constant|Exponent)|ed)|acing|readMethod)|eed|lope)|h(oriz-(origin-x|adv-x)|eight|anging|ref(lang)?)|y(1|2|ChannelSelector)?|n(umOctaves|ame)|c(y|o(ntentS(criptType|tyleType)|lor(-(interpolation(-filters)?|profile|rendering))?)|ursor|l(ip(-(path|rule)|PathUnits)?|ass)|a(p-height|lcMode)|x)|t(ype|o|ext(-(decoration|anchor|rendering)|Length)|a(rget(X|Y)?|b(index|leValues))|ransform)|i(n(tercept|2)?|d(eographic)?|mage-rendering)|z(oomAndPan)?|o(p(erator|acity)|ver(flow|line-(thickness|position))|ffset|r(i(ent(ation)?|gin)|der))|d(y|i(splay|visor|ffuseConstant|rection)|ominant-baseline|ur|e(scent|celerate)|x)?|u(1|n(i(code(-(range|bidi))?|ts-per-em)|derline-(thickness|position))|2)|p(ing|oint(s(At(X|Y|Z))?|er-events)|a(nose-1|t(h(Length)?|tern(ContentUnits|Transform|Units))|int-order)|r(imitiveUnits|eserveA(spectRatio|lpha)))|e(n(d|able-background)|dgeMode|levation|x(ternalResourcesRequired|ponent))|v(i(sibility|ew(Box|Target))|-(hanging|ideographic|alphabetic|mathematical)|e(ctor-effect|r(sion|t-(origin-(y|x)|adv-y)))|alues)|k(1|2|3|e(y(Splines|Times|Points)|rn(ing|el(Matrix|UnitLength)))|4)?|f(y|il(ter(Res|Units)?|l(-(opacity|rule))?)|o(nt-(s(t(yle|retch)|ize(-adjust)?)|variant|family|weight)|rmat)|lood-(color|opacity)|r(om)?|x)|w(idth(s)?|ord-spacing|riting-mode)|l(i(ghting-color|mitingConeAngle)|ocal|e(ngthAdjust|tter-spacing)|ang)|a(scent|cc(umulate|ent-height)|ttribute(Name|Type)|zimuth|dditive|utoReverse|l(ignment-baseline|phabetic|lowReorder)|rabic-form|mplitude)|r(y|otate|e(s(tart|ult)|ndering-intent|peat(Count|Dur)|quired(Extensions|Features)|f(X|Y|errerPolicy)|l)|adius|x)?|g(1|2|lyph(Ref|-(name|orientation-(horizontal|vertical)))|radient(Transform|Units))|x(1|2|ChannelSelector|-height|link:(show|href|t(ype|itle)|a(ctuate|rcrole)|role)|ml:(space|lang|base))?|m(in|ode|e(thod|dia)|a(sk(ContentUnits|Units)?|thematical|rker(Height|-(start|end|mid)|Units|Width)|x))|b(y|ias|egin|ase(Profile|line-shift|Frequency)|box))(?![\w:-])</string>
-							<key>beginCaptures</key>
-							<dict>
-								<key>0</key>
-								<dict>
-									<key>name</key>
-									<string>entity.other.attribute-name.html</string>
-								</dict>
-							</dict>
-							<key>end</key>
-							<string>(?=\s*+[^=\s])</string>
-							<key>name</key>
-							<string>meta.attribute.$1.html</string>
-							<key>patterns</key>
-							<array>
-								<dict>
-									<key>include</key>
-									<string>#attribute-interior</string>
-								</dict>
-							</array>
-						</dict>
-						<dict>
-							<key>begin</key>
-							<string>([^\x{0020}"'&lt;&gt;/=\x{0000}-\x{001F}\x{007F}-\x{009F}\x{FDD0}-\x{FDEF}\x{FFFE}\x{FFFF}\x{1FFFE}\x{1FFFF}\x{2FFFE}\x{2FFFF}\x{3FFFE}\x{3FFFF}\x{4FFFE}\x{4FFFF}\x{5FFFE}\x{5FFFF}\x{6FFFE}\x{6FFFF}\x{7FFFE}\x{7FFFF}\x{8FFFE}\x{8FFFF}\x{9FFFE}\x{9FFFF}\x{AFFFE}\x{AFFFF}\x{BFFFE}\x{BFFFF}\x{CFFFE}\x{CFFFF}\x{DFFFE}\x{DFFFF}\x{EFFFE}\x{EFFFF}\x{FFFFE}\x{FFFFF}\x{10FFFE}\x{10FFFF}]+)</string>
-							<key>beginCaptures</key>
-							<dict>
-								<key>0</key>
-								<dict>
-									<key>name</key>
-									<string>entity.other.attribute-name.html</string>
-								</dict>
-							</dict>
-							<key>comment</key>
-							<string>Anything else that is valid</string>
+							<string>\G</string>
 							<key>end</key>
-							<string>(?=\s*+[^=\s])</string>
-							<key>name</key>
-							<string>meta.attribute.unrecognized.$1.html</string>
+							<string>(?=/)</string>
 							<key>patterns</key>
 							<array>
 								<dict>
-									<key>include</key>
-									<string>#attribute-interior</string>
-								</dict>
-							</array>
-						</dict>
-						<dict>
-							<key>match</key>
-							<string>[^\s&gt;]+</string>
-							<key>name</key>
-							<string>invalid.illegal.character-not-allowed-here.html</string>
-						</dict>
-					</array>
-				</dict>
-				<key>tags</key>
-				<dict>
-					<key>patterns</key>
-					<array>
-						<dict>
-							<key>include</key>
-							<string>#comment</string>
-						</dict>
-						<dict>
-							<key>include</key>
-							<string>#cdata</string>
-						</dict>
-						<dict>
-							<key>captures</key>
-							<dict>
-								<key>0</key>
-								<dict>
-									<key>name</key>
-									<string>meta.tag.metadata.svg.$2.void.html</string>
-								</dict>
-								<key>1</key>
-								<dict>
-									<key>name</key>
-									<string>punctuation.definition.tag.begin.html</string>
-								</dict>
-								<key>2</key>
-								<dict>
-									<key>name</key>
-									<string>entity.name.tag.html</string>
-								</dict>
-								<key>3</key>
-								<dict>
-									<key>patterns</key>
-									<array>
+									<key>begin</key>
+									<string>(&gt;)</string>
+									<key>beginCaptures</key>
+									<dict>
+										<key>0</key>
 										<dict>
-											<key>include</key>
-											<string>#attribute</string>
+											<key>name</key>
+											<string>meta.tag.metadata.script.start.html</string>
 										</dict>
-									</array>
-								</dict>
-								<key>5</key>
-								<dict>
-									<key>name</key>
-									<string>punctuation.definition.tag.end.html</string>
-								</dict>
-							</dict>
-							<key>match</key>
-							<string>(?i)(&lt;)(color-profile|desc|metadata|script|style|title)(?=\s|/?&gt;)(?:(([^"'&gt;]|"[^"]*"|'[^']*')*)(/&gt;))</string>
-							<key>name</key>
-							<string>meta.element.metadata.svg.$2.html</string>
-						</dict>
-						<dict>
-							<key>begin</key>
-							<string>(?i)(&lt;)(color-profile|desc|metadata|script|style|title)(?=\s|/?&gt;)(?:(([^"'&gt;]|"[^"]*"|'[^']*')*)(&gt;))?</string>
-							<key>beginCaptures</key>
-							<dict>
-								<key>0</key>
-								<dict>
-									<key>name</key>
-									<string>meta.tag.metadata.svg.$2.start.html</string>
-								</dict>
-								<key>1</key>
-								<dict>
-									<key>name</key>
-									<string>punctuation.definition.tag.begin.html</string>
-								</dict>
-								<key>2</key>
-								<dict>
-									<key>name</key>
-									<string>entity.name.tag.html</string>
-								</dict>
-								<key>3</key>
-								<dict>
-									<key>patterns</key>
-									<array>
+										<key>1</key>
 										<dict>
-											<key>include</key>
-											<string>#attribute</string>
+											<key>name</key>
+											<string>punctuation.definition.tag.end.html</string>
 										</dict>
-									</array>
-								</dict>
-								<key>5</key>
-								<dict>
-									<key>name</key>
-									<string>punctuation.definition.tag.end.html</string>
-								</dict>
-							</dict>
-							<key>end</key>
-							<string>(?i)(&lt;/)(\2)\s*(&gt;)|(/&gt;)|(?=&lt;/\w+)</string>
-							<key>endCaptures</key>
-							<dict>
-								<key>0</key>
-								<dict>
-									<key>name</key>
-									<string>meta.tag.metadata.svg.$2.end.html</string>
-								</dict>
-								<key>1</key>
-								<dict>
-									<key>name</key>
-									<string>punctuation.definition.tag.begin.html</string>
-								</dict>
-								<key>2</key>
-								<dict>
-									<key>name</key>
-									<string>entity.name.tag.html</string>
-								</dict>
-								<key>3</key>
-								<dict>
-									<key>name</key>
-									<string>punctuation.definition.tag.end.html</string>
-								</dict>
-								<key>4</key>
-								<dict>
-									<key>name</key>
-									<string>punctuation.definition.tag.end.html</string>
-								</dict>
-							</dict>
-							<key>name</key>
-							<string>meta.element.metadata.svg.$2.html</string>
-							<key>patterns</key>
-							<array>
-								<dict>
-									<key>begin</key>
-									<string>(?&lt;!&gt;)\G</string>
+									</dict>
 									<key>end</key>
-									<string>(?=/&gt;)|&gt;</string>
+									<string>((&lt;))(?=/(?i:script))</string>
 									<key>endCaptures</key>
 									<dict>
 										<key>0</key>
 										<dict>
 											<key>name</key>
-											<string>punctuation.definition.tag.end.html</string>
+											<string>meta.tag.metadata.script.end.html</string>
 										</dict>
-									</dict>
-									<key>name</key>
-									<string>meta.tag.metadata.start.html</string>
-									<key>patterns</key>
-									<array>
+										<key>1</key>
 										<dict>
-											<key>include</key>
-											<string>#attribute</string>
+											<key>name</key>
+											<string>punctuation.definition.tag.begin.html</string>
 										</dict>
-									</array>
-								</dict>
-								<dict>
-									<key>include</key>
-									<string>#tags</string>
-								</dict>
-							</array>
-						</dict>
-						<dict>
-							<key>captures</key>
-							<dict>
-								<key>0</key>
-								<dict>
-									<key>name</key>
-									<string>meta.tag.structure.svg.$2.void.html</string>
-								</dict>
-								<key>1</key>
-								<dict>
-									<key>name</key>
-									<string>punctuation.definition.tag.begin.html</string>
-								</dict>
-								<key>2</key>
-								<dict>
-									<key>name</key>
-									<string>entity.name.tag.html</string>
-								</dict>
-								<key>3</key>
-								<dict>
+										<key>2</key>
+										<dict>
+											<key>name</key>
+											<string>source.js</string>
+										</dict>
+									</dict>
 									<key>patterns</key>
 									<array>
 										<dict>
-											<key>include</key>
-											<string>#attribute</string>
+											<key>begin</key>
+											<string>\G</string>
+											<key>end</key>
+											<string>(?=&lt;/(?i:script))</string>
+											<key>name</key>
+											<string>source.js</string>
+											<key>patterns</key>
+											<array>
+												<dict>
+													<key>begin</key>
+													<string>(^[ \t]+)?(?=//)</string>
+													<key>beginCaptures</key>
+													<dict>
+														<key>1</key>
+														<dict>
+															<key>name</key>
+															<string>punctuation.whitespace.comment.leading.js</string>
+														</dict>
+													</dict>
+													<key>end</key>
+													<string>(?!\G)</string>
+													<key>patterns</key>
+													<array>
+														<dict>
+															<key>begin</key>
+															<string>//</string>
+															<key>beginCaptures</key>
+															<dict>
+																<key>0</key>
+																<dict>
+																	<key>name</key>
+																	<string>punctuation.definition.comment.js</string>
+																</dict>
+															</dict>
+															<key>end</key>
+															<string>(?=&lt;/script)|\n</string>
+															<key>name</key>
+															<string>comment.line.double-slash.js</string>
+														</dict>
+													</array>
+												</dict>
+												<dict>
+													<key>begin</key>
+													<string>/\*</string>
+													<key>captures</key>
+													<dict>
+														<key>0</key>
+														<dict>
+															<key>name</key>
+															<string>punctuation.definition.comment.js</string>
+														</dict>
+													</dict>
+													<key>end</key>
+													<string>\*/|(?=&lt;/script)</string>
+													<key>name</key>
+													<string>comment.block.js</string>
+												</dict>
+												<dict>
+													<key>include</key>
+													<string>source.js</string>
+												</dict>
+											</array>
 										</dict>
 									</array>
 								</dict>
-								<key>5</key>
-								<dict>
-									<key>name</key>
-									<string>punctuation.definition.tag.end.html</string>
-								</dict>
-							</dict>
-							<key>match</key>
-							<string>(?i)(&lt;)(animateMotion|clipPath|defs|feComponentTransfer|feDiffuseLighting|feMerge|feSpecularLighting|filter|g|hatch|linearGradient|marker|mask|mesh|meshgradient|meshpatch|meshrow|pattern|radialGradient|switch|text|textPath)(?=\s|/?&gt;)(?:(([^"'&gt;]|"[^"]*"|'[^']*')*)(/&gt;))</string>
-							<key>name</key>
-							<string>meta.element.structure.svg.$2.html</string>
-						</dict>
-						<dict>
-							<key>begin</key>
-							<string>(?i)(&lt;)(animateMotion|clipPath|defs|feComponentTransfer|feDiffuseLighting|feMerge|feSpecularLighting|filter|g|hatch|linearGradient|marker|mask|mesh|meshgradient|meshpatch|meshrow|pattern|radialGradient|switch|text|textPath)(?=\s|/?&gt;)(?:(([^"'&gt;]|"[^"]*"|'[^']*')*)(&gt;))?</string>
-							<key>beginCaptures</key>
-							<dict>
-								<key>0</key>
-								<dict>
-									<key>name</key>
-									<string>meta.tag.structure.svg.$2.start.html</string>
-								</dict>
-								<key>1</key>
-								<dict>
-									<key>name</key>
-									<string>punctuation.definition.tag.begin.html</string>
-								</dict>
-								<key>2</key>
 								<dict>
+									<key>begin</key>
+									<string>\G</string>
+									<key>end</key>
+									<string>(?ix:
+												(?=&gt;											# Tag without type attribute
+												  | type(?=[\s=])
+												  	(?!\s*=\s*
+														(
+															''								# Empty
+														  | ""									#   Values
+														  | ('|"|)
+															(
+																text/							# Text mime-types
+																(
+																	javascript(1\.[0-5])?
+																  | x-javascript
+																  | jscript
+																  | livescript
+																  | (x-)?ecmascript
+																  | babel						# Javascript variant currently
+																  								#   recognized as such
+															  	)
+															  | application/					# Application mime-types
+															  	(
+																	(x-)?javascript
+																  | (x-)?ecmascript
+																)
+															  | module
+														  	)
+															[\s"'&gt;]
+														)
+													)
+												)
+											)</string>
 									<key>name</key>
-									<string>entity.name.tag.html</string>
-								</dict>
-								<key>3</key>
-								<dict>
+									<string>meta.tag.metadata.script.start.html</string>
 									<key>patterns</key>
 									<array>
 										<dict>
@@ -2058,261 +1908,492 @@
 										</dict>
 									</array>
 								</dict>
-								<key>5</key>
-								<dict>
-									<key>name</key>
-									<string>punctuation.definition.tag.end.html</string>
-								</dict>
-							</dict>
-							<key>end</key>
-							<string>(?i)(&lt;/)(\2)\s*(&gt;)|(/&gt;)|(?=&lt;/\w+)</string>
-							<key>endCaptures</key>
-							<dict>
-								<key>0</key>
-								<dict>
-									<key>name</key>
-									<string>meta.tag.structure.svg.$2.end.html</string>
-								</dict>
-								<key>1</key>
-								<dict>
-									<key>name</key>
-									<string>punctuation.definition.tag.begin.html</string>
-								</dict>
-								<key>2</key>
-								<dict>
-									<key>name</key>
-									<string>entity.name.tag.html</string>
-								</dict>
-								<key>3</key>
-								<dict>
-									<key>name</key>
-									<string>punctuation.definition.tag.end.html</string>
-								</dict>
-								<key>4</key>
-								<dict>
-									<key>name</key>
-									<string>punctuation.definition.tag.end.html</string>
-								</dict>
-							</dict>
-							<key>name</key>
-							<string>meta.element.structure.svg.$2.html</string>
-							<key>patterns</key>
-							<array>
 								<dict>
 									<key>begin</key>
-									<string>(?&lt;!&gt;)\G</string>
+									<string>(?ix:
+												(?=
+													type\s*=\s*
+													('|"|)
+													text/
+													(
+														x-handlebars
+													  | (x-(handlebars-)?|ng-)?template
+													  | html
+													)
+													[\s"'&gt;]
+												)
+											)</string>
 									<key>end</key>
-									<string>(?=/&gt;)|&gt;</string>
+									<string>((&lt;))(?=/(?i:script))</string>
 									<key>endCaptures</key>
 									<dict>
 										<key>0</key>
 										<dict>
 											<key>name</key>
-											<string>punctuation.definition.tag.end.html</string>
+											<string>meta.tag.metadata.script.end.html</string>
+										</dict>
+										<key>1</key>
+										<dict>
+											<key>name</key>
+											<string>punctuation.definition.tag.begin.html</string>
+										</dict>
+										<key>2</key>
+										<dict>
+											<key>name</key>
+											<string>text.html.basic</string>
 										</dict>
 									</dict>
-									<key>name</key>
-									<string>meta.tag.structure.start.html</string>
 									<key>patterns</key>
 									<array>
 										<dict>
-											<key>include</key>
-											<string>#attribute</string>
+											<key>begin</key>
+											<string>\G</string>
+											<key>end</key>
+											<string>(&gt;)</string>
+											<key>endCaptures</key>
+											<dict>
+												<key>1</key>
+												<dict>
+													<key>name</key>
+													<string>punctuation.definition.tag.end.html</string>
+												</dict>
+											</dict>
+											<key>name</key>
+											<string>meta.tag.metadata.script.start.html</string>
+											<key>patterns</key>
+											<array>
+												<dict>
+													<key>include</key>
+													<string>#attribute</string>
+												</dict>
+											</array>
 										</dict>
-									</array>
-								</dict>
-								<dict>
-									<key>include</key>
-									<string>#tags</string>
-								</dict>
-							</array>
-						</dict>
-						<dict>
-							<key>captures</key>
-							<dict>
-								<key>0</key>
-								<dict>
-									<key>name</key>
-									<string>meta.tag.inline.svg.$2.void.html</string>
-								</dict>
-								<key>1</key>
-								<dict>
-									<key>name</key>
-									<string>punctuation.definition.tag.begin.html</string>
-								</dict>
-								<key>2</key>
-								<dict>
-									<key>name</key>
-									<string>entity.name.tag.html</string>
-								</dict>
-								<key>3</key>
-								<dict>
-									<key>patterns</key>
-									<array>
-										<dict>
-											<key>include</key>
-											<string>#attribute</string>
-										</dict>
-									</array>
-								</dict>
-								<key>5</key>
-								<dict>
-									<key>name</key>
-									<string>punctuation.definition.tag.end.html</string>
-								</dict>
-							</dict>
-							<key>match</key>
-							<string>(?i)(&lt;)(a|animate|discard|feBlend|feColorMatrix|feComposite|feConvolveMatrix|feDisplacementMap|feDistantLight|feDropShadow|feFlood|feFuncA|feFuncB|feFuncG|feFuncR|feGaussianBlur|feMergeNode|feMorphology|feOffset|fePointLight|feSpotLight|feTile|feTurbulence|hatchPath|mpath|set|solidcolor|stop|tspan)(?=\s|/?&gt;)(?:(([^"'&gt;]|"[^"]*"|'[^']*')*)(/&gt;))</string>
-							<key>name</key>
-							<string>meta.element.inline.svg.$2.html</string>
-						</dict>
-						<dict>
-							<key>begin</key>
-							<string>(?i)(&lt;)(a|animate|discard|feBlend|feColorMatrix|feComposite|feConvolveMatrix|feDisplacementMap|feDistantLight|feDropShadow|feFlood|feFuncA|feFuncB|feFuncG|feFuncR|feGaussianBlur|feMergeNode|feMorphology|feOffset|fePointLight|feSpotLight|feTile|feTurbulence|hatchPath|mpath|set|solidcolor|stop|tspan)(?=\s|/?&gt;)(?:(([^"'&gt;]|"[^"]*"|'[^']*')*)(&gt;))?</string>
-							<key>beginCaptures</key>
-							<dict>
-								<key>0</key>
-								<dict>
-									<key>name</key>
-									<string>meta.tag.inline.svg.$2.start.html</string>
-								</dict>
-								<key>1</key>
-								<dict>
-									<key>name</key>
-									<string>punctuation.definition.tag.begin.html</string>
-								</dict>
-								<key>2</key>
-								<dict>
-									<key>name</key>
-									<string>entity.name.tag.html</string>
-								</dict>
-								<key>3</key>
-								<dict>
-									<key>patterns</key>
-									<array>
 										<dict>
-											<key>include</key>
-											<string>#attribute</string>
+											<key>begin</key>
+											<string>(?!\G)</string>
+											<key>end</key>
+											<string>(?=&lt;/(?i:script))</string>
+											<key>name</key>
+											<string>text.html.basic</string>
+											<key>patterns</key>
+											<array>
+												<dict>
+													<key>include</key>
+													<string>text.html.basic</string>
+												</dict>
+											</array>
 										</dict>
 									</array>
 								</dict>
-								<key>5</key>
-								<dict>
-									<key>name</key>
-									<string>punctuation.definition.tag.end.html</string>
-								</dict>
-							</dict>
-							<key>end</key>
-							<string>(?i)(&lt;/)(\2)\s*(&gt;)|(/&gt;)|(?=&lt;/\w+)</string>
-							<key>endCaptures</key>
-							<dict>
-								<key>0</key>
-								<dict>
-									<key>name</key>
-									<string>meta.tag.inline.svg.$2.end.html</string>
-								</dict>
-								<key>1</key>
-								<dict>
-									<key>name</key>
-									<string>punctuation.definition.tag.begin.html</string>
-								</dict>
-								<key>2</key>
-								<dict>
-									<key>name</key>
-									<string>entity.name.tag.html</string>
-								</dict>
-								<key>3</key>
-								<dict>
-									<key>name</key>
-									<string>punctuation.definition.tag.end.html</string>
-								</dict>
-								<key>4</key>
-								<dict>
-									<key>name</key>
-									<string>punctuation.definition.tag.end.html</string>
-								</dict>
-							</dict>
-							<key>name</key>
-							<string>meta.element.inline.svg.$2.html</string>
-							<key>patterns</key>
-							<array>
 								<dict>
 									<key>begin</key>
-									<string>(?&lt;!&gt;)\G</string>
+									<string>(?=(?i:type))</string>
 									<key>end</key>
-									<string>(?=/&gt;)|&gt;</string>
+									<string>(&lt;)(?=/(?i:script))</string>
 									<key>endCaptures</key>
 									<dict>
 										<key>0</key>
 										<dict>
 											<key>name</key>
-											<string>punctuation.definition.tag.end.html</string>
+											<string>meta.tag.metadata.script.end.html</string>
+										</dict>
+										<key>1</key>
+										<dict>
+											<key>name</key>
+											<string>punctuation.definition.tag.begin.html</string>
 										</dict>
 									</dict>
-									<key>name</key>
-									<string>meta.tag.inline.start.html</string>
 									<key>patterns</key>
 									<array>
 										<dict>
-											<key>include</key>
-											<string>#attribute</string>
+											<key>begin</key>
+											<string>\G</string>
+											<key>end</key>
+											<string>(&gt;)</string>
+											<key>endCaptures</key>
+											<dict>
+												<key>1</key>
+												<dict>
+													<key>name</key>
+													<string>punctuation.definition.tag.end.html</string>
+												</dict>
+											</dict>
+											<key>name</key>
+											<string>meta.tag.metadata.script.start.html</string>
+											<key>patterns</key>
+											<array>
+												<dict>
+													<key>include</key>
+													<string>#attribute</string>
+												</dict>
+											</array>
+										</dict>
+										<dict>
+											<key>begin</key>
+											<string>(?!\G)</string>
+											<key>end</key>
+											<string>(?=&lt;/(?i:script))</string>
+											<key>name</key>
+											<string>source.unknown</string>
 										</dict>
 									</array>
 								</dict>
-								<dict>
-									<key>include</key>
-									<string>#tags</string>
-								</dict>
 							</array>
 						</dict>
+					</array>
+				</dict>
+			</array>
+		</dict>
+		<key>style</key>
+		<dict>
+			<key>begin</key>
+			<string>(^[ \t]+)?(?=&lt;(?i:style)\b(?!-))</string>
+			<key>beginCaptures</key>
+			<dict>
+				<key>1</key>
+				<dict>
+					<key>name</key>
+					<string>punctuation.whitespace.embedded.leading.html</string>
+				</dict>
+			</dict>
+			<key>end</key>
+			<string>(?!\G)([ \t]*$\n?)?</string>
+			<key>endCaptures</key>
+			<dict>
+				<key>1</key>
+				<dict>
+					<key>name</key>
+					<string>punctuation.whitespace.embedded.trailing.html</string>
+				</dict>
+			</dict>
+			<key>patterns</key>
+			<array>
+				<dict>
+					<key>begin</key>
+					<string>(?i)(&lt;)(style)(?=\s|/?&gt;)</string>
+					<key>beginCaptures</key>
+					<dict>
+						<key>0</key>
+						<dict>
+							<key>name</key>
+							<string>meta.tag.metadata.style.start.html</string>
+						</dict>
+						<key>1</key>
+						<dict>
+							<key>name</key>
+							<string>punctuation.definition.tag.begin.html</string>
+						</dict>
+						<key>2</key>
+						<dict>
+							<key>name</key>
+							<string>entity.name.tag.html</string>
+						</dict>
+					</dict>
+					<key>end</key>
+					<string>(?i)((&lt;)/)(style)\s*(&gt;)</string>
+					<key>endCaptures</key>
+					<dict>
+						<key>0</key>
+						<dict>
+							<key>name</key>
+							<string>meta.tag.metadata.style.end.html</string>
+						</dict>
+						<key>1</key>
+						<dict>
+							<key>name</key>
+							<string>punctuation.definition.tag.begin.html</string>
+						</dict>
+						<key>2</key>
+						<dict>
+							<key>name</key>
+							<string>source.css</string>
+						</dict>
+						<key>3</key>
+						<dict>
+							<key>name</key>
+							<string>entity.name.tag.html</string>
+						</dict>
+						<key>4</key>
+						<dict>
+							<key>name</key>
+							<string>punctuation.definition.tag.end.html</string>
+						</dict>
+					</dict>
+					<key>name</key>
+					<string>meta.embedded.block.html</string>
+					<key>patterns</key>
+					<array>
 						<dict>
+							<key>begin</key>
+							<string>\G</string>
 							<key>captures</key>
 							<dict>
-								<key>0</key>
-								<dict>
-									<key>name</key>
-									<string>meta.tag.object.svg.$2.void.html</string>
-								</dict>
 								<key>1</key>
-								<dict>
-									<key>name</key>
-									<string>punctuation.definition.tag.begin.html</string>
-								</dict>
-								<key>2</key>
-								<dict>
-									<key>name</key>
-									<string>entity.name.tag.html</string>
-								</dict>
-								<key>3</key>
-								<dict>
-									<key>patterns</key>
-									<array>
-										<dict>
-											<key>include</key>
-											<string>#attribute</string>
-										</dict>
-									</array>
-								</dict>
-								<key>5</key>
 								<dict>
 									<key>name</key>
 									<string>punctuation.definition.tag.end.html</string>
 								</dict>
 							</dict>
-							<key>match</key>
-							<string>(?i)(&lt;)(circle|ellipse|feImage|foreignObject|image|line|path|polygon|polyline|rect|symbol|use|view)(?=\s|/?&gt;)(?:(([^"'&gt;]|"[^"]*"|'[^']*')*)(/&gt;))</string>
+							<key>end</key>
+							<string>(&gt;)</string>
 							<key>name</key>
-							<string>meta.element.object.svg.$2.html</string>
+							<string>meta.tag.metadata.style.start.html</string>
+							<key>patterns</key>
+							<array>
+								<dict>
+									<key>include</key>
+									<string>#attribute</string>
+								</dict>
+							</array>
 						</dict>
 						<dict>
 							<key>begin</key>
-							<string>(?i)(&lt;)(a|circle|ellipse|feImage|foreignObject|image|line|path|polygon|polyline|rect|symbol|use|view)(?=\s|/?&gt;)(?:(([^"'&gt;]|"[^"]*"|'[^']*')*)(&gt;))?</string>
+							<string>(?!\G)</string>
+							<key>end</key>
+							<string>(?=&lt;/(?i:style))</string>
+							<key>name</key>
+							<string>source.css</string>
+							<key>patterns</key>
+							<array>
+								<dict>
+									<key>include</key>
+									<string>source.css</string>
+								</dict>
+							</array>
+						</dict>
+					</array>
+				</dict>
+			</array>
+		</dict>
+		<key>svg</key>
+		<dict>
+			<key>patterns</key>
+			<array>
+				<dict>
+					<key>begin</key>
+					<string>(?i)(&lt;)(svg)(?=\s|/?&gt;)(?:(([^"'&gt;]|"[^"]*"|'[^']*')*)(&gt;))?</string>
+					<key>beginCaptures</key>
+					<dict>
+						<key>0</key>
+						<dict>
+							<key>name</key>
+							<string>meta.tag.structure.$2.start.html</string>
+						</dict>
+						<key>1</key>
+						<dict>
+							<key>name</key>
+							<string>punctuation.definition.tag.begin.html</string>
+						</dict>
+						<key>2</key>
+						<dict>
+							<key>name</key>
+							<string>entity.name.tag.html</string>
+						</dict>
+						<key>3</key>
+						<dict>
+							<key>patterns</key>
+							<array>
+								<dict>
+									<key>include</key>
+									<string>#attribute</string>
+								</dict>
+							</array>
+						</dict>
+						<key>5</key>
+						<dict>
+							<key>name</key>
+							<string>punctuation.definition.tag.end.html</string>
+						</dict>
+					</dict>
+					<key>end</key>
+					<string>(?i)(&lt;/)(\2)\s*(&gt;)</string>
+					<key>endCaptures</key>
+					<dict>
+						<key>0</key>
+						<dict>
+							<key>name</key>
+							<string>meta.tag.structure.$2.end.html</string>
+						</dict>
+						<key>1</key>
+						<dict>
+							<key>name</key>
+							<string>punctuation.definition.tag.begin.html</string>
+						</dict>
+						<key>2</key>
+						<dict>
+							<key>name</key>
+							<string>entity.name.tag.html</string>
+						</dict>
+						<key>3</key>
+						<dict>
+							<key>name</key>
+							<string>punctuation.definition.tag.end.html</string>
+						</dict>
+					</dict>
+					<key>name</key>
+					<string>meta.element.structure.$2.html</string>
+					<key>patterns</key>
+					<array>
+						<dict>
+							<key>begin</key>
+							<string>(?&lt;!&gt;)\G</string>
+							<key>end</key>
+							<string>&gt;</string>
+							<key>endCaptures</key>
+							<dict>
+								<key>0</key>
+								<dict>
+									<key>name</key>
+									<string>punctuation.definition.tag.end.html</string>
+								</dict>
+							</dict>
+							<key>name</key>
+							<string>meta.tag.structure.start.html</string>
+							<key>patterns</key>
+							<array>
+								<dict>
+									<key>include</key>
+									<string>#attribute</string>
+								</dict>
+							</array>
+						</dict>
+						<dict>
+							<key>include</key>
+							<string>#tags</string>
+						</dict>
+					</array>
+				</dict>
+			</array>
+			<key>repository</key>
+			<dict>
+				<key>attribute</key>
+				<dict>
+					<key>patterns</key>
+					<array>
+						<dict>
+							<key>begin</key>
+							<string>(s(hape-rendering|ystemLanguage|cale|t(yle|itchTiles|op-(color|opacity)|dDeviation|em(h|v)|artOffset|r(i(ng|kethrough-(thickness|position))|oke(-(opacity|dash(offset|array)|width|line(cap|join)|miterlimit))?))|urfaceScale|p(e(cular(Constant|Exponent)|ed)|acing|readMethod)|eed|lope)|h(oriz-(origin-x|adv-x)|eight|anging|ref(lang)?)|y(1|2|ChannelSelector)?|n(umOctaves|ame)|c(y|o(ntentS(criptType|tyleType)|lor(-(interpolation(-filters)?|profile|rendering))?)|ursor|l(ip(-(path|rule)|PathUnits)?|ass)|a(p-height|lcMode)|x)|t(ype|o|ext(-(decoration|anchor|rendering)|Length)|a(rget(X|Y)?|b(index|leValues))|ransform)|i(n(tercept|2)?|d(eographic)?|mage-rendering)|z(oomAndPan)?|o(p(erator|acity)|ver(flow|line-(thickness|position))|ffset|r(i(ent(ation)?|gin)|der))|d(y|i(splay|visor|ffuseConstant|rection)|ominant-baseline|ur|e(scent|celerate)|x)?|u(1|n(i(code(-(range|bidi))?|ts-per-em)|derline-(thickness|position))|2)|p(ing|oint(s(At(X|Y|Z))?|er-events)|a(nose-1|t(h(Length)?|tern(ContentUnits|Transform|Units))|int-order)|r(imitiveUnits|eserveA(spectRatio|lpha)))|e(n(d|able-background)|dgeMode|levation|x(ternalResourcesRequired|ponent))|v(i(sibility|ew(Box|Target))|-(hanging|ideographic|alphabetic|mathematical)|e(ctor-effect|r(sion|t-(origin-(y|x)|adv-y)))|alues)|k(1|2|3|e(y(Splines|Times|Points)|rn(ing|el(Matrix|UnitLength)))|4)?|f(y|il(ter(Res|Units)?|l(-(opacity|rule))?)|o(nt-(s(t(yle|retch)|ize(-adjust)?)|variant|family|weight)|rmat)|lood-(color|opacity)|r(om)?|x)|w(idth(s)?|ord-spacing|riting-mode)|l(i(ghting-color|mitingConeAngle)|ocal|e(ngthAdjust|tter-spacing)|ang)|a(scent|cc(umulate|ent-height)|ttribute(Name|Type)|zimuth|dditive|utoReverse|l(ignment-baseline|phabetic|lowReorder)|rabic-form|mplitude)|r(y|otate|e(s(tart|ult)|ndering-intent|peat(Count|Dur)|quired(Extensions|Features)|f(X|Y|errerPolicy)|l)|adius|x)?|g(1|2|lyph(Ref|-(name|orientation-(horizontal|vertical)))|radient(Transform|Units))|x(1|2|ChannelSelector|-height|link:(show|href|t(ype|itle)|a(ctuate|rcrole)|role)|ml:(space|lang|base))?|m(in|ode|e(thod|dia)|a(sk(ContentUnits|Units)?|thematical|rker(Height|-(start|end|mid)|Units|Width)|x))|b(y|ias|egin|ase(Profile|line-shift|Frequency)|box))(?![\w:-])</string>
 							<key>beginCaptures</key>
 							<dict>
 								<key>0</key>
 								<dict>
 									<key>name</key>
-									<string>meta.tag.object.svg.$2.start.html</string>
+									<string>entity.other.attribute-name.html</string>
+								</dict>
+							</dict>
+							<key>end</key>
+							<string>(?=\s*+[^=\s])</string>
+							<key>name</key>
+							<string>meta.attribute.$1.html</string>
+							<key>patterns</key>
+							<array>
+								<dict>
+									<key>include</key>
+									<string>#attribute-interior</string>
+								</dict>
+							</array>
+						</dict>
+						<dict>
+							<key>begin</key>
+							<string>([^\x{0020}"'&lt;&gt;/=\x{0000}-\x{001F}\x{007F}-\x{009F}\x{FDD0}-\x{FDEF}\x{FFFE}\x{FFFF}\x{1FFFE}\x{1FFFF}\x{2FFFE}\x{2FFFF}\x{3FFFE}\x{3FFFF}\x{4FFFE}\x{4FFFF}\x{5FFFE}\x{5FFFF}\x{6FFFE}\x{6FFFF}\x{7FFFE}\x{7FFFF}\x{8FFFE}\x{8FFFF}\x{9FFFE}\x{9FFFF}\x{AFFFE}\x{AFFFF}\x{BFFFE}\x{BFFFF}\x{CFFFE}\x{CFFFF}\x{DFFFE}\x{DFFFF}\x{EFFFE}\x{EFFFF}\x{FFFFE}\x{FFFFF}\x{10FFFE}\x{10FFFF}]+)</string>
+							<key>beginCaptures</key>
+							<dict>
+								<key>0</key>
+								<dict>
+									<key>name</key>
+									<string>entity.other.attribute-name.html</string>
+								</dict>
+							</dict>
+							<key>comment</key>
+							<string>Anything else that is valid</string>
+							<key>end</key>
+							<string>(?=\s*+[^=\s])</string>
+							<key>name</key>
+							<string>meta.attribute.unrecognized.$1.html</string>
+							<key>patterns</key>
+							<array>
+								<dict>
+									<key>include</key>
+									<string>#attribute-interior</string>
+								</dict>
+							</array>
+						</dict>
+						<dict>
+							<key>match</key>
+							<string>[^\s&gt;]+</string>
+							<key>name</key>
+							<string>invalid.illegal.character-not-allowed-here.html</string>
+						</dict>
+					</array>
+				</dict>
+				<key>tags</key>
+				<dict>
+					<key>patterns</key>
+					<array>
+						<dict>
+							<key>include</key>
+							<string>#comment</string>
+						</dict>
+						<dict>
+							<key>include</key>
+							<string>#cdata</string>
+						</dict>
+						<dict>
+							<key>include</key>
+							<string>#style</string>
+						</dict>
+						<dict>
+							<key>include</key>
+							<string>#script</string>
+						</dict>
+						<dict>
+							<key>captures</key>
+							<dict>
+								<key>0</key>
+								<dict>
+									<key>name</key>
+									<string>meta.tag.metadata.svg.$2.void.html</string>
+								</dict>
+								<key>1</key>
+								<dict>
+									<key>name</key>
+									<string>punctuation.definition.tag.begin.html</string>
+								</dict>
+								<key>2</key>
+								<dict>
+									<key>name</key>
+									<string>entity.name.tag.html</string>
+								</dict>
+								<key>3</key>
+								<dict>
+									<key>patterns</key>
+									<array>
+										<dict>
+											<key>include</key>
+											<string>#attribute</string>
+										</dict>
+									</array>
+								</dict>
+								<key>5</key>
+								<dict>
+									<key>name</key>
+									<string>punctuation.definition.tag.end.html</string>
+								</dict>
+							</dict>
+							<key>match</key>
+							<string>(?i)(&lt;)(color-profile|desc|metadata|title)(?=\s|/?&gt;)(?:(([^"'&gt;]|"[^"]*"|'[^']*')*)(/&gt;))</string>
+							<key>name</key>
+							<string>meta.element.metadata.svg.$2.html</string>
+						</dict>
+						<dict>
+							<key>begin</key>
+							<string>(?i)(&lt;)(color-profile|desc|metadata|title)(?=\s|/?&gt;)(?:(([^"'&gt;]|"[^"]*"|'[^']*')*)(&gt;))?</string>
+							<key>beginCaptures</key>
+							<dict>
+								<key>0</key>
+								<dict>
+									<key>name</key>
+									<string>meta.tag.metadata.svg.$2.start.html</string>
 								</dict>
 								<key>1</key>
 								<dict>
@@ -2347,7 +2428,7 @@
 								<key>0</key>
 								<dict>
 									<key>name</key>
-									<string>meta.tag.object.svg.$2.end.html</string>
+									<string>meta.tag.metadata.svg.$2.end.html</string>
 								</dict>
 								<key>1</key>
 								<dict>
@@ -2371,7 +2452,7 @@
 								</dict>
 							</dict>
 							<key>name</key>
-							<string>meta.element.object.svg.$2.html</string>
+							<string>meta.element.metadata.svg.$2.html</string>
 							<key>patterns</key>
 							<array>
 								<dict>
@@ -2388,7 +2469,7 @@
 										</dict>
 									</dict>
 									<key>name</key>
-									<string>meta.tag.object.start.html</string>
+									<string>meta.tag.metadata.start.html</string>
 									<key>patterns</key>
 									<array>
 										<dict>
@@ -2409,7 +2490,7 @@
 								<key>0</key>
 								<dict>
 									<key>name</key>
-									<string>meta.tag.other.svg.$2.void.html</string>
+									<string>meta.tag.structure.svg.$2.void.html</string>
 								</dict>
 								<key>1</key>
 								<dict>
@@ -2422,11 +2503,6 @@
 									<string>entity.name.tag.html</string>
 								</dict>
 								<key>3</key>
-								<dict>
-									<key>name</key>
-									<string>invalid.deprecated.html</string>
-								</dict>
-								<key>4</key>
 								<dict>
 									<key>patterns</key>
 									<array>
@@ -2436,26 +2512,26 @@
 										</dict>
 									</array>
 								</dict>
-								<key>6</key>
+								<key>5</key>
 								<dict>
 									<key>name</key>
 									<string>punctuation.definition.tag.end.html</string>
 								</dict>
 							</dict>
 							<key>match</key>
-							<string>(?i)(&lt;)((altGlyph|altGlyphDef|altGlyphItem|animateColor|animateTransform|cursor|font|font-face|font-face-format|font-face-name|font-face-src|font-face-uri|glyph|glyphRef|hkern|missing-glyph|tref|vkern))(?=\s|/?&gt;)(?:(([^"'&gt;]|"[^"]*"|'[^']*')*)(/&gt;))</string>
+							<string>(?i)(&lt;)(animateMotion|clipPath|defs|feComponentTransfer|feDiffuseLighting|feMerge|feSpecularLighting|filter|g|hatch|linearGradient|marker|mask|mesh|meshgradient|meshpatch|meshrow|pattern|radialGradient|switch|text|textPath)(?=\s|/?&gt;)(?:(([^"'&gt;]|"[^"]*"|'[^']*')*)(/&gt;))</string>
 							<key>name</key>
-							<string>meta.element.other.svg.$2.html</string>
+							<string>meta.element.structure.svg.$2.html</string>
 						</dict>
 						<dict>
 							<key>begin</key>
-							<string>(?i)(&lt;)((altGlyph|altGlyphDef|altGlyphItem|animateColor|animateTransform|cursor|font|font-face|font-face-format|font-face-name|font-face-src|font-face-uri|glyph|glyphRef|hkern|missing-glyph|tref|vkern))(?=\s|/?&gt;)(?:(([^"'&gt;]|"[^"]*"|'[^']*')*)(&gt;))?</string>
+							<string>(?i)(&lt;)(animateMotion|clipPath|defs|feComponentTransfer|feDiffuseLighting|feMerge|feSpecularLighting|filter|g|hatch|linearGradient|marker|mask|mesh|meshgradient|meshpatch|meshrow|pattern|radialGradient|switch|text|textPath)(?=\s|/?&gt;)(?:(([^"'&gt;]|"[^"]*"|'[^']*')*)(&gt;))?</string>
 							<key>beginCaptures</key>
 							<dict>
 								<key>0</key>
 								<dict>
 									<key>name</key>
-									<string>meta.tag.other.svg.$2.start.html</string>
+									<string>meta.tag.structure.svg.$2.start.html</string>
 								</dict>
 								<key>1</key>
 								<dict>
@@ -2468,11 +2544,6 @@
 									<string>entity.name.tag.html</string>
 								</dict>
 								<key>3</key>
-								<dict>
-									<key>name</key>
-									<string>invalid.deprecated.html</string>
-								</dict>
-								<key>4</key>
 								<dict>
 									<key>patterns</key>
 									<array>
@@ -2482,20 +2553,20 @@
 										</dict>
 									</array>
 								</dict>
-								<key>6</key>
+								<key>5</key>
 								<dict>
 									<key>name</key>
 									<string>punctuation.definition.tag.end.html</string>
 								</dict>
 							</dict>
 							<key>end</key>
-							<string>(?i)(&lt;/)((\2))\s*(&gt;)|(/&gt;)|(?=&lt;/\w+)</string>
+							<string>(?i)(&lt;/)(\2)\s*(&gt;)|(/&gt;)|(?=&lt;/\w+)</string>
 							<key>endCaptures</key>
 							<dict>
 								<key>0</key>
 								<dict>
 									<key>name</key>
-									<string>meta.tag.other.svg.$2.end.html</string>
+									<string>meta.tag.structure.svg.$2.end.html</string>
 								</dict>
 								<key>1</key>
 								<dict>
@@ -2508,23 +2579,18 @@
 									<string>entity.name.tag.html</string>
 								</dict>
 								<key>3</key>
-								<dict>
-									<key>name</key>
-									<string>invalid.deprecated.html</string>
-								</dict>
-								<key>4</key>
 								<dict>
 									<key>name</key>
 									<string>punctuation.definition.tag.end.html</string>
 								</dict>
-								<key>5</key>
+								<key>4</key>
 								<dict>
 									<key>name</key>
 									<string>punctuation.definition.tag.end.html</string>
 								</dict>
 							</dict>
 							<key>name</key>
-							<string>meta.element.other.svg.$2.html</string>
+							<string>meta.element.structure.svg.$2.html</string>
 							<key>patterns</key>
 							<array>
 								<dict>
@@ -2541,7 +2607,7 @@
 										</dict>
 									</dict>
 									<key>name</key>
-									<string>meta.tag.other.start.html</string>
+									<string>meta.tag.structure.start.html</string>
 									<key>patterns</key>
 									<array>
 										<dict>
@@ -2562,7 +2628,7 @@
 								<key>0</key>
 								<dict>
 									<key>name</key>
-									<string>meta.tag.other.invalid.void.html</string>
+									<string>meta.tag.inline.svg.$2.void.html</string>
 								</dict>
 								<key>1</key>
 								<dict>
@@ -2575,11 +2641,6 @@
 									<string>entity.name.tag.html</string>
 								</dict>
 								<key>3</key>
-								<dict>
-									<key>name</key>
-									<string>invalid.illegal.unrecognized-tag.html</string>
-								</dict>
-								<key>4</key>
 								<dict>
 									<key>patterns</key>
 									<array>
@@ -2589,26 +2650,26 @@
 										</dict>
 									</array>
 								</dict>
-								<key>6</key>
+								<key>5</key>
 								<dict>
 									<key>name</key>
 									<string>punctuation.definition.tag.end.html</string>
 								</dict>
 							</dict>
 							<key>match</key>
-							<string>(?i)(&lt;)(([\w:]+))(?=\s|/?&gt;)(?:(([^"'&gt;]|"[^"]*"|'[^']*')*)(/&gt;))</string>
+							<string>(?i)(&lt;)(a|animate|discard|feBlend|feColorMatrix|feComposite|feConvolveMatrix|feDisplacementMap|feDistantLight|feDropShadow|feFlood|feFuncA|feFuncB|feFuncG|feFuncR|feGaussianBlur|feMergeNode|feMorphology|feOffset|fePointLight|feSpotLight|feTile|feTurbulence|hatchPath|mpath|set|solidcolor|stop|tspan)(?=\s|/?&gt;)(?:(([^"'&gt;]|"[^"]*"|'[^']*')*)(/&gt;))</string>
 							<key>name</key>
-							<string>meta.element.other.invalid.html</string>
+							<string>meta.element.inline.svg.$2.html</string>
 						</dict>
 						<dict>
 							<key>begin</key>
-							<string>(?i)(&lt;)((\w[^\s&gt;]*))(?=\s|/?&gt;)(?:(([^"'&gt;]|"[^"]*"|'[^']*')*)(&gt;))?</string>
+							<string>(?i)(&lt;)(a|animate|discard|feBlend|feColorMatrix|feComposite|feConvolveMatrix|feDisplacementMap|feDistantLight|feDropShadow|feFlood|feFuncA|feFuncB|feFuncG|feFuncR|feGaussianBlur|feMergeNode|feMorphology|feOffset|fePointLight|feSpotLight|feTile|feTurbulence|hatchPath|mpath|set|solidcolor|stop|tspan)(?=\s|/?&gt;)(?:(([^"'&gt;]|"[^"]*"|'[^']*')*)(&gt;))?</string>
 							<key>beginCaptures</key>
 							<dict>
 								<key>0</key>
 								<dict>
 									<key>name</key>
-									<string>meta.tag.other.invalid.start.html</string>
+									<string>meta.tag.inline.svg.$2.start.html</string>
 								</dict>
 								<key>1</key>
 								<dict>
@@ -2621,11 +2682,6 @@
 									<string>entity.name.tag.html</string>
 								</dict>
 								<key>3</key>
-								<dict>
-									<key>name</key>
-									<string>invalid.illegal.unrecognized-tag.html</string>
-								</dict>
-								<key>4</key>
 								<dict>
 									<key>patterns</key>
 									<array>
@@ -2635,20 +2691,20 @@
 										</dict>
 									</array>
 								</dict>
-								<key>6</key>
+								<key>5</key>
 								<dict>
 									<key>name</key>
 									<string>punctuation.definition.tag.end.html</string>
 								</dict>
 							</dict>
 							<key>end</key>
-							<string>(?i)(&lt;/)((\2))\s*(&gt;)|(/&gt;)|(?=&lt;/\w+)</string>
+							<string>(?i)(&lt;/)(\2)\s*(&gt;)|(/&gt;)|(?=&lt;/\w+)</string>
 							<key>endCaptures</key>
 							<dict>
 								<key>0</key>
 								<dict>
 									<key>name</key>
-									<string>meta.tag.other.invalid.end.html</string>
+									<string>meta.tag.inline.svg.$2.end.html</string>
 								</dict>
 								<key>1</key>
 								<dict>
@@ -2661,23 +2717,18 @@
 									<string>entity.name.tag.html</string>
 								</dict>
 								<key>3</key>
-								<dict>
-									<key>name</key>
-									<string>invalid.illegal.unrecognized-tag.html</string>
-								</dict>
-								<key>4</key>
 								<dict>
 									<key>name</key>
 									<string>punctuation.definition.tag.end.html</string>
 								</dict>
-								<key>5</key>
+								<key>4</key>
 								<dict>
 									<key>name</key>
 									<string>punctuation.definition.tag.end.html</string>
 								</dict>
 							</dict>
 							<key>name</key>
-							<string>meta.element.other.invalid.html</string>
+							<string>meta.element.inline.svg.$2.html</string>
 							<key>patterns</key>
 							<array>
 								<dict>
@@ -2694,7 +2745,7 @@
 										</dict>
 									</dict>
 									<key>name</key>
-									<string>meta.tag.other.invalid.start.html</string>
+									<string>meta.tag.inline.start.html</string>
 									<key>patterns</key>
 									<array>
 										<dict>
@@ -2710,96 +2761,53 @@
 							</array>
 						</dict>
 						<dict>
-							<key>include</key>
-							<string>#tags-invalid</string>
-						</dict>
-					</array>
-				</dict>
-			</dict>
-		</dict>
-		<key>tags-invalid</key>
-		<dict>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>begin</key>
-					<string>(&lt;/?)((\w[^\s&gt;]*))(?&lt;!/)</string>
-					<key>beginCaptures</key>
-					<dict>
-						<key>1</key>
-						<dict>
-							<key>name</key>
-							<string>punctuation.definition.tag.begin.html</string>
-						</dict>
-						<key>2</key>
-						<dict>
-							<key>name</key>
-							<string>entity.name.tag.html</string>
-						</dict>
-						<key>3</key>
-						<dict>
-							<key>name</key>
-							<string>invalid.illegal.unrecognized-tag.html</string>
-						</dict>
-					</dict>
-					<key>end</key>
-					<string>((?: ?/)?&gt;)</string>
-					<key>endCaptures</key>
-					<dict>
-						<key>1</key>
-						<dict>
-							<key>name</key>
-							<string>punctuation.definition.tag.end.html</string>
-						</dict>
-					</dict>
-					<key>name</key>
-					<string>meta.tag.other.$2.html</string>
-					<key>patterns</key>
-					<array>
-						<dict>
-							<key>include</key>
-							<string>#attribute</string>
-						</dict>
-					</array>
-				</dict>
-			</array>
-		</dict>
-		<key>tags-valid</key>
-		<dict>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>begin</key>
-					<string>(^[ \t]+)?(?=&lt;(?i:style)\b(?!-))</string>
-					<key>beginCaptures</key>
-					<dict>
-						<key>1</key>
-						<dict>
-							<key>name</key>
-							<string>punctuation.whitespace.embedded.leading.html</string>
-						</dict>
-					</dict>
-					<key>end</key>
-					<string>(?!\G)([ \t]*$\n?)?</string>
-					<key>endCaptures</key>
-					<dict>
-						<key>1</key>
-						<dict>
+							<key>captures</key>
+							<dict>
+								<key>0</key>
+								<dict>
+									<key>name</key>
+									<string>meta.tag.object.svg.$2.void.html</string>
+								</dict>
+								<key>1</key>
+								<dict>
+									<key>name</key>
+									<string>punctuation.definition.tag.begin.html</string>
+								</dict>
+								<key>2</key>
+								<dict>
+									<key>name</key>
+									<string>entity.name.tag.html</string>
+								</dict>
+								<key>3</key>
+								<dict>
+									<key>patterns</key>
+									<array>
+										<dict>
+											<key>include</key>
+											<string>#attribute</string>
+										</dict>
+									</array>
+								</dict>
+								<key>5</key>
+								<dict>
+									<key>name</key>
+									<string>punctuation.definition.tag.end.html</string>
+								</dict>
+							</dict>
+							<key>match</key>
+							<string>(?i)(&lt;)(circle|ellipse|feImage|foreignObject|image|line|path|polygon|polyline|rect|symbol|use|view)(?=\s|/?&gt;)(?:(([^"'&gt;]|"[^"]*"|'[^']*')*)(/&gt;))</string>
 							<key>name</key>
-							<string>punctuation.whitespace.embedded.trailing.html</string>
+							<string>meta.element.object.svg.$2.html</string>
 						</dict>
-					</dict>
-					<key>patterns</key>
-					<array>
 						<dict>
 							<key>begin</key>
-							<string>(?i)(&lt;)(style)(?=\s|/?&gt;)</string>
+							<string>(?i)(&lt;)(a|circle|ellipse|feImage|foreignObject|image|line|path|polygon|polyline|rect|symbol|use|view)(?=\s|/?&gt;)(?:(([^"'&gt;]|"[^"]*"|'[^']*')*)(&gt;))?</string>
 							<key>beginCaptures</key>
 							<dict>
 								<key>0</key>
 								<dict>
 									<key>name</key>
-									<string>meta.tag.metadata.style.start.html</string>
+									<string>meta.tag.object.svg.$2.start.html</string>
 								</dict>
 								<key>1</key>
 								<dict>
@@ -2811,15 +2819,30 @@
 									<key>name</key>
 									<string>entity.name.tag.html</string>
 								</dict>
+								<key>3</key>
+								<dict>
+									<key>patterns</key>
+									<array>
+										<dict>
+											<key>include</key>
+											<string>#attribute</string>
+										</dict>
+									</array>
+								</dict>
+								<key>5</key>
+								<dict>
+									<key>name</key>
+									<string>punctuation.definition.tag.end.html</string>
+								</dict>
 							</dict>
 							<key>end</key>
-							<string>(?i)((&lt;)/)(style)\s*(&gt;)</string>
+							<string>(?i)(&lt;/)(\2)\s*(&gt;)|(/&gt;)|(?=&lt;/\w+)</string>
 							<key>endCaptures</key>
 							<dict>
 								<key>0</key>
 								<dict>
 									<key>name</key>
-									<string>meta.tag.metadata.style.end.html</string>
+									<string>meta.tag.object.svg.$2.end.html</string>
 								</dict>
 								<key>1</key>
 								<dict>
@@ -2829,12 +2852,12 @@
 								<key>2</key>
 								<dict>
 									<key>name</key>
-									<string>source.css</string>
+									<string>entity.name.tag.html</string>
 								</dict>
 								<key>3</key>
 								<dict>
 									<key>name</key>
-									<string>entity.name.tag.html</string>
+									<string>punctuation.definition.tag.end.html</string>
 								</dict>
 								<key>4</key>
 								<dict>
@@ -2843,24 +2866,24 @@
 								</dict>
 							</dict>
 							<key>name</key>
-							<string>meta.embedded.block.html</string>
+							<string>meta.element.object.svg.$2.html</string>
 							<key>patterns</key>
 							<array>
 								<dict>
 									<key>begin</key>
-									<string>\G</string>
-									<key>captures</key>
+									<string>(?&lt;!&gt;)\G</string>
+									<key>end</key>
+									<string>(?=/&gt;)|&gt;</string>
+									<key>endCaptures</key>
 									<dict>
-										<key>1</key>
+										<key>0</key>
 										<dict>
 											<key>name</key>
 											<string>punctuation.definition.tag.end.html</string>
 										</dict>
 									</dict>
-									<key>end</key>
-									<string>(&gt;)</string>
 									<key>name</key>
-									<string>meta.tag.metadata.style.start.html</string>
+									<string>meta.tag.object.start.html</string>
 									<key>patterns</key>
 									<array>
 										<dict>
@@ -2870,56 +2893,64 @@
 									</array>
 								</dict>
 								<dict>
-									<key>begin</key>
-									<string>(?!\G)</string>
-									<key>end</key>
-									<string>(?=&lt;/(?i:style))</string>
-									<key>name</key>
-									<string>source.css</string>
-									<key>patterns</key>
-									<array>
-										<dict>
-											<key>include</key>
-											<string>source.css</string>
-										</dict>
-									</array>
+									<key>include</key>
+									<string>#tags</string>
 								</dict>
 							</array>
 						</dict>
-					</array>
-				</dict>
-				<dict>
-					<key>begin</key>
-					<string>(^[ \t]+)?(?=&lt;(?i:script)\b(?!-))</string>
-					<key>beginCaptures</key>
-					<dict>
-						<key>1</key>
-						<dict>
-							<key>name</key>
-							<string>punctuation.whitespace.embedded.leading.html</string>
-						</dict>
-					</dict>
-					<key>end</key>
-					<string>(?!\G)([ \t]*$\n?)?</string>
-					<key>endCaptures</key>
-					<dict>
-						<key>1</key>
-						<dict>
-							<key>name</key>
-							<string>punctuation.whitespace.embedded.trailing.html</string>
-						</dict>
-					</dict>
-					<key>patterns</key>
-					<array>
 						<dict>
-							<key>begin</key>
-							<string>(&lt;)((?i:script))\b</string>
-							<key>beginCaptures</key>
+							<key>captures</key>
 							<dict>
 								<key>0</key>
 								<dict>
 									<key>name</key>
-									<string>meta.tag.metadata.script.start.html</string>
+									<string>meta.tag.other.svg.$2.void.html</string>
+								</dict>
+								<key>1</key>
+								<dict>
+									<key>name</key>
+									<string>punctuation.definition.tag.begin.html</string>
+								</dict>
+								<key>2</key>
+								<dict>
+									<key>name</key>
+									<string>entity.name.tag.html</string>
+								</dict>
+								<key>3</key>
+								<dict>
+									<key>name</key>
+									<string>invalid.deprecated.html</string>
+								</dict>
+								<key>4</key>
+								<dict>
+									<key>patterns</key>
+									<array>
+										<dict>
+											<key>include</key>
+											<string>#attribute</string>
+										</dict>
+									</array>
+								</dict>
+								<key>6</key>
+								<dict>
+									<key>name</key>
+									<string>punctuation.definition.tag.end.html</string>
+								</dict>
+							</dict>
+							<key>match</key>
+							<string>(?i)(&lt;)((altGlyph|altGlyphDef|altGlyphItem|animateColor|animateTransform|cursor|font|font-face|font-face-format|font-face-name|font-face-src|font-face-uri|glyph|glyphRef|hkern|missing-glyph|tref|vkern))(?=\s|/?&gt;)(?:(([^"'&gt;]|"[^"]*"|'[^']*')*)(/&gt;))</string>
+							<key>name</key>
+							<string>meta.element.other.svg.$2.html</string>
+						</dict>
+						<dict>
+							<key>begin</key>
+							<string>(?i)(&lt;)((altGlyph|altGlyphDef|altGlyphItem|animateColor|animateTransform|cursor|font|font-face|font-face-format|font-face-name|font-face-src|font-face-uri|glyph|glyphRef|hkern|missing-glyph|tref|vkern))(?=\s|/?&gt;)(?:(([^"'&gt;]|"[^"]*"|'[^']*')*)(&gt;))?</string>
+							<key>beginCaptures</key>
+							<dict>
+								<key>0</key>
+								<dict>
+									<key>name</key>
+									<string>meta.tag.other.svg.$2.start.html</string>
 								</dict>
 								<key>1</key>
 								<dict>
@@ -2931,15 +2962,35 @@
 									<key>name</key>
 									<string>entity.name.tag.html</string>
 								</dict>
+								<key>3</key>
+								<dict>
+									<key>name</key>
+									<string>invalid.deprecated.html</string>
+								</dict>
+								<key>4</key>
+								<dict>
+									<key>patterns</key>
+									<array>
+										<dict>
+											<key>include</key>
+											<string>#attribute</string>
+										</dict>
+									</array>
+								</dict>
+								<key>6</key>
+								<dict>
+									<key>name</key>
+									<string>punctuation.definition.tag.end.html</string>
+								</dict>
 							</dict>
 							<key>end</key>
-							<string>(/)((?i:script))(&gt;)</string>
+							<string>(?i)(&lt;/)((\2))\s*(&gt;)|(/&gt;)|(?=&lt;/\w+)</string>
 							<key>endCaptures</key>
 							<dict>
 								<key>0</key>
 								<dict>
 									<key>name</key>
-									<string>meta.tag.metadata.script.end.html</string>
+									<string>meta.tag.other.svg.$2.end.html</string>
 								</dict>
 								<key>1</key>
 								<dict>
@@ -2952,307 +3003,274 @@
 									<string>entity.name.tag.html</string>
 								</dict>
 								<key>3</key>
+								<dict>
+									<key>name</key>
+									<string>invalid.deprecated.html</string>
+								</dict>
+								<key>4</key>
+								<dict>
+									<key>name</key>
+									<string>punctuation.definition.tag.end.html</string>
+								</dict>
+								<key>5</key>
 								<dict>
 									<key>name</key>
 									<string>punctuation.definition.tag.end.html</string>
 								</dict>
 							</dict>
 							<key>name</key>
-							<string>meta.embedded.block.html</string>
+							<string>meta.element.other.svg.$2.html</string>
 							<key>patterns</key>
 							<array>
 								<dict>
 									<key>begin</key>
-									<string>\G</string>
+									<string>(?&lt;!&gt;)\G</string>
 									<key>end</key>
-									<string>(?=/)</string>
+									<string>(?=/&gt;)|&gt;</string>
+									<key>endCaptures</key>
+									<dict>
+										<key>0</key>
+										<dict>
+											<key>name</key>
+											<string>punctuation.definition.tag.end.html</string>
+										</dict>
+									</dict>
+									<key>name</key>
+									<string>meta.tag.other.start.html</string>
 									<key>patterns</key>
 									<array>
 										<dict>
-											<key>begin</key>
-											<string>(&gt;)</string>
-											<key>beginCaptures</key>
-											<dict>
-												<key>0</key>
-												<dict>
-													<key>name</key>
-													<string>meta.tag.metadata.script.start.html</string>
-												</dict>
-												<key>1</key>
-												<dict>
-													<key>name</key>
-													<string>punctuation.definition.tag.end.html</string>
-												</dict>
-											</dict>
-											<key>end</key>
-											<string>((&lt;))(?=/(?i:script))</string>
-											<key>endCaptures</key>
-											<dict>
-												<key>0</key>
-												<dict>
-													<key>name</key>
-													<string>meta.tag.metadata.script.end.html</string>
-												</dict>
-												<key>1</key>
-												<dict>
-													<key>name</key>
-													<string>punctuation.definition.tag.begin.html</string>
-												</dict>
-												<key>2</key>
-												<dict>
-													<key>name</key>
-													<string>source.js</string>
-												</dict>
-											</dict>
-											<key>patterns</key>
-											<array>
-												<dict>
-													<key>begin</key>
-													<string>\G</string>
-													<key>end</key>
-													<string>(?=&lt;/(?i:script))</string>
-													<key>name</key>
-													<string>source.js</string>
-													<key>patterns</key>
-													<array>
-														<dict>
-															<key>begin</key>
-															<string>(^[ \t]+)?(?=//)</string>
-															<key>beginCaptures</key>
-															<dict>
-																<key>1</key>
-																<dict>
-																	<key>name</key>
-																	<string>punctuation.whitespace.comment.leading.js</string>
-																</dict>
-															</dict>
-															<key>end</key>
-															<string>(?!\G)</string>
-															<key>patterns</key>
-															<array>
-																<dict>
-																	<key>begin</key>
-																	<string>//</string>
-																	<key>beginCaptures</key>
-																	<dict>
-																		<key>0</key>
-																		<dict>
-																			<key>name</key>
-																			<string>punctuation.definition.comment.js</string>
-																		</dict>
-																	</dict>
-																	<key>end</key>
-																	<string>(?=&lt;/script)|\n</string>
-																	<key>name</key>
-																	<string>comment.line.double-slash.js</string>
-																</dict>
-															</array>
-														</dict>
-														<dict>
-															<key>begin</key>
-															<string>/\*</string>
-															<key>captures</key>
-															<dict>
-																<key>0</key>
-																<dict>
-																	<key>name</key>
-																	<string>punctuation.definition.comment.js</string>
-																</dict>
-															</dict>
-															<key>end</key>
-															<string>\*/|(?=&lt;/script)</string>
-															<key>name</key>
-															<string>comment.block.js</string>
-														</dict>
-														<dict>
-															<key>include</key>
-															<string>source.js</string>
-														</dict>
-													</array>
-												</dict>
-											</array>
+											<key>include</key>
+											<string>#attribute</string>
 										</dict>
+									</array>
+								</dict>
+								<dict>
+									<key>include</key>
+									<string>#tags</string>
+								</dict>
+							</array>
+						</dict>
+						<dict>
+							<key>captures</key>
+							<dict>
+								<key>0</key>
+								<dict>
+									<key>name</key>
+									<string>meta.tag.other.invalid.void.html</string>
+								</dict>
+								<key>1</key>
+								<dict>
+									<key>name</key>
+									<string>punctuation.definition.tag.begin.html</string>
+								</dict>
+								<key>2</key>
+								<dict>
+									<key>name</key>
+									<string>entity.name.tag.html</string>
+								</dict>
+								<key>3</key>
+								<dict>
+									<key>name</key>
+									<string>invalid.illegal.unrecognized-tag.html</string>
+								</dict>
+								<key>4</key>
+								<dict>
+									<key>patterns</key>
+									<array>
 										<dict>
-											<key>begin</key>
-											<string>\G</string>
-											<key>end</key>
-											<string>(?ix:
-												(?=&gt;											# Tag without type attribute
-												  | type(?=[\s=])
-												  	(?!\s*=\s*
-														(
-															''								# Empty
-														  | ""									#   Values
-														  | ('|"|)
-															(
-																text/							# Text mime-types
-																(
-																	javascript(1\.[0-5])?
-																  | x-javascript
-																  | jscript
-																  | livescript
-																  | (x-)?ecmascript
-																  | babel						# Javascript variant currently
-																  								#   recognized as such
-															  	)
-															  | application/					# Application mime-types
-															  	(
-																	(x-)?javascript
-																  | (x-)?ecmascript
-																)
-															  | module
-														  	)
-															[\s"'&gt;]
-														)
-													)
-												)
-											)</string>
-											<key>name</key>
-											<string>meta.tag.metadata.script.start.html</string>
-											<key>patterns</key>
-											<array>
-												<dict>
-													<key>include</key>
-													<string>#attribute</string>
-												</dict>
-											</array>
+											<key>include</key>
+											<string>#attribute</string>
 										</dict>
-										<dict>
-											<key>begin</key>
-											<string>(?ix:
-												(?=
-													type\s*=\s*
-													('|"|)
-													text/
-													(
-														x-handlebars
-													  | (x-(handlebars-)?|ng-)?template
-													  | html
-													)
-													[\s"'&gt;]
-												)
-											)</string>
-											<key>end</key>
-											<string>((&lt;))(?=/(?i:script))</string>
-											<key>endCaptures</key>
-											<dict>
-												<key>0</key>
-												<dict>
-													<key>name</key>
-													<string>meta.tag.metadata.script.end.html</string>
-												</dict>
-												<key>1</key>
-												<dict>
-													<key>name</key>
-													<string>punctuation.definition.tag.begin.html</string>
-												</dict>
-												<key>2</key>
-												<dict>
-													<key>name</key>
-													<string>text.html.basic</string>
-												</dict>
-											</dict>
-											<key>patterns</key>
-											<array>
-												<dict>
-													<key>begin</key>
-													<string>\G</string>
-													<key>end</key>
-													<string>(&gt;)</string>
-													<key>endCaptures</key>
-													<dict>
-														<key>1</key>
-														<dict>
-															<key>name</key>
-															<string>punctuation.definition.tag.end.html</string>
-														</dict>
-													</dict>
-													<key>name</key>
-													<string>meta.tag.metadata.script.start.html</string>
-													<key>patterns</key>
-													<array>
-														<dict>
-															<key>include</key>
-															<string>#attribute</string>
-														</dict>
-													</array>
-												</dict>
-												<dict>
-													<key>begin</key>
-													<string>(?!\G)</string>
-													<key>end</key>
-													<string>(?=&lt;/(?i:script))</string>
-													<key>name</key>
-													<string>text.html.basic</string>
-													<key>patterns</key>
-													<array>
-														<dict>
-															<key>include</key>
-															<string>text.html.basic</string>
-														</dict>
-													</array>
-												</dict>
-											</array>
+									</array>
+								</dict>
+								<key>6</key>
+								<dict>
+									<key>name</key>
+									<string>punctuation.definition.tag.end.html</string>
+								</dict>
+							</dict>
+							<key>match</key>
+							<string>(?i)(&lt;)(([\w:]+))(?=\s|/?&gt;)(?:(([^"'&gt;]|"[^"]*"|'[^']*')*)(/&gt;))</string>
+							<key>name</key>
+							<string>meta.element.other.invalid.html</string>
+						</dict>
+						<dict>
+							<key>begin</key>
+							<string>(?i)(&lt;)((\w[^\s&gt;]*))(?=\s|/?&gt;)(?:(([^"'&gt;]|"[^"]*"|'[^']*')*)(&gt;))?</string>
+							<key>beginCaptures</key>
+							<dict>
+								<key>0</key>
+								<dict>
+									<key>name</key>
+									<string>meta.tag.other.invalid.start.html</string>
+								</dict>
+								<key>1</key>
+								<dict>
+									<key>name</key>
+									<string>punctuation.definition.tag.begin.html</string>
+								</dict>
+								<key>2</key>
+								<dict>
+									<key>name</key>
+									<string>entity.name.tag.html</string>
+								</dict>
+								<key>3</key>
+								<dict>
+									<key>name</key>
+									<string>invalid.illegal.unrecognized-tag.html</string>
+								</dict>
+								<key>4</key>
+								<dict>
+									<key>patterns</key>
+									<array>
+										<dict>
+											<key>include</key>
+											<string>#attribute</string>
+										</dict>
+									</array>
+								</dict>
+								<key>6</key>
+								<dict>
+									<key>name</key>
+									<string>punctuation.definition.tag.end.html</string>
+								</dict>
+							</dict>
+							<key>end</key>
+							<string>(?i)(&lt;/)((\2))\s*(&gt;)|(/&gt;)|(?=&lt;/\w+)</string>
+							<key>endCaptures</key>
+							<dict>
+								<key>0</key>
+								<dict>
+									<key>name</key>
+									<string>meta.tag.other.invalid.end.html</string>
+								</dict>
+								<key>1</key>
+								<dict>
+									<key>name</key>
+									<string>punctuation.definition.tag.begin.html</string>
+								</dict>
+								<key>2</key>
+								<dict>
+									<key>name</key>
+									<string>entity.name.tag.html</string>
+								</dict>
+								<key>3</key>
+								<dict>
+									<key>name</key>
+									<string>invalid.illegal.unrecognized-tag.html</string>
+								</dict>
+								<key>4</key>
+								<dict>
+									<key>name</key>
+									<string>punctuation.definition.tag.end.html</string>
+								</dict>
+								<key>5</key>
+								<dict>
+									<key>name</key>
+									<string>punctuation.definition.tag.end.html</string>
+								</dict>
+							</dict>
+							<key>name</key>
+							<string>meta.element.other.invalid.html</string>
+							<key>patterns</key>
+							<array>
+								<dict>
+									<key>begin</key>
+									<string>(?&lt;!&gt;)\G</string>
+									<key>end</key>
+									<string>(?=/&gt;)|&gt;</string>
+									<key>endCaptures</key>
+									<dict>
+										<key>0</key>
+										<dict>
+											<key>name</key>
+											<string>punctuation.definition.tag.end.html</string>
 										</dict>
+									</dict>
+									<key>name</key>
+									<string>meta.tag.other.invalid.start.html</string>
+									<key>patterns</key>
+									<array>
 										<dict>
-											<key>begin</key>
-											<string>(?=(?i:type))</string>
-											<key>end</key>
-											<string>(&lt;)(?=/(?i:script))</string>
-											<key>endCaptures</key>
-											<dict>
-												<key>0</key>
-												<dict>
-													<key>name</key>
-													<string>meta.tag.metadata.script.end.html</string>
-												</dict>
-												<key>1</key>
-												<dict>
-													<key>name</key>
-													<string>punctuation.definition.tag.begin.html</string>
-												</dict>
-											</dict>
-											<key>patterns</key>
-											<array>
-												<dict>
-													<key>begin</key>
-													<string>\G</string>
-													<key>end</key>
-													<string>(&gt;)</string>
-													<key>endCaptures</key>
-													<dict>
-														<key>1</key>
-														<dict>
-															<key>name</key>
-															<string>punctuation.definition.tag.end.html</string>
-														</dict>
-													</dict>
-													<key>name</key>
-													<string>meta.tag.metadata.script.start.html</string>
-													<key>patterns</key>
-													<array>
-														<dict>
-															<key>include</key>
-															<string>#attribute</string>
-														</dict>
-													</array>
-												</dict>
-												<dict>
-													<key>begin</key>
-													<string>(?!\G)</string>
-													<key>end</key>
-													<string>(?=&lt;/(?i:script))</string>
-													<key>name</key>
-													<string>source.unknown</string>
-												</dict>
-											</array>
+											<key>include</key>
+											<string>#attribute</string>
 										</dict>
 									</array>
 								</dict>
+								<dict>
+									<key>include</key>
+									<string>#tags</string>
+								</dict>
 							</array>
 						</dict>
+						<dict>
+							<key>include</key>
+							<string>#tags-invalid</string>
+						</dict>
+					</array>
+				</dict>
+			</dict>
+		</dict>
+		<key>tags-invalid</key>
+		<dict>
+			<key>patterns</key>
+			<array>
+				<dict>
+					<key>begin</key>
+					<string>(&lt;/?)((\w[^\s&gt;]*))(?&lt;!/)</string>
+					<key>beginCaptures</key>
+					<dict>
+						<key>1</key>
+						<dict>
+							<key>name</key>
+							<string>punctuation.definition.tag.begin.html</string>
+						</dict>
+						<key>2</key>
+						<dict>
+							<key>name</key>
+							<string>entity.name.tag.html</string>
+						</dict>
+						<key>3</key>
+						<dict>
+							<key>name</key>
+							<string>invalid.illegal.unrecognized-tag.html</string>
+						</dict>
+					</dict>
+					<key>end</key>
+					<string>((?: ?/)?&gt;)</string>
+					<key>endCaptures</key>
+					<dict>
+						<key>1</key>
+						<dict>
+							<key>name</key>
+							<string>punctuation.definition.tag.end.html</string>
+						</dict>
+					</dict>
+					<key>name</key>
+					<string>meta.tag.other.$2.html</string>
+					<key>patterns</key>
+					<array>
+						<dict>
+							<key>include</key>
+							<string>#attribute</string>
+						</dict>
 					</array>
 				</dict>
+			</array>
+		</dict>
+		<key>tags-valid</key>
+		<dict>
+			<key>patterns</key>
+			<array>
+				<dict>
+					<key>include</key>
+					<string>#style</string>
+				</dict>
+				<dict>
+					<key>include</key>
+					<string>#script</string>
+				</dict>
 				<dict>
 					<key>begin</key>
 					<string>(?i)(&lt;)(base|link|meta)(?=\s|/?&gt;)</string>