diff --git a/runtime/queries/basic/highlights.scm b/runtime/queries/basic/highlights.scm
index 49a75c7f..fbc2e376 100644
--- a/runtime/queries/basic/highlights.scm
+++ b/runtime/queries/basic/highlights.scm
@@ -33,7 +33,7 @@
 (rem_statement) @comment
 
 ; Function calls
-(function_call) @function.call
+(function_call) @function
 
 ; Numbers
 (line_number) @constant.numeric
diff --git a/runtime/queries/bicep/highlights.scm b/runtime/queries/bicep/highlights.scm
index 5dc01f4a..faff8253 100644
--- a/runtime/queries/bicep/highlights.scm
+++ b/runtime/queries/bicep/highlights.scm
@@ -115,7 +115,7 @@
     (loop_enumerator) @variable))
 
 ; Conditionals
-"if" @keyword.conditional
+"if" @keyword.control.conditional
 
 (ternary_expression
   "?" @keyword.control.conditional
diff --git a/runtime/queries/common-lisp/highlights.scm b/runtime/queries/common-lisp/highlights.scm
index d23c19ff..1e8bf40f 100644
--- a/runtime/queries/common-lisp/highlights.scm
+++ b/runtime/queries/common-lisp/highlights.scm
@@ -25,7 +25,7 @@
   "until"
   "do"
   "repeat"
-] @keyword.control.loop
+] @keyword.control.repeat
 
 [
   "in"
@@ -95,5 +95,5 @@
 [(comment) (block_comment)] @comment
 (dis_expr) @comment
 
-["(" ")"] @punctuaton.bracket
+["(" ")"] @punctuation.bracket
 [":" "::" "."] @punctuation.special
diff --git a/runtime/queries/cython/indents.scm b/runtime/queries/cython/indents.scm
index 8f3a569a..95243571 100644
--- a/runtime/queries/cython/indents.scm
+++ b/runtime/queries/cython/indents.scm
@@ -50,7 +50,7 @@
   (ERROR
     (block
       (expression_statement
-        (identifier) @_except) @indent.branch))
+        (identifier) @_except) @indent))
   (#eq? @_except "except"))
 
 [
diff --git a/runtime/queries/cython/locals.scm b/runtime/queries/cython/locals.scm
index 9abed8f7..b0c22d02 100644
--- a/runtime/queries/cython/locals.scm
+++ b/runtime/queries/cython/locals.scm
@@ -5,14 +5,14 @@
   body: (block
     (expression_statement
       (assignment
-        left: (identifier) @local.definition)))) @local.scope
+        left: (identifier) @local.definition.variable)))) @local.scope
 
 (class_definition
   body: (block
     (expression_statement
       (assignment
         left: (_
-          (identifier) @local.definition))))) @local.scope
+          (identifier) @local.definition.variable))))) @local.scope
 
 ; Imports
 (aliased_import
@@ -42,7 +42,7 @@
 ; *args parameter
 (parameters
   (list_splat_pattern
-    (identifier) @local.definition))
+    (identifier) @local.definition.variable))
 
 ; **kwargs parameter
 (parameters
diff --git a/runtime/queries/eiffel/highlights.scm b/runtime/queries/eiffel/highlights.scm
index 90b0cfdb..d9afeca2 100644
--- a/runtime/queries/eiffel/highlights.scm
+++ b/runtime/queries/eiffel/highlights.scm
@@ -10,7 +10,7 @@
  "create"
 ] @keyword.control.import
 
-["export"] @keyword.control.export
+["export"] @keyword.control.import
 
 [
  "do"
diff --git a/runtime/queries/elm/highlights.scm b/runtime/queries/elm/highlights.scm
index d02b3a5c..490e8938 100644
--- a/runtime/queries/elm/highlights.scm
+++ b/runtime/queries/elm/highlights.scm
@@ -30,7 +30,7 @@
 (field_access_expr(lower_case_identifier) @attribute)
 
 (operator_identifier) @keyword.operator
-(eq) @keyword.operator.assignment
+(eq) @operator
 
 [
   "("
diff --git a/runtime/queries/freebasic/highlights.scm b/runtime/queries/freebasic/highlights.scm
index 5a4991cf..f7015e44 100644
--- a/runtime/queries/freebasic/highlights.scm
+++ b/runtime/queries/freebasic/highlights.scm
@@ -53,7 +53,7 @@
 
 ; Function calls
 (call_expression
-  function: (identifier) @function.call)
+  function: (identifier) @function)
 
 ; Built-in functions
 ((identifier) @function.builtin
diff --git a/runtime/queries/fsharp/highlights.scm b/runtime/queries/fsharp/highlights.scm
index 48441034..306fe795 100644
--- a/runtime/queries/fsharp/highlights.scm
+++ b/runtime/queries/fsharp/highlights.scm
@@ -115,7 +115,7 @@
       (long_identifier (identifier)* (identifier) @function)
       (identifier) @function
     ])
