diff --git a/extensions/jade/test/colorize-results/test_jade.json b/extensions/jade/test/colorize-results/test_jade.json
index ce4fb418fd5..bee15dc2c9c 100644
--- a/extensions/jade/test/colorize-results/test_jade.json
+++ b/extensions/jade/test/colorize-results/test_jade.json
@@ -672,7 +672,7 @@
 	},
 	{
 		"c": "user",
-		"t": "text.jade source.js meta.var.expr.js meta.var-single-variable.expr.js variable.other.readwrite.js",
+		"t": "text.jade source.js meta.var.expr.js meta.var-single-variable.expr.js meta.definition.variable.js variable.other.readwrite.js",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
diff --git a/extensions/javascript/syntaxes/JavaScript.tmLanguage.json b/extensions/javascript/syntaxes/JavaScript.tmLanguage.json
index f65e8c874ae..77e5be6475a 100644
--- a/extensions/javascript/syntaxes/JavaScript.tmLanguage.json
+++ b/extensions/javascript/syntaxes/JavaScript.tmLanguage.json
@@ -98,7 +98,7 @@
 					"begin": "(?x)([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*\n  (=\\s*(\n    (async\\s+) |\n    (function\\s*[(<]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>) |\n    ([(]\\s*(([)]\\s*:)|([_$[:alpha:]][_$[:alnum:]]*\\s*:)|(\\.\\.\\.) )) |\n    ([<]\\s*[_$[:alpha:]][_$[:alnum:]]*((\\s+extends\\s*[^=>])|(\\s*[,]))) |\n    ((<([^<>]|\\<[^<>]+\\>)+>\\s*)?\\(([^()]|\\([^()]*\\))*\\)(\\s*:\\s*(.)*)?\\s*=>))\n  ) |\n  (:\\s*(\n    (<) |\n    ([(]\\s*(\n      ([)]) |\n      (\\.\\.\\.) |\n      ([_$[:alnum:]]+\\s*(\n        ([:,?=])|\n        ([)]\\s*=>)\n      ))\n    )))\n  )\n)",
 					"beginCaptures": {
 						"1": {
-							"name": "entity.name.function.js"
+							"name": "meta.definition.variable.js entity.name.function.js"
 						}
 					},
 					"end": "(?=$|[;,=}]|(\\s+(of|in)\\s+))",
@@ -113,7 +113,7 @@
 					"begin": "([[:upper:]][_$[:digit:][:upper:]]*)(?![_$[:alnum:]])",
 					"beginCaptures": {
 						"1": {
-							"name": "variable.other.constant.js"
+							"name": "meta.definition.variable.js variable.other.constant.js"
 						}
 					},
 					"end": "(?=$|[;,=}]|(\\s+(of|in)\\s+))",
@@ -128,7 +128,7 @@
 					"begin": "([_$[:alpha:]][_$[:alnum:]]*)",
 					"beginCaptures": {
 						"1": {
-							"name": "variable.other.readwrite.js"
+							"name": "meta.definition.variable.js variable.other.readwrite.js"
 						}
 					},
 					"end": "(?=$|[;,=}]|(\\s+(of|in)\\s+))",
@@ -267,7 +267,7 @@
 					"name": "keyword.operator.rest.js"
 				},
 				"2": {
-					"name": "variable.other.readwrite.js"
+					"name": "meta.definition.variable.js variable.other.readwrite.js"
 				}
 			}
 		},
@@ -1121,11 +1121,11 @@
 							"include": "#comment"
 						},
 						{
-							"name": "entity.name.function.js",
+							"name": "meta.definition.property.js entity.name.function.js",
 							"match": "(?x)([_$[:alpha:]][_$[:alnum:]]*)(?=(\\?\\s*)?\\s*\n  (=\\s*(\n    (async\\s+) |\n    (function\\s*[(<]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>) |\n    ([(]\\s*(([)]\\s*:)|([_$[:alpha:]][_$[:alnum:]]*\\s*:)|(\\.\\.\\.) )) |\n    ([<]\\s*[_$[:alpha:]][_$[:alnum:]]*((\\s+extends\\s*[^=>])|(\\s*[,]))) |\n    ((<([^<>]|\\<[^<>]+\\>)+>\\s*)?\\(([^()]|\\([^()]*\\))*\\)(\\s*:\\s*(.)*)?\\s*=>))\n  ) |\n  (:\\s*(\n    (<) |\n    ([(]\\s*(\n      ([)]) |\n      (\\.\\.\\.) |\n      ([_$[:alnum:]]+\\s*(\n        ([:,?=])|\n        ([)]\\s*=>)\n      ))\n    )))\n  )\n)"
 						},
 						{
-							"name": "variable.object.property.js",
+							"name": "meta.definition.property.js variable.object.property.js",
 							"match": "[_$[:alpha:]][_$[:alnum:]]*"
 						},
 						{
@@ -1195,7 +1195,7 @@
 					"include": "#array-literal"
 				},
 				{
-					"name": "entity.name.function.js",
+					"name": "meta.definition.method.js entity.name.function.js",
 					"match": "[_$[:alpha:]][_$[:alnum:]]*"
 				},
 				{
@@ -1341,7 +1341,7 @@
 					"name": "keyword.generator.asterisk.js"
 				},
 				"5": {
-					"name": "entity.name.function.js"
+					"name": "meta.definition.function.js entity.name.function.js"
 				}
 			},
 			"end": "(?=$|;)|(?<=\\})",
