diff --git a/runtime/queries/amber/highlights.scm b/runtime/queries/amber/highlights.scm
index 559bd5eb..d75e3d5f 100644
--- a/runtime/queries/amber/highlights.scm
+++ b/runtime/queries/amber/highlights.scm
@@ -35,7 +35,7 @@
 ; Literals
 (boolean) @constant.builtin.boolean
 (number) @constant.numeric
-(null) @constant.numeric
+(null) @constant.builtin
 (string) @string
 (status) @keyword
 ; Highlight only command delimiters, not content (bash injection handles content)
diff --git a/runtime/queries/c/highlights.scm b/runtime/queries/c/highlights.scm
index 8e499dd6..706e68b7 100644
--- a/runtime/queries/c/highlights.scm
+++ b/runtime/queries/c/highlights.scm
@@ -109,7 +109,7 @@
 (string_literal) @string
 (system_lib_string) @string
 
-(null) @constant
+(null) @constant.builtin
 (number_literal) @constant.numeric
 (char_literal) @constant.character
 (escape_sequence) @constant.character.escape
diff --git a/runtime/queries/crystal/highlights.scm b/runtime/queries/crystal/highlights.scm
index 0845479b..e4d1e5fe 100644
--- a/runtime/queries/crystal/highlights.scm
+++ b/runtime/queries/crystal/highlights.scm
@@ -145,9 +145,11 @@
 [
   (true)
   (false)
-  (nil)
-  (self)
-] @variable.builtin
+] @constant.builtin.boolean
+
+(nil) @constant.builtin
+
+(self) @variable.builtin
 
 (
   (comment)+ @comment.block.documentation
diff --git a/runtime/queries/gdscript/highlights.scm b/runtime/queries/gdscript/highlights.scm
index fee67dc9..2d4b5423 100644
--- a/runtime/queries/gdscript/highlights.scm
+++ b/runtime/queries/gdscript/highlights.scm
@@ -34,10 +34,7 @@
 (binary_operator (identifier) @type)
 (enum_definition (name) @type.enum)
 (enumerator (identifier) @type.enum.variant)
-[
-  (null)
-  (underscore)
-] @type.builtin
+(underscore) @type.builtin
 
 
 (variable_statement (identifier) @variable)
@@ -63,6 +60,7 @@
   (true)
   (false)
 ] @constant.builtin.boolean
+(null) @constant.builtin
 
 [
   "+"
diff --git a/runtime/queries/kotlin/highlights.scm b/runtime/queries/kotlin/highlights.scm
index d08fa2ab..91751849 100644
--- a/runtime/queries/kotlin/highlights.scm
+++ b/runtime/queries/kotlin/highlights.scm
@@ -162,10 +162,8 @@
 
 (character_literal) @constant.character
 
-[
-	(null_literal) ; should be highlighted the same as booleans
-	(boolean_literal)
-] @constant.builtin.boolean
+(boolean_literal) @constant.builtin.boolean
+(null_literal) @constant.builtin
 
 (real_literal) @constant.numeric.float
 [
diff --git a/runtime/queries/opencl/highlights.scm b/runtime/queries/opencl/highlights.scm
index 36133bd2..82f77a42 100644
--- a/runtime/queries/opencl/highlights.scm
+++ b/runtime/queries/opencl/highlights.scm
@@ -116,7 +116,7 @@
 (string_literal) @string
 (system_lib_string) @string
 
-(null) @constant
+(null) @constant.builtin
 (number_literal) @constant.numeric
 (char_literal) @constant.character
 
diff --git a/runtime/queries/prisma/highlights.scm b/runtime/queries/prisma/highlights.scm
index dfd5292d..6c85a4cc 100644
--- a/runtime/queries/prisma/highlights.scm
+++ b/runtime/queries/prisma/highlights.scm
@@ -33,8 +33,8 @@
 [
  (true)
  (false)
- (null)
 ] @constant.builtin.boolean
+(null) @constant.builtin
 
 [
  "("
@@ -55,4 +55,4 @@
  "@"
  "@@"
  (binary_expression)
-] @operator
\ No newline at end of file
+] @operator
diff --git a/runtime/queries/r/highlights.scm b/runtime/queries/r/highlights.scm
index 29526bcf..779d223b 100644
--- a/runtime/queries/r/highlights.scm
+++ b/runtime/queries/r/highlights.scm
@@ -4,11 +4,25 @@
 
 ; Literals
 
-(integer) @constant.numeric.integer
+[
+  (integer)
+  (complex)
+] @constant.numeric.integer
 
-(float) @constant.numeric.float
+[
+  (float)
+  (nan)
+] @constant.numeric.float
 
-(complex) @constant.numeric.integer
+[
+  (true)
+  (false)
+] @constant.builtin.boolean
+
+[
+  (na)
+  (null)
+] @constant.builtin
 
 (string) @string
 (string (escape_sequence) @constant.character.escape)
@@ -86,12 +100,6 @@
  (inf)
 ] @keyword
 
-[
-  (nan)
-  (na)
-  (null)
-] @type.builtin
-
 [
   "if"
   "else"
@@ -104,11 +112,6 @@
   "for"
 ] @keyword.control.repeat
 
-[
-  (true)
-  (false)
-] @constant.builtin.boolean
-
 "function" @keyword.function
 
 (call function: (identifier) @function)
diff --git a/runtime/queries/v/highlights.scm b/runtime/queries/v/highlights.scm
index 9ae91d97..00bf9e79 100644
--- a/runtime/queries/v/highlights.scm
+++ b/runtime/queries/v/highlights.scm
@@ -98,6 +98,7 @@
  (true)
  (false)
 ] @constant.builtin.boolean
+(nil) @constant.builtin
 
 [
   "pub"
@@ -106,7 +107,6 @@
   "defer"
   "unsafe"
   "sql"
-  (nil)
   (none)
 ] @keyword