diff --git a/queries/highlights.scm b/queries/highlights.scm
index e7c2264..40e607e 100644
--- a/queries/highlights.scm
+++ b/queries/highlights.scm
@@ -1,5 +1,12 @@
 ; Waltzing Template Highlights
 
+; Comments (all template comment variants)
+(template_comment) @comment
+(template_comment_1) @comment
+(template_comment_2) @comment
+(template_comment_3) @comment
+(html_comment) @comment
+
 ; Keywords
 "@use" @keyword
 "@import" @keyword
@@ -90,5 +97,14 @@
 (escape_sequence) @escape
 (escape_at) @escape
 
+; Embedded language names
+"json" @label
+"alpine" @label
+"js" @label
+"javascript" @label
+"css" @label
+"style" @label
+"html" @label
+
 ; Variables (fallback)
 (identifier) @variable