diff --git a/extensions/html/test/colorize-results/test_html.json b/extensions/html/test/colorize-results/test_html.json
index c8c3d5b2063..67f8386825b 100644
--- a/extensions/html/test/colorize-results/test_html.json
+++ b/extensions/html/test/colorize-results/test_html.json
@@ -1552,7 +1552,7 @@
 	},
 	{
 		"c": "{",
-		"t": "block.definition.embedded.html.js.meta.object-literal.punctuation.source",
+		"t": "block.definition.embedded.html.js.meta.objectliteral.punctuation.source",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -1563,7 +1563,7 @@
 	},
 	{
 		"c": "\t\t\t",
-		"t": "embedded.html.js.meta.object-literal.source",
+		"t": "embedded.html.js.meta.objectliteral.source",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -1574,7 +1574,7 @@
 	},
 	{
 		"c": "baseUrl",
-		"t": "embedded.html.js.key.member.meta.object.object-literal.source",
+		"t": "embedded.html.js.key.member.meta.object.object-literal.objectliteral.source",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.object-literal.member.key rgb(156, 220, 254)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.object-literal.member.key rgb(0, 16, 128)",
@@ -1585,7 +1585,7 @@
 	},
 	{
 		"c": ":",
-		"t": "embedded.html.js.key.key-value.member.meta.object.object-literal.punctuation.separator.source",
+		"t": "embedded.html.js.key.key-value.member.meta.object.object-literal.objectliteral.punctuation.separator.source",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.object-literal.member.key rgb(156, 220, 254)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.object-literal.member.key rgb(0, 16, 128)",
@@ -1596,7 +1596,7 @@
 	},
 	{
 		"c": " ",
-		"t": "embedded.html.js.member.meta.object.object-literal.source",
+		"t": "embedded.html.js.member.meta.object.objectliteral.source",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -1607,7 +1607,7 @@
 	},
 	{
 		"c": "'",
-		"t": "begin.definition.embedded.html.js.member.meta.object.object-literal.punctuation.quoted.single.source.string",
+		"t": "begin.definition.embedded.html.js.member.meta.object.objectliteral.punctuation.quoted.single.source.string",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.string rgb(206, 145, 120)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.string.html rgb(0, 0, 255)",
@@ -1618,7 +1618,7 @@
 	},
 	{
 		"c": "/out",
-		"t": "embedded.html.js.member.meta.object.object-literal.quoted.single.source.string",
+		"t": "embedded.html.js.member.meta.object.objectliteral.quoted.single.source.string",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.string rgb(206, 145, 120)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.string.html rgb(0, 0, 255)",
@@ -1629,7 +1629,7 @@
 	},
 	{
 		"c": "'",
-		"t": "definition.embedded.end.html.js.member.meta.object.object-literal.punctuation.quoted.single.source.string",
+		"t": "definition.embedded.end.html.js.member.meta.object.objectliteral.punctuation.quoted.single.source.string",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.string rgb(206, 145, 120)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.string.html rgb(0, 0, 255)",
@@ -1640,7 +1640,7 @@
 	},
 	{
 		"c": ",",
-		"t": "comma.embedded.html.js.meta.object-literal.punctuation.separator.source",
+		"t": "comma.embedded.html.js.meta.objectliteral.punctuation.separator.source",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -1651,7 +1651,7 @@
 	},
 	{
 		"c": "\t\t\t",
-		"t": "embedded.html.js.meta.object-literal.source",
+		"t": "embedded.html.js.meta.objectliteral.source",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -1662,7 +1662,7 @@
 	},
 	{
 		"c": "paths",
-		"t": "embedded.html.js.key.member.meta.object.object-literal.source",
+		"t": "embedded.html.js.key.member.meta.object.object-literal.objectliteral.source",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.object-literal.member.key rgb(156, 220, 254)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.object-literal.member.key rgb(0, 16, 128)",
@@ -1673,7 +1673,7 @@
 	},
 	{
 		"c": ":",
-		"t": "embedded.html.js.key.key-value.member.meta.object.object-literal.punctuation.separator.source",
+		"t": "embedded.html.js.key.key-value.member.meta.object.object-literal.objectliteral.punctuation.separator.source",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.object-literal.member.key rgb(156, 220, 254)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.object-literal.member.key rgb(0, 16, 128)",
@@ -1684,7 +1684,7 @@
 	},
 	{
 		"c": " ",
-		"t": "embedded.html.js.member.meta.object.object-literal.source",
+		"t": "embedded.html.js.member.meta.object.objectliteral.source",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -1695,7 +1695,7 @@
 	},
 	{
 		"c": "{",
-		"t": "block.definition.embedded.html.js.member.meta.object.object-literal.punctuation.source",
+		"t": "block.definition.embedded.html.js.member.meta.object.objectliteral.punctuation.source",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -1706,7 +1706,7 @@
 	},
 	{
 		"c": "\t\t\t\t",
-		"t": "embedded.html.js.member.meta.object.object-literal.source",
+		"t": "embedded.html.js.member.meta.object.objectliteral.source",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -1717,7 +1717,7 @@
 	},
 	{
 		"c": "assert",
-		"t": "embedded.html.js.key.member.meta.object.object-literal.source",
+		"t": "embedded.html.js.key.member.meta.object.object-literal.objectliteral.source",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.object-literal.member.key rgb(156, 220, 254)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.object-literal.member.key rgb(0, 16, 128)",
@@ -1728,7 +1728,7 @@
 	},
 	{
 		"c": ":",
-		"t": "embedded.html.js.key.key-value.member.meta.object.object-literal.punctuation.separator.source",
+		"t": "embedded.html.js.key.key-value.member.meta.object.object-literal.objectliteral.punctuation.separator.source",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.object-literal.member.key rgb(156, 220, 254)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.object-literal.member.key rgb(0, 16, 128)",
@@ -1739,7 +1739,7 @@
 	},
 	{
 		"c": " ",
-		"t": "embedded.html.js.member.meta.object.object-literal.source",
+		"t": "embedded.html.js.member.meta.object.objectliteral.source",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -1750,7 +1750,7 @@
 	},
 	{
 		"c": "'",
-		"t": "begin.definition.embedded.html.js.member.meta.object.object-literal.punctuation.quoted.single.source.string",
+		"t": "begin.definition.embedded.html.js.member.meta.object.objectliteral.punctuation.quoted.single.source.string",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.string rgb(206, 145, 120)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.string.html rgb(0, 0, 255)",
@@ -1761,7 +1761,7 @@
 	},
 	{
 		"c": "/test/assert.js",
-		"t": "embedded.html.js.member.meta.object.object-literal.quoted.single.source.string",
+		"t": "embedded.html.js.member.meta.object.objectliteral.quoted.single.source.string",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.string rgb(206, 145, 120)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.string.html rgb(0, 0, 255)",
@@ -1772,7 +1772,7 @@
 	},
 	{
 		"c": "'",
-		"t": "definition.embedded.end.html.js.member.meta.object.object-literal.punctuation.quoted.single.source.string",
+		"t": "definition.embedded.end.html.js.member.meta.object.objectliteral.punctuation.quoted.single.source.string",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.string rgb(206, 145, 120)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.string.html rgb(0, 0, 255)",
@@ -1783,7 +1783,7 @@
 	},
 	{
 		"c": "\t\t\t",
-		"t": "embedded.html.js.member.meta.object.object-literal.source",
+		"t": "embedded.html.js.member.meta.object.objectliteral.source",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -1794,7 +1794,7 @@
 	},
 	{
 		"c": "}",
-		"t": "block.definition.embedded.html.js.member.meta.object.object-literal.punctuation.source",
+		"t": "block.definition.embedded.html.js.member.meta.object.objectliteral.punctuation.source",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -1805,7 +1805,7 @@
 	},
 	{
 		"c": "\t\t",
-		"t": "embedded.html.js.member.meta.object.object-literal.source",
+		"t": "embedded.html.js.member.meta.object.objectliteral.source",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -1816,7 +1816,7 @@
 	},
 	{
 		"c": "}",
-		"t": "block.definition.embedded.html.js.meta.object-literal.punctuation.source",
+		"t": "block.definition.embedded.html.js.meta.objectliteral.punctuation.source",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -1882,7 +1882,7 @@
 	},
 	{
 		"c": "{",
-		"t": "block.definition.embedded.html.js.meta.object-literal.punctuation.source",
+		"t": "block.definition.embedded.html.js.meta.objectliteral.punctuation.source",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -1893,7 +1893,7 @@
 	},
 	{
 		"c": "{ ",
-		"t": "embedded.html.js.meta.object-literal.source",
+		"t": "embedded.html.js.meta.objectliteral.source",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -1904,7 +1904,7 @@
 	},
 	{
 		"c": "modules",
-		"t": "embedded.html.js.member.meta.object.object-literal.other.readwrite.source.variable",
+		"t": "embedded.html.js.member.meta.object.objectliteral.other.readwrite.source.variable",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.variable rgb(156, 220, 254)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.variable rgb(0, 16, 128)",
@@ -1915,7 +1915,7 @@
 	},
 	{
 		"c": " ",
-		"t": "embedded.html.js.member.meta.object.object-literal.source",
+		"t": "embedded.html.js.member.meta.object.objectliteral.source",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -1926,7 +1926,7 @@
 	},
 	{
 		"c": "}",
-		"t": "block.definition.embedded.html.js.meta.object-literal.punctuation.source",
+		"t": "block.definition.embedded.html.js.meta.objectliteral.punctuation.source",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
diff --git a/extensions/jade/test/colorize-results/test_jade.json b/extensions/jade/test/colorize-results/test_jade.json
index 61f9b6013ff..01aa7f049ba 100644
--- a/extensions/jade/test/colorize-results/test_jade.json
+++ b/extensions/jade/test/colorize-results/test_jade.json
@@ -716,7 +716,7 @@
 	},
 	{
 		"c": "{",
-		"t": "block.definition.expr.js.meta.object-literal.punctuation.source.var",
+		"t": "block.definition.expr.js.meta.objectliteral.punctuation.source.var",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -727,7 +727,7 @@
 	},
 	{
 		"c": " ",
-		"t": "expr.js.meta.object-literal.source.var",
+		"t": "expr.js.meta.objectliteral.source.var",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -738,7 +738,7 @@
 	},
 	{
 		"c": "name",
-		"t": "expr.js.key.member.meta.object.object-literal.source.var",
+		"t": "expr.js.key.member.meta.object.object-literal.objectliteral.source.var",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.object-literal.member.key rgb(156, 220, 254)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.object-literal.member.key rgb(0, 16, 128)",
@@ -749,7 +749,7 @@
 	},
 	{
 		"c": ":",
-		"t": "expr.js.key.key-value.member.meta.object.object-literal.punctuation.separator.source.var",
+		"t": "expr.js.key.key-value.member.meta.object.object-literal.objectliteral.punctuation.separator.source.var",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.object-literal.member.key rgb(156, 220, 254)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.object-literal.member.key rgb(0, 16, 128)",
@@ -760,7 +760,7 @@
 	},
 	{
 		"c": " ",
-		"t": "expr.js.member.meta.object.object-literal.source.var",
+		"t": "expr.js.member.meta.object.objectliteral.source.var",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -771,7 +771,7 @@
 	},
 	{
 		"c": "'",
-		"t": "begin.definition.expr.js.member.meta.object.object-literal.punctuation.quoted.single.source.string.var",
+		"t": "begin.definition.expr.js.member.meta.object.objectliteral.punctuation.quoted.single.source.string.var",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.string rgb(206, 145, 120)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.string rgb(163, 21, 21)",
@@ -782,7 +782,7 @@
 	},
 	{
 		"c": "John",
-		"t": "expr.js.member.meta.object.object-literal.quoted.single.source.string.var",
+		"t": "expr.js.member.meta.object.objectliteral.quoted.single.source.string.var",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.string rgb(206, 145, 120)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.string rgb(163, 21, 21)",
@@ -793,7 +793,7 @@
 	},
 	{
 		"c": "'",
-		"t": "definition.end.expr.js.member.meta.object.object-literal.punctuation.quoted.single.source.string.var",
+		"t": "definition.end.expr.js.member.meta.object.objectliteral.punctuation.quoted.single.source.string.var",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.string rgb(206, 145, 120)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.string rgb(163, 21, 21)",
@@ -804,7 +804,7 @@
 	},
 	{
 		"c": " ",
-		"t": "expr.js.member.meta.object.object-literal.source.var",
+		"t": "expr.js.member.meta.object.objectliteral.source.var",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -815,7 +815,7 @@
 	},
 	{
 		"c": "}",
-		"t": "block.definition.expr.js.meta.object-literal.punctuation.source.var",
+		"t": "block.definition.expr.js.meta.objectliteral.punctuation.source.var",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
diff --git a/extensions/javascript/syntaxes/JavaScript.tmLanguage.json b/extensions/javascript/syntaxes/JavaScript.tmLanguage.json
index f40f2396903..5d52b791c45 100644
--- a/extensions/javascript/syntaxes/JavaScript.tmLanguage.json
+++ b/extensions/javascript/syntaxes/JavaScript.tmLanguage.json
@@ -495,8 +495,8 @@
 		},
 		"enum-declaration": {
 			"name": "meta.enum.declaration.js",
-			"match": "(?<!\\.|\\$)(?:(\\bexport)\\s+)?(?:\\b(const)\\s+)?\\b(enum)\\s+([_$[:alpha:]][_$[:alnum:]]*)",
-			"captures": {
+			"begin": "(?<!\\.|\\$)(?:(\\bexport)\\s+)?(?:\\b(const)\\s+)?\\b(enum)\\s+([_$[:alpha:]][_$[:alnum:]]*)",
+			"beginCaptures": {
 				"1": {
 					"name": "keyword.control.export.js"
 				},
@@ -509,7 +509,67 @@
 				"4": {
 					"name": "entity.name.type.enum.js"
 				}
-			}
+			},
+			"end": "(?<=\\})",
+			"patterns": [
+				{
+					"include": "#comment"
+				},
+				{
+					"begin": "\\{",
+					"beginCaptures": {
+						"0": {
+							"name": "punctuation.definition.block.js"
+						}
+					},
+					"end": "\\}",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.definition.block.js"
+						}
+					},
+					"patterns": [
+						{
+							"include": "#comment"
+						},
+						{
+							"begin": "([_$[:alpha:]][_$[:alnum:]]*)",
+							"beginCaptures": {
+								"0": {
+									"name": "variable.other.enummember.js"
+								}
+							},
+							"end": "(?=,|\\}|$)",
+							"patterns": [
+								{
+									"include": "#comment"
+								},
+								{
+									"include": "#variable-initializer"
+								}
+							]
+						},
+						{
+							"begin": "(?=(?:(?:\\'[^']*\\')|(?:\\\"[^\"]*\\\")))",
+							"end": "(?=,|\\}|$)",
+							"patterns": [
+								{
+									"include": "#string"
+								},
+								{
+									"include": "#comment"
+								},
+								{
+									"include": "#variable-initializer"
+								}
+							]
+						},
+						{
+							"include": "#punctuation-comma"
+						}
+					]
+				}
+			]
 		},
 		"namespace-declaration": {
 			"name": "meta.namespace.declaration.js",
@@ -1223,7 +1283,7 @@
 			}
 		},
 		"object-literal": {
-			"name": "meta.object-literal.js",
+			"name": "meta.objectliteral.js",
 			"begin": "\\{",
 			"beginCaptures": {
 				"0": {
@@ -1263,7 +1323,7 @@
 			]
 		},
 		"after-operator-block": {
-			"name": "meta.object-literal.js",
+			"name": "meta.objectliteral.js",
 			"begin": "(?<=[=(,\\[?+!]|await|return|yield|throw|in|of|typeof|&&|\\|\\||\\*)\\s*(\\{)",
 			"beginCaptures": {
 				"1": {
@@ -1511,7 +1571,7 @@
 			]
 		},
 		"type-predicate-operator": {
-			"name": "keyword.operator.is.js",
+			"name": "keyword.operator.expression.is.js",
 			"match": "(?<!\\.|\\$)\\bis\\b(?!\\$)"
 		},
 		"type-annotation": {
@@ -2116,7 +2176,7 @@
 					"name": "entity.name.function.js"
 				}
 			},
-			"end": "(?=\\()",
+			"end": "(?<=\\))",
 			"patterns": [
 				{
 					"include": "#comment"
@@ -2143,6 +2203,9 @@
 							"include": "#punctuation-comma"
 						}
 					]
+				},
+				{
+					"include": "#paren-expression"
 				}
 			]
 		},
