diff --git a/crates/languages/src/javascript/highlights.scm b/crates/languages/src/javascript/highlights.scm
index 378cb579f4366c4be9eb16fa87708aeb5391814a..e5b84ab68df2b32061691f469046569a6597750e 100644
--- a/crates/languages/src/javascript/highlights.scm
+++ b/crates/languages/src/javascript/highlights.scm
@@ -47,45 +47,10 @@
   left: (identifier) @function
   right: [(function_expression) (arrow_function)])
 
-; Parameters
-
-(required_parameter
-  (identifier) @variable.parameter)
-
-(required_parameter
-  (_
-    ([
-      (identifier)
-      (shorthand_property_identifier_pattern)
-    ]) @variable.parameter))
-
-(optional_parameter
-  (identifier) @variable.parameter)
-
-(optional_parameter
-  (_
-    ([
-      (identifier)
-      (shorthand_property_identifier_pattern)
-    ]) @variable.parameter))
-
-(catch_clause
-  parameter: (identifier) @variable.parameter)
-
-(index_signature
-  name: (identifier) @variable.parameter)
-
-(arrow_function
-  parameter: (identifier) @variable.parameter)
-
 ; Special identifiers
-;
-(class_declaration
-  (type_identifier) @type.class)
-
-(extends_clause
-  value: (identifier) @type.class)
 
