diff --git a/runtime/queries/nasm/highlights.scm b/runtime/queries/nasm/highlights.scm
index 9c37177d8965..5e3cfebe6f5b 100644
--- a/runtime/queries/nasm/highlights.scm
+++ b/runtime/queries/nasm/highlights.scm
@@ -2,20 +2,17 @@
 
 (label) @label
 
+(preproc_expression) @keyword.directive
+
 [
-  (preproc_expression)
   (line_here_token)
   (section_here_token)
 ] @variable.builtin
-(preproc_expression
-  "]" @variable.builtin)
-(preproc_expression
-  "}" @variable.builtin)
 
 (unary_expression
-  operator: _ @operator.unary)
+  operator: _ @operator)
 (binary_expression
-  operator: _ @operator.binary)
+  operator: _ @operator)
 (conditional_expression
   "?" @operator
   ":" @operator)
@@ -54,10 +51,10 @@
 
 (register) @constant.builtin
 
-(number_literal) @number.integer
+(number_literal) @constant.numeric.integer
 (string_literal) @string
-(float_literal) @number.float
-(packed_bcd_literal) @number.integer
+(float_literal) @constant.numeric.float
+(packed_bcd_literal) @constant.numeric.integer
 
 ((word) @constant
   (#match? @constant "^[A-Z_][?A-Z_0-9]+$"))
@@ -65,7 +62,7 @@
   (#match? @constant.builtin "^__\\?[A-Z_a-z0-9]+\\?__$"))
 (word) @variable
 
-(preproc_arg) @keyword
+(preproc_arg) @keyword.directive
 
 [
   (preproc_def)
@@ -91,7 +88,7 @@
   (preproc_pragma)
   (preproc_line)
   (preproc_clear)
-] @keyword
+] @keyword.directive
 [
   (pseudo_instruction_dx)
   (pseudo_instruction_resx)
@@ -99,7 +96,7 @@
   (pseudo_instruction_equ_command)
   (pseudo_instruction_times_prefix)
   (pseudo_instruction_alignx_macro)
-] @keyword
+] @function.special
 [
   (assembl_directive_target)
   (assembl_directive_defaults)