@@ -2167,7 +2230,7 @@
 					}
 				},
 				{
-					"match": "(?x)(?:(\\.)\\s*)?([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*=\\s*( (async\\s+)|(function\\s+)| ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)| ((<([^<>]|\\<[^<>]+\\>)+>\\s*)?\\(([^()]|\\([^()]*\\))*\\)(\\s*:\\s*(.)*)?\\s*=>)))",
+					"match": "(?x)(?:(\\.)\\s*)?([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*=\\s*( (async\\s+)|(function\\s*[(<])|(function\\s+)| ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)| ((<([^<>]|\\<[^<>]+\\>)+>\\s*)?\\(([^()]|\\([^()]*\\))*\\)(\\s*:\\s*(.)*)?\\s*=>)))",
 					"captures": {
 						"1": {
 							"name": "punctuation.accessor.js"
@@ -2235,8 +2298,11 @@
 					"name": "keyword.operator.new.js"
 				}
 			},
-			"end": "(?=[(;),]|$|((?<!\\.|\\$)\\bnew\\b(?!\\$)))",
+			"end": "(?<=\\))|(?=[;),]|$|((?<!\\.|\\$)\\bnew\\b(?!\\$)))",
 			"patterns": [
+				{
+					"include": "#paren-expression"
+				},
 				{
 					"include": "#type"
 				}
@@ -2280,7 +2346,7 @@
 				},
 				{
 					"name": "meta.object.member.js",
-					"begin": "(?x)(?:([_$[:alpha:]][_$[:alnum:]]*)\\s*(:)(?=\\s*( (async\\s+)|(function\\s+)| ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)| ((<([^<>]|\\<[^<>]+\\>)+>\\s*)?\\(([^()]|\\([^()]*\\))*\\)(\\s*:\\s*(.)*)?\\s*=>))))",
+					"begin": "(?x)(?:([_$[:alpha:]][_$[:alnum:]]*)\\s*(:)(?=\\s*( (async\\s+)|(function\\s*[(<])|(function\\s+)| ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)| ((<([^<>]|\\<[^<>]+\\>)+>\\s*)?\\(([^()]|\\([^()]*\\))*\\)(\\s*:\\s*(.)*)?\\s*=>))))",
 					"beginCaptures": {
 						"0": {
 							"name": "meta.object-literal.key.js"
@@ -2353,19 +2419,19 @@
 					"match": "(?<!\\.|\\$)\\b(await)\\b(?!\\$)"
 				},
 				{
-					"name": "keyword.operator.delete.js",
+					"name": "keyword.operator.expression.delete.js",
 					"match": "(?<!\\.|\\$)\\bdelete\\b(?!\\$)"
 				},
 				{
-					"name": "keyword.operator.in.js",
+					"name": "keyword.operator.expression.in.js",
 					"match": "(?<!\\.|\\$)\\bin\\b(?!\\$)"
 				},
 				{
-					"name": "keyword.operator.of.js",
+					"name": "keyword.operator.expression.of.js",
 					"match": "(?<!\\.|\\$)\\bof\\b(?!\\$)"
 				},
 				{
-					"name": "keyword.operator.instanceof.js",
+					"name": "keyword.operator.expression.instanceof.js",
 					"match": "(?<!\\.|\\$)\\binstanceof\\b(?!\\$)"
 				},
 				{
@@ -2376,7 +2442,7 @@
 					"include": "#typeof-operator"
 				},
 				{
-					"name": "keyword.operator.void.js",
+					"name": "keyword.operator.expression.void.js",
 					"match": "(?<!\\.|\\$)\\bvoid\\b(?!\\$)"
 				},
 				{
@@ -2444,7 +2510,7 @@
 			]
 		},
 		"typeof-operator": {
-			"name": "keyword.operator.typeof.js",
+			"name": "keyword.operator.expression.typeof.js",
 			"match": "(?<!\\.|\\$)\\btypeof\\b(?!\\$)"
 		},
 		"arrow-function": {
@@ -3394,5 +3460,5 @@
 			]
 		}
 	},
-	"version": "https://github.com/Microsoft/TypeScript-TmLanguage/commit/fea3b25eb632f689a02057a1715faab29343dda2"
+	"version": "https://github.com/Microsoft/TypeScript-TmLanguage/commit/578dd5db70333e3b6826ff529276f32916a2c81b"
 }