@@ -1377,7 +1377,7 @@
 					"name": "keyword.generator.asterisk.js"
 				},
 				"4": {
-					"name": "entity.name.function.js"
+					"name": "meta.definition.function.js entity.name.function.js"
 				}
 			},
 			"end": "(?<=\\})",
diff --git a/extensions/javascript/test/colorize-results/test6916_js.json b/extensions/javascript/test/colorize-results/test6916_js.json
index ec99db302a0..92e3ffc82eb 100644
--- a/extensions/javascript/test/colorize-results/test6916_js.json
+++ b/extensions/javascript/test/colorize-results/test6916_js.json
@@ -45,7 +45,7 @@
 	},
 	{
 		"c": "i",
-		"t": "source.js meta.var.expr.js meta.var-single-variable.expr.js variable.other.readwrite.js",
+		"t": "source.js meta.var.expr.js meta.var-single-variable.expr.js meta.definition.variable.js variable.other.readwrite.js",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -221,7 +221,7 @@
 	},
 	{
 		"c": "j",
-		"t": "source.js meta.block.js meta.var.expr.js meta.var-single-variable.expr.js variable.other.readwrite.js",
+		"t": "source.js meta.block.js meta.var.expr.js meta.var-single-variable.expr.js meta.definition.variable.js variable.other.readwrite.js",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
diff --git a/extensions/javascript/test/colorize-results/test_js.json b/extensions/javascript/test/colorize-results/test_js.json
index ce8dc121897..3008ccfe0cd 100644
--- a/extensions/javascript/test/colorize-results/test_js.json
+++ b/extensions/javascript/test/colorize-results/test_js.json
@@ -89,7 +89,7 @@
 	},
 	{
 		"c": "gulp",
-		"t": "source.js meta.var.expr.js meta.var-single-variable.expr.js variable.other.readwrite.js",
+		"t": "source.js meta.var.expr.js meta.var-single-variable.expr.js meta.definition.variable.js variable.other.readwrite.js",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -232,7 +232,7 @@
 	},
 	{
 		"c": "tsb",
-		"t": "source.js meta.var.expr.js meta.var-single-variable.expr.js variable.other.readwrite.js",
+		"t": "source.js meta.var.expr.js meta.var-single-variable.expr.js meta.definition.variable.js variable.other.readwrite.js",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -375,7 +375,7 @@
 	},
 	{
 		"c": "util",
-		"t": "source.js meta.var.expr.js meta.var-single-variable.expr.js variable.other.readwrite.js",
+		"t": "source.js meta.var.expr.js meta.var-single-variable.expr.js meta.definition.variable.js variable.other.readwrite.js",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -518,7 +518,7 @@
 	},
 	{
 		"c": "watcher",
-		"t": "source.js meta.var.expr.js meta.var-single-variable.expr.js variable.other.readwrite.js",
+		"t": "source.js meta.var.expr.js meta.var-single-variable.expr.js meta.definition.variable.js variable.other.readwrite.js",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -661,7 +661,7 @@
 	},
 	{
 		"c": "assign",
-		"t": "source.js meta.var.expr.js meta.var-single-variable.expr.js variable.other.readwrite.js",
+		"t": "source.js meta.var.expr.js meta.var-single-variable.expr.js meta.definition.variable.js variable.other.readwrite.js",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -804,7 +804,7 @@
 	},
 	{
 		"c": "compilation",
-		"t": "source.js meta.var.expr.js meta.var-single-variable.expr.js variable.other.readwrite.js",
+		"t": "source.js meta.var.expr.js meta.var-single-variable.expr.js meta.definition.variable.js variable.other.readwrite.js",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -1959,7 +1959,7 @@
 	},
 	{
 		"c": "src",
-		"t": "source.js meta.function.expression.js meta.block.js meta.var.expr.js meta.var-single-variable.expr.js variable.other.readwrite.js",
+		"t": "source.js meta.function.expression.js meta.block.js meta.var.expr.js meta.var-single-variable.expr.js meta.definition.variable.js variable.other.readwrite.js",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -2971,7 +2971,7 @@
 	},
 	{
 		"c": "cloneArray",
-		"t": "source.js meta.function.js entity.name.function.js",
+		"t": "source.js meta.function.js meta.definition.function.js entity.name.function.js",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -3136,7 +3136,7 @@
 	},
 	{
 		"c": "r",
-		"t": "source.js meta.function.js meta.block.js meta.var.expr.js meta.var-single-variable.expr.js variable.other.readwrite.js",
+		"t": "source.js meta.function.js meta.block.js meta.var.expr.js meta.var-single-variable.expr.js meta.definition.variable.js variable.other.readwrite.js",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -3268,7 +3268,7 @@
 	},
 	{
 		"c": "i",
-		"t": "source.js meta.function.js meta.block.js meta.var.expr.js meta.var-single-variable.expr.js variable.other.readwrite.js",
+		"t": "source.js meta.function.js meta.block.js meta.var.expr.js meta.var-single-variable.expr.js meta.definition.variable.js variable.other.readwrite.js",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -3345,7 +3345,7 @@
 	},
 	{
 		"c": "len",
-		"t": "source.js meta.function.js meta.block.js meta.var.expr.js meta.var-single-variable.expr.js variable.other.readwrite.js",
+		"t": "source.js meta.function.js meta.block.js meta.var.expr.js meta.var-single-variable.expr.js meta.definition.variable.js variable.other.readwrite.js",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
diff --git a/extensions/javascript/test/colorize-results/test_jsx.json b/extensions/javascript/test/colorize-results/test_jsx.json
index d8427b10b21..2b3f1b2b106 100644
--- a/extensions/javascript/test/colorize-results/test_jsx.json
+++ b/extensions/javascript/test/colorize-results/test_jsx.json
@@ -23,7 +23,7 @@
 	},
 	{
 		"c": "ToggleText",
-		"t": "source.js meta.var.expr.js meta.var-single-variable.expr.js variable.other.readwrite.js",
+		"t": "source.js meta.var.expr.js meta.var-single-variable.expr.js meta.definition.variable.js variable.other.readwrite.js",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -1090,7 +1090,7 @@
 	},
 	{
 		"c": "message",
-		"t": "source.js meta.var.expr.js meta.objectliteral.js meta.object.member.js meta.function.expression.js meta.block.js meta.var.expr.js meta.var-single-variable.expr.js variable.other.readwrite.js",
+		"t": "source.js meta.var.expr.js meta.objectliteral.js meta.object.member.js meta.function.expression.js meta.block.js meta.var.expr.js meta.var-single-variable.expr.js meta.definition.variable.js variable.other.readwrite.js",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
diff --git a/extensions/typescript/build/update-grammars.js b/extensions/typescript/build/update-grammars.js
index d980cf742f3..2ce6ee9d828 100644
--- a/extensions/typescript/build/update-grammars.js
+++ b/extensions/typescript/build/update-grammars.js
@@ -14,26 +14,6 @@ function adaptToJavaScript(grammar) {
 	var fixScopeNames = function(rule) {
 		if (typeof rule.name === 'string') {
 			rule.name = rule.name.replace(/\.tsx/g, '.js');
-			rule.name = rule.name.replace(/^\S+ (\S+)$/g, '$1');
-		}
-		for (var property in rule) {
-			var value = rule[property];
-			if (typeof value === 'object') {
-				fixScopeNames(value);
-			}
-		}
-	};
-
-	var repository = grammar.repository;
-	for (var key in repository) {
-		fixScopeNames(repository[key]);
-	}
-}
-
-function fixSpacesInNames(grammar) {
-	var fixScopeNames = function(rule) {
-		if (typeof rule.name === 'string') {
-			rule.name = rule.name.replace(/^\S+ (\S+)$/g, '$1');
 		}
 		for (var property in rule) {
 			var value = rule[property];
@@ -50,8 +30,8 @@ function fixSpacesInNames(grammar) {
 }
 
 var tsGrammarRepo = 'Microsoft/TypeScript-TmLanguage';
-updateGrammar.update(tsGrammarRepo, 'TypeScript.tmLanguage', './syntaxes/TypeScript.tmLanguage.json', fixSpacesInNames);
-updateGrammar.update(tsGrammarRepo, 'TypeScriptReact.tmLanguage', './syntaxes/TypeScriptReact.tmLanguage.json', fixSpacesInNames);
+updateGrammar.update(tsGrammarRepo, 'TypeScript.tmLanguage', './syntaxes/TypeScript.tmLanguage.json');
+updateGrammar.update(tsGrammarRepo, 'TypeScriptReact.tmLanguage', './syntaxes/TypeScriptReact.tmLanguage.json');
 updateGrammar.update(tsGrammarRepo, 'TypeScriptReact.tmLanguage', '../javascript/syntaxes/JavaScript.tmLanguage.json', adaptToJavaScript);
 
 
diff --git a/extensions/typescript/syntaxes/TypeScript.tmLanguage.json b/extensions/typescript/syntaxes/TypeScript.tmLanguage.json
index 467f4af9790..5d0ba8b2a53 100644
--- a/extensions/typescript/syntaxes/TypeScript.tmLanguage.json
+++ b/extensions/typescript/syntaxes/TypeScript.tmLanguage.json
@@ -97,7 +97,7 @@
 					"begin": "(?x)([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*\n  (=\\s*(\n    (async\\s+) |\n    (function\\s*[(<]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>) |\n    ([(]\\s*(([)]\\s*:)|([_$[:alpha:]][_$[:alnum:]]*\\s*:)|(\\.\\.\\.) )) |\n    ([<]\\s*[_$[:alpha:]][_$[:alnum:]]*((\\s+extends\\s*[^=>])|(\\s*[,]))) |\n    ((<([^<>]|\\<[^<>]+\\>)+>\\s*)?\\(([^()]|\\([^()]*\\))*\\)(\\s*:\\s*(.)*)?\\s*=>))\n  ) |\n  (:\\s*(\n    (<) |\n    ([(]\\s*(\n      ([)]) |\n      (\\.\\.\\.) |\n      ([_$[:alnum:]]+\\s*(\n        ([:,?=])|\n        ([)]\\s*=>)\n      ))\n    )))\n  )\n)",
 					"beginCaptures": {
 						"1": {
-							"name": "entity.name.function.ts"
+							"name": "meta.definition.variable.ts entity.name.function.ts"
 						}
 					},
 					"end": "(?=$|[;,=}]|(\\s+(of|in)\\s+))",
@@ -112,7 +112,7 @@
 					"begin": "([[:upper:]][_$[:digit:][:upper:]]*)(?![_$[:alnum:]])",
 					"beginCaptures": {
 						"1": {
-							"name": "variable.other.constant.ts"
+							"name": "meta.definition.variable.ts variable.other.constant.ts"
 						}
 					},
 					"end": "(?=$|[;,=}]|(\\s+(of|in)\\s+))",
@@ -127,7 +127,7 @@
 					"begin": "([_$[:alpha:]][_$[:alnum:]]*)",
 					"beginCaptures": {
 						"1": {
-							"name": "variable.other.readwrite.ts"
+							"name": "meta.definition.variable.ts variable.other.readwrite.ts"
 						}
 					},
 					"end": "(?=$|[;,=}]|(\\s+(of|in)\\s+))",
@@ -266,7 +266,7 @@
 					"name": "keyword.operator.rest.ts"
 				},
 				"2": {
-					"name": "variable.other.readwrite.ts"
+					"name": "meta.definition.variable.ts variable.other.readwrite.ts"
 				}
 			}
 		},
@@ -1117,11 +1117,11 @@
 							"include": "#comment"
 						},
 						{
-							"name": "entity.name.function.ts",
+							"name": "meta.definition.property.ts entity.name.function.ts",
 							"match": "(?x)([_$[:alpha:]][_$[:alnum:]]*)(?=(\\?\\s*)?\\s*\n  (=\\s*(\n    (async\\s+) |\n    (function\\s*[(<]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>) |\n    ([(]\\s*(([)]\\s*:)|([_$[:alpha:]][_$[:alnum:]]*\\s*:)|(\\.\\.\\.) )) |\n    ([<]\\s*[_$[:alpha:]][_$[:alnum:]]*((\\s+extends\\s*[^=>])|(\\s*[,]))) |\n    ((<([^<>]|\\<[^<>]+\\>)+>\\s*)?\\(([^()]|\\([^()]*\\))*\\)(\\s*:\\s*(.)*)?\\s*=>))\n  ) |\n  (:\\s*(\n    (<) |\n    ([(]\\s*(\n      ([)]) |\n      (\\.\\.\\.) |\n      ([_$[:alnum:]]+\\s*(\n        ([:,?=])|\n        ([)]\\s*=>)\n      ))\n    )))\n  )\n)"
 						},
 						{
-							"name": "variable.object.property.ts",
+							"name": "meta.definition.property.ts variable.object.property.ts",
 							"match": "[_$[:alpha:]][_$[:alnum:]]*"
 						},
 						{
@@ -1191,7 +1191,7 @@
 					"include": "#array-literal"
 				},
 				{
-					"name": "entity.name.function.ts",
+					"name": "meta.definition.method.ts entity.name.function.ts",
 					"match": "[_$[:alpha:]][_$[:alnum:]]*"
 				},
 				{
@@ -1337,7 +1337,7 @@
 					"name": "keyword.generator.asterisk.ts"
 				},
 				"5": {
-					"name": "entity.name.function.ts"
+					"name": "meta.definition.function.ts entity.name.function.ts"
 				}
 			},
 			"end": "(?=$|;)|(?<=\\})",
