diff --git a/queries/zig/highlights.scm b/queries/zig/highlights.scm
index 60e5b373a..0989704ce 100644
--- a/queries/zig/highlights.scm
+++ b/queries/zig/highlights.scm
@@ -79,6 +79,11 @@ field_constant: (IDENTIFIER) @constant
 
 (FLOAT) @float
 
+[
+  "true"
+  "false"
+] @boolean
+
 [
   (LINESTRING)
   (STRINGLITERALSINGLE)
@@ -96,6 +101,11 @@ field_constant: (IDENTIFIER) @constant
   "defer"
   "errdefer"
   "test"
+  "struct"
+  "union"
+  "enum"
+  "opaque"
+  "error"
 ] @keyword
 
 [
@@ -147,14 +157,6 @@ field_constant: (IDENTIFIER) @constant
   (BuildinTypeExpr)
 ] @type.builtin
 
-[
-  "struct"
-  "union"
-  "enum"
-  "opaque"
-  "error"
-] @type.definition
-
 [
   "const"
   "var"
@@ -185,8 +187,6 @@ field_constant: (IDENTIFIER) @constant
   "null"
   "unreachable"
   "undefined"
-  "true"
-  "false"
 ] @constant.builtin
 
 [