\ No newline at end of file
diff --git a/extensions/javascript/test/colorize-results/test_js.json b/extensions/javascript/test/colorize-results/test_js.json
index e20d041b5dd..88b7879f569 100644
--- a/extensions/javascript/test/colorize-results/test_js.json
+++ b/extensions/javascript/test/colorize-results/test_js.json
@@ -914,7 +914,7 @@
 	},
 	{
 		"c": "{",
-		"t": "block.definition.expr.js.meta.object-literal.punctuation.var",
+		"t": "block.definition.expr.js.meta.objectliteral.punctuation.var",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -925,7 +925,7 @@
 	},
 	{
 		"c": " ",
-		"t": "expr.js.meta.object-literal.var",
+		"t": "expr.js.meta.objectliteral.var",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -936,7 +936,7 @@
 	},
 	{
 		"c": "verbose",
-		"t": "expr.js.key.member.meta.object.object-literal.var",
+		"t": "expr.js.key.member.meta.object.object-literal.objectliteral.var",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.object-literal.member.key rgb(156, 220, 254)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.object-literal.member.key rgb(0, 16, 128)",
@@ -947,7 +947,7 @@
 	},
 	{
 		"c": ":",
-		"t": "expr.js.key.key-value.member.meta.object.object-literal.punctuation.separator.var",
+		"t": "expr.js.key.key-value.member.meta.object.object-literal.objectliteral.punctuation.separator.var",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.object-literal.member.key rgb(156, 220, 254)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.object-literal.member.key rgb(0, 16, 128)",
@@ -958,7 +958,7 @@
 	},
 	{
 		"c": " ",
-		"t": "expr.js.member.meta.object.object-literal.var",
+		"t": "expr.js.member.meta.object.objectliteral.var",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -969,7 +969,7 @@
 	},
 	{
 		"c": "true",
-		"t": "boolean.constant.expr.js.language.member.meta.object.object-literal.true.var",
+		"t": "boolean.constant.expr.js.language.member.meta.object.objectliteral.true.var",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.constant.language rgb(86, 156, 214)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.constant.language rgb(0, 0, 255)",
@@ -980,7 +980,7 @@
 	},
 	{
 		"c": " ",
-		"t": "expr.js.member.meta.object.object-literal.var",
+		"t": "expr.js.member.meta.object.objectliteral.var",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -991,7 +991,7 @@
 	},
 	{
 		"c": "}",
-		"t": "block.definition.expr.js.meta.object-literal.punctuation.var",
+		"t": "block.definition.expr.js.meta.objectliteral.punctuation.var",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -1420,7 +1420,7 @@
 	},
 	{
 		"c": "{",
-		"t": "block.definition.function.js.meta.object-literal.punctuation",
+		"t": "block.definition.function.js.meta.objectliteral.punctuation",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -1431,7 +1431,7 @@
 	},
 	{
 		"c": " ",
-		"t": "block.function.js.meta.object-literal",
+		"t": "block.function.js.meta.objectliteral",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -1442,7 +1442,7 @@
 	},
 	{
 		"c": "base",
-		"t": "block.function.js.key.member.meta.object.object-literal",
+		"t": "block.function.js.key.member.meta.object.object-literal.objectliteral",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.object-literal.member.key rgb(156, 220, 254)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.object-literal.member.key rgb(0, 16, 128)",
@@ -1453,7 +1453,7 @@
 	},
 	{
 		"c": ":",
-		"t": "block.function.js.key.key-value.member.meta.object.object-literal.punctuation.separator",
+		"t": "block.function.js.key.key-value.member.meta.object.object-literal.objectliteral.punctuation.separator",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.object-literal.member.key rgb(156, 220, 254)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.object-literal.member.key rgb(0, 16, 128)",
@@ -1464,7 +1464,7 @@
 	},
 	{
 		"c": " ",
-		"t": "block.function.js.member.meta.object.object-literal",
+		"t": "block.function.js.member.meta.object.objectliteral",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -1475,7 +1475,7 @@
 	},
 	{
 		"c": "'",
-		"t": "begin.block.definition.function.js.member.meta.object.object-literal.punctuation.quoted.single.string",
+		"t": "begin.block.definition.function.js.member.meta.object.objectliteral.punctuation.quoted.single.string",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.string rgb(206, 145, 120)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.string rgb(163, 21, 21)",
@@ -1486,7 +1486,7 @@
 	},
 	{
 		"c": ".",
-		"t": "block.function.js.member.meta.object.object-literal.quoted.single.string",
+		"t": "block.function.js.member.meta.object.objectliteral.quoted.single.string",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.string rgb(206, 145, 120)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.string rgb(163, 21, 21)",
@@ -1497,7 +1497,7 @@
 	},
 	{
 		"c": "'",
-		"t": "block.definition.end.function.js.member.meta.object.object-literal.punctuation.quoted.single.string",
+		"t": "block.definition.end.function.js.member.meta.object.objectliteral.punctuation.quoted.single.string",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.string rgb(206, 145, 120)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.string rgb(163, 21, 21)",
@@ -1508,7 +1508,7 @@
 	},
 	{
 		"c": " ",
-		"t": "block.function.js.member.meta.object.object-literal",
+		"t": "block.function.js.member.meta.object.objectliteral",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -1519,7 +1519,7 @@
 	},
 	{
 		"c": "}",
-		"t": "block.definition.function.js.meta.object-literal.punctuation",
+		"t": "block.definition.function.js.meta.objectliteral.punctuation",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -2102,7 +2102,7 @@
 	},
 	{
 		"c": "{",
-		"t": "block.definition.expr.function.js.meta.object-literal.punctuation.var",
+		"t": "block.definition.expr.function.js.meta.objectliteral.punctuation.var",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -2113,7 +2113,7 @@
 	},
 	{
 		"c": " ",
-		"t": "block.expr.function.js.meta.object-literal.var",
+		"t": "block.expr.function.js.meta.objectliteral.var",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -2124,7 +2124,7 @@
 	},
 	{
 		"c": "base",
-		"t": "block.expr.function.js.key.member.meta.object.object-literal.var",
+		"t": "block.expr.function.js.key.member.meta.object.object-literal.objectliteral.var",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.object-literal.member.key rgb(156, 220, 254)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.object-literal.member.key rgb(0, 16, 128)",
@@ -2135,7 +2135,7 @@
 	},
 	{
 		"c": ":",
-		"t": "block.expr.function.js.key.key-value.member.meta.object.object-literal.punctuation.separator.var",
+		"t": "block.expr.function.js.key.key-value.member.meta.object.object-literal.objectliteral.punctuation.separator.var",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.object-literal.member.key rgb(156, 220, 254)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.object-literal.member.key rgb(0, 16, 128)",
@@ -2146,7 +2146,7 @@
 	},
 	{
 		"c": " ",
-		"t": "block.expr.function.js.member.meta.object.object-literal.var",
+		"t": "block.expr.function.js.member.meta.object.objectliteral.var",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -2157,7 +2157,7 @@
 	},
 	{
 		"c": "'",
-		"t": "begin.block.definition.expr.function.js.member.meta.object.object-literal.punctuation.quoted.single.string.var",
+		"t": "begin.block.definition.expr.function.js.member.meta.object.objectliteral.punctuation.quoted.single.string.var",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.string rgb(206, 145, 120)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.string rgb(163, 21, 21)",
@@ -2168,7 +2168,7 @@
 	},
 	{
 		"c": ".",
-		"t": "block.expr.function.js.member.meta.object.object-literal.quoted.single.string.var",
+		"t": "block.expr.function.js.member.meta.object.objectliteral.quoted.single.string.var",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.string rgb(206, 145, 120)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.string rgb(163, 21, 21)",
@@ -2179,7 +2179,7 @@
 	},
 	{
 		"c": "'",
-		"t": "block.definition.end.expr.function.js.member.meta.object.object-literal.punctuation.quoted.single.string.var",
+		"t": "block.definition.end.expr.function.js.member.meta.object.objectliteral.punctuation.quoted.single.string.var",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.string rgb(206, 145, 120)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.string rgb(163, 21, 21)",
@@ -2190,7 +2190,7 @@
 	},
 	{
 		"c": " ",
-		"t": "block.expr.function.js.member.meta.object.object-literal.var",
+		"t": "block.expr.function.js.member.meta.object.objectliteral.var",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -2201,7 +2201,7 @@
 	},
 	{
 		"c": "}",
-		"t": "block.definition.expr.function.js.meta.object-literal.punctuation.var",
+		"t": "block.definition.expr.function.js.meta.objectliteral.punctuation.var",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -2344,7 +2344,7 @@
 	},
 	{
 		"c": "{",
-		"t": "block.definition.function.js.meta.object-literal.punctuation",
+		"t": "block.definition.function.js.meta.objectliteral.punctuation",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -2355,7 +2355,7 @@
 	},
 	{
 		"c": " ",
-		"t": "block.function.js.meta.object-literal",
+		"t": "block.function.js.meta.objectliteral",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -2366,7 +2366,7 @@
 	},
 	{
 		"c": "base",
-		"t": "block.function.js.key.member.meta.object.object-literal",
+		"t": "block.function.js.key.member.meta.object.object-literal.objectliteral",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.object-literal.member.key rgb(156, 220, 254)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.object-literal.member.key rgb(0, 16, 128)",
@@ -2377,7 +2377,7 @@
 	},
 	{
 		"c": ":",
-		"t": "block.function.js.key.key-value.member.meta.object.object-literal.punctuation.separator",
+		"t": "block.function.js.key.key-value.member.meta.object.object-literal.objectliteral.punctuation.separator",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.object-literal.member.key rgb(156, 220, 254)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.object-literal.member.key rgb(0, 16, 128)",
@@ -2388,7 +2388,7 @@
 	},
 	{
 		"c": " ",
-		"t": "block.function.js.member.meta.object.object-literal",
+		"t": "block.function.js.member.meta.object.objectliteral",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -2399,7 +2399,7 @@
 	},
 	{
 		"c": "'",
-		"t": "begin.block.definition.function.js.member.meta.object.object-literal.punctuation.quoted.single.string",
+		"t": "begin.block.definition.function.js.member.meta.object.objectliteral.punctuation.quoted.single.string",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.string rgb(206, 145, 120)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.string rgb(163, 21, 21)",
@@ -2410,7 +2410,7 @@
 	},
 	{
 		"c": ".",
-		"t": "block.function.js.member.meta.object.object-literal.quoted.single.string",
+		"t": "block.function.js.member.meta.object.objectliteral.quoted.single.string",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.string rgb(206, 145, 120)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.string rgb(163, 21, 21)",
@@ -2421,7 +2421,7 @@
 	},
 	{
 		"c": "'",
-		"t": "block.definition.end.function.js.member.meta.object.object-literal.punctuation.quoted.single.string",
+		"t": "block.definition.end.function.js.member.meta.object.objectliteral.punctuation.quoted.single.string",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.string rgb(206, 145, 120)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.string rgb(163, 21, 21)",
@@ -2432,7 +2432,7 @@
 	},
 	{
 		"c": " ",
-		"t": "block.function.js.member.meta.object.object-literal",
+		"t": "block.function.js.member.meta.object.objectliteral",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -2443,7 +2443,7 @@
 	},
 	{
 		"c": "}",
-		"t": "block.definition.function.js.meta.object-literal.punctuation",
+		"t": "block.definition.function.js.meta.objectliteral.punctuation",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
diff --git a/extensions/javascript/test/colorize-results/test_jsx.json b/extensions/javascript/test/colorize-results/test_jsx.json
index 18aad52b40c..2a1f91a6d6e 100644
--- a/extensions/javascript/test/colorize-results/test_jsx.json
+++ b/extensions/javascript/test/colorize-results/test_jsx.json
@@ -111,7 +111,7 @@
 	},
 	{
 		"c": "{",
-		"t": "block.definition.expr.js.meta.object-literal.punctuation.var",
+		"t": "block.definition.expr.js.meta.objectliteral.punctuation.var",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -122,7 +122,7 @@
 	},
 	{
 		"c": "  ",
-		"t": "expr.js.meta.object-literal.var",
+		"t": "expr.js.meta.objectliteral.var",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -133,7 +133,7 @@
 	},
 	{
 		"c": "getInitialState",
-		"t": "entity.expr.function.js.key.member.meta.name.object.object-literal.var",
+		"t": "entity.expr.function.js.key.member.meta.name.object.object-literal.objectliteral.var",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.object-literal.member.key rgb(156, 220, 254)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.object-literal.member.key rgb(0, 16, 128)",
@@ -144,7 +144,7 @@
 	},
 	{
 		"c": ":",
-		"t": "expr.js.key.key-value.member.meta.object.object-literal.punctuation.separator.var",
+		"t": "expr.js.key.key-value.member.meta.object.object-literal.objectliteral.punctuation.separator.var",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.object-literal.member.key rgb(156, 220, 254)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.object-literal.member.key rgb(0, 16, 128)",
@@ -155,7 +155,7 @@
 	},
 	{
 		"c": " ",
-		"t": "expr.js.member.meta.object.object-literal.var",
+		"t": "expr.js.member.meta.object.objectliteral.var",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -166,7 +166,7 @@
 	},
 	{
 		"c": "function",
-		"t": "expr.function.js.member.meta.object.object-literal.storage.type.var",
+		"t": "expr.function.js.member.meta.object.objectliteral.storage.type.var",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.storage.type rgb(86, 156, 214)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.storage.type rgb(0, 0, 255)",
@@ -177,7 +177,7 @@
 	},
 	{
 		"c": " ",
-		"t": "expr.function.js.member.meta.object.object-literal.var",
+		"t": "expr.function.js.member.meta.object.objectliteral.var",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -188,7 +188,7 @@
 	},
 	{
 		"c": "(",
-		"t": "begin.definition.expr.function.js.member.meta.object.object-literal.parameters.punctuation.var",
+		"t": "begin.definition.expr.function.js.member.meta.object.objectliteral.parameters.punctuation.var",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -199,7 +199,7 @@
 	},
 	{
 		"c": ")",
-		"t": "definition.end.expr.function.js.member.meta.object.object-literal.parameters.punctuation.var",
+		"t": "definition.end.expr.function.js.member.meta.object.objectliteral.parameters.punctuation.var",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -210,7 +210,7 @@
 	},
 	{
 		"c": " ",
-		"t": "expr.function.js.member.meta.object.object-literal.var",
+		"t": "expr.function.js.member.meta.object.objectliteral.var",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -221,7 +221,7 @@
 	},
 	{
 		"c": "{",
-		"t": "block.definition.expr.function.js.member.meta.object.object-literal.punctuation.var",
+		"t": "block.definition.expr.function.js.member.meta.object.objectliteral.punctuation.var",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -232,7 +232,7 @@
 	},
 	{
 		"c": "    ",
-		"t": "block.expr.function.js.member.meta.object.object-literal.var",
+		"t": "block.expr.function.js.member.meta.object.objectliteral.var",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -243,7 +243,7 @@
 	},
 	{
 		"c": "return",
-		"t": "block.control.expr.flow.function.js.keyword.member.meta.object.object-literal.var",
+		"t": "block.control.expr.flow.function.js.keyword.member.meta.object.objectliteral.var",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.keyword.control rgb(197, 134, 192)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.keyword.control rgb(175, 0, 219)",
@@ -254,7 +254,7 @@
 	},
 	{
 		"c": " ",
-		"t": "block.expr.function.js.member.meta.object.object-literal.var",
+		"t": "block.expr.function.js.member.meta.object.objectliteral.var",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -265,7 +265,7 @@
 	},
 	{
 		"c": "{",
-		"t": "block.definition.expr.function.js.member.meta.object.object-literal.punctuation.var",
+		"t": "block.definition.expr.function.js.member.meta.object.objectliteral.punctuation.var",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -276,7 +276,7 @@
 	},
 	{
 		"c": "      ",
-		"t": "block.expr.function.js.member.meta.object.object-literal.var",
+		"t": "block.expr.function.js.member.meta.object.objectliteral.var",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -287,7 +287,7 @@
 	},
 	{
 		"c": "showDefault",
-		"t": "block.expr.function.js.key.member.meta.object.object-literal.var",
+		"t": "block.expr.function.js.key.member.meta.object.object-literal.objectliteral.var",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.object-literal.member.key rgb(156, 220, 254)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.object-literal.member.key rgb(0, 16, 128)",
@@ -298,7 +298,7 @@
 	},
 	{
 		"c": ":",
-		"t": "block.expr.function.js.key.key-value.member.meta.object.object-literal.punctuation.separator.var",
+		"t": "block.expr.function.js.key.key-value.member.meta.object.object-literal.objectliteral.punctuation.separator.var",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.object-literal.member.key rgb(156, 220, 254)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.object-literal.member.key rgb(0, 16, 128)",
@@ -309,7 +309,7 @@
 	},
 	{
 		"c": " ",
-		"t": "block.expr.function.js.member.meta.object.object-literal.var",
+		"t": "block.expr.function.js.member.meta.object.objectliteral.var",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -320,7 +320,7 @@
 	},
 	{
 		"c": "true",
-		"t": "block.boolean.constant.expr.function.js.language.member.meta.object.object-literal.true.var",
+		"t": "block.boolean.constant.expr.function.js.language.member.meta.object.objectliteral.true.var",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.constant.language rgb(86, 156, 214)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.constant.language rgb(0, 0, 255)",
@@ -331,7 +331,7 @@
 	},
 	{
 		"c": "    ",
-		"t": "block.expr.function.js.member.meta.object.object-literal.var",
+		"t": "block.expr.function.js.member.meta.object.objectliteral.var",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -342,7 +342,7 @@
 	},
 	{
 		"c": "}",
-		"t": "block.definition.expr.function.js.member.meta.object.object-literal.punctuation.var",
+		"t": "block.definition.expr.function.js.member.meta.object.objectliteral.punctuation.var",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -353,7 +353,7 @@
 	},
 	{
 		"c": "  ",
-		"t": "block.expr.function.js.member.meta.object.object-literal.var",
+		"t": "block.expr.function.js.member.meta.object.objectliteral.var",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -364,7 +364,7 @@
 	},
 	{
 		"c": "}",
-		"t": "block.definition.expr.function.js.member.meta.object.object-literal.punctuation.var",
+		"t": "block.definition.expr.function.js.member.meta.object.objectliteral.punctuation.var",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -375,7 +375,7 @@
 	},
 	{
 		"c": ",",
-		"t": "comma.expr.js.meta.object-literal.punctuation.separator.var",
+		"t": "comma.expr.js.meta.objectliteral.punctuation.separator.var",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -386,7 +386,7 @@
 	},
 	{
 		"c": "  ",
-		"t": "expr.js.meta.object-literal.var",
+		"t": "expr.js.meta.objectliteral.var",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -397,7 +397,7 @@
 	},
 	{
 		"c": "toggle",
-		"t": "entity.expr.function.js.key.member.meta.name.object.object-literal.var",
+		"t": "entity.expr.function.js.key.member.meta.name.object.object-literal.objectliteral.var",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.object-literal.member.key rgb(156, 220, 254)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.object-literal.member.key rgb(0, 16, 128)",
@@ -408,7 +408,7 @@
 	},
 	{
 		"c": ":",
-		"t": "expr.js.key.key-value.member.meta.object.object-literal.punctuation.separator.var",
+		"t": "expr.js.key.key-value.member.meta.object.object-literal.objectliteral.punctuation.separator.var",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.object-literal.member.key rgb(156, 220, 254)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.object-literal.member.key rgb(0, 16, 128)",
@@ -419,7 +419,7 @@
 	},
 	{
 		"c": " ",
-		"t": "expr.js.member.meta.object.object-literal.var",
+		"t": "expr.js.member.meta.object.objectliteral.var",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -430,7 +430,7 @@
 	},
 	{
 		"c": "function",
-		"t": "expr.function.js.member.meta.object.object-literal.storage.type.var",
+		"t": "expr.function.js.member.meta.object.objectliteral.storage.type.var",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.storage.type rgb(86, 156, 214)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.storage.type rgb(0, 0, 255)",
@@ -441,7 +441,7 @@
 	},
 	{
 		"c": " ",
-		"t": "expr.function.js.member.meta.object.object-literal.var",
+		"t": "expr.function.js.member.meta.object.objectliteral.var",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -452,7 +452,7 @@
 	},
 	{
 		"c": "(",
-		"t": "begin.definition.expr.function.js.member.meta.object.object-literal.parameters.punctuation.var",
+		"t": "begin.definition.expr.function.js.member.meta.object.objectliteral.parameters.punctuation.var",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -463,7 +463,7 @@
 	},
 	{
 		"c": "e",
-		"t": "expr.function.js.member.meta.object.object-literal.parameter.parameters.var.variable",
+		"t": "expr.function.js.member.meta.object.objectliteral.parameter.parameters.var.variable",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.variable.parameter rgb(156, 220, 254)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.variable.parameter rgb(0, 16, 128)",
@@ -474,7 +474,7 @@
 	},
 	{
 		"c": ")",
-		"t": "definition.end.expr.function.js.member.meta.object.object-literal.parameters.punctuation.var",
+		"t": "definition.end.expr.function.js.member.meta.object.objectliteral.parameters.punctuation.var",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -485,7 +485,7 @@
 	},
 	{
 		"c": " ",
-		"t": "expr.function.js.member.meta.object.object-literal.var",
+		"t": "expr.function.js.member.meta.object.objectliteral.var",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -496,7 +496,7 @@
 	},
 	{
 		"c": "{",
-		"t": "block.definition.expr.function.js.member.meta.object.object-literal.punctuation.var",
+		"t": "block.definition.expr.function.js.member.meta.object.objectliteral.punctuation.var",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -507,7 +507,7 @@
 	},
 	{
 		"c": "    ",
-		"t": "block.comment.expr.function.js.leading.member.meta.object.object-literal.punctuation.var.whitespace",
+		"t": "block.comment.expr.function.js.leading.member.meta.object.objectliteral.punctuation.var.whitespace",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.comment rgba(227, 228, 226, 0.156863)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.comment rgba(51, 51, 51, 0.2)",
@@ -518,7 +518,7 @@
 	},
 	{
 		"c": "//",
-		"t": "block.comment.definition.double-slash.expr.function.js.line.member.meta.object.object-literal.punctuation.var",
+		"t": "block.comment.definition.double-slash.expr.function.js.line.member.meta.object.objectliteral.punctuation.var",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.comment rgb(96, 139, 78)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.comment rgb(0, 128, 0)",
@@ -529,7 +529,7 @@
 	},
 	{
 		"c": " Prevent following the link.",
-		"t": "block.comment.double-slash.expr.function.js.line.member.meta.object.object-literal.var",
+		"t": "block.comment.double-slash.expr.function.js.line.member.meta.object.objectliteral.var",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.comment rgb(96, 139, 78)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.comment rgb(0, 128, 0)",
@@ -540,7 +540,7 @@
 	},
 	{
 		"c": "    ",
-		"t": "block.expr.function.js.member.meta.object.object-literal.var",
+		"t": "block.expr.function.js.member.meta.object.objectliteral.var",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -551,7 +551,7 @@
 	},
 	{
 		"c": "e",
-		"t": "block.expr.function.js.member.meta.object.object-literal.other.var.variable",
+		"t": "block.expr.function.js.member.meta.object.objectliteral.other.var.variable",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.variable rgb(156, 220, 254)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.variable rgb(0, 16, 128)",
@@ -562,7 +562,7 @@
 	},
 	{
 		"c": ".",
-		"t": "accessor.block.expr.function.js.member.meta.object.object-literal.punctuation.var",
+		"t": "accessor.block.expr.function.js.member.meta.object.objectliteral.punctuation.var",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -573,7 +573,7 @@
 	},
 	{
 		"c": "preventDefault",
-		"t": "block.dom.expr.function.js.member.meta.object.object-literal.support.var",
+		"t": "block.dom.expr.function.js.member.meta.object.objectliteral.support.var",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.support.function rgb(220, 220, 170)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.support.function rgb(121, 94, 38)",
@@ -584,7 +584,7 @@
 	},
 	{
 		"c": "()",
-		"t": "block.brace.expr.function.js.member.meta.object.object-literal.round.var",
+		"t": "block.brace.expr.function.js.member.meta.object.objectliteral.round.var",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -595,7 +595,7 @@
 	},
 	{
 		"c": ";",
-		"t": "block.expr.function.js.member.meta.object.object-literal.punctuation.statement.terminator.var",
+		"t": "block.expr.function.js.member.meta.object.objectliteral.punctuation.statement.terminator.var",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -606,7 +606,7 @@
 	},
 	{
 		"c": "    ",
-		"t": "block.comment.expr.function.js.leading.member.meta.object.object-literal.punctuation.var.whitespace",
+		"t": "block.comment.expr.function.js.leading.member.meta.object.objectliteral.punctuation.var.whitespace",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.comment rgba(227, 228, 226, 0.156863)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.comment rgba(51, 51, 51, 0.2)",
@@ -617,7 +617,7 @@
 	},
 	{
 		"c": "//",
-		"t": "block.comment.definition.double-slash.expr.function.js.line.member.meta.object.object-literal.punctuation.var",
+		"t": "block.comment.definition.double-slash.expr.function.js.line.member.meta.object.objectliteral.punctuation.var",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.comment rgb(96, 139, 78)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.comment rgb(0, 128, 0)",
@@ -628,7 +628,7 @@
 	},
 	{
 		"c": " Invert the chosen default.",
-		"t": "block.comment.double-slash.expr.function.js.line.member.meta.object.object-literal.var",
+		"t": "block.comment.double-slash.expr.function.js.line.member.meta.object.objectliteral.var",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.comment rgb(96, 139, 78)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.comment rgb(0, 128, 0)",
@@ -639,7 +639,7 @@
 	},
 	{
 		"c": "    ",
-		"t": "block.comment.expr.function.js.leading.member.meta.object.object-literal.punctuation.var.whitespace",
+		"t": "block.comment.expr.function.js.leading.member.meta.object.objectliteral.punctuation.var.whitespace",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.comment rgba(227, 228, 226, 0.156863)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.comment rgba(51, 51, 51, 0.2)",
@@ -650,7 +650,7 @@
 	},
 	{
 		"c": "//",
-		"t": "block.comment.definition.double-slash.expr.function.js.line.member.meta.object.object-literal.punctuation.var",
+		"t": "block.comment.definition.double-slash.expr.function.js.line.member.meta.object.objectliteral.punctuation.var",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.comment rgb(96, 139, 78)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.comment rgb(0, 128, 0)",
@@ -661,7 +661,7 @@
 	},
 	{
 		"c": " This will trigger an intelligent re-render of the component.",
-		"t": "block.comment.double-slash.expr.function.js.line.member.meta.object.object-literal.var",
+		"t": "block.comment.double-slash.expr.function.js.line.member.meta.object.objectliteral.var",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.comment rgb(96, 139, 78)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.comment rgb(0, 128, 0)",
@@ -672,7 +672,7 @@
 	},
 	{
 		"c": "    ",
-		"t": "block.expr.function.js.member.meta.object.object-literal.var",
+		"t": "block.expr.function.js.member.meta.object.objectliteral.var",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -683,7 +683,7 @@
 	},
 	{
 		"c": "this",
-		"t": "block.expr.function.js.language.member.meta.object.object-literal.this.var.variable",
+		"t": "block.expr.function.js.language.member.meta.object.objectliteral.this.var.variable",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.variable.language rgb(86, 156, 214)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.variable.language rgb(0, 0, 255)",
@@ -694,7 +694,7 @@
 	},
 	{
 		"c": ".",
-		"t": "accessor.block.expr.function.js.member.meta.object.object-literal.punctuation.var",
+		"t": "accessor.block.expr.function.js.member.meta.object.objectliteral.punctuation.var",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -705,7 +705,7 @@
 	},
 	{
 		"c": "setState",
-		"t": "block.entity.expr.function.js.member.meta.name.object.object-literal.var",
+		"t": "block.entity.expr.function.js.member.meta.name.object.objectliteral.var",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.entity.name.function rgb(220, 220, 170)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.entity.name.function rgb(121, 94, 38)",
@@ -716,7 +716,7 @@
 	},
 	{
 		"c": "(",
-		"t": "block.brace.expr.function.js.member.meta.object.object-literal.round.var",
+		"t": "block.brace.expr.function.js.member.meta.object.objectliteral.round.var",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -727,7 +727,7 @@
 	},
 	{
 		"c": "{",
-		"t": "block.definition.expr.function.js.member.meta.object.object-literal.punctuation.var",
+		"t": "block.definition.expr.function.js.member.meta.object.objectliteral.punctuation.var",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -738,7 +738,7 @@
 	},
 	{
 		"c": " ",
-		"t": "block.expr.function.js.member.meta.object.object-literal.var",
+		"t": "block.expr.function.js.member.meta.object.objectliteral.var",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -749,7 +749,7 @@
 	},
 	{
 		"c": "showDefault",
-		"t": "block.expr.function.js.key.member.meta.object.object-literal.var",
+		"t": "block.expr.function.js.key.member.meta.object.object-literal.objectliteral.var",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.object-literal.member.key rgb(156, 220, 254)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.object-literal.member.key rgb(0, 16, 128)",
@@ -760,7 +760,7 @@
 	},
 	{
 		"c": ":",
-		"t": "block.expr.function.js.key.key-value.member.meta.object.object-literal.punctuation.separator.var",
+		"t": "block.expr.function.js.key.key-value.member.meta.object.object-literal.objectliteral.punctuation.separator.var",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.object-literal.member.key rgb(156, 220, 254)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.object-literal.member.key rgb(0, 16, 128)",
@@ -771,7 +771,7 @@
 	},
 	{
 		"c": " ",
-		"t": "block.expr.function.js.member.meta.object.object-literal.var",
+		"t": "block.expr.function.js.member.meta.object.objectliteral.var",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -782,7 +782,7 @@
 	},
 	{
 		"c": "!",
-		"t": "block.expr.function.js.keyword.logical.member.meta.object.object-literal.operator.var",
+		"t": "block.expr.function.js.keyword.logical.member.meta.object.objectliteral.operator.var",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.keyword.operator rgb(212, 212, 212)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.keyword.operator rgb(0, 0, 0)",
@@ -793,7 +793,7 @@
 	},
 	{
 		"c": "this",
-		"t": "block.expr.function.js.language.member.meta.object.object-literal.this.var.variable",
+		"t": "block.expr.function.js.language.member.meta.object.objectliteral.this.var.variable",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.variable.language rgb(86, 156, 214)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.variable.language rgb(0, 0, 255)",
@@ -804,7 +804,7 @@
 	},
 	{
 		"c": ".",
-		"t": "accessor.block.expr.function.js.member.meta.object.object-literal.punctuation.var",
+		"t": "accessor.block.expr.function.js.member.meta.object.objectliteral.punctuation.var",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -815,7 +815,7 @@
 	},
 	{
 		"c": "state",
-		"t": "block.expr.function.js.member.meta.object.object-literal.other.property.var.variable",
+		"t": "block.expr.function.js.member.meta.object.objectliteral.other.property.var.variable",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.variable rgb(156, 220, 254)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.variable rgb(0, 16, 128)",
@@ -826,7 +826,7 @@
 	},
 	{
 		"c": ".",
-		"t": "accessor.block.expr.function.js.member.meta.object.object-literal.punctuation.var",
+		"t": "accessor.block.expr.function.js.member.meta.object.objectliteral.punctuation.var",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -837,7 +837,7 @@
 	},
 	{
 		"c": "showDefault",
-		"t": "block.expr.function.js.member.meta.object.object-literal.other.property.var.variable",
+		"t": "block.expr.function.js.member.meta.object.objectliteral.other.property.var.variable",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.variable rgb(156, 220, 254)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.variable rgb(0, 16, 128)",
@@ -848,7 +848,7 @@
 	},
 	{
 		"c": " ",
-		"t": "block.expr.function.js.member.meta.object.object-literal.var",
+		"t": "block.expr.function.js.member.meta.object.objectliteral.var",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -859,7 +859,7 @@
 	},
 	{
 		"c": "}",
-		"t": "block.definition.expr.function.js.member.meta.object.object-literal.punctuation.var",
+		"t": "block.definition.expr.function.js.member.meta.object.objectliteral.punctuation.var",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -870,7 +870,7 @@
 	},
 	{
 		"c": ")",
-		"t": "block.brace.expr.function.js.member.meta.object.object-literal.round.var",
+		"t": "block.brace.expr.function.js.member.meta.object.objectliteral.round.var",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -881,7 +881,7 @@
 	},
 	{
 		"c": "  ",
-		"t": "block.expr.function.js.member.meta.object.object-literal.var",
+		"t": "block.expr.function.js.member.meta.object.objectliteral.var",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -892,7 +892,7 @@
 	},
 	{
 		"c": "}",
-		"t": "block.definition.expr.function.js.member.meta.object.object-literal.punctuation.var",
+		"t": "block.definition.expr.function.js.member.meta.object.objectliteral.punctuation.var",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -903,7 +903,7 @@
 	},
 	{
 		"c": ",",
-		"t": "comma.expr.js.meta.object-literal.punctuation.separator.var",
+		"t": "comma.expr.js.meta.objectliteral.punctuation.separator.var",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -914,7 +914,7 @@
 	},
 	{
 		"c": "  ",
-		"t": "expr.js.meta.object-literal.var",
+		"t": "expr.js.meta.objectliteral.var",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -925,7 +925,7 @@
 	},
 	{
 		"c": "render",
-		"t": "entity.expr.function.js.key.member.meta.name.object.object-literal.var",
+		"t": "entity.expr.function.js.key.member.meta.name.object.object-literal.objectliteral.var",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.object-literal.member.key rgb(156, 220, 254)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.object-literal.member.key rgb(0, 16, 128)",
@@ -936,7 +936,7 @@
 	},
 	{
 		"c": ":",
-		"t": "expr.js.key.key-value.member.meta.object.object-literal.punctuation.separator.var",
+		"t": "expr.js.key.key-value.member.meta.object.object-literal.objectliteral.punctuation.separator.var",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.object-literal.member.key rgb(156, 220, 254)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.object-literal.member.key rgb(0, 16, 128)",
@@ -947,7 +947,7 @@
 	},
 	{
 		"c": " ",
-		"t": "expr.js.member.meta.object.object-literal.var",
+		"t": "expr.js.member.meta.object.objectliteral.var",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -958,7 +958,7 @@
 	},
 	{
 		"c": "function",
-		"t": "expr.function.js.member.meta.object.object-literal.storage.type.var",
+		"t": "expr.function.js.member.meta.object.objectliteral.storage.type.var",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.storage.type rgb(86, 156, 214)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.storage.type rgb(0, 0, 255)",
@@ -969,7 +969,7 @@
 	},
 	{
 		"c": " ",
-		"t": "expr.function.js.member.meta.object.object-literal.var",
+		"t": "expr.function.js.member.meta.object.objectliteral.var",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -980,7 +980,7 @@
 	},
 	{
 		"c": "(",
-		"t": "begin.definition.expr.function.js.member.meta.object.object-literal.parameters.punctuation.var",
+		"t": "begin.definition.expr.function.js.member.meta.object.objectliteral.parameters.punctuation.var",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -991,7 +991,7 @@
 	},
 	{
 		"c": ")",
-		"t": "definition.end.expr.function.js.member.meta.object.object-literal.parameters.punctuation.var",
+		"t": "definition.end.expr.function.js.member.meta.object.objectliteral.parameters.punctuation.var",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -1002,7 +1002,7 @@
 	},
 	{
 		"c": " ",
-		"t": "expr.function.js.member.meta.object.object-literal.var",
+		"t": "expr.function.js.member.meta.object.objectliteral.var",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -1013,7 +1013,7 @@
 	},
 	{
 		"c": "{",
-		"t": "block.definition.expr.function.js.member.meta.object.object-literal.punctuation.var",
+		"t": "block.definition.expr.function.js.member.meta.object.objectliteral.punctuation.var",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -1024,7 +1024,7 @@
 	},
 	{
 		"c": "    ",
-		"t": "block.comment.expr.function.js.leading.member.meta.object.object-literal.punctuation.var.whitespace",
+		"t": "block.comment.expr.function.js.leading.member.meta.object.objectliteral.punctuation.var.whitespace",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.comment rgba(227, 228, 226, 0.156863)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.comment rgba(51, 51, 51, 0.2)",
@@ -1035,7 +1035,7 @@
 	},
 	{
 		"c": "//",
-		"t": "block.comment.definition.double-slash.expr.function.js.line.member.meta.object.object-literal.punctuation.var",
+		"t": "block.comment.definition.double-slash.expr.function.js.line.member.meta.object.objectliteral.punctuation.var",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.comment rgb(96, 139, 78)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.comment rgb(0, 128, 0)",
@@ -1046,7 +1046,7 @@
 	},
 	{
 		"c": " Default to the default message.",
-		"t": "block.comment.double-slash.expr.function.js.line.member.meta.object.object-literal.var",
+		"t": "block.comment.double-slash.expr.function.js.line.member.meta.object.objectliteral.var",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.comment rgb(96, 139, 78)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.comment rgb(0, 128, 0)",
@@ -1057,7 +1057,7 @@
 	},
 	{
 		"c": "    ",
-		"t": "block.expr.function.js.member.meta.object.object-literal.var",
+		"t": "block.expr.function.js.member.meta.object.objectliteral.var",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -1068,7 +1068,7 @@
 	},
 	{
 		"c": "var",
-		"t": "block.expr.function.js.member.meta.object.object-literal.storage.type.var",
+		"t": "block.expr.function.js.member.meta.object.objectliteral.storage.type.var",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.storage.type rgb(86, 156, 214)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.storage.type rgb(0, 0, 255)",
@@ -1079,7 +1079,7 @@
 	},
 	{
 		"c": " ",
-		"t": "block.expr.function.js.member.meta.object.object-literal.var",
+		"t": "block.expr.function.js.member.meta.object.objectliteral.var",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -1090,7 +1090,7 @@
 	},
 	{
 		"c": "message",
-		"t": "block.expr.function.js.member.meta.object.object-literal.other.readwrite.var.var-single-variable.variable",
+		"t": "block.expr.function.js.member.meta.object.objectliteral.other.readwrite.var.var-single-variable.variable",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.variable rgb(156, 220, 254)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.variable rgb(0, 16, 128)",
@@ -1101,7 +1101,7 @@
 	},
 	{
 		"c": " ",
-		"t": "block.expr.function.js.member.meta.object.object-literal.var.var-single-variable",
+		"t": "block.expr.function.js.member.meta.object.objectliteral.var.var-single-variable",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -1112,7 +1112,7 @@
 	},
 	{
 		"c": "=",
-		"t": "assignment.block.expr.function.js.keyword.member.meta.object.object-literal.operator.var",
+		"t": "assignment.block.expr.function.js.keyword.member.meta.object.objectliteral.operator.var",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.keyword.operator rgb(212, 212, 212)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.keyword.operator rgb(0, 0, 0)",
@@ -1123,7 +1123,7 @@
 	},
 	{
 		"c": " ",
-		"t": "block.expr.function.js.member.meta.object.object-literal.var",
+		"t": "block.expr.function.js.member.meta.object.objectliteral.var",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -1134,7 +1134,7 @@
 	},
 	{
 		"c": "this",
-		"t": "block.expr.function.js.language.member.meta.object.object-literal.this.var.variable",
+		"t": "block.expr.function.js.language.member.meta.object.objectliteral.this.var.variable",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.variable.language rgb(86, 156, 214)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.variable.language rgb(0, 0, 255)",
@@ -1145,7 +1145,7 @@
 	},
 	{
 		"c": ".",
-		"t": "accessor.block.expr.function.js.member.meta.object.object-literal.punctuation.var",
+		"t": "accessor.block.expr.function.js.member.meta.object.objectliteral.punctuation.var",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -1156,7 +1156,7 @@
 	},
 	{
 		"c": "props",
-		"t": "block.expr.function.js.member.meta.object.object-literal.other.property.var.variable",
+		"t": "block.expr.function.js.member.meta.object.objectliteral.other.property.var.variable",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.variable rgb(156, 220, 254)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.variable rgb(0, 16, 128)",
@@ -1167,7 +1167,7 @@
 	},
 	{
 		"c": ".",
-		"t": "accessor.block.expr.function.js.member.meta.object.object-literal.punctuation.var",
+		"t": "accessor.block.expr.function.js.member.meta.object.objectliteral.punctuation.var",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -1178,7 +1178,7 @@
 	},
 	{
 		"c": "default",
-		"t": "block.expr.function.js.member.meta.object.object-literal.other.property.var.variable",
+		"t": "block.expr.function.js.member.meta.object.objectliteral.other.property.var.variable",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.variable rgb(156, 220, 254)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.variable rgb(0, 16, 128)",
@@ -1189,7 +1189,7 @@
 	},
 	{
 		"c": ";",
-		"t": "block.expr.function.js.member.meta.object.object-literal.punctuation.statement.terminator.var",
+		"t": "block.expr.function.js.member.meta.object.objectliteral.punctuation.statement.terminator.var",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -1200,7 +1200,7 @@
 	},
 	{
 		"c": "    ",
-		"t": "block.comment.expr.function.js.leading.member.meta.object.object-literal.punctuation.var.whitespace",
+		"t": "block.comment.expr.function.js.leading.member.meta.object.objectliteral.punctuation.var.whitespace",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.comment rgba(227, 228, 226, 0.156863)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.comment rgba(51, 51, 51, 0.2)",
@@ -1211,7 +1211,7 @@
 	},
 	{
 		"c": "//",
-		"t": "block.comment.definition.double-slash.expr.function.js.line.member.meta.object.object-literal.punctuation.var",
+		"t": "block.comment.definition.double-slash.expr.function.js.line.member.meta.object.objectliteral.punctuation.var",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.comment rgb(96, 139, 78)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.comment rgb(0, 128, 0)",
@@ -1222,7 +1222,7 @@
 	},
 	{
 		"c": " If toggled, show the alternate message.",
-		"t": "block.comment.double-slash.expr.function.js.line.member.meta.object.object-literal.var",
+		"t": "block.comment.double-slash.expr.function.js.line.member.meta.object.objectliteral.var",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.comment rgb(96, 139, 78)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.comment rgb(0, 128, 0)",
@@ -1233,7 +1233,7 @@
 	},
 	{
 		"c": "    ",
-		"t": "block.expr.function.js.member.meta.object.object-literal.var",
+		"t": "block.expr.function.js.member.meta.object.objectliteral.var",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -1244,7 +1244,7 @@
 	},
 	{
 		"c": "if",
-		"t": "block.conditional.control.expr.function.js.keyword.member.meta.object.object-literal.var",
+		"t": "block.conditional.control.expr.function.js.keyword.member.meta.object.objectliteral.var",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.keyword.control rgb(197, 134, 192)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.keyword.control rgb(175, 0, 219)",
@@ -1255,7 +1255,7 @@
 	},
 	{
 		"c": " ",
-		"t": "block.expr.function.js.member.meta.object.object-literal.var",
+		"t": "block.expr.function.js.member.meta.object.objectliteral.var",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -1266,7 +1266,7 @@
 	},
 	{
 		"c": "(",
-		"t": "block.brace.expr.function.js.member.meta.object.object-literal.round.var",
+		"t": "block.brace.expr.function.js.member.meta.object.objectliteral.round.var",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -1277,7 +1277,7 @@
 	},
 	{
 		"c": "!",
-		"t": "block.expr.function.js.keyword.logical.member.meta.object.object-literal.operator.var",
+		"t": "block.expr.function.js.keyword.logical.member.meta.object.objectliteral.operator.var",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.keyword.operator rgb(212, 212, 212)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.keyword.operator rgb(0, 0, 0)",
@@ -1288,7 +1288,7 @@
 	},
 	{
 		"c": "this",
-		"t": "block.expr.function.js.language.member.meta.object.object-literal.this.var.variable",
+		"t": "block.expr.function.js.language.member.meta.object.objectliteral.this.var.variable",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.variable.language rgb(86, 156, 214)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.variable.language rgb(0, 0, 255)",
@@ -1299,7 +1299,7 @@
 	},
 	{
 		"c": ".",
-		"t": "accessor.block.expr.function.js.member.meta.object.object-literal.punctuation.var",
+		"t": "accessor.block.expr.function.js.member.meta.object.objectliteral.punctuation.var",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -1310,7 +1310,7 @@
 	},
 	{
 		"c": "state",
-		"t": "block.expr.function.js.member.meta.object.object-literal.other.property.var.variable",
+		"t": "block.expr.function.js.member.meta.object.objectliteral.other.property.var.variable",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.variable rgb(156, 220, 254)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.variable rgb(0, 16, 128)",
@@ -1321,7 +1321,7 @@
 	},
 	{
 		"c": ".",
-		"t": "accessor.block.expr.function.js.member.meta.object.object-literal.punctuation.var",
+		"t": "accessor.block.expr.function.js.member.meta.object.objectliteral.punctuation.var",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -1332,7 +1332,7 @@
 	},
 	{
 		"c": "showDefault",
-		"t": "block.expr.function.js.member.meta.object.object-literal.other.property.var.variable",
+		"t": "block.expr.function.js.member.meta.object.objectliteral.other.property.var.variable",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.variable rgb(156, 220, 254)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.variable rgb(0, 16, 128)",
@@ -1343,7 +1343,7 @@
 	},
 	{
 		"c": ")",
-		"t": "block.brace.expr.function.js.member.meta.object.object-literal.round.var",
+		"t": "block.brace.expr.function.js.member.meta.object.objectliteral.round.var",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -1354,7 +1354,7 @@
 	},
 	{
 		"c": " ",
-		"t": "block.expr.function.js.member.meta.object.object-literal.var",
+		"t": "block.expr.function.js.member.meta.object.objectliteral.var",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -1365,7 +1365,7 @@
 	},
 	{
 		"c": "{",
-		"t": "block.definition.expr.function.js.member.meta.object.object-literal.punctuation.var",
+		"t": "block.definition.expr.function.js.member.meta.object.objectliteral.punctuation.var",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -1376,7 +1376,7 @@
 	},
 	{
 		"c": "      ",
-		"t": "block.expr.function.js.member.meta.object.object-literal.var",
+		"t": "block.expr.function.js.member.meta.object.objectliteral.var",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -1387,7 +1387,7 @@
 	},
 	{
 		"c": "message",
-		"t": "block.expr.function.js.member.meta.object.object-literal.other.readwrite.var.variable",
+		"t": "block.expr.function.js.member.meta.object.objectliteral.other.readwrite.var.variable",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.variable rgb(156, 220, 254)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.variable rgb(0, 16, 128)",
@@ -1398,7 +1398,7 @@
 	},
 	{
 		"c": " ",
-		"t": "block.expr.function.js.member.meta.object.object-literal.var",
+		"t": "block.expr.function.js.member.meta.object.objectliteral.var",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -1409,7 +1409,7 @@
 	},
 	{
 		"c": "=",
-		"t": "assignment.block.expr.function.js.keyword.member.meta.object.object-literal.operator.var",
+		"t": "assignment.block.expr.function.js.keyword.member.meta.object.objectliteral.operator.var",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.keyword.operator rgb(212, 212, 212)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.keyword.operator rgb(0, 0, 0)",
@@ -1420,7 +1420,7 @@
 	},
 	{
 		"c": " ",
-		"t": "block.expr.function.js.member.meta.object.object-literal.var",
+		"t": "block.expr.function.js.member.meta.object.objectliteral.var",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -1431,7 +1431,7 @@
 	},
 	{
 		"c": "this",
-		"t": "block.expr.function.js.language.member.meta.object.object-literal.this.var.variable",
+		"t": "block.expr.function.js.language.member.meta.object.objectliteral.this.var.variable",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.variable.language rgb(86, 156, 214)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.variable.language rgb(0, 0, 255)",
@@ -1442,7 +1442,7 @@
 	},
 	{
 		"c": ".",
-		"t": "accessor.block.expr.function.js.member.meta.object.object-literal.punctuation.var",
+		"t": "accessor.block.expr.function.js.member.meta.object.objectliteral.punctuation.var",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -1453,7 +1453,7 @@
 	},
 	{
 		"c": "props",
-		"t": "block.expr.function.js.member.meta.object.object-literal.other.property.var.variable",
+		"t": "block.expr.function.js.member.meta.object.objectliteral.other.property.var.variable",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.variable rgb(156, 220, 254)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.variable rgb(0, 16, 128)",
@@ -1464,7 +1464,7 @@
 	},
 	{
 		"c": ".",
-		"t": "accessor.block.expr.function.js.member.meta.object.object-literal.punctuation.var",
+		"t": "accessor.block.expr.function.js.member.meta.object.objectliteral.punctuation.var",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -1475,7 +1475,7 @@
 	},
 	{
 		"c": "alt",
-		"t": "block.dom.expr.function.js.member.meta.object.object-literal.property.support.var.variable",
+		"t": "block.dom.expr.function.js.member.meta.object.objectliteral.property.support.var.variable",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.support.variable rgb(156, 220, 254)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.support.variable rgb(0, 16, 128)",
@@ -1486,7 +1486,7 @@
 	},
 	{
 		"c": ";",
-		"t": "block.expr.function.js.member.meta.object.object-literal.punctuation.statement.terminator.var",
+		"t": "block.expr.function.js.member.meta.object.objectliteral.punctuation.statement.terminator.var",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -1497,7 +1497,7 @@
 	},
 	{
 		"c": "    ",
-		"t": "block.expr.function.js.member.meta.object.object-literal.var",
+		"t": "block.expr.function.js.member.meta.object.objectliteral.var",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -1508,7 +1508,7 @@
 	},
 	{
 		"c": "}",
-		"t": "block.definition.expr.function.js.member.meta.object.object-literal.punctuation.var",
+		"t": "block.definition.expr.function.js.member.meta.object.objectliteral.punctuation.var",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -1519,7 +1519,7 @@
 	},
 	{
 		"c": "    ",
-		"t": "block.expr.function.js.member.meta.object.object-literal.var",
+		"t": "block.expr.function.js.member.meta.object.objectliteral.var",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -1530,7 +1530,7 @@
 	},
 	{
 		"c": "return",
-		"t": "block.control.expr.flow.function.js.keyword.member.meta.object.object-literal.var",
+		"t": "block.control.expr.flow.function.js.keyword.member.meta.object.objectliteral.var",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.keyword.control rgb(197, 134, 192)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.keyword.control rgb(175, 0, 219)",
@@ -1541,7 +1541,7 @@
 	},
 	{
 		"c": " ",
-		"t": "block.expr.function.js.member.meta.object.object-literal.var",
+		"t": "block.expr.function.js.member.meta.object.objectliteral.var",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -1552,7 +1552,7 @@
 	},
 	{
 		"c": "(",
-		"t": "block.brace.expr.function.js.member.meta.object.object-literal.round.var",
+		"t": "block.brace.expr.function.js.member.meta.object.objectliteral.round.var",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -1563,7 +1563,7 @@
 	},
 	{
 		"c": "      ",
-		"t": "block.expr.function.js.member.meta.object.object-literal.var",
+		"t": "block.expr.function.js.member.meta.object.objectliteral.var",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -1574,7 +1574,7 @@
 	},
 	{
 		"c": "<",
-		"t": "begin.block.definition.expr.function.js.member.meta.object.object-literal.punctuation.tag.var.without-attributes",
+		"t": "begin.block.definition.expr.function.js.member.meta.object.objectliteral.punctuation.tag.var.without-attributes",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.punctuation.definition.tag rgb(128, 128, 128)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.punctuation.definition.tag rgb(128, 0, 0)",
@@ -1585,7 +1585,7 @@
 	},
 	{
 		"c": "div",
-		"t": "block.entity.expr.function.js.member.meta.name.object.object-literal.tag.var.without-attributes",
+		"t": "block.entity.expr.function.js.member.meta.name.object.objectliteral.tag.var.without-attributes",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.entity.name.function.tag rgb(86, 156, 214)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.entity.name.function.tag rgb(128, 0, 0)",
@@ -1596,7 +1596,7 @@
 	},
 	{
 		"c": ">",
-		"t": "block.definition.end.expr.function.js.member.meta.object.object-literal.punctuation.tag.var.without-attributes",
+		"t": "block.definition.end.expr.function.js.member.meta.object.objectliteral.punctuation.tag.var.without-attributes",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.punctuation.definition.tag rgb(128, 128, 128)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.punctuation.definition.tag rgb(128, 0, 0)",
@@ -1607,7 +1607,7 @@
 	},
 	{
 		"c": "        ",
-		"t": "block.children.expr.function.js.jsx.member.meta.object.object-literal.tag.tsx.var.without-attributes",
+		"t": "block.children.expr.function.js.jsx.member.meta.object.objectliteral.tag.tsx.var.without-attributes",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -1618,7 +1618,7 @@
 	},
 	{
 		"c": "<",
-		"t": "begin.block.children.definition.expr.function.js.jsx.member.meta.object.object-literal.punctuation.tag.tsx.var.without-attributes",
+		"t": "begin.block.children.definition.expr.function.js.jsx.member.meta.object.objectliteral.punctuation.tag.tsx.var.without-attributes",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.punctuation.definition.tag rgb(128, 128, 128)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.punctuation.definition.tag rgb(128, 0, 0)",
@@ -1629,7 +1629,7 @@
 	},
 	{
 		"c": "h1",
-		"t": "block.children.entity.expr.function.js.jsx.member.meta.name.object.object-literal.tag.tsx.var.without-attributes",
+		"t": "block.children.entity.expr.function.js.jsx.member.meta.name.object.objectliteral.tag.tsx.var.without-attributes",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.entity.name.function.tag rgb(86, 156, 214)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.entity.name.function.tag rgb(128, 0, 0)",
@@ -1640,7 +1640,7 @@
 	},
 	{
 		"c": ">",
-		"t": "block.children.definition.end.expr.function.js.jsx.member.meta.object.object-literal.punctuation.tag.tsx.var.without-attributes",
+		"t": "block.children.definition.end.expr.function.js.jsx.member.meta.object.objectliteral.punctuation.tag.tsx.var.without-attributes",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.punctuation.definition.tag rgb(128, 128, 128)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.punctuation.definition.tag rgb(128, 0, 0)",
@@ -1651,7 +1651,7 @@
 	},
 	{
 		"c": "Hello ",
-		"t": "block.children.expr.function.js.jsx.member.meta.object.object-literal.tag.tsx.var.without-attributes",
+		"t": "block.children.expr.function.js.jsx.member.meta.object.objectliteral.tag.tsx.var.without-attributes",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -1662,7 +1662,7 @@
 	},
 	{
 		"c": "{",
-		"t": "begin.block.children.embedded.expr.expression.function.js.jsx.member.meta.object.object-literal.punctuation.section.tag.tsx.var.without-attributes",
+		"t": "begin.block.children.embedded.expr.expression.function.js.jsx.member.meta.object.objectliteral.punctuation.section.tag.tsx.var.without-attributes",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -1673,7 +1673,7 @@
 	},
 	{
 		"c": "message",
-		"t": "block.children.embedded.expr.expression.function.js.jsx.member.meta.object.object-literal.other.readwrite.tag.tsx.var.variable.without-attributes",
+		"t": "block.children.embedded.expr.expression.function.js.jsx.member.meta.object.objectliteral.other.readwrite.tag.tsx.var.variable.without-attributes",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.variable rgb(156, 220, 254)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.variable rgb(0, 16, 128)",
@@ -1684,7 +1684,7 @@
 	},
 	{
 		"c": "}",
-		"t": "block.children.embedded.end.expr.expression.function.js.jsx.member.meta.object.object-literal.punctuation.section.tag.tsx.var.without-attributes",
+		"t": "block.children.embedded.end.expr.expression.function.js.jsx.member.meta.object.objectliteral.punctuation.section.tag.tsx.var.without-attributes",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -1695,7 +1695,7 @@
 	},
 	{
 		"c": "!",
-		"t": "block.children.expr.function.js.jsx.member.meta.object.object-literal.tag.tsx.var.without-attributes",
+		"t": "block.children.expr.function.js.jsx.member.meta.object.objectliteral.tag.tsx.var.without-attributes",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -1706,7 +1706,7 @@
 	},
 	{
 		"c": "</",
-		"t": "begin.block.children.definition.expr.function.js.jsx.member.meta.object.object-literal.punctuation.tag.tsx.var.without-attributes",
+		"t": "begin.block.children.definition.expr.function.js.jsx.member.meta.object.objectliteral.punctuation.tag.tsx.var.without-attributes",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.punctuation.definition.tag rgb(128, 128, 128)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.punctuation.definition.tag rgb(128, 0, 0)",
@@ -1717,7 +1717,7 @@
 	},
 	{
 		"c": "h1",
-		"t": "block.children.entity.expr.function.js.jsx.member.meta.name.object.object-literal.tag.tsx.var.without-attributes",
+		"t": "block.children.entity.expr.function.js.jsx.member.meta.name.object.objectliteral.tag.tsx.var.without-attributes",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.entity.name.function.tag rgb(86, 156, 214)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.entity.name.function.tag rgb(128, 0, 0)",
@@ -1728,7 +1728,7 @@
 	},
 	{
 		"c": ">",
-		"t": "block.children.definition.end.expr.function.js.jsx.member.meta.object.object-literal.punctuation.tag.tsx.var.without-attributes",
+		"t": "block.children.definition.end.expr.function.js.jsx.member.meta.object.objectliteral.punctuation.tag.tsx.var.without-attributes",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.punctuation.definition.tag rgb(128, 128, 128)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.punctuation.definition.tag rgb(128, 0, 0)",
@@ -1739,7 +1739,7 @@
 	},
 	{
 		"c": "        ",
-		"t": "block.children.expr.function.js.jsx.member.meta.object.object-literal.tag.tsx.var.without-attributes",
+		"t": "block.children.expr.function.js.jsx.member.meta.object.objectliteral.tag.tsx.var.without-attributes",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -1750,7 +1750,7 @@
 	},
 	{
 		"c": "<",
-		"t": "begin.block.children.definition.expr.function.js.jsx.member.meta.object.object-literal.punctuation.tag.tsx.var.without-attributes",
+		"t": "begin.block.children.definition.expr.function.js.jsx.member.meta.object.objectliteral.punctuation.tag.tsx.var.without-attributes",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.punctuation.definition.tag rgb(128, 128, 128)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.punctuation.definition.tag rgb(128, 0, 0)",
@@ -1761,7 +1761,7 @@
 	},
 	{
 		"c": "a",
-		"t": "block.children.entity.expr.function.js.jsx.member.meta.name.object.object-literal.tag.tsx.var.without-attributes",
+		"t": "block.children.entity.expr.function.js.jsx.member.meta.name.object.objectliteral.tag.tsx.var.without-attributes",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.entity.name.function.tag rgb(86, 156, 214)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.entity.name.function.tag rgb(128, 0, 0)",
@@ -1772,7 +1772,7 @@
 	},
 	{
 		"c": " ",
-		"t": "attribute-name.block.children.expr.function.js.jsx.member.meta.object.object-literal.tag.tsx.var.without-attributes",
+		"t": "attribute-name.block.children.expr.function.js.jsx.member.meta.object.objectliteral.tag.tsx.var.without-attributes",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -1783,7 +1783,7 @@
 	},
 	{
 		"c": "href",
-		"t": "attribute-name.block.children.entity.expr.function.js.jsx.member.meta.object.object-literal.other.tag.tsx.var.without-attributes",
+		"t": "attribute-name.block.children.entity.expr.function.js.jsx.member.meta.object.objectliteral.other.tag.tsx.var.without-attributes",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.entity.other.attribute-name rgb(156, 220, 254)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.entity.other.attribute-name rgb(255, 0, 0)",
@@ -1794,7 +1794,7 @@
 	},
 	{
 		"c": "=",
-		"t": "assignment.block.children.expr.function.js.jsx.keyword.member.meta.object.object-literal.operator.tag.tsx.var.without-attributes",
+		"t": "assignment.block.children.expr.function.js.jsx.keyword.member.meta.object.objectliteral.operator.tag.tsx.var.without-attributes",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.keyword.operator rgb(212, 212, 212)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.keyword.operator rgb(0, 0, 0)",
@@ -1805,7 +1805,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "begin.block.children.definition.double.expr.function.js.jsx.jsxAttributeValue.member.meta.object.object-literal.punctuation.quoted.string.tag.tsx.var.without-attributes",
+		"t": "begin.block.children.definition.double.expr.function.js.jsx.jsxAttributeValue.member.meta.object.objectliteral.punctuation.quoted.string.tag.tsx.var.without-attributes",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.punctuation.definition.tag rgb(128, 128, 128)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.punctuation.definition.tag rgb(128, 0, 0)",
@@ -1816,7 +1816,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "block.children.definition.double.end.expr.function.js.jsx.jsxAttributeValue.member.meta.object.object-literal.punctuation.quoted.string.tag.tsx.var.without-attributes",
+		"t": "block.children.definition.double.end.expr.function.js.jsx.jsxAttributeValue.member.meta.object.objectliteral.punctuation.quoted.string.tag.tsx.var.without-attributes",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.punctuation.definition.tag rgb(128, 128, 128)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.punctuation.definition.tag rgb(128, 0, 0)",
@@ -1827,7 +1827,7 @@
 	},
 	{
 		"c": " ",
-		"t": "attribute-name.block.children.expr.function.js.jsx.member.meta.object.object-literal.tag.tsx.var.without-attributes",
+		"t": "attribute-name.block.children.expr.function.js.jsx.member.meta.object.objectliteral.tag.tsx.var.without-attributes",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -1838,7 +1838,7 @@
 	},
 	{
 		"c": "onClick",
-		"t": "attribute-name.block.children.entity.expr.function.js.jsx.member.meta.object.object-literal.other.tag.tsx.var.without-attributes",
+		"t": "attribute-name.block.children.entity.expr.function.js.jsx.member.meta.object.objectliteral.other.tag.tsx.var.without-attributes",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.entity.other.attribute-name rgb(156, 220, 254)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.entity.other.attribute-name rgb(255, 0, 0)",
@@ -1849,7 +1849,7 @@
 	},
 	{
 		"c": "=",
-		"t": "assignment.block.children.expr.function.js.jsx.keyword.member.meta.object.object-literal.operator.tag.tsx.var.without-attributes",
+		"t": "assignment.block.children.expr.function.js.jsx.keyword.member.meta.object.objectliteral.operator.tag.tsx.var.without-attributes",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.keyword.operator rgb(212, 212, 212)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.keyword.operator rgb(0, 0, 0)",
@@ -1860,7 +1860,7 @@
 	},
 	{
 		"c": "{",
-		"t": "begin.block.children.embedded.expr.expression.function.js.jsx.member.meta.object.object-literal.punctuation.section.tag.tsx.var.without-attributes",
+		"t": "begin.block.children.embedded.expr.expression.function.js.jsx.member.meta.object.objectliteral.punctuation.section.tag.tsx.var.without-attributes",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -1871,7 +1871,7 @@
 	},
 	{
 		"c": "this",
-		"t": "block.children.embedded.expr.expression.function.js.jsx.language.member.meta.object.object-literal.tag.this.tsx.var.variable.without-attributes",
+		"t": "block.children.embedded.expr.expression.function.js.jsx.language.member.meta.object.objectliteral.tag.this.tsx.var.variable.without-attributes",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.variable.language rgb(86, 156, 214)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.variable.language rgb(0, 0, 255)",
@@ -1882,7 +1882,7 @@
 	},
 	{
 		"c": ".",
-		"t": "accessor.block.children.embedded.expr.expression.function.js.jsx.member.meta.object.object-literal.punctuation.tag.tsx.var.without-attributes",
+		"t": "accessor.block.children.embedded.expr.expression.function.js.jsx.member.meta.object.objectliteral.punctuation.tag.tsx.var.without-attributes",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -1893,7 +1893,7 @@
 	},
 	{
 		"c": "toggle",
-		"t": "block.children.embedded.expr.expression.function.js.jsx.member.meta.object.object-literal.other.property.tag.tsx.var.variable.without-attributes",
+		"t": "block.children.embedded.expr.expression.function.js.jsx.member.meta.object.objectliteral.other.property.tag.tsx.var.variable.without-attributes",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.variable rgb(156, 220, 254)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.variable rgb(0, 16, 128)",
@@ -1904,7 +1904,7 @@
 	},
 	{
 		"c": "}",
-		"t": "block.children.embedded.end.expr.expression.function.js.jsx.member.meta.object.object-literal.punctuation.section.tag.tsx.var.without-attributes",
+		"t": "block.children.embedded.end.expr.expression.function.js.jsx.member.meta.object.objectliteral.punctuation.section.tag.tsx.var.without-attributes",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -1915,7 +1915,7 @@
 	},
 	{
 		"c": ">",
-		"t": "block.children.definition.end.expr.function.js.jsx.member.meta.object.object-literal.punctuation.tag.tsx.var.without-attributes",
+		"t": "block.children.definition.end.expr.function.js.jsx.member.meta.object.objectliteral.punctuation.tag.tsx.var.without-attributes",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.punctuation.definition.tag rgb(128, 128, 128)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.punctuation.definition.tag rgb(128, 0, 0)",
@@ -1926,7 +1926,7 @@
 	},
 	{
 		"c": "Toggle",
-		"t": "block.children.expr.function.js.jsx.member.meta.object.object-literal.tag.tsx.var.without-attributes",
+		"t": "block.children.expr.function.js.jsx.member.meta.object.objectliteral.tag.tsx.var.without-attributes",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -1937,7 +1937,7 @@
 	},
 	{
 		"c": "</",
-		"t": "begin.block.children.definition.expr.function.js.jsx.member.meta.object.object-literal.punctuation.tag.tsx.var.without-attributes",
+		"t": "begin.block.children.definition.expr.function.js.jsx.member.meta.object.objectliteral.punctuation.tag.tsx.var.without-attributes",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.punctuation.definition.tag rgb(128, 128, 128)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.punctuation.definition.tag rgb(128, 0, 0)",
@@ -1948,7 +1948,7 @@
 	},
 	{
 		"c": "a",
-		"t": "block.children.entity.expr.function.js.jsx.member.meta.name.object.object-literal.tag.tsx.var.without-attributes",
+		"t": "block.children.entity.expr.function.js.jsx.member.meta.name.object.objectliteral.tag.tsx.var.without-attributes",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.entity.name.function.tag rgb(86, 156, 214)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.entity.name.function.tag rgb(128, 0, 0)",
@@ -1959,7 +1959,7 @@
 	},
 	{
 		"c": ">",
-		"t": "block.children.definition.end.expr.function.js.jsx.member.meta.object.object-literal.punctuation.tag.tsx.var.without-attributes",
+		"t": "block.children.definition.end.expr.function.js.jsx.member.meta.object.objectliteral.punctuation.tag.tsx.var.without-attributes",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.punctuation.definition.tag rgb(128, 128, 128)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.punctuation.definition.tag rgb(128, 0, 0)",
@@ -1970,7 +1970,7 @@
 	},
 	{
 		"c": "      ",
-		"t": "block.children.expr.function.js.jsx.member.meta.object.object-literal.tag.tsx.var.without-attributes",
+		"t": "block.children.expr.function.js.jsx.member.meta.object.objectliteral.tag.tsx.var.without-attributes",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -1981,7 +1981,7 @@
 	},
 	{
 		"c": "</",
-		"t": "begin.block.definition.expr.function.js.member.meta.object.object-literal.punctuation.tag.var.without-attributes",
+		"t": "begin.block.definition.expr.function.js.member.meta.object.objectliteral.punctuation.tag.var.without-attributes",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.punctuation.definition.tag rgb(128, 128, 128)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.punctuation.definition.tag rgb(128, 0, 0)",
@@ -1992,7 +1992,7 @@
 	},
 	{
 		"c": "div",
-		"t": "block.entity.expr.function.js.member.meta.name.object.object-literal.tag.var.without-attributes",
+		"t": "block.entity.expr.function.js.member.meta.name.object.objectliteral.tag.var.without-attributes",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.entity.name.function.tag rgb(86, 156, 214)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.entity.name.function.tag rgb(128, 0, 0)",
@@ -2003,7 +2003,7 @@
 	},
 	{
 		"c": ">",
-		"t": "block.definition.end.expr.function.js.member.meta.object.object-literal.punctuation.tag.var.without-attributes",
+		"t": "block.definition.end.expr.function.js.member.meta.object.objectliteral.punctuation.tag.var.without-attributes",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.punctuation.definition.tag rgb(128, 128, 128)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.punctuation.definition.tag rgb(128, 0, 0)",
@@ -2014,7 +2014,7 @@
 	},
 	{
 		"c": "    ",
-		"t": "block.expr.function.js.member.meta.object.object-literal.var",
+		"t": "block.expr.function.js.member.meta.object.objectliteral.var",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -2025,7 +2025,7 @@
 	},
 	{
 		"c": ")",
-		"t": "block.brace.expr.function.js.member.meta.object.object-literal.round.var",
+		"t": "block.brace.expr.function.js.member.meta.object.objectliteral.round.var",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -2036,7 +2036,7 @@
 	},
 	{
 		"c": ";",
-		"t": "block.expr.function.js.member.meta.object.object-literal.punctuation.statement.terminator.var",
+		"t": "block.expr.function.js.member.meta.object.objectliteral.punctuation.statement.terminator.var",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -2047,7 +2047,7 @@
 	},
 	{
 		"c": "  ",
-		"t": "block.expr.function.js.member.meta.object.object-literal.var",
+		"t": "block.expr.function.js.member.meta.object.objectliteral.var",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -2058,7 +2058,7 @@
 	},
 	{
 		"c": "}",
-		"t": "block.definition.expr.function.js.member.meta.object.object-literal.punctuation.var",
+		"t": "block.definition.expr.function.js.member.meta.object.objectliteral.punctuation.var",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -2069,7 +2069,7 @@
 	},
 	{
 		"c": "}",
-		"t": "block.definition.expr.js.meta.object-literal.punctuation.var",
+		"t": "block.definition.expr.js.meta.objectliteral.punctuation.var",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
diff --git a/extensions/typescript/syntaxes/TypeScript.tmLanguage.json b/extensions/typescript/syntaxes/TypeScript.tmLanguage.json
index cb9231b920d..a132a799da4 100644
--- a/extensions/typescript/syntaxes/TypeScript.tmLanguage.json
+++ b/extensions/typescript/syntaxes/TypeScript.tmLanguage.json
@@ -491,8 +491,8 @@
 		},
 		"enum-declaration": {
 			"name": "meta.enum.declaration.ts",
-			"match": "(?<!\\.|\\$)(?:(\\bexport)\\s+)?(?:\\b(const)\\s+)?\\b(enum)\\s+([_$[:alpha:]][_$[:alnum:]]*)",
-			"captures": {
+			"begin": "(?<!\\.|\\$)(?:(\\bexport)\\s+)?(?:\\b(const)\\s+)?\\b(enum)\\s+([_$[:alpha:]][_$[:alnum:]]*)",
+			"beginCaptures": {
 				"1": {
 					"name": "keyword.control.export.ts"
 				},
@@ -505,7 +505,67 @@
 				"4": {
 					"name": "entity.name.type.enum.ts"
 				}
-			}
+			},
+			"end": "(?<=\\})",
+			"patterns": [
+				{
+					"include": "#comment"
+				},
+				{
+					"begin": "\\{",
+					"beginCaptures": {
+						"0": {
+							"name": "punctuation.definition.block.ts"
+						}
+					},
+					"end": "\\}",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.definition.block.ts"
+						}
+					},
+					"patterns": [
+						{
+							"include": "#comment"
+						},
+						{
+							"begin": "([_$[:alpha:]][_$[:alnum:]]*)",
+							"beginCaptures": {
+								"0": {
+									"name": "variable.other.enummember.ts"
+								}
+							},
+							"end": "(?=,|\\}|$)",
+							"patterns": [
+								{
+									"include": "#comment"
+								},
+								{
+									"include": "#variable-initializer"
+								}
+							]
+						},
+						{
+							"begin": "(?=(?:(?:\\'[^']*\\')|(?:\\\"[^\"]*\\\")))",
+							"end": "(?=,|\\}|$)",
+							"patterns": [
+								{
+									"include": "#string"
+								},
+								{
+									"include": "#comment"
+								},
+								{
+									"include": "#variable-initializer"
+								}
+							]
+						},
+						{
+							"include": "#punctuation-comma"
+						}
+					]
+				}
+			]
 		},
 		"namespace-declaration": {
 			"name": "meta.namespace.declaration.ts",
@@ -1219,7 +1279,7 @@
 			}
 		},
 		"object-literal": {
-			"name": "meta.object-literal.ts",
+			"name": "meta.objectliteral.ts",
 			"begin": "\\{",
 			"beginCaptures": {
 				"0": {
@@ -1259,7 +1319,7 @@
 			]
 		},
 		"after-operator-block": {
-			"name": "meta.object-literal.ts",
+			"name": "meta.objectliteral.ts",
 			"begin": "(?<=[=(,\\[?+!]|await|return|yield|throw|in|of|typeof|&&|\\|\\||\\*)\\s*(\\{)",
 			"beginCaptures": {
 				"1": {
@@ -1507,7 +1567,7 @@
 			]
 		},
 		"type-predicate-operator": {
-			"name": "keyword.operator.is.ts",
+			"name": "keyword.operator.expression.is.ts",
 			"match": "(?<!\\.|\\$)\\bis\\b(?!\\$)"
 		},
 		"type-annotation": {
@@ -2112,7 +2172,7 @@
 					"name": "entity.name.function.ts"
 				}
 			},
-			"end": "(?=\\()",
+			"end": "(?<=\\))",
 			"patterns": [
 				{
 					"include": "#comment"
@@ -2139,6 +2199,9 @@
 							"include": "#punctuation-comma"
 						}
 					]
+				},
+				{
+					"include": "#paren-expression"
 				}
 			]
 		},