@@ -1373,7 +1373,7 @@
 					"name": "keyword.generator.asterisk.ts"
 				},
 				"4": {
-					"name": "entity.name.function.ts"
+					"name": "meta.definition.function.ts entity.name.function.ts"
 				}
 			},
 			"end": "(?<=\\})",
diff --git a/extensions/typescript/syntaxes/TypeScriptReact.tmLanguage.json b/extensions/typescript/syntaxes/TypeScriptReact.tmLanguage.json
index a0dff0e8465..63ca0e40474 100644
--- a/extensions/typescript/syntaxes/TypeScriptReact.tmLanguage.json
+++ b/extensions/typescript/syntaxes/TypeScriptReact.tmLanguage.json
@@ -97,7 +97,7 @@
 					"begin": "(?x)([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*\n  (=\\s*(\n    (async\\s+) |\n    (function\\s*[(<]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>) |\n    ([(]\\s*(([)]\\s*:)|([_$[:alpha:]][_$[:alnum:]]*\\s*:)|(\\.\\.\\.) )) |\n    ([<]\\s*[_$[:alpha:]][_$[:alnum:]]*((\\s+extends\\s*[^=>])|(\\s*[,]))) |\n    ((<([^<>]|\\<[^<>]+\\>)+>\\s*)?\\(([^()]|\\([^()]*\\))*\\)(\\s*:\\s*(.)*)?\\s*=>))\n  ) |\n  (:\\s*(\n    (<) |\n    ([(]\\s*(\n      ([)]) |\n      (\\.\\.\\.) |\n      ([_$[:alnum:]]+\\s*(\n        ([:,?=])|\n        ([)]\\s*=>)\n      ))\n    )))\n  )\n)",
 					"beginCaptures": {
 						"1": {
-							"name": "entity.name.function.tsx"
+							"name": "meta.definition.variable.tsx entity.name.function.tsx"
 						}
 					},
 					"end": "(?=$|[;,=}]|(\\s+(of|in)\\s+))",
