diff --git a/queries/heex/highlights.scm b/queries/heex/highlights.scm
index d9d0b0c66..c69e3d53e 100644
--- a/queries/heex/highlights.scm
+++ b/queries/heex/highlights.scm
@@ -1,35 +1,33 @@
-; HEEx text is highlighted as such
 (text) @text
-
-; HEEx has two types of comments, both are highlighted as such
 (comment) @comment
+(doctype) @constant
 
 ; HEEx attributes are highlighted as HTML attributes
 (attribute_name) @tag.attribute
-
-; Attributes are highlighted as strings
 (quoted_attribute_value) @string
 
-; HEEx supports HTML tags and are highlighted as such
 [
-  "<"
-  ">"
-  "</"
-  "/>"
-  "<%"
-  "<%="
-  "<%%="
-  "<%#"
   "%>"
+  "/>"
+  "<!"
+  "<"
+  "<%"
+  "<%#"
+  "<%%="
+  "<%="
+  "</"
+  ">"
   "{"
   "}"
 ] @tag.delimiter
 
+[
+  "="
+] @operator
+
 ; HEEx tags are highlighted as HTML
 (tag_name) @tag
 
 ; HEEx components are highlighted as types (Elixir modules)
 (component_name) @type
 
-; HEEx operators
-["="] @operator