diff --git a/queries/highlights.scm b/queries/highlights.scm
index 21e701b..1f9ad0e 100644
--- a/queries/highlights.scm
+++ b/queries/highlights.scm
@@ -1,53 +1,11 @@
 ; Waltzing Template Highlights
 
 ; Comments
-(template_comment_1) @comment
-(template_comment_2) @comment
-(template_comment_3) @comment
-(template_comment_4) @comment
-(template_comment_5) @comment
-(template_comment_6) @comment
-(template_comment_7) @comment
-(template_comment_8) @comment
-(template_comment_9) @comment
-(template_comment_10) @comment
-(template_comment_11) @comment
-(template_comment_12) @comment
-(template_comment_13) @comment
-(template_comment_14) @comment
-(template_comment_15) @comment
-(template_comment_16) @comment
-(template_comment_17) @comment
-(template_comment_18) @comment
-(template_comment_19) @comment
-(template_comment_20) @comment
-(template_comment_21) @comment
-(template_comment_22) @comment
+(template_comment) @comment
 (html_comment) @comment
 
 ; Raw blocks
-(raw_block_1) @string.special
-(raw_block_2) @string.special
-(raw_block_3) @string.special
-(raw_block_4) @string.special
-(raw_block_5) @string.special
-(raw_block_6) @string.special
-(raw_block_7) @string.special
-(raw_block_8) @string.special
-(raw_block_9) @string.special
-(raw_block_10) @string.special
-(raw_block_11) @string.special
-(raw_block_12) @string.special
-(raw_block_13) @string.special
-(raw_block_14) @string.special
-(raw_block_15) @string.special
-(raw_block_16) @string.special
-(raw_block_17) @string.special
-(raw_block_18) @string.special
-(raw_block_19) @string.special
-(raw_block_20) @string.special
-(raw_block_21) @string.special
-(raw_block_22) @string.special
+(raw_block) @string.special
 
 ; Keywords
 "@use" @keyword