diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-241001_ts.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-241001_ts.json
index e870a69ea3f..8180a2388ea 100644
--- a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-241001_ts.json
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-241001_ts.json
@@ -1261,7 +1261,7 @@
 	},
 	{
 		"c": "rest",
-		"t": "variable",
+		"t": "variable.parameter",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_ts.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_ts.json
index 8a0ca583697..70b287ec2c1 100644
--- a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_ts.json
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_ts.json
@@ -15,16 +15,16 @@
 	},
 	{
 		"c": "module",
-		"t": "",
+		"t": "storage.type.namespace.ts",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF",
-			"dark_modern": "default: #CCCCCC",
-			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"dark_plus": "storage.type: #569CD6",
+			"light_plus": "storage.type: #0000FF",
+			"dark_vs": "storage.type: #569CD6",
+			"light_vs": "storage.type: #0000FF",
+			"hc_black": "storage.type: #569CD6",
+			"dark_modern": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_modern": "storage.type: #0000FF"
 		}
 	},
 	{
diff --git a/src/vs/editor/common/languages/highlights/typescript.scm b/src/vs/editor/common/languages/highlights/typescript.scm
index 18d45571ccf..c536c7160cb 100644
--- a/src/vs/editor/common/languages/highlights/typescript.scm
+++ b/src/vs/editor/common/languages/highlights/typescript.scm
@@ -75,9 +75,16 @@
 (required_parameter
   (identifier) @variable.parameter)
 
+(required_parameter
+  (rest_pattern
+    (identifier) @variable.parameter))
+
 (optional_parameter
   (identifier) @variable.parameter)
 
+(catch_clause
+  parameter: (identifier) @variable.parameter)
+
 ; Function and method calls
 
 (call_expression
@@ -103,6 +110,8 @@
 (predefined_type) @support.type
 (predefined_type (["string" "boolean" "number" "any" "unknown"])) @support.type.primitive
 (type_identifier) @entity.name.type
+(internal_module
+  name: (identifier) @entity.name.type.ts)
 
 ([
   (identifier)
@@ -297,6 +306,10 @@
   "var"
 ] @storage.type
 
+[
+  "module"
+] @storage.type.namespace.ts
+
 [
   "debugger"
   "target"
diff --git a/src/vs/workbench/services/themes/common/colorThemeData.ts b/src/vs/workbench/services/themes/common/colorThemeData.ts
index c4eb060a76a..4d879061713 100644
--- a/src/vs/workbench/services/themes/common/colorThemeData.ts
+++ b/src/vs/workbench/services/themes/common/colorThemeData.ts
@@ -905,20 +905,19 @@ export function findMetadata(colorThemeData: ColorThemeData, captureNames: strin
 	}
 
 	const fontStyle = definitions.foreground?.settings.fontStyle || definitions.bold?.settings.fontStyle;
-	switch (fontStyle) {
-		case 'italic':
-			metadata |= FontStyle.Italic | MetadataConsts.ITALIC_MASK;
-			break;
-		case 'bold':
-			metadata |= FontStyle.Bold | MetadataConsts.BOLD_MASK;
-			break;
-		case 'underline':
-			metadata |= FontStyle.Underline | MetadataConsts.UNDERLINE_MASK;
-			break;
-		case 'strikethrough':
-			metadata |= FontStyle.Strikethrough | MetadataConsts.STRIKETHROUGH_MASK;
-			break;
+	if (fontStyle?.includes('italic')) {
+		metadata |= FontStyle.Italic | MetadataConsts.ITALIC_MASK;
 	}
+	if (fontStyle?.includes('bold')) {
+		metadata |= FontStyle.Bold | MetadataConsts.BOLD_MASK;
+	}
+	if (fontStyle?.includes('underline')) {
+		metadata |= FontStyle.Underline | MetadataConsts.UNDERLINE_MASK;
+	}
+	if (fontStyle?.includes('strikethrough')) {
+		metadata |= FontStyle.Strikethrough | MetadataConsts.STRIKETHROUGH_MASK;
+	}
+
 	const foreground = tokenStyle?.foreground;
 	const tokenStyleForeground = (foreground !== undefined) ? colorThemeData.getTokenColorIndex().get(foreground) : ColorId.DefaultForeground;
 	metadata |= tokenStyleForeground << MetadataConsts.FOREGROUND_OFFSET;