@@ -2163,7 +2226,7 @@
 					}
 				},
 				{
-					"match": "(?x)(?:(\\.)\\s*)?([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*=\\s*( (async\\s+)|(function\\s+)| ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)| ((<([^<>]|\\<[^<>]+\\>)+>\\s*)?\\(([^()]|\\([^()]*\\))*\\)(\\s*:\\s*(.)*)?\\s*=>)))",
+					"match": "(?x)(?:(\\.)\\s*)?([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*=\\s*( (async\\s+)|(function\\s*[(<])|(function\\s+)| ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)| ((<([^<>]|\\<[^<>]+\\>)+>\\s*)?\\(([^()]|\\([^()]*\\))*\\)(\\s*:\\s*(.)*)?\\s*=>)))",
 					"captures": {
 						"1": {
 							"name": "punctuation.accessor.ts"
@@ -2244,8 +2307,11 @@
 					"name": "keyword.operator.new.ts"
 				}
 			},
-			"end": "(?=[(;),]|$|((?<!\\.|\\$)\\bnew\\b(?!\\$)))",
+			"end": "(?<=\\))|(?=[;),]|$|((?<!\\.|\\$)\\bnew\\b(?!\\$)))",
 			"patterns": [
+				{
+					"include": "#paren-expression"
+				},
 				{
 					"include": "#type"
 				}
@@ -2289,7 +2355,7 @@
 				},
 				{
 					"name": "meta.object.member.ts",
-					"begin": "(?x)(?:([_$[:alpha:]][_$[:alnum:]]*)\\s*(:)(?=\\s*( (async\\s+)|(function\\s+)| ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)| ((<([^<>]|\\<[^<>]+\\>)+>\\s*)?\\(([^()]|\\([^()]*\\))*\\)(\\s*:\\s*(.)*)?\\s*=>))))",
+					"begin": "(?x)(?:([_$[:alpha:]][_$[:alnum:]]*)\\s*(:)(?=\\s*( (async\\s+)|(function\\s*[(<])|(function\\s+)| ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)| ((<([^<>]|\\<[^<>]+\\>)+>\\s*)?\\(([^()]|\\([^()]*\\))*\\)(\\s*:\\s*(.)*)?\\s*=>))))",
 					"beginCaptures": {
 						"0": {
 							"name": "meta.object-literal.key.ts"
@@ -2362,19 +2428,19 @@
 					"match": "(?<!\\.|\\$)\\b(await)\\b(?!\\$)"
 				},
 				{
-					"name": "keyword.operator.delete.ts",
+					"name": "keyword.operator.expression.delete.ts",
 					"match": "(?<!\\.|\\$)\\bdelete\\b(?!\\$)"
 				},
 				{
-					"name": "keyword.operator.in.ts",
+					"name": "keyword.operator.expression.in.ts",
 					"match": "(?<!\\.|\\$)\\bin\\b(?!\\$)"
 				},
 				{
-					"name": "keyword.operator.of.ts",
+					"name": "keyword.operator.expression.of.ts",
 					"match": "(?<!\\.|\\$)\\bof\\b(?!\\$)"
 				},
 				{
-					"name": "keyword.operator.instanceof.ts",
+					"name": "keyword.operator.expression.instanceof.ts",
 					"match": "(?<!\\.|\\$)\\binstanceof\\b(?!\\$)"
 				},
 				{
@@ -2385,7 +2451,7 @@
 					"include": "#typeof-operator"
 				},
 				{
-					"name": "keyword.operator.void.ts",
+					"name": "keyword.operator.expression.void.ts",
 					"match": "(?<!\\.|\\$)\\bvoid\\b(?!\\$)"
 				},
 				{
@@ -2453,7 +2519,7 @@
 			]
 		},
 		"typeof-operator": {
-			"name": "keyword.operator.typeof.ts",
+			"name": "keyword.operator.expression.typeof.ts",
 			"match": "(?<!\\.|\\$)\\btypeof\\b(?!\\$)"
 		},
 		"arrow-function": {
@@ -3101,5 +3167,5 @@
 			]
 		}
 	},