-    (typed_expression . (long_identifier_or_op (long_identifier (identifier)* . (identifier) @function.call)))
+    (typed_expression . (long_identifier_or_op (long_identifier (identifier)* . (identifier) @function)))
     (dot_expression base: (_) @variable.other.member field: (_) @function)
   ] @function)
 
diff --git a/runtime/queries/gdscript/highlights.scm b/runtime/queries/gdscript/highlights.scm
index 2d4b5423..1716f51d 100644
--- a/runtime/queries/gdscript/highlights.scm
+++ b/runtime/queries/gdscript/highlights.scm
@@ -114,7 +114,7 @@
 
 [
   "func"
-] @keyword.control.function
+] @keyword.function
 
 [
   "export"
diff --git a/runtime/queries/ghostty/highlights.scm b/runtime/queries/ghostty/highlights.scm
index 679fb493..9de6fb8f 100644
--- a/runtime/queries/ghostty/highlights.scm
+++ b/runtime/queries/ghostty/highlights.scm
@@ -38,7 +38,7 @@
 (palette_index) @variable.other.member
 
 ; `path_directive`
-(path_directive (property) @keyword.import)
+(path_directive (property) @keyword.control.import)
 (path_directive (path_value (string) @string.special.path ))
 
 
diff --git a/runtime/queries/haskell/highlights.scm b/runtime/queries/haskell/highlights.scm
index 562f5653..97753764 100644
--- a/runtime/queries/haskell/highlights.scm
+++ b/runtime/queries/haskell/highlights.scm
@@ -58,7 +58,7 @@
 [
   "forall"
   ; "∀" ; utf-8 is not cross-platform safe
-] @keyword.repeat
+] @keyword.control.repeat
 
 (pragma) @keyword.directive
 
@@ -68,13 +68,13 @@
   "else"
   "case"
   "of"
-] @keyword.conditional
+] @keyword.control.conditional
 
 [
   "import"
   "qualified"
   "module"
-] @keyword.import
+] @keyword.control.import
 
 [
   (operator)
@@ -185,9 +185,9 @@
 ; view patterns
 (view_pattern
   [
-    (expression/variable) @function.call
+    (expression/variable) @function
     (expression/qualified
-      (variable) @function.call)
+      (variable) @function)
   ])
 
 ; consider infix functions as operators
@@ -202,10 +202,10 @@
 ; e.g. func <$> a <*> b
 (infix
   [
-    (variable) @function.call
+    (variable) @function
     (qualified
       ((module) @namespace
-        (variable) @function.call))
+        (variable) @function))
   ]
   .
   (operator))
@@ -225,9 +225,9 @@
 
 ; decl/function calls with infix operators
 ([
-    (expression/variable) @function.call
+    (expression/variable) @function
     (expression/qualified
-      (variable) @function.call)
+      (variable) @function)
   ]
   .
   (operator) @operator
@@ -241,9 +241,9 @@
   ] ; infix or `func`
   .
   [
-    (variable) @function.call
+    (variable) @function
     (qualified
-      (variable) @function.call)
+      (variable) @function)
   ])
   .
   (operator) @operator
@@ -296,9 +296,9 @@
 
 (apply
   [
-    (expression/variable) @function.call
+    (expression/variable) @function
     (expression/qualified
-      (variable) @function.call)
+      (variable) @function)
   ])
 
 ; function compositions, in parentheses, applied
@@ -308,9 +308,9 @@
   (expression/parens
     (infix
       [
-        (variable) @function.call
+        (variable) @function
         (qualified
-          (variable) @function.call)
+          (variable) @function)
       ]
       .
       (operator))))
@@ -323,9 +323,9 @@
       (operator)
       .
       [
-        (variable) @function.call
+        (variable) @function
         (qualified
-          (variable) @function.call)
+          (variable) @function)
       ])))
 
 ; variables being passed to a function call
@@ -383,7 +383,7 @@
 
 ; ----------------------------------------------------------------------------
 ; Quasi-quotes
