diff --git a/queries/highlights.scm b/queries/highlights.scm
index 5ea7e47..7adff90 100644
--- a/queries/highlights.scm
+++ b/queries/highlights.scm
@@ -2,12 +2,17 @@
 
 ; Comments
 (html_comment) @comment
+(template_comment) @comment
+(comment_content) @comment
 
 ; Raw blocks (verbatim content)
 (raw_block) @string.special
+(raw_content) @string.special
 
-; Template comments
-(template_comment) @comment
+; Embedded language
+(embedded_language) @string.special
+(embedded_content) @string.special
+(language_name) @label
 
 ; Keywords
 "@use" @keyword
@@ -99,8 +104,5 @@
 (escape_sequence) @escape
 (escape_at) @escape
 
-; Embedded
-(language_name) @label
-
 ; Variables (fallback)
 (identifier) @variable