-	"version": "https://github.com/Microsoft/TypeScript-TmLanguage/commit/fea3b25eb632f689a02057a1715faab29343dda2"
+	"version": "https://github.com/Microsoft/TypeScript-TmLanguage/commit/578dd5db70333e3b6826ff529276f32916a2c81b"
 }
\ No newline at end of file
diff --git a/extensions/typescript/syntaxes/TypeScriptReact.tmLanguage.json b/extensions/typescript/syntaxes/TypeScriptReact.tmLanguage.json
index a6d79b78670..49cd144a67d 100644
--- a/extensions/typescript/syntaxes/TypeScriptReact.tmLanguage.json
+++ b/extensions/typescript/syntaxes/TypeScriptReact.tmLanguage.json
@@ -494,8 +494,8 @@
 		},
 		"enum-declaration": {
 			"name": "meta.enum.declaration.tsx",
-			"match": "(?<!\\.|\\$)(?:(\\bexport)\\s+)?(?:\\b(const)\\s+)?\\b(enum)\\s+([_$[:alpha:]][_$[:alnum:]]*)",
-			"captures": {
+			"begin": "(?<!\\.|\\$)(?:(\\bexport)\\s+)?(?:\\b(const)\\s+)?\\b(enum)\\s+([_$[:alpha:]][_$[:alnum:]]*)",
+			"beginCaptures": {
 				"1": {
 					"name": "keyword.control.export.tsx"
 				},
@@ -508,7 +508,67 @@
 				"4": {
 					"name": "entity.name.type.enum.tsx"
 				}
-			}
+			},
+			"end": "(?<=\\})",
+			"patterns": [
+				{
+					"include": "#comment"
+				},
+				{
+					"begin": "\\{",
+					"beginCaptures": {
+						"0": {
+							"name": "punctuation.definition.block.tsx"
+						}
+					},
+					"end": "\\}",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.definition.block.tsx"
+						}
+					},
+					"patterns": [
+						{
+							"include": "#comment"
+						},
+						{
+							"begin": "([_$[:alpha:]][_$[:alnum:]]*)",
+							"beginCaptures": {
+								"0": {
+									"name": "variable.other.enummember.tsx"
+								}
+							},
+							"end": "(?=,|\\}|$)",
+							"patterns": [
+								{
+									"include": "#comment"
+								},
+								{
+									"include": "#variable-initializer"
+								}
+							]
+						},
+						{
+							"begin": "(?=(?:(?:\\'[^']*\\')|(?:\\\"[^\"]*\\\")))",
+							"end": "(?=,|\\}|$)",
+							"patterns": [
+								{
+									"include": "#string"
+								},
+								{
+									"include": "#comment"
+								},
+								{
+									"include": "#variable-initializer"
+								}
+							]
+						},
+						{
+							"include": "#punctuation-comma"
+						}
+					]
+				}
+			]
 		},
 		"namespace-declaration": {
 			"name": "meta.namespace.declaration.tsx",
@@ -1222,7 +1282,7 @@
 			}
 		},
 		"object-literal": {
-			"name": "meta.object-literal.tsx",
+			"name": "meta.objectliteral.tsx",
 			"begin": "\\{",
 			"beginCaptures": {
 				"0": {
@@ -1262,7 +1322,7 @@
 			]
 		},
 		"after-operator-block": {
-			"name": "meta.object-literal.tsx",
+			"name": "meta.objectliteral.tsx",
 			"begin": "(?<=[=(,\\[?+!]|await|return|yield|throw|in|of|typeof|&&|\\|\\||\\*)\\s*(\\{)",
 			"beginCaptures": {
 				"1": {
@@ -1510,7 +1570,7 @@
 			]
 		},
 		"type-predicate-operator": {
-			"name": "keyword.operator.is.tsx",
+			"name": "keyword.operator.expression.is.tsx",
 			"match": "(?<!\\.|\\$)\\bis\\b(?!\\$)"
 		},
 		"type-annotation": {
@@ -2115,7 +2175,7 @@
 					"name": "entity.name.function.tsx"
 				}
 			},
-			"end": "(?=\\()",
+			"end": "(?<=\\))",
 			"patterns": [
 				{
 					"include": "#comment"
@@ -2142,6 +2202,9 @@
 							"include": "#punctuation-comma"
 						}
 					]
+				},
+				{
+					"include": "#paren-expression"
 				}
 			]
 		},
