diff --git a/queries/cmake/highlights.scm b/queries/cmake/highlights.scm
index 795c330b3..ff6f8f102 100644
--- a/queries/cmake/highlights.scm
+++ b/queries/cmake/highlights.scm
@@ -1,22 +1,27 @@
 [
  (quoted_argument)
- (bracket_content)
+ (bracket_argument)
 ] @string
 
 (variable_ref) @variable
 
+[
+ (bracket_comment)
+ (line_comment)
+] @comment
+
 [
  "$ENV"
  "$CACHE"
 ] @variable.builtin
 
 (normal_command (identifier) @function)
+
 [
  (function)
  (endfunction)
  (macro)
  (endmacro)
- (message)
 ] @function
 
 [