-(quoter) @function.call
+(quoter) @function
 
 (quasiquote
   [
@@ -405,7 +405,7 @@
   (_
     (module) @namespace
     .
-    (variable) @function.call))
+    (variable) @function))
 
 ; Highlighting of quasiquote_body for other languages is handled by injections.scm
 ; ----------------------------------------------------------------------------
diff --git a/runtime/queries/haxe/highlights.scm b/runtime/queries/haxe/highlights.scm
index f499b30c..18bab570 100644
--- a/runtime/queries/haxe/highlights.scm
+++ b/runtime/queries/haxe/highlights.scm
@@ -56,7 +56,7 @@
 (string) @string
 (bool) @constant.builtin.boolean
 (operator) @operator
-(escape_sequence) @punctuation
+(escape_sequence) @constant.character.escape
 (null) @constant.builtin
 (access_identifiers "null" @keyword)
 
diff --git a/runtime/queries/java/highlights.scm b/runtime/queries/java/highlights.scm
index 5d8958e6..6a3076b8 100644
--- a/runtime/queries/java/highlights.scm
+++ b/runtime/queries/java/highlights.scm
@@ -6,7 +6,7 @@
   name: (identifier) @function.method)
 (method_invocation
   name: (identifier) @function.method)
-(super) @function.builtin
+(super) @variable.builtin
 
 ; Annotations
 
diff --git a/runtime/queries/java/tags.scm b/runtime/queries/java/tags.scm
index a8465022..ee42f46d 100644
--- a/runtime/queries/java/tags.scm
+++ b/runtime/queries/java/tags.scm
@@ -8,7 +8,7 @@
   name: (identifier) @definition.class)
 
 (enum_declaration
-  name: (identifier) @defintion.class)
+  name: (identifier) @definition.class)
 
 (method_declaration
   name: (identifier) @definition.function)
diff --git a/runtime/queries/julia/injections.scm b/runtime/queries/julia/injections.scm
index 3c2f2bfe..7168d6d7 100644
--- a/runtime/queries/julia/injections.scm
+++ b/runtime/queries/julia/injections.scm
@@ -26,7 +26,7 @@
     (command_literal)
     (prefixed_command_literal)
   ] @injection.content
-  (#set! injection.language "sh"))
+  (#set! injection.language "bash"))
 
 (
   (prefixed_string_literal
diff --git a/runtime/queries/just/highlights.scm b/runtime/queries/just/highlights.scm
index 77ab454a..67c88b87 100644
--- a/runtime/queries/just/highlights.scm
+++ b/runtime/queries/just/highlights.scm
@@ -46,7 +46,7 @@
   name: (identifier) @function)
 
 (recipe_dependency
-  name: (identifier) @function.call)
+  name: (identifier) @function)
 
 (function_call
   name: (identifier) @function.builtin)
diff --git a/runtime/queries/ledger/highlights.scm b/runtime/queries/ledger/highlights.scm
index 02a9ea9a..46d9c4af 100644
--- a/runtime/queries/ledger/highlights.scm
+++ b/runtime/queries/ledger/highlights.scm
@@ -12,7 +12,7 @@
 ((account) @variable.other.member)
 ((commodity) @text.literal)
 
-"include" @keyword.local.import
+"include" @keyword.control.import
 
 [
     "account"
diff --git a/runtime/queries/lua/highlights.scm b/runtime/queries/lua/highlights.scm
index f9fb5693..a1ea7e82 100644
--- a/runtime/queries/lua/highlights.scm
+++ b/runtime/queries/lua/highlights.scm
@@ -189,11 +189,11 @@
 
 (function_call
   name: [
-    (identifier) @function.call
+    (identifier) @function
     (dot_index_expression
-      field: (identifier) @function.call)
+      field: (identifier) @function)
     (method_index_expression
-      method: (identifier) @function.method.call)
+      method: (identifier) @function.method)
   ])
 
 ; TODO: incorrectly highlights variable N in `N, nop = 42, function() end`
diff --git a/runtime/queries/nim/highlights.scm b/runtime/queries/nim/highlights.scm
index 00a94c4b..bf44f7d7 100644
--- a/runtime/queries/nim/highlights.scm
+++ b/runtime/queries/nim/highlights.scm
@@ -262,25 +262,25 @@
 
 (call
   function: [
-    (identifier) @function.call
+    (identifier) @function
     (dot_expression
-      right: (identifier) @function.call)
+      right: (identifier) @function)
     (bracket_expression
       left: [
-        (identifier) @function.call
+        (identifier) @function
         (dot_expression
-          right: (identifier) @function.call)])])
+          right: (identifier) @function)])])
 (generalized_string
   function: [
-    (identifier) @function.call
+    (identifier) @function
     (dot_expression
-      right: (identifier) @function.call)
+      right: (identifier) @function)
     (bracket_expression
       left: [
-        (identifier) @function.call
+        (identifier) @function
         (dot_expression
-          right: (identifier) @function.call)])])
-(dot_generic_call function: (_) @function.call)
+          right: (identifier) @function)])])
+(dot_generic_call function: (_) @function)
 
 ;; Variables
 