@@ -2166,7 +2229,7 @@
 					}
 				},
 				{
-					"match": "(?x)(?:(\\.)\\s*)?([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*=\\s*( (async\\s+)|(function\\s+)| ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)| ((<([^<>]|\\<[^<>]+\\>)+>\\s*)?\\(([^()]|\\([^()]*\\))*\\)(\\s*:\\s*(.)*)?\\s*=>)))",
+					"match": "(?x)(?:(\\.)\\s*)?([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*=\\s*( (async\\s+)|(function\\s*[(<])|(function\\s+)| ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)| ((<([^<>]|\\<[^<>]+\\>)+>\\s*)?\\(([^()]|\\([^()]*\\))*\\)(\\s*:\\s*(.)*)?\\s*=>)))",
 					"captures": {
 						"1": {
 							"name": "punctuation.accessor.tsx"
@@ -2234,8 +2297,11 @@
 					"name": "keyword.operator.new.tsx"
 				}
 			},
-			"end": "(?=[(;),]|$|((?<!\\.|\\$)\\bnew\\b(?!\\$)))",
+			"end": "(?<=\\))|(?=[;),]|$|((?<!\\.|\\$)\\bnew\\b(?!\\$)))",
 			"patterns": [
+				{
+					"include": "#paren-expression"
+				},
 				{
 					"include": "#type"
 				}
@@ -2279,7 +2345,7 @@
 				},
 				{
 					"name": "meta.object.member.tsx",
-					"begin": "(?x)(?:([_$[:alpha:]][_$[:alnum:]]*)\\s*(:)(?=\\s*( (async\\s+)|(function\\s+)| ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)| ((<([^<>]|\\<[^<>]+\\>)+>\\s*)?\\(([^()]|\\([^()]*\\))*\\)(\\s*:\\s*(.)*)?\\s*=>))))",
+					"begin": "(?x)(?:([_$[:alpha:]][_$[:alnum:]]*)\\s*(:)(?=\\s*( (async\\s+)|(function\\s*[(<])|(function\\s+)| ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)| ((<([^<>]|\\<[^<>]+\\>)+>\\s*)?\\(([^()]|\\([^()]*\\))*\\)(\\s*:\\s*(.)*)?\\s*=>))))",
 					"beginCaptures": {
 						"0": {
 							"name": "meta.object-literal.key.tsx"
@@ -2352,19 +2418,19 @@
 					"match": "(?<!\\.|\\$)\\b(await)\\b(?!\\$)"
 				},
 				{
-					"name": "keyword.operator.delete.tsx",
+					"name": "keyword.operator.expression.delete.tsx",
 					"match": "(?<!\\.|\\$)\\bdelete\\b(?!\\$)"
 				},
 				{
-					"name": "keyword.operator.in.tsx",
+					"name": "keyword.operator.expression.in.tsx",
 					"match": "(?<!\\.|\\$)\\bin\\b(?!\\$)"
 				},
 				{
-					"name": "keyword.operator.of.tsx",
+					"name": "keyword.operator.expression.of.tsx",
 					"match": "(?<!\\.|\\$)\\bof\\b(?!\\$)"
 				},
 				{
-					"name": "keyword.operator.instanceof.tsx",
+					"name": "keyword.operator.expression.instanceof.tsx",
 					"match": "(?<!\\.|\\$)\\binstanceof\\b(?!\\$)"
 				},
 				{
@@ -2375,7 +2441,7 @@
 					"include": "#typeof-operator"
 				},
 				{
-					"name": "keyword.operator.void.tsx",
+					"name": "keyword.operator.expression.void.tsx",
 					"match": "(?<!\\.|\\$)\\bvoid\\b(?!\\$)"
 				},
 				{
@@ -2443,7 +2509,7 @@
 			]
 		},
 		"typeof-operator": {
-			"name": "keyword.operator.typeof.tsx",
+			"name": "keyword.operator.expression.typeof.tsx",
 			"match": "(?<!\\.|\\$)\\btypeof\\b(?!\\$)"
 		},
 		"arrow-function": {
@@ -3393,5 +3459,5 @@
 			]
 		}
 	},