@@ -112,7 +112,7 @@
 					"begin": "([[:upper:]][_$[:digit:][:upper:]]*)(?![_$[:alnum:]])",
 					"beginCaptures": {
 						"1": {
-							"name": "variable.other.constant.tsx"
+							"name": "meta.definition.variable.tsx variable.other.constant.tsx"
 						}
 					},
 					"end": "(?=$|[;,=}]|(\\s+(of|in)\\s+))",
@@ -127,7 +127,7 @@
 					"begin": "([_$[:alpha:]][_$[:alnum:]]*)",
 					"beginCaptures": {
 						"1": {
-							"name": "variable.other.readwrite.tsx"
+							"name": "meta.definition.variable.tsx variable.other.readwrite.tsx"
 						}
 					},
 					"end": "(?=$|[;,=}]|(\\s+(of|in)\\s+))",
@@ -266,7 +266,7 @@
 					"name": "keyword.operator.rest.tsx"
 				},
 				"2": {
-					"name": "variable.other.readwrite.tsx"
+					"name": "meta.definition.variable.tsx variable.other.readwrite.tsx"
 				}
 			}
 		},
@@ -1120,11 +1120,11 @@
 							"include": "#comment"
 						},
 						{
-							"name": "entity.name.function.tsx",
+							"name": "meta.definition.property.tsx entity.name.function.tsx",
 							"match": "(?x)([_$[:alpha:]][_$[:alnum:]]*)(?=(\\?\\s*)?\\s*\n  (=\\s*(\n    (async\\s+) |\n    (function\\s*[(<]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>) |\n    ([(]\\s*(([)]\\s*:)|([_$[:alpha:]][_$[:alnum:]]*\\s*:)|(\\.\\.\\.) )) |\n    ([<]\\s*[_$[:alpha:]][_$[:alnum:]]*((\\s+extends\\s*[^=>])|(\\s*[,]))) |\n    ((<([^<>]|\\<[^<>]+\\>)+>\\s*)?\\(([^()]|\\([^()]*\\))*\\)(\\s*:\\s*(.)*)?\\s*=>))\n  ) |\n  (:\\s*(\n    (<) |\n    ([(]\\s*(\n      ([)]) |\n      (\\.\\.\\.) |\n      ([_$[:alnum:]]+\\s*(\n        ([:,?=])|\n        ([)]\\s*=>)\n      ))\n    )))\n  )\n)"
 						},
 						{
-							"name": "variable.object.property.tsx",
+							"name": "meta.definition.property.tsx variable.object.property.tsx",
 							"match": "[_$[:alpha:]][_$[:alnum:]]*"
 						},
 						{
@@ -1194,7 +1194,7 @@
 					"include": "#array-literal"
 				},
 				{
-					"name": "entity.name.function.tsx",
+					"name": "meta.definition.method.tsx entity.name.function.tsx",
 					"match": "[_$[:alpha:]][_$[:alnum:]]*"
 				},
 				{
@@ -1340,7 +1340,7 @@
 					"name": "keyword.generator.asterisk.tsx"
 				},
 				"5": {
-					"name": "entity.name.function.tsx"
+					"name": "meta.definition.function.tsx entity.name.function.tsx"
 				}
 			},
 			"end": "(?=$|;)|(?<=\\})",
