diff --git a/queries/highlights.scm b/queries/highlights.scm
index f224ed2..b5dd676 100644
--- a/queries/highlights.scm
+++ b/queries/highlights.scm
@@ -11,7 +11,7 @@
 "@match" @keyword.conditional
 "@break" @keyword.control
 "@continue" @keyword.control
-"@safe" @keyword.function
+"safe" @keyword.function
 "else" @keyword.conditional
 "if" @keyword.conditional
 "let" @keyword
@@ -24,7 +24,6 @@
 (unary_operator) @operator
 "=>" @operator
 "=" @operator
-"::" @punctuation.delimiter
 
 ; Punctuation
 "{" @punctuation.bracket
@@ -42,7 +41,6 @@
 ; Literals
 (string_literal) @string
 (char_literal) @character
-(number_literal) @number
 (integer_literal) @number
 (float_literal) @number
 (boolean_literal) @boolean
@@ -50,7 +48,6 @@
 
 ; Types
 (primitive_type) @type.builtin
-(rust_type) @type
 (generic_params (identifier) @type)
 (generic_type (rust_path) @type)
 
@@ -73,7 +70,6 @@
 
 ; HTML elements
 (tag_name) @tag
-(html_element) @tag
 (attribute_name) @attribute
 (attribute_value) @string
 
@@ -83,8 +79,6 @@
 (import_statement (string_literal) @string.special)
 
 ; Expressions
-(simple_expression "@" @punctuation.special)
-(complex_expression "@" @punctuation.special)
 (expression_path (identifier) @variable)
 (field_access (identifier) @property)
 (method_call (identifier) @function.method)
@@ -95,12 +89,6 @@
 (struct_pattern (rust_path) @type)
 (field_pattern (identifier) @property)
 
-; Control flow
-(if_statement) @conditional
-(for_loop) @repeat
-(match_statement) @conditional
-(match_arm) @conditional
-
 ; Comments
 (template_comment) @comment
 (html_comment) @comment
@@ -118,3 +106,6 @@
 
 ; Text content
 (text_content) @text
+
+; Catch-all
+(identifier) @variable