-	"version": "https://github.com/Microsoft/TypeScript-TmLanguage/commit/fea3b25eb632f689a02057a1715faab29343dda2"
+	"version": "https://github.com/Microsoft/TypeScript-TmLanguage/commit/578dd5db70333e3b6826ff529276f32916a2c81b"
 }
\ No newline at end of file
diff --git a/extensions/typescript/test/colorize-results/test-function-inv_ts.json b/extensions/typescript/test/colorize-results/test-function-inv_ts.json
index d3d2218800a..1cee8de1acd 100644
--- a/extensions/typescript/test/colorize-results/test-function-inv_ts.json
+++ b/extensions/typescript/test/colorize-results/test-function-inv_ts.json
@@ -100,7 +100,7 @@
 	},
 	{
 		"c": "(",
-		"t": "brace.meta.round.ts",
+		"t": "brace.expr.meta.new.round.ts",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -111,7 +111,7 @@
 	},
 	{
 		"c": "row",
-		"t": "other.readwrite.ts.variable",
+		"t": "expr.new.other.readwrite.ts.variable",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.variable rgb(156, 220, 254)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.variable rgb(0, 16, 128)",
@@ -122,7 +122,7 @@
 	},
 	{
 		"c": ",",
-		"t": "comma.punctuation.separator.ts",
+		"t": "comma.expr.new.punctuation.separator.ts",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -133,7 +133,7 @@
 	},
 	{
 		"c": " ",
-		"t": "",
+		"t": "expr.new.ts",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -144,7 +144,7 @@
 	},
 	{
 		"c": "col",
-		"t": "other.readwrite.ts.variable",
+		"t": "expr.new.other.readwrite.ts.variable",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.variable rgb(156, 220, 254)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.variable rgb(0, 16, 128)",
@@ -155,7 +155,7 @@
 	},
 	{
 		"c": ",",
-		"t": "comma.punctuation.separator.ts",
+		"t": "comma.expr.new.punctuation.separator.ts",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -166,7 +166,7 @@
 	},
 	{
 		"c": " ",
-		"t": "",
+		"t": "expr.new.ts",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -177,7 +177,7 @@
 	},
 	{
 		"c": "false",
-		"t": "boolean.constant.false.language.ts",
+		"t": "boolean.constant.expr.false.language.new.ts",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.constant.language rgb(86, 156, 214)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.constant.language rgb(0, 0, 255)",
@@ -187,7 +187,18 @@
 		}
 	},
 	{
-		"c": ")))",
+		"c": ")",
+		"t": "brace.expr.meta.new.round.ts",
+		"r": {
+			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
+			"light_plus": ".vs .token rgb(0, 0, 0)",
+			"dark_vs": ".vs-dark .token rgb(212, 212, 212)",
+			"light_vs": ".vs .token rgb(0, 0, 0)",
+			"hc_black": ".hc-black .token rgb(255, 255, 255)"
+		}
+	},
+	{
+		"c": "))",
 		"t": "brace.meta.round.ts",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
diff --git a/extensions/typescript/test/colorize-results/test-issue5566_ts.json b/extensions/typescript/test/colorize-results/test-issue5566_ts.json
index ae502039842..653a8d604ab 100644
--- a/extensions/typescript/test/colorize-results/test-issue5566_ts.json
+++ b/extensions/typescript/test/colorize-results/test-issue5566_ts.json
@@ -254,7 +254,7 @@
 	},
 	{
 		"c": "{",
-		"t": "block.definition.expr.function.meta.object-literal.punctuation.ts.var",
+		"t": "block.definition.expr.function.meta.objectliteral.punctuation.ts.var",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -265,7 +265,7 @@
 	},
 	{
 		"c": " ",
-		"t": "block.expr.function.meta.object-literal.ts.var",
+		"t": "block.expr.function.meta.objectliteral.ts.var",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -276,7 +276,7 @@
 	},
 	{
 		"c": "'",
-		"t": "begin.block.definition.expr.function.key.member.meta.object.object-literal.punctuation.quoted.single.string.ts.var",
+		"t": "begin.block.definition.expr.function.key.member.meta.object.object-literal.objectliteral.punctuation.quoted.single.string.ts.var",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.object-literal.member.key rgb(156, 220, 254)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.object-literal.member.key rgb(0, 16, 128)",
@@ -287,7 +287,7 @@
 	},
 	{
 		"c": "bar",
-		"t": "block.expr.function.key.member.meta.object.object-literal.quoted.single.string.ts.var",
+		"t": "block.expr.function.key.member.meta.object.object-literal.objectliteral.quoted.single.string.ts.var",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.object-literal.member.key rgb(156, 220, 254)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.object-literal.member.key rgb(0, 16, 128)",
@@ -298,7 +298,7 @@
 	},
 	{
 		"c": "'",
-		"t": "block.definition.end.expr.function.key.member.meta.object.object-literal.punctuation.quoted.single.string.ts.var",
+		"t": "block.definition.end.expr.function.key.member.meta.object.object-literal.objectliteral.punctuation.quoted.single.string.ts.var",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.object-literal.member.key rgb(156, 220, 254)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.object-literal.member.key rgb(0, 16, 128)",
@@ -309,7 +309,7 @@
 	},
 	{
 		"c": ":",
-		"t": "block.expr.function.key.key-value.member.meta.object.object-literal.punctuation.separator.ts.var",
+		"t": "block.expr.function.key.key-value.member.meta.object.object-literal.objectliteral.punctuation.separator.ts.var",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.object-literal.member.key rgb(156, 220, 254)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.object-literal.member.key rgb(0, 16, 128)",
@@ -320,7 +320,7 @@
 	},
 	{
 		"c": " ",
-		"t": "block.expr.function.member.meta.object.object-literal.ts.var",
+		"t": "block.expr.function.member.meta.object.objectliteral.ts.var",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -331,7 +331,7 @@
 	},
 	{
 		"c": "'",
-		"t": "begin.block.definition.expr.function.member.meta.object.object-literal.punctuation.quoted.single.string.ts.var",
+		"t": "begin.block.definition.expr.function.member.meta.object.objectliteral.punctuation.quoted.single.string.ts.var",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.string rgb(206, 145, 120)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.string rgb(163, 21, 21)",
@@ -342,7 +342,7 @@
 	},
 	{
 		"c": "baz",
-		"t": "block.expr.function.member.meta.object.object-literal.quoted.single.string.ts.var",
+		"t": "block.expr.function.member.meta.object.objectliteral.quoted.single.string.ts.var",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.string rgb(206, 145, 120)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.string rgb(163, 21, 21)",
@@ -353,7 +353,7 @@
 	},
 	{
 		"c": "'",
-		"t": "block.definition.end.expr.function.member.meta.object.object-literal.punctuation.quoted.single.string.ts.var",
+		"t": "block.definition.end.expr.function.member.meta.object.objectliteral.punctuation.quoted.single.string.ts.var",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.string rgb(206, 145, 120)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.string rgb(163, 21, 21)",
@@ -364,7 +364,7 @@
 	},
 	{
 		"c": " ",
-		"t": "block.expr.function.member.meta.object.object-literal.ts.var",
+		"t": "block.expr.function.member.meta.object.objectliteral.ts.var",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -375,7 +375,7 @@
 	},
 	{
 		"c": "}",
-		"t": "block.definition.expr.function.meta.object-literal.punctuation.ts.var",
+		"t": "block.definition.expr.function.meta.objectliteral.punctuation.ts.var",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
diff --git a/extensions/typescript/test/colorize-results/test-keywords_ts.json b/extensions/typescript/test/colorize-results/test-keywords_ts.json
index dc8a84515f7..bf083fb3227 100644
--- a/extensions/typescript/test/colorize-results/test-keywords_ts.json
+++ b/extensions/typescript/test/colorize-results/test-keywords_ts.json
@@ -177,7 +177,7 @@
 	},
 	{
 		"c": "(",
-		"t": "brace.expr.meta.round.ts.var",
+		"t": "brace.expr.meta.new.round.ts.var",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -188,7 +188,7 @@
 	},
 	{
 		"c": "'",
-		"t": "begin.definition.expr.meta.punctuation.quoted.single.string.ts.var",
+		"t": "begin.definition.expr.meta.new.punctuation.quoted.single.string.ts.var",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.string rgb(206, 145, 120)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.string rgb(163, 21, 21)",
@@ -199,7 +199,7 @@
 	},
 	{
 		"c": "'",
-		"t": "definition.end.expr.meta.punctuation.quoted.single.string.ts.var",
+		"t": "definition.end.expr.meta.new.punctuation.quoted.single.string.ts.var",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.string rgb(206, 145, 120)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.string rgb(163, 21, 21)",
@@ -210,7 +210,7 @@
 	},
 	{
 		"c": ")",
-		"t": "brace.expr.meta.round.ts.var",
+		"t": "brace.expr.meta.new.round.ts.var",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
diff --git a/extensions/typescript/test/colorize-results/test-object-literals_ts.json b/extensions/typescript/test/colorize-results/test-object-literals_ts.json
index 459686ee472..84d8cb35aed 100644
--- a/extensions/typescript/test/colorize-results/test-object-literals_ts.json
+++ b/extensions/typescript/test/colorize-results/test-object-literals_ts.json
@@ -67,7 +67,7 @@
 	},
 	{
 		"c": "{",
-		"t": "block.definition.expr.meta.object-literal.punctuation.ts.var",
+		"t": "block.definition.expr.meta.objectliteral.punctuation.ts.var",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -78,7 +78,7 @@
 	},
 	{
 		"c": "\t",
-		"t": "expr.meta.object-literal.ts.var",
+		"t": "expr.meta.objectliteral.ts.var",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -89,7 +89,7 @@
 	},
 	{
 		"c": "k",
-		"t": "expr.key.member.meta.object.object-literal.ts.var",
+		"t": "expr.key.member.meta.object.object-literal.objectliteral.ts.var",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.object-literal.member.key rgb(156, 220, 254)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.object-literal.member.key rgb(0, 16, 128)",
@@ -100,7 +100,7 @@
 	},
 	{
 		"c": ":",
-		"t": "expr.key.key-value.member.meta.object.object-literal.punctuation.separator.ts.var",
+		"t": "expr.key.key-value.member.meta.object.object-literal.objectliteral.punctuation.separator.ts.var",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.object-literal.member.key rgb(156, 220, 254)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.object-literal.member.key rgb(0, 16, 128)",
@@ -111,7 +111,7 @@
 	},
 	{
 		"c": " ",
-		"t": "expr.member.meta.object.object-literal.ts.var",
+		"t": "expr.member.meta.object.objectliteral.ts.var",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -122,7 +122,7 @@
 	},
 	{
 		"c": "{",
-		"t": "block.definition.expr.member.meta.object.object-literal.punctuation.ts.var",
+		"t": "block.definition.expr.member.meta.object.objectliteral.punctuation.ts.var",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -133,7 +133,7 @@
 	},
 	{
 		"c": "\t\t",
-		"t": "expr.member.meta.object.object-literal.ts.var",
+		"t": "expr.member.meta.object.objectliteral.ts.var",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -144,7 +144,7 @@
 	},
 	{
 		"c": "k1",
-		"t": "expr.key.member.meta.object.object-literal.ts.var",
+		"t": "expr.key.member.meta.object.object-literal.objectliteral.ts.var",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.object-literal.member.key rgb(156, 220, 254)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.object-literal.member.key rgb(0, 16, 128)",
@@ -155,7 +155,7 @@
 	},
 	{
 		"c": ":",
-		"t": "expr.key.key-value.member.meta.object.object-literal.punctuation.separator.ts.var",
+		"t": "expr.key.key-value.member.meta.object.object-literal.objectliteral.punctuation.separator.ts.var",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.object-literal.member.key rgb(156, 220, 254)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.object-literal.member.key rgb(0, 16, 128)",
@@ -166,7 +166,7 @@
 	},
 	{
 		"c": " ",
-		"t": "expr.member.meta.object.object-literal.ts.var",
+		"t": "expr.member.meta.object.objectliteral.ts.var",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -177,7 +177,7 @@
 	},
 	{
 		"c": "s",
-		"t": "expr.member.meta.object.object-literal.other.readwrite.ts.var.variable",
+		"t": "expr.member.meta.object.objectliteral.other.readwrite.ts.var.variable",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.variable rgb(156, 220, 254)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.variable rgb(0, 16, 128)",
@@ -188,7 +188,7 @@
 	},
 	{
 		"c": ",",
-		"t": "comma.expr.member.meta.object.object-literal.punctuation.separator.ts.var",
+		"t": "comma.expr.member.meta.object.objectliteral.punctuation.separator.ts.var",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -199,7 +199,7 @@
 	},
 	{
 		"c": "\t\t",
-		"t": "expr.member.meta.object.object-literal.ts.var",
+		"t": "expr.member.meta.object.objectliteral.ts.var",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -210,7 +210,7 @@
 	},
 	{
 		"c": "k2",
-		"t": "expr.key.member.meta.object.object-literal.ts.var",
+		"t": "expr.key.member.meta.object.object-literal.objectliteral.ts.var",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.object-literal.member.key rgb(156, 220, 254)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.object-literal.member.key rgb(0, 16, 128)",
@@ -221,7 +221,7 @@
 	},
 	{
 		"c": ":",
-		"t": "expr.key.key-value.member.meta.object.object-literal.punctuation.separator.ts.var",
+		"t": "expr.key.key-value.member.meta.object.object-literal.objectliteral.punctuation.separator.ts.var",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.object-literal.member.key rgb(156, 220, 254)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.object-literal.member.key rgb(0, 16, 128)",
@@ -232,7 +232,7 @@
 	},
 	{
 		"c": " ",
-		"t": "expr.member.meta.object.object-literal.ts.var",
+		"t": "expr.member.meta.object.objectliteral.ts.var",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -243,7 +243,7 @@
 	},
 	{
 		"c": "1",
-		"t": "constant.decimal.expr.member.meta.numeric.object.object-literal.ts.var",
+		"t": "constant.decimal.expr.member.meta.numeric.object.objectliteral.ts.var",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.constant.numeric rgb(181, 206, 168)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.constant.numeric rgb(9, 136, 90)",
@@ -254,7 +254,7 @@
 	},
 	{
 		"c": "\t",
-		"t": "expr.member.meta.object.object-literal.ts.var",
+		"t": "expr.member.meta.object.objectliteral.ts.var",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -265,7 +265,7 @@
 	},
 	{
 		"c": "}",
-		"t": "block.definition.expr.member.meta.object.object-literal.punctuation.ts.var",
+		"t": "block.definition.expr.member.meta.object.objectliteral.punctuation.ts.var",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -276,7 +276,7 @@
 	},
 	{
 		"c": "}",
-		"t": "block.definition.expr.meta.object-literal.punctuation.ts.var",
+		"t": "block.definition.expr.meta.objectliteral.punctuation.ts.var",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
diff --git a/extensions/typescript/test/colorize-results/test_ts.json b/extensions/typescript/test/colorize-results/test_ts.json
index a7e6685e625..d1c2392bb17 100644
--- a/extensions/typescript/test/colorize-results/test_ts.json
+++ b/extensions/typescript/test/colorize-results/test_ts.json
@@ -5160,7 +5160,7 @@
 	},
 	{
 		"c": "(",
-		"t": "block.brace.class.declaration.expr.meta.method.round.ts.var",
+		"t": "block.brace.class.declaration.expr.meta.method.new.round.ts.var",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -5171,7 +5171,7 @@
 	},
 	{
 		"c": "cell",
-		"t": "block.class.declaration.expr.meta.method.object.other.ts.var.variable",
+		"t": "block.class.declaration.expr.meta.method.new.object.other.ts.var.variable",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.variable rgb(156, 220, 254)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.variable rgb(0, 16, 128)",
@@ -5182,7 +5182,7 @@
 	},
 	{
 		"c": ".",
-		"t": "accessor.block.class.declaration.expr.meta.method.punctuation.ts.var",
+		"t": "accessor.block.class.declaration.expr.meta.method.new.punctuation.ts.var",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -5193,7 +5193,7 @@
 	},
 	{
 		"c": "row",
-		"t": "block.class.declaration.expr.meta.method.other.property.ts.var.variable",
+		"t": "block.class.declaration.expr.meta.method.new.other.property.ts.var.variable",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.variable rgb(156, 220, 254)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.variable rgb(0, 16, 128)",
@@ -5204,7 +5204,7 @@
 	},
 	{
 		"c": ",",
-		"t": "block.class.comma.declaration.expr.meta.method.punctuation.separator.ts.var",
+		"t": "block.class.comma.declaration.expr.meta.method.new.punctuation.separator.ts.var",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -5215,7 +5215,7 @@
 	},
 	{
 		"c": " ",
-		"t": "block.class.declaration.expr.meta.method.ts.var",
+		"t": "block.class.declaration.expr.meta.method.new.ts.var",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -5226,7 +5226,7 @@
 	},
 	{
 		"c": "cell",
-		"t": "block.class.declaration.expr.meta.method.object.other.ts.var.variable",
+		"t": "block.class.declaration.expr.meta.method.new.object.other.ts.var.variable",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.variable rgb(156, 220, 254)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.variable rgb(0, 16, 128)",
@@ -5237,7 +5237,7 @@
 	},
 	{
 		"c": ".",
-		"t": "accessor.block.class.declaration.expr.meta.method.punctuation.ts.var",
+		"t": "accessor.block.class.declaration.expr.meta.method.new.punctuation.ts.var",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -5248,7 +5248,7 @@
 	},
 	{
 		"c": "col",
-		"t": "block.class.declaration.expr.meta.method.other.property.ts.var.variable",
+		"t": "block.class.declaration.expr.meta.method.new.other.property.ts.var.variable",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.variable rgb(156, 220, 254)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.variable rgb(0, 16, 128)",
@@ -5259,7 +5259,7 @@
 	},
 	{
 		"c": ",",
-		"t": "block.class.comma.declaration.expr.meta.method.punctuation.separator.ts.var",
+		"t": "block.class.comma.declaration.expr.meta.method.new.punctuation.separator.ts.var",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -5270,7 +5270,7 @@
 	},
 	{
 		"c": " ",
-		"t": "block.class.declaration.expr.meta.method.ts.var",
+		"t": "block.class.declaration.expr.meta.method.new.ts.var",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -5281,7 +5281,7 @@
 	},
 	{
 		"c": "cell",
-		"t": "block.class.declaration.expr.meta.method.object.other.ts.var.variable",
+		"t": "block.class.declaration.expr.meta.method.new.object.other.ts.var.variable",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.variable rgb(156, 220, 254)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.variable rgb(0, 16, 128)",
@@ -5292,7 +5292,7 @@
 	},
 	{
 		"c": ".",
-		"t": "accessor.block.class.declaration.expr.meta.method.punctuation.ts.var",
+		"t": "accessor.block.class.declaration.expr.meta.method.new.punctuation.ts.var",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -5303,7 +5303,7 @@
 	},
 	{
 		"c": "live",
-		"t": "block.class.declaration.expr.meta.method.other.property.ts.var.variable",
+		"t": "block.class.declaration.expr.meta.method.new.other.property.ts.var.variable",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.variable rgb(156, 220, 254)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.variable rgb(0, 16, 128)",
@@ -5314,7 +5314,7 @@
 	},
 	{
 		"c": ")",
-		"t": "block.brace.class.declaration.expr.meta.method.round.ts.var",
+		"t": "block.brace.class.declaration.expr.meta.method.new.round.ts.var",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -9230,7 +9230,7 @@
 	},
 	{
 		"c": "(",
-		"t": "block.brace.class.declaration.meta.method.round.ts",
+		"t": "block.brace.class.declaration.expr.meta.method.new.round.ts",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -9241,7 +9241,7 @@
 	},
 	{
 		"c": "row",
-		"t": "block.class.declaration.meta.method.other.readwrite.ts.variable",
+		"t": "block.class.declaration.expr.meta.method.new.other.readwrite.ts.variable",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.variable rgb(156, 220, 254)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.variable rgb(0, 16, 128)",
@@ -9252,7 +9252,7 @@
 	},
 	{
 		"c": ",",
-		"t": "block.class.comma.declaration.meta.method.punctuation.separator.ts",
+		"t": "block.class.comma.declaration.expr.meta.method.new.punctuation.separator.ts",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -9263,7 +9263,7 @@
 	},
 	{
 		"c": " ",
-		"t": "block.class.declaration.meta.method.ts",
+		"t": "block.class.declaration.expr.meta.method.new.ts",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -9274,7 +9274,7 @@
 	},
 	{
 		"c": "col",
-		"t": "block.class.declaration.meta.method.other.readwrite.ts.variable",
+		"t": "block.class.declaration.expr.meta.method.new.other.readwrite.ts.variable",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.variable rgb(156, 220, 254)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.variable rgb(0, 16, 128)",
@@ -9285,7 +9285,7 @@
 	},
 	{
 		"c": ",",
-		"t": "block.class.comma.declaration.meta.method.punctuation.separator.ts",
+		"t": "block.class.comma.declaration.expr.meta.method.new.punctuation.separator.ts",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -9296,7 +9296,7 @@
 	},
 	{
 		"c": " ",
-		"t": "block.class.declaration.meta.method.ts",
+		"t": "block.class.declaration.expr.meta.method.new.ts",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -9307,7 +9307,7 @@
 	},
 	{
 		"c": "false",
-		"t": "block.boolean.class.constant.declaration.false.language.meta.method.ts",
+		"t": "block.boolean.class.constant.declaration.expr.false.language.meta.method.new.ts",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.constant.language rgb(86, 156, 214)",
 			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.constant.language rgb(0, 0, 255)",
@@ -9317,7 +9317,18 @@
 		}
 	},
 	{
-		"c": ")))",
+		"c": ")",
+		"t": "block.brace.class.declaration.expr.meta.method.new.round.ts",
+		"r": {
+			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
+			"light_plus": ".vs .token rgb(0, 0, 0)",
+			"dark_vs": ".vs-dark .token rgb(212, 212, 212)",
+			"light_vs": ".vs .token rgb(0, 0, 0)",
+			"hc_black": ".hc-black .token rgb(255, 255, 255)"
+		}
+	},
+	{
+		"c": "))",
 		"t": "block.brace.class.declaration.meta.method.round.ts",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
@@ -11386,7 +11397,7 @@
 	},
 	{
 		"c": "()",
-		"t": "brace.expr.meta.round.ts.var",
+		"t": "brace.expr.meta.new.round.ts.var",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
 			"light_plus": ".vs .token rgb(0, 0, 0)",