diff --git a/runtime/queries/php-only/highlights.scm b/runtime/queries/php-only/highlights.scm
index 349f7372..f64a8cf8 100644
--- a/runtime/queries/php-only/highlights.scm
+++ b/runtime/queries/php-only/highlights.scm
@@ -82,7 +82,7 @@
 "as" @keyword
 "break" @keyword
 "case" @keyword
-"catch" @keyword
+"catch" @keyword.control.exception
 "class" @keyword
 "const" @keyword
 "continue" @keyword
@@ -99,10 +99,10 @@
 "endwhile" @keyword
 "extends" @keyword
 "final" @keyword
-"finally" @keyword
+"finally" @keyword.control.exception
 "for" @keyword
 "foreach" @keyword
-"function" @keyword
+"function" @keyword.function
 "global" @keyword
 "if" @keyword
 "implements" @keyword
@@ -117,11 +117,11 @@
 "public" @keyword
 "require_once" @keyword
 "require" @keyword
-"return" @keyword
+"return" @keyword.control.return
 "static" @keyword
 "switch" @keyword
-"throw" @keyword
+"throw" @keyword.control.exception
 "trait" @keyword
-"try" @keyword
+"try" @keyword.control.exception
 "use" @keyword
 "while" @keyword
diff --git a/runtime/queries/ponylang/textobjects.scm b/runtime/queries/ponylang/textobjects.scm
index 0f24583d..194a42ce 100644
--- a/runtime/queries/ponylang/textobjects.scm
+++ b/runtime/queries/ponylang/textobjects.scm
@@ -33,7 +33,7 @@
 ) @function.around
 (lambda
   body: (block)? @function.inside
-) @function.outside
+) @function.around
 
 (params
   ((_) @parameter.inside . ","? @parameter.around) @parameter.around
@@ -58,7 +58,7 @@
   (entity
     provides: (type (nominal_type name: (identifier) @_provides))
     members: (members) @test.inside
-  ) @test.outside
+  ) @test.around
   (#eq? @_provides "UnitTest")
 )
 
diff --git a/runtime/queries/ripple/highlights.scm b/runtime/queries/ripple/highlights.scm
index 456cd095..20db3540 100644
--- a/runtime/queries/ripple/highlights.scm
+++ b/runtime/queries/ripple/highlights.scm
@@ -23,11 +23,11 @@
   name: (property_name) @function.method)
 
 (call_expression
-  function: (identifier) @function.call)
+  function: (identifier) @function)
 
 (call_expression
   function: (member_expression
-    property: (identifier) @function.method.call))
+    property: (identifier) @function.method))
 
 ; Variables
 (identifier) @variable
@@ -217,7 +217,7 @@
 [
   "await"
   "async"
-] @keyword.control.flow
+] @keyword.control
 
 [
   "import"
diff --git a/runtime/queries/rpmspec/highlights.scm b/runtime/queries/rpmspec/highlights.scm
index f0f6f619..4f9e8a50 100644
--- a/runtime/queries/rpmspec/highlights.scm
+++ b/runtime/queries/rpmspec/highlights.scm
@@ -11,8 +11,8 @@
     (word) @variable.parameter
     (concatenation
       (word) @variable.parameter)
-    (macro_expansion) @function.call
-    (macro_simple_expansion) @function.call
+    (macro_expansion) @function
+    (macro_simple_expansion) @function
   ])
 
 ; Highlight macro options in parametric expansions
