diff --git a/queries/kdl/highlights.scm b/queries/kdl/highlights.scm
index e61361f96..7d200c85e 100644
--- a/queries/kdl/highlights.scm
+++ b/queries/kdl/highlights.scm
@@ -1,18 +1,19 @@
 ; Types
+; Variables
+(identifier) @variable
+
+; Nodes
 (node
+  (identifier) @tag)
+
+; Type annotation
+(type
   (identifier) @type)
 
-(type) @type
-
-(annotation_type) @type.builtin
-
 ; Properties
 (prop
   (identifier) @property)
 
-; Variables
-(identifier) @variable
-
 ; Operators
 [
   "="