@@ -1376,7 +1376,7 @@
 					"name": "keyword.generator.asterisk.tsx"
 				},
 				"4": {
-					"name": "entity.name.function.tsx"
+					"name": "meta.definition.function.tsx entity.name.function.tsx"
 				}
 			},
 			"end": "(?<=\\})",
diff --git a/extensions/typescript/test/colorize-results/test-brackets_tsx.json b/extensions/typescript/test/colorize-results/test-brackets_tsx.json
index 2b1cf7451f9..eee5eb6c25a 100644
--- a/extensions/typescript/test/colorize-results/test-brackets_tsx.json
+++ b/extensions/typescript/test/colorize-results/test-brackets_tsx.json
@@ -23,7 +23,7 @@
 	},
 	{
 		"c": "a",
-		"t": "source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx variable.other.readwrite.tsx",
+		"t": "source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.definition.variable.tsx variable.other.readwrite.tsx",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -232,7 +232,7 @@
 	},
 	{
 		"c": "a",
-		"t": "source.tsx meta.class.tsx meta.field.declaration.tsx variable.object.property.tsx",
+		"t": "source.tsx meta.class.tsx meta.field.declaration.tsx meta.definition.property.tsx variable.object.property.tsx",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -353,7 +353,7 @@
 	},
 	{
 		"c": "s",
-		"t": "source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx variable.other.readwrite.tsx",
+		"t": "source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.definition.variable.tsx variable.other.readwrite.tsx",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
diff --git a/extensions/typescript/test/colorize-results/test-issue11_ts.json b/extensions/typescript/test/colorize-results/test-issue11_ts.json
index f844e800e16..55336072536 100644
--- a/extensions/typescript/test/colorize-results/test-issue11_ts.json
+++ b/extensions/typescript/test/colorize-results/test-issue11_ts.json
@@ -23,7 +23,7 @@
 	},
 	{
 		"c": "keyCode",
-		"t": "source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts",
+		"t": "source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -419,7 +419,7 @@
 	},
 	{
 		"c": "i",
-		"t": "source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts",
+		"t": "source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -639,7 +639,7 @@
 	},
 	{
 		"c": "i",
-		"t": "source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts",
+		"t": "source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -859,7 +859,7 @@
 	},
 	{
 		"c": "i",
-		"t": "source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts",
+		"t": "source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -1211,7 +1211,7 @@
 	},
 	{
 		"c": "i",
-		"t": "source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts",
+		"t": "source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -1497,7 +1497,7 @@
 	},
 	{
 		"c": "p",
-		"t": "source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts",
+		"t": "source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -1948,7 +1948,7 @@
 	},
 	{
 		"c": "a",
-		"t": "source.ts meta.class.ts meta.type.parameters.ts meta.object.type.ts meta.field.declaration.ts entity.name.function.ts",
+		"t": "source.ts meta.class.ts meta.type.parameters.ts meta.object.type.ts meta.field.declaration.ts meta.definition.property.ts entity.name.function.ts",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -2300,7 +2300,7 @@
 	},
 	{
 		"c": "foo",
-		"t": "source.ts meta.function.ts entity.name.function.ts",
+		"t": "source.ts meta.function.ts meta.definition.function.ts entity.name.function.ts",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -2476,7 +2476,7 @@
 	},
 	{
 		"c": "x1",
-		"t": "source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts",
+		"t": "source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -2729,7 +2729,7 @@
 	},
 	{
 		"c": "x2",
-		"t": "source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts",
+		"t": "source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -2960,7 +2960,7 @@
 	},
 	{
 		"c": "t",
-		"t": "source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts",
+		"t": "source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -3246,7 +3246,7 @@
 	},
 	{
 		"c": "f6",
-		"t": "source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts",
+		"t": "source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
diff --git a/extensions/typescript/test/colorize-results/test-issue5431_ts.json b/extensions/typescript/test/colorize-results/test-issue5431_ts.json
index 6ae3cee0110..8f699a350f5 100644
--- a/extensions/typescript/test/colorize-results/test-issue5431_ts.json
+++ b/extensions/typescript/test/colorize-results/test-issue5431_ts.json
@@ -23,7 +23,7 @@
 	},
 	{
 		"c": "foo",
-		"t": "source.ts meta.function.ts entity.name.function.ts",
+		"t": "source.ts meta.function.ts meta.definition.function.ts entity.name.function.ts",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -188,7 +188,7 @@
 	},
 	{
 		"c": "timeRange",
-		"t": "source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts",
+		"t": "source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
diff --git a/extensions/typescript/test/colorize-results/test-issue5465_ts.json b/extensions/typescript/test/colorize-results/test-issue5465_ts.json
index 831ba9d126a..f43dc3fba29 100644
--- a/extensions/typescript/test/colorize-results/test-issue5465_ts.json
+++ b/extensions/typescript/test/colorize-results/test-issue5465_ts.json
@@ -34,7 +34,7 @@
 	},
 	{
 		"c": "foo2",
-		"t": "source.ts meta.function.ts entity.name.function.ts",
+		"t": "source.ts meta.function.ts meta.definition.function.ts entity.name.function.ts",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
diff --git a/extensions/typescript/test/colorize-results/test-issue5566_ts.json b/extensions/typescript/test/colorize-results/test-issue5566_ts.json
index e1f189d7e63..1dd7f196c49 100644
--- a/extensions/typescript/test/colorize-results/test-issue5566_ts.json
+++ b/extensions/typescript/test/colorize-results/test-issue5566_ts.json
@@ -23,7 +23,7 @@
 	},
 	{
 		"c": "foo3",
-		"t": "source.ts meta.function.ts entity.name.function.ts",
+		"t": "source.ts meta.function.ts meta.definition.function.ts entity.name.function.ts",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -111,7 +111,7 @@
 	},
 	{
 		"c": "foo",
-		"t": "source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts entity.name.function.ts",
+		"t": "source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts entity.name.function.ts",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
diff --git a/extensions/typescript/test/colorize-results/test-keywords_ts.json b/extensions/typescript/test/colorize-results/test-keywords_ts.json
index fc41fc71f6f..ac1e6e571f7 100644
--- a/extensions/typescript/test/colorize-results/test-keywords_ts.json
+++ b/extensions/typescript/test/colorize-results/test-keywords_ts.json
@@ -45,7 +45,7 @@
 	},
 	{
 		"c": "foo",
-		"t": "source.ts meta.var.expr.ts meta.var-single-variable.expr.ts entity.name.function.ts",
+		"t": "source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts entity.name.function.ts",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
diff --git a/extensions/typescript/test/colorize-results/test-members_ts.json b/extensions/typescript/test/colorize-results/test-members_ts.json
index ed699ba0b11..b28c868cca0 100644
--- a/extensions/typescript/test/colorize-results/test-members_ts.json
+++ b/extensions/typescript/test/colorize-results/test-members_ts.json
@@ -133,7 +133,7 @@
 	},
 	{
 		"c": "count",
-		"t": "source.ts meta.class.ts meta.field.declaration.ts variable.object.property.ts",
+		"t": "source.ts meta.class.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -265,7 +265,7 @@
 	},
 	{
 		"c": "resolveNextGeneration",
-		"t": "source.ts meta.class.ts meta.method.declaration.ts entity.name.function.ts",
+		"t": "source.ts meta.class.ts meta.method.declaration.ts meta.definition.method.ts entity.name.function.ts",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
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 bdaeab8096a..36b795a88e5 100644
--- a/extensions/typescript/test/colorize-results/test-object-literals_ts.json
+++ b/extensions/typescript/test/colorize-results/test-object-literals_ts.json
@@ -23,7 +23,7 @@
 	},
 	{
 		"c": "s1",
-		"t": "source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts",
+		"t": "source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
diff --git a/extensions/typescript/test/colorize-results/test-strings_ts.json b/extensions/typescript/test/colorize-results/test-strings_ts.json
index 92001c57079..3971bf1d302 100644
--- a/extensions/typescript/test/colorize-results/test-strings_ts.json
+++ b/extensions/typescript/test/colorize-results/test-strings_ts.json
@@ -23,7 +23,7 @@
 	},
 	{
 		"c": "x",
-		"t": "source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts",
+		"t": "source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
diff --git a/extensions/typescript/test/colorize-results/test_ts.json b/extensions/typescript/test/colorize-results/test_ts.json
index 1c1daf6ef1a..6c8568c3511 100644
--- a/extensions/typescript/test/colorize-results/test_ts.json
+++ b/extensions/typescript/test/colorize-results/test_ts.json
@@ -243,7 +243,7 @@
 	},
 	{
 		"c": "row",
-		"t": "source.ts meta.block.ts meta.class.ts meta.field.declaration.ts variable.object.property.ts",
+		"t": "source.ts meta.block.ts meta.class.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -331,7 +331,7 @@
 	},
 	{
 		"c": "col",
-		"t": "source.ts meta.block.ts meta.class.ts meta.field.declaration.ts variable.object.property.ts",
+		"t": "source.ts meta.block.ts meta.class.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -419,7 +419,7 @@
 	},
 	{
 		"c": "live",
-		"t": "source.ts meta.block.ts meta.class.ts meta.field.declaration.ts variable.object.property.ts",
+		"t": "source.ts meta.block.ts meta.class.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -1167,7 +1167,7 @@
 	},
 	{
 		"c": "gridSize",
-		"t": "source.ts meta.block.ts meta.class.ts meta.field.declaration.ts variable.object.property.ts",
+		"t": "source.ts meta.block.ts meta.class.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -1255,7 +1255,7 @@
 	},
 	{
 		"c": "canvasSize",
-		"t": "source.ts meta.block.ts meta.class.ts meta.field.declaration.ts variable.object.property.ts",
+		"t": "source.ts meta.block.ts meta.class.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -1343,7 +1343,7 @@
 	},
 	{
 		"c": "lineColor",
-		"t": "source.ts meta.block.ts meta.class.ts meta.field.declaration.ts variable.object.property.ts",
+		"t": "source.ts meta.block.ts meta.class.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -1431,7 +1431,7 @@
 	},
 	{
 		"c": "liveColor",
-		"t": "source.ts meta.block.ts meta.class.ts meta.field.declaration.ts variable.object.property.ts",
+		"t": "source.ts meta.block.ts meta.class.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -1519,7 +1519,7 @@
 	},
 	{
 		"c": "deadColor",
-		"t": "source.ts meta.block.ts meta.class.ts meta.field.declaration.ts variable.object.property.ts",
+		"t": "source.ts meta.block.ts meta.class.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -1607,7 +1607,7 @@
 	},
 	{
 		"c": "initialLifeProbability",
-		"t": "source.ts meta.block.ts meta.class.ts meta.field.declaration.ts variable.object.property.ts",
+		"t": "source.ts meta.block.ts meta.class.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -1695,7 +1695,7 @@
 	},
 	{
 		"c": "animationRate",
-		"t": "source.ts meta.block.ts meta.class.ts meta.field.declaration.ts variable.object.property.ts",
+		"t": "source.ts meta.block.ts meta.class.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -1783,7 +1783,7 @@
 	},
 	{
 		"c": "cellSize",
-		"t": "source.ts meta.block.ts meta.class.ts meta.field.declaration.ts variable.object.property.ts",
+		"t": "source.ts meta.block.ts meta.class.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -3092,7 +3092,7 @@
 	},
 	{
 		"c": "createWorld",
-		"t": "source.ts meta.block.ts meta.class.ts meta.method.declaration.ts entity.name.function.ts",
+		"t": "source.ts meta.block.ts meta.class.ts meta.method.declaration.ts meta.definition.method.ts entity.name.function.ts",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -3708,7 +3708,7 @@
 	},
 	{
 		"c": "circleOfLife",
-		"t": "source.ts meta.block.ts meta.class.ts meta.method.declaration.ts entity.name.function.ts",
+		"t": "source.ts meta.block.ts meta.class.ts meta.method.declaration.ts meta.definition.method.ts entity.name.function.ts",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -4786,7 +4786,7 @@
 	},
 	{
 		"c": "resolveNextGeneration",
-		"t": "source.ts meta.block.ts meta.class.ts meta.method.declaration.ts entity.name.function.ts",
+		"t": "source.ts meta.block.ts meta.class.ts meta.method.declaration.ts meta.definition.method.ts entity.name.function.ts",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -4929,7 +4929,7 @@
 	},
 	{
 		"c": "count",
-		"t": "source.ts meta.block.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts",
+		"t": "source.ts meta.block.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -5083,7 +5083,7 @@
 	},
 	{
 		"c": "newCell",
-		"t": "source.ts meta.block.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts",
+		"t": "source.ts meta.block.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -5952,7 +5952,7 @@
 	},
 	{
 		"c": "countNeighbors",
-		"t": "source.ts meta.block.ts meta.class.ts meta.method.declaration.ts entity.name.function.ts",
+		"t": "source.ts meta.block.ts meta.class.ts meta.method.declaration.ts meta.definition.method.ts entity.name.function.ts",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -6095,7 +6095,7 @@
 	},
 	{
 		"c": "neighbors",
-		"t": "source.ts meta.block.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts",
+		"t": "source.ts meta.block.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -6216,7 +6216,7 @@
 	},
 	{
 		"c": "row",
-		"t": "source.ts meta.block.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts",
+		"t": "source.ts meta.block.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -6480,7 +6480,7 @@
 	},
 	{
 		"c": "col",
-		"t": "source.ts meta.block.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts",
+		"t": "source.ts meta.block.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -7426,7 +7426,7 @@
 	},
 	{
 		"c": "isAlive",
-		"t": "source.ts meta.block.ts meta.class.ts meta.method.declaration.ts entity.name.function.ts",
+		"t": "source.ts meta.block.ts meta.class.ts meta.method.declaration.ts meta.definition.method.ts entity.name.function.ts",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -8284,7 +8284,7 @@
 	},
 	{
 		"c": "travelWorld",
-		"t": "source.ts meta.block.ts meta.class.ts meta.method.declaration.ts entity.name.function.ts",
+		"t": "source.ts meta.block.ts meta.class.ts meta.method.declaration.ts meta.definition.method.ts entity.name.function.ts",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -8383,7 +8383,7 @@
 	},
 	{
 		"c": "result",
-		"t": "source.ts meta.block.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts",
+		"t": "source.ts meta.block.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -8504,7 +8504,7 @@
 	},
 	{
 		"c": "row",
-		"t": "source.ts meta.block.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts",
+		"t": "source.ts meta.block.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -8768,7 +8768,7 @@
 	},
 	{
 		"c": "rowData",
-		"t": "source.ts meta.block.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts",
+		"t": "source.ts meta.block.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -8889,7 +8889,7 @@
 	},
 	{
 		"c": "col",
-		"t": "source.ts meta.block.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts",
+		"t": "source.ts meta.block.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -9593,7 +9593,7 @@
 	},
 	{
 		"c": "draw",
-		"t": "source.ts meta.block.ts meta.class.ts meta.method.declaration.ts entity.name.function.ts",
+		"t": "source.ts meta.block.ts meta.class.ts meta.method.declaration.ts meta.definition.method.ts entity.name.function.ts",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -11298,7 +11298,7 @@
 	},
 	{
 		"c": "game",
-		"t": "source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts",
+		"t": "source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",