@@ -24,7 +24,7 @@
   argument: (_) @variable.parameter)
 
 (macro_expansion
-  (identifier) @function.call
+  (identifier) @function
   argument: [
     (word) @variable.parameter
     (concatenation
@@ -176,7 +176,7 @@
   "%elifos"
   "%else"
   "%endif"
-] @keyword.conditional
+] @keyword.control.conditional
 
 ; Fallback rule for identifiers (commented out due to conflicts with parametric macros)
 ; (identifier) @variable
diff --git a/runtime/queries/ruby/highlights.scm b/runtime/queries/ruby/highlights.scm
index e0948d3a..131229bb 100644
--- a/runtime/queries/ruby/highlights.scm
+++ b/runtime/queries/ruby/highlights.scm
@@ -103,7 +103,7 @@
  (#match? @constant "^[A-Z\\d_]+$"))
 
 (self) @variable.builtin
-(super) @function.builtin
+(super) @variable.builtin
 
 [(forward_parameter)(forward_argument)] @variable.parameter
 (keyword_parameter name:((_)":" @variable.parameter) @variable.parameter)
diff --git a/runtime/queries/rust/highlights.scm b/runtime/queries/rust/highlights.scm
index e7ab80f6..9f455e7f 100644
--- a/runtime/queries/rust/highlights.scm
+++ b/runtime/queries/rust/highlights.scm
@@ -289,7 +289,7 @@
 
 "let" @keyword.storage
 "fn" @keyword.function
-"unsafe" @keyword.special
+"unsafe" @keyword.storage.modifier
 "macro_rules!" @function.macro
 
 (mutable_specifier) @keyword.storage.modifier.mut
diff --git a/runtime/queries/slint/highlights.scm b/runtime/queries/slint/highlights.scm
index 06d82a41..9b133723 100644
--- a/runtime/queries/slint/highlights.scm
+++ b/runtime/queries/slint/highlights.scm
@@ -52,7 +52,7 @@
 (argument) @variable.parameter
 
 (function_call
-  name: (_) @function.call)
+  name: (_) @function)
 
 ; definitions
 (callback
@@ -62,7 +62,7 @@
   name: (_) @function)
 
 (callback_event
-  name: (simple_identifier) @function.call)
+  name: (simple_identifier) @function)
 
 (enum_definition
   name: (_) @type.enum)
diff --git a/runtime/queries/slint/textobjects.scm b/runtime/queries/slint/textobjects.scm
index 258ce4e0..ef8c2a2c 100644
--- a/runtime/queries/slint/textobjects.scm
+++ b/runtime/queries/slint/textobjects.scm
@@ -31,5 +31,5 @@
   arguments: (_) @parameter.inside)
 
 (string_value
-  "\"" . (_) @text.inside . "\"") @text.around
+  "\"" . (_) @entry.inside . "\"") @entry.around
 
diff --git a/runtime/queries/slisp/highlights.scm b/runtime/queries/slisp/highlights.scm
index a7bf91d8..087349fd 100644
--- a/runtime/queries/slisp/highlights.scm
+++ b/runtime/queries/slisp/highlights.scm
@@ -29,7 +29,7 @@
 (external_definition return_type: (external_type) @type.builtin)
 
 ;; Function definitions
-[ "def" ] @keyword
+[ "def" ] @keyword.function
 
 (function_definition name: (symbol) @function)
 (function_definition parameters: (parameters (symbol) @variable.parameter))