+((identifier) @type
+ (#match? @type "^[A-Z]"))
 (type_identifier) @type
 (predefined_type) @type.builtin
 
diff --git a/crates/languages/src/jsdoc/highlights.scm b/crates/languages/src/jsdoc/highlights.scm
index 581b5d8111fe25443de9951cfdddc8c277ad83ff..103d32d0bd29dae56bd456893288e86a8cf87148 100644
--- a/crates/languages/src/jsdoc/highlights.scm
+++ b/crates/languages/src/jsdoc/highlights.scm
@@ -1,3 +1,2 @@
 (tag_name) @keyword.jsdoc
 (type) @type.jsdoc
-(identifier) @variable.jsdoc
diff --git a/crates/languages/src/tsx/highlights.scm b/crates/languages/src/tsx/highlights.scm
index 816ae3c58634597495f943dfaeb4a7e7aab77228..ef12b3d7913e07109e32bb5bf41909511aa2b555 100644
--- a/crates/languages/src/tsx/highlights.scm
+++ b/crates/languages/src/tsx/highlights.scm
@@ -47,68 +47,13 @@
   left: (identifier) @function
   right: [(function_expression) (arrow_function)])
 
-; Parameters
-
-(required_parameter
-  (identifier) @variable.parameter)
-
-(required_parameter
-  (_
-    ([
-      (identifier)
-      (shorthand_property_identifier_pattern)
-    ]) @variable.parameter))
-
-(optional_parameter
-  (identifier) @variable.parameter)
-
-(optional_parameter
-  (_
-    ([
-      (identifier)
-      (shorthand_property_identifier_pattern)
-    ]) @variable.parameter))
-
-(catch_clause
-  parameter: (identifier) @variable.parameter)
-
-(index_signature
-  name: (identifier) @variable.parameter)
-
-(arrow_function
-  parameter: (identifier) @variable.parameter)
-
-(type_predicate
-  name: (identifier) @variable.parameter)
-
 ; Special identifiers
 
-(type_annotation) @type
+((identifier) @type
+ (#match? @type "^[A-Z]"))
 (type_identifier) @type
 (predefined_type) @type.builtin
 
-(type_alias_declaration
-  (type_identifier) @type)
-
-(type_alias_declaration
-  value: (_
-    (type_identifier) @type))
-
-(interface_declaration
-  (type_identifier) @type)
-
-(class_declaration
-  (type_identifier) @type.class)
-
-(extends_clause
-  value: (identifier) @type.class)
-
-(extends_type_clause
-  type: (type_identifier) @type)
-
-(implements_clause
-  (type_identifier) @type)
-
 ([
   (identifier)
   (shorthand_property_identifier)
@@ -286,42 +231,8 @@
   "<" @punctuation.bracket
   ">" @punctuation.bracket)
 
-(type_parameters
-  "<" @punctuation.bracket
-  ">" @punctuation.bracket)
-
 (decorator "@" @punctuation.special)
 
-(union_type
-  ("|") @punctuation.special)
-
-(intersection_type
-  ("&") @punctuation.special)
-
-(type_annotation
-  (":") @punctuation.special)
-
-(index_signature
-  (":") @punctuation.special)
-
-(type_predicate_annotation
-  (":") @punctuation.special)
-
-(public_field_definition
-  ("?") @punctuation.special)
-
-(property_signature
-  ("?") @punctuation.special)
-
-(method_signature
-  ("?") @punctuation.special)
-
-(optional_parameter
-  ([
-    "?"
-    ":"
-  ]) @punctuation.special)
-
 ; Keywords
 
 [ "abstract"
diff --git a/crates/languages/src/typescript/highlights.scm b/crates/languages/src/typescript/highlights.scm
index 94690ca30ece07d482593085755682e3e9abba70..5e8d55581e3ae86c85ca2b845e8a07caa6444c1d 100644
--- a/crates/languages/src/typescript/highlights.scm
+++ b/crates/languages/src/typescript/highlights.scm
@@ -4,33 +4,11 @@
 
 ; Special identifiers
 
-(type_annotation) @type
-
+((identifier) @type
+ (#match? @type "^[A-Z]"))
 (type_identifier) @type
 (predefined_type) @type.builtin
 
-(type_alias_declaration
-  (type_identifier) @type)
-
-(type_alias_declaration
-  value: (_
-    (type_identifier) @type))
-
-(interface_declaration
-  (type_identifier) @type)
-
-(class_declaration
-  (type_identifier) @type.class)
-
-(extends_clause
-  value: (identifier) @type.class)
-
-(extends_type_clause
-  type: (type_identifier) @type)
-
-(implements_clause
-  (type_identifier) @type)
-
 ;; Enables ts-pretty-errors
 ;; The Lsp returns "snippets" of typescript, which are not valid typescript in totality,
 ;; but should still be highlighted
@@ -136,40 +114,6 @@
 
 (arrow_function) @function
 
-; Parameters
-
-(required_parameter
-  (identifier) @variable.parameter)
-
-(required_parameter
-  (_
-    ([
-      (identifier)
-      (shorthand_property_identifier_pattern)
-    ]) @variable.parameter))
-
-(optional_parameter
-  (identifier) @variable.parameter)
-
-(optional_parameter
-  (_
-    ([
-      (identifier)
-      (shorthand_property_identifier_pattern)
-    ]) @variable.parameter))
-
-(catch_clause
-  parameter: (identifier) @variable.parameter)
-
-(index_signature
-  name: (identifier) @variable.parameter)
-
-(arrow_function
-  parameter: (identifier) @variable.parameter)
-
-(type_predicate
-  name: (identifier) @variable.parameter)
-
 ; Literals
 
 (this) @variable.special
@@ -300,42 +244,8 @@
   "<" @punctuation.bracket
   ">" @punctuation.bracket)
 
-(type_parameters
-  "<" @punctuation.bracket
-  ">" @punctuation.bracket)
-
 (decorator "@" @punctuation.special)
 
-(union_type
-  ("|") @punctuation.special)
-
-(intersection_type
-  ("&") @punctuation.special)
-
-(type_annotation
-  (":") @punctuation.special)
-
-(index_signature
-  (":") @punctuation.special)
-
-(type_predicate_annotation
-  (":") @punctuation.special)
-
-(public_field_definition
-  ("?") @punctuation.special)
-
-(property_signature
-  ("?") @punctuation.special)
-
-(method_signature
-  ("?") @punctuation.special)
-
-(optional_parameter
-  ([
-    "?"
-    ":"
-  ]) @punctuation.special)
-
 ; Keywords
 
 [