diff --git a/runtime/queries/snakemake/highlights.scm b/runtime/queries/snakemake/highlights.scm
index 18d81811..1c394d3e 100644
--- a/runtime/queries/snakemake/highlights.scm
+++ b/runtime/queries/snakemake/highlights.scm
@@ -30,12 +30,12 @@
 
 ; Rule imports
 (rule_import
-  "use" @keyword.import
-  "rule" @keyword.import
-  "from" @keyword.import
-  "exclude"? @keyword.import
-  "as"? @keyword.import
-  "with"? @keyword.import)
+  "use" @keyword.control.import
+  "rule" @keyword.control.import
+  "from" @keyword.control.import
+  "exclude"? @keyword.control.import
+  "as"? @keyword.control.import
+  "with"? @keyword.control.import)
 
 ; Rule inheritance
 (rule_inheritance
diff --git a/runtime/queries/sourcepawn/highlights.scm b/runtime/queries/sourcepawn/highlights.scm
index e15cf30d..df8292c1 100644
--- a/runtime/queries/sourcepawn/highlights.scm
+++ b/runtime/queries/sourcepawn/highlights.scm
@@ -65,7 +65,7 @@
 (do_while_statement) @keyword.control.repeat
 (switch_statement) @keyword.control.conditional
 (switch_case) @keyword.control.conditional
-(ternary_expression) @conditional.ternary
+(ternary_expression ["?" ":"] @operator)
 
 ; Expressions
 (view_as) @function.builtin
diff --git a/runtime/queries/spade/highlights.scm b/runtime/queries/spade/highlights.scm
index 2d287cbb..eb013fd3 100644
--- a/runtime/queries/spade/highlights.scm
+++ b/runtime/queries/spade/highlights.scm
@@ -67,7 +67,7 @@
 
 [
   "use"
-] @keyword.import
+] @keyword.control.import
 
 [
   "gen"
diff --git a/runtime/queries/swift/highlights.scm b/runtime/queries/swift/highlights.scm
index 758a71ac..5a49f27f 100644
--- a/runtime/queries/swift/highlights.scm
+++ b/runtime/queries/swift/highlights.scm
@@ -174,14 +174,14 @@
 (guard_statement "guard" @keyword.control.conditional)
 (if_statement "if" @keyword.control.conditional)
 (switch_statement "switch" @keyword.control.conditional)
-(switch_entry "case" @keyword)
-(switch_entry "fallthrough" @keyword)
-(switch_entry (default_keyword) @keyword)
-"return" @keyword.return
+(switch_entry "case" @keyword.control.conditional)
+(switch_entry "fallthrough" @keyword.control.conditional)
+(switch_entry (default_keyword) @keyword.control.conditional)
+"return" @keyword.control.return
 (ternary_expression
   ["?" ":"] @keyword.control.conditional)
 
-["do" (throw_keyword) (catch_keyword)] @keyword
+["do" (throw_keyword) (catch_keyword)] @keyword.control.exception
 
 (statement_label) @label
 
diff --git a/runtime/queries/systemverilog/highlights.scm b/runtime/queries/systemverilog/highlights.scm
index 74653229..2dbf8bdf 100644
--- a/runtime/queries/systemverilog/highlights.scm
+++ b/runtime/queries/systemverilog/highlights.scm
@@ -10,7 +10,8 @@
 
 
 ;; Keywords
-(["begin" "end" "this"]) @keyword
+(["begin" "end"]) @keyword
+("this") @variable.builtin
 (["input" "output" "inout" "ref"]) @keyword
 (["alias" "and" "assert" "assign" "assume" "before" "bind" "binsof" "break"
   "case" "checker" "class" "class" "clocking" "config" "const" "constraint"
diff --git a/runtime/queries/tql/highlights.scm b/runtime/queries/tql/highlights.scm
index 42e4c6c5..db29677d 100644
--- a/runtime/queries/tql/highlights.scm
+++ b/runtime/queries/tql/highlights.scm
@@ -77,16 +77,16 @@
 (format_expr) @string
 (ip) @constant
 (subnet) @constant
-(time) @number
+(time) @constant.numeric
 (duration) @constant.numeric
 (frontmatter_open) @comment
 (frontmatter_close) @comment
 (comment) @comment
 
 (invocation
-  operator: (entity) @function.call)
+  operator: (entity) @function)
 (call_expression
-  (entity) @function.call)
+  (entity) @function)
 (call_expression
   method: (entity) @function.method)
 (identifier) @variable
diff --git a/runtime/queries/typespec/indents.scm b/runtime/queries/typespec/indents.scm
index aee01f35..0c45a16c 100644
--- a/runtime/queries/typespec/indents.scm
+++ b/runtime/queries/typespec/indents.scm
@@ -8,11 +8,11 @@
   (template_arguments)
   (template_parameters)
   (operation_arguments)
-] @indent.begin
+] @indent
 
 [
   "}"
   ")"
   ">"
   "]"
-] @indent.end
+] @outdent
diff --git a/runtime/queries/unison/highlights.scm b/runtime/queries/unison/highlights.scm
index eaf4c6bf..f0e2e7a9 100644
--- a/runtime/queries/unison/highlights.scm
+++ b/runtime/queries/unison/highlights.scm
@@ -43,7 +43,7 @@
 
 (pattern) @variable
 
-(use_clause) @keyword.import
+(use_clause) @keyword.control.import
 
 ;; Types
 (record_field
diff --git a/runtime/queries/wit/highlights.scm b/runtime/queries/wit/highlights.scm
index 45754a5a..ad271ba4 100644
--- a/runtime/queries/wit/highlights.scm
+++ b/runtime/queries/wit/highlights.scm
@@ -53,7 +53,7 @@
   "resource"
 ] @keyword.storage.type
 
-"func" @keyword
+"func" @keyword.function
 
 [
   "static"