diff --git a/queries/agda/highlights.scm b/queries/agda/highlights.scm
index ed208f1b6..7a4e954e8 100644
--- a/queries/agda/highlights.scm
+++ b/queries/agda/highlights.scm
@@ -35,7 +35,7 @@
 
 (pragma) @preproc
 
-(comment) @comment
+(comment) @comment @spell
 
 ;; Keywords
 [
diff --git a/queries/bibtex/highlights.scm b/queries/bibtex/highlights.scm
index 00cae314d..bd240f581 100644
--- a/queries/bibtex/highlights.scm
+++ b/queries/bibtex/highlights.scm
@@ -11,6 +11,8 @@
   (comment)
 ] @comment
 
+(comment) @spell
+
 [
   "="
   "#"
diff --git a/queries/blueprint/highlights.scm b/queries/blueprint/highlights.scm
index 3d4b48266..d85986ffd 100644
--- a/queries/blueprint/highlights.scm
+++ b/queries/blueprint/highlights.scm
@@ -3,7 +3,7 @@
 (string) @string
 (escape_sequence) @string.escape
 
-(comment) @comment
+(comment) @comment @spell
 
 (constant) @constant.builtin
 
diff --git a/queries/corn/highlights.scm b/queries/corn/highlights.scm
index 9bb0274e5..66873492f 100644
--- a/queries/corn/highlights.scm
+++ b/queries/corn/highlights.scm
@@ -11,7 +11,7 @@
 "." @punctuation.delimiter
 
 (input) @constant
-(comment) @comment
+(comment) @comment @spell
 
 (string) @string
 (integer) @number
diff --git a/queries/devicetree/highlights.scm b/queries/devicetree/highlights.scm
index e3140a5da..a7504260a 100644
--- a/queries/devicetree/highlights.scm
+++ b/queries/devicetree/highlights.scm
@@ -1,4 +1,4 @@
-(comment) @comment
+(comment) @comment @spell
 
 [
   (preproc_include)
diff --git a/queries/ebnf/highlights.scm b/queries/ebnf/highlights.scm
index feafa1cef..00acf59e0 100644
--- a/queries/ebnf/highlights.scm
+++ b/queries/ebnf/highlights.scm
@@ -5,7 +5,7 @@
 
 (integer) @number
 
-(comment) @comment
+(comment) @comment @spell
 
 ;;;; Identifiers ;;;;
 
diff --git a/queries/eex/highlights.scm b/queries/eex/highlights.scm
index 781b39466..29b733e89 100644
--- a/queries/eex/highlights.scm
+++ b/queries/eex/highlights.scm
@@ -9,7 +9,7 @@
 ] @tag.delimiter
 
 ; EEx comments are highlighted as such
-(comment) @comment
+(comment) @comment @spell
 
 ; Tree-sitter parser errors
 (ERROR) @error
diff --git a/queries/elsa/highlights.scm b/queries/elsa/highlights.scm
index 7021a0970..c787dadd8 100644
--- a/queries/elsa/highlights.scm
+++ b/queries/elsa/highlights.scm
@@ -38,4 +38,4 @@
 
 ; Comments
 
-(comment) @comment
+(comment) @comment @spell
diff --git a/queries/elvish/highlights.scm b/queries/elvish/highlights.scm
index af7c41dd8..886f5bcda 100644
--- a/queries/elvish/highlights.scm
+++ b/queries/elvish/highlights.scm
@@ -1,4 +1,4 @@
-(comment) @comment
+(comment) @comment @spell
 
 ["if" "elif"] @conditional
 (if (else "else" @conditional))
diff --git a/queries/embedded_template/highlights.scm b/queries/embedded_template/highlights.scm
index 0bf76a7d4..410983d65 100644
--- a/queries/embedded_template/highlights.scm
+++ b/queries/embedded_template/highlights.scm
@@ -1,4 +1,4 @@
-(comment_directive) @comment
+(comment_directive) @comment @spell
 
 [
   "<%#"
diff --git a/queries/foam/highlights.scm b/queries/foam/highlights.scm
index 5d45b0a34..aba33b4e8 100644
--- a/queries/foam/highlights.scm
+++ b/queries/foam/highlights.scm
@@ -1,5 +1,5 @@
 ;; Comments
-(comment) @comment
+(comment) @comment @spell
 
 ;; Generic Key-value pairs and dictionary keywords
 (key_value
diff --git a/queries/forth/highlights.scm b/queries/forth/highlights.scm
index e8c53e9ce..c2c5c3801 100644
--- a/queries/forth/highlights.scm
+++ b/queries/forth/highlights.scm
@@ -16,6 +16,6 @@
   (end_definition)
 ] @punctuation.delimiter
 
-(comment) @comment
+(comment) @comment @spell
 
 (ERROR) @error
diff --git a/queries/fusion/highlights.scm b/queries/fusion/highlights.scm
index bb24a413f..81f471f68 100644
--- a/queries/fusion/highlights.scm
+++ b/queries/fusion/highlights.scm
@@ -1,5 +1,5 @@
-(comment) @comment
-(afx_comment) @comment
+(comment) @comment @spell
+(afx_comment) @comment @spell
 
 ; identifiers afx
 (afx_opening_element
diff --git a/queries/glimmer/highlights.scm b/queries/glimmer/highlights.scm
index 70a48cf83..a577ba425 100644
--- a/queries/glimmer/highlights.scm
+++ b/queries/glimmer/highlights.scm
@@ -73,7 +73,7 @@
 
 (hash_pair key: (identifier) @property)
 
-(comment_statement) @comment
+(comment_statement) @comment @spell
 
 (attribute_node "=" @operator)
 
diff --git a/queries/gomod/highlights.scm b/queries/gomod/highlights.scm
index 46cd3b65e..36a676414 100644
--- a/queries/gomod/highlights.scm
+++ b/queries/gomod/highlights.scm
@@ -9,7 +9,7 @@
 
 "=>" @operator
 
-(comment) @comment
+(comment) @comment @spell
 (module_path) @text.uri
 
 [
diff --git a/queries/gowork/highlights.scm b/queries/gowork/highlights.scm
index 9c84bcc44..0584f1a68 100644
--- a/queries/gowork/highlights.scm
+++ b/queries/gowork/highlights.scm
@@ -6,7 +6,7 @@
 
 "=>" @operator
 
-(comment) @comment
+(comment) @comment @spell
 
 [
 (version)
diff --git a/queries/heex/highlights.scm b/queries/heex/highlights.scm
index 7dd4dd6fd..fe85a0652 100644
--- a/queries/heex/highlights.scm
+++ b/queries/heex/highlights.scm
@@ -27,7 +27,7 @@
 (doctype) @constant
 
 ; HEEx comments are highlighted as such
-(comment) @comment
+(comment) @comment @spell
 
 ; HEEx text content is treated as markup
 (text) @text
diff --git a/queries/hjson/highlights.scm b/queries/hjson/highlights.scm
index c8eed139f..8d5f5998d 100644
--- a/queries/hjson/highlights.scm
+++ b/queries/hjson/highlights.scm
@@ -13,4 +13,4 @@
 "{" @punctuation.bracket
 "}" @punctuation.bracket
 
-(comment) @comment
+(comment) @comment @spell
diff --git a/queries/hocon/highlights.scm b/queries/hocon/highlights.scm
index 3fb8249a9..1fdd6ca4b 100644
--- a/queries/hocon/highlights.scm
+++ b/queries/hocon/highlights.scm
@@ -1,4 +1,4 @@
-(comment) @comment
+(comment) @comment @spell
 
 (null) @constant.builtin
 [ (true) (false) ] @boolean
diff --git a/queries/html_tags/highlights.scm b/queries/html_tags/highlights.scm
index e789fd922..d51f9b27e 100644
--- a/queries/html_tags/highlights.scm
+++ b/queries/html_tags/highlights.scm
@@ -1,6 +1,6 @@
 (tag_name) @tag
 (erroneous_end_tag_name) @error
-(comment) @comment
+(comment) @comment @spell
 (attribute_name) @tag.attribute
 (attribute
   (quoted_attribute_value) @string)
diff --git a/queries/ini/highlights.scm b/queries/ini/highlights.scm
index e14d5a334..dfe46cc72 100644
--- a/queries/ini/highlights.scm
+++ b/queries/ini/highlights.scm
@@ -1,6 +1,6 @@
 (section_name
   (text) @type) ; consistency with toml
-(comment) @comment
+(comment) @comment @spell
 
 [
  "["
diff --git a/queries/json5/highlights.scm b/queries/json5/highlights.scm
index 4e41971ba..202d084b0 100644
--- a/queries/json5/highlights.scm
+++ b/queries/json5/highlights.scm
@@ -9,7 +9,7 @@
 
 (number) @number
 
-(comment) @comment
+(comment) @comment @spell
 
 (member
     name: (_) @keyword)
diff --git a/queries/jsonnet/highlights.scm b/queries/jsonnet/highlights.scm
index b0769c639..2ec60d0a7 100644
--- a/queries/jsonnet/highlights.scm
+++ b/queries/jsonnet/highlights.scm
@@ -1,5 +1,5 @@
 (id) @variable
-(comment) @comment
+(comment) @comment @spell
 
 ; Literals
 (null) @constant.builtin
diff --git a/queries/kconfig/highlights.scm b/queries/kconfig/highlights.scm
index c18c69f69..71889cb5e 100644
--- a/queries/kconfig/highlights.scm
+++ b/queries/kconfig/highlights.scm
@@ -76,6 +76,6 @@
 
 (source (prompt) @text.uri @string.special)
 
-(comment) @comment
+(comment) @comment @spell
 
 (ERROR) @error
diff --git a/queries/latex/highlights.scm b/queries/latex/highlights.scm
index 66cd8b6f3..8bb8fb10c 100644
--- a/queries/latex/highlights.scm
+++ b/queries/latex/highlights.scm
@@ -13,7 +13,7 @@
  (line_comment)
  (block_comment)
  (comment_environment)
-] @comment
+] @comment @spell
 
 ((line_comment) @preproc
   (#lua-match? @preproc "^%% !TeX"))
diff --git a/queries/ledger/highlights.scm b/queries/ledger/highlights.scm
index 963de1882..185269a00 100644
--- a/queries/ledger/highlights.scm
+++ b/queries/ledger/highlights.scm
@@ -3,7 +3,7 @@
     (comment)
     (note)
     (test)
-] @comment
+] @comment @spell
 
 [
     (quantity)
diff --git a/queries/llvm/highlights.scm b/queries/llvm/highlights.scm
index e2857b02c..c788aaafd 100644
--- a/queries/llvm/highlights.scm
+++ b/queries/llvm/highlights.scm
@@ -112,7 +112,7 @@
   ] @keyword.function)
 
 (number) @number
-(comment) @comment
+(comment) @comment @spell
 (string) @string
 (cstring) @string
 (label) @label
diff --git a/queries/m68k/highlights.scm b/queries/m68k/highlights.scm
index 49acaad1d..edb36cd57 100644
--- a/queries/m68k/highlights.scm
+++ b/queries/m68k/highlights.scm
@@ -47,7 +47,7 @@
 (repeat (control_mnemonic) @repeat)
 (conditional (control_mnemonic) @conditional)
 
-(comment) @comment
+(comment) @comment @spell
 
 [
   (operator)
diff --git a/queries/menhir/highlights.scm b/queries/menhir/highlights.scm
index 64789ee49..14bd2ea8d 100644
--- a/queries/menhir/highlights.scm
+++ b/queries/menhir/highlights.scm
@@ -25,5 +25,5 @@
 (ocaml_type) @type
 (ocaml) @none
 
-[(comment) (line_comment) (ocaml_comment)] @comment
+[(comment) (line_comment) (ocaml_comment)] @comment @spell
 (ERROR) @error
diff --git a/queries/meson/highlights.scm b/queries/meson/highlights.scm
index f687f5ae0..14fc52136 100644
--- a/queries/meson/highlights.scm
+++ b/queries/meson/highlights.scm
@@ -1,4 +1,4 @@
-(comment) @comment
+(comment) @comment @spell
 (number) @number
 (bool) @boolean
 
diff --git a/queries/mlir/highlights.scm b/queries/mlir/highlights.scm
index 3cc3c671a..a25d4c3f9 100644
--- a/queries/mlir/highlights.scm
+++ b/queries/mlir/highlights.scm
@@ -332,4 +332,4 @@
 
 (caret_id) @tag
 (value_use) @variable
-(comment) @comment
+(comment) @comment @spell
diff --git a/queries/ninja/highlights.scm b/queries/ninja/highlights.scm
index 1b31b560c..e90169ff3 100644
--- a/queries/ninja/highlights.scm
+++ b/queries/ninja/highlights.scm
@@ -96,3 +96,5 @@
  (split)
  (comment)
 ] @comment
+
+(comment) @spell
diff --git a/queries/nix/highlights.scm b/queries/nix/highlights.scm
index d30deeaf5..b83a81027 100644
--- a/queries/nix/highlights.scm
+++ b/queries/nix/highlights.scm
@@ -30,7 +30,7 @@
 "or" @keyword.operator
 
 ; comments
-(comment) @comment
+(comment) @comment @spell
 
 ; strings
 ([ (string_expression) (indented_string_expression) ]
diff --git a/queries/ocaml/highlights.scm b/queries/ocaml/highlights.scm
index db70575e8..ba9ea4def 100644
--- a/queries/ocaml/highlights.scm
+++ b/queries/ocaml/highlights.scm
@@ -172,6 +172,6 @@
 ; Comments
 ;---------
 
-[(comment) (line_number_directive) (directive) (shebang)] @comment
+[(comment) (line_number_directive) (directive) (shebang)] @comment @spell
 
 (ERROR) @error
diff --git a/queries/ocamllex/highlights.scm b/queries/ocamllex/highlights.scm
index 060a57dc8..3673206ae 100644
--- a/queries/ocamllex/highlights.scm
+++ b/queries/ocamllex/highlights.scm
@@ -37,5 +37,5 @@
 
 ; Misc
 
-(comment) @comment
+(comment) @comment @spell
 (ERROR) @error
diff --git a/queries/pem/highlights.scm b/queries/pem/highlights.scm
index 9192e88c0..82289c6a9 100644
--- a/queries/pem/highlights.scm
+++ b/queries/pem/highlights.scm
@@ -6,6 +6,6 @@
 
 (data) @none
 
-(comment) @comment
+(comment) @comment @spell
 
 (ERROR) @error
diff --git a/queries/pioasm/highlights.scm b/queries/pioasm/highlights.scm
index aa176aa24..055f745b4 100644
--- a/queries/pioasm/highlights.scm
+++ b/queries/pioasm/highlights.scm
@@ -1,4 +1,4 @@
-[ (line_comment) (block_comment) ] @comment
+[ (line_comment) (block_comment) ] @comment @spell
 
 (label_decl) @label
 
diff --git a/queries/pymanifest/highlights.scm b/queries/pymanifest/highlights.scm
index f2522443e..2205509ab 100644
--- a/queries/pymanifest/highlights.scm
+++ b/queries/pymanifest/highlights.scm
@@ -19,4 +19,4 @@
 
 (ERROR) @error
 
-(comment) @comment
+(comment) @comment @spell
diff --git a/queries/qmljs/highlights.scm b/queries/qmljs/highlights.scm
index 7c0c866d9..40008aad9 100644
--- a/queries/qmljs/highlights.scm
+++ b/queries/qmljs/highlights.scm
@@ -93,7 +93,7 @@
   (undefined)
 ] @constant.builtin
 
-(comment) @comment
+(comment) @comment @spell
 
 [
   (string)
diff --git a/queries/rasi/highlights.scm b/queries/rasi/highlights.scm
index e2be63ffb..7936d99ed 100644
--- a/queries/rasi/highlights.scm
+++ b/queries/rasi/highlights.scm
@@ -1,4 +1,4 @@
-(comment) @comment
+(comment) @comment @spell
 
 "@media" @keyword
 "@import" @include
diff --git a/queries/rego/highlights.scm b/queries/rego/highlights.scm
index 42d276cd2..8d15d4fb4 100644
--- a/queries/rego/highlights.scm
+++ b/queries/rego/highlights.scm
@@ -37,7 +37,7 @@
 
 (term (ref (var))) @variable
 
-(comment) @comment
+(comment) @comment @spell
 
 (number) @number
 
diff --git a/queries/robot/highlights.scm b/queries/robot/highlights.scm
index 152526f70..06c559986 100644
--- a/queries/robot/highlights.scm
+++ b/queries/robot/highlights.scm
@@ -1,7 +1,7 @@
 [
   (comment)
   (extra_text)
-] @comment
+] @comment @spell
 
 [
   (section_header)
diff --git a/queries/scss/highlights.scm b/queries/scss/highlights.scm
index 2e6de820f..f45b4301e 100644
--- a/queries/scss/highlights.scm
+++ b/queries/scss/highlights.scm
@@ -26,7 +26,7 @@
   "in"
 ] @repeat
 
-(single_line_comment) @comment
+(single_line_comment) @comment @spell
 (function_name) @function
 
 
diff --git a/queries/slint/highlights.scm b/queries/slint/highlights.scm
index 8928bc9a5..2ec720c33 100644
--- a/queries/slint/highlights.scm
+++ b/queries/slint/highlights.scm
@@ -1,6 +1,6 @@
 (identifier) @variable
 (type_identifier) @type
-(comment) @comment
+(comment) @comment @spell
 (int_literal) @number
 (float_literal) @float
 (string_literal) @string
diff --git a/queries/sparql/highlights.scm b/queries/sparql/highlights.scm
index 8b09502bc..2cc745b65 100644
--- a/queries/sparql/highlights.scm
+++ b/queries/sparql/highlights.scm
@@ -176,7 +176,7 @@
 ] @keyword.operator
 
 
-(comment) @comment
+(comment) @comment @spell
 
 
 ; Could this be summarized?
diff --git a/queries/strace/highlights.scm b/queries/strace/highlights.scm
index fff706f01..f45ef31c9 100644
--- a/queries/strace/highlights.scm
+++ b/queries/strace/highlights.scm
@@ -49,6 +49,6 @@
   "=>"
 ] @punctuation.delimiter
 
-(comment) @comment
+(comment) @comment @spell
 
 (ERROR) @error
diff --git a/queries/supercollider/highlights.scm b/queries/supercollider/highlights.scm
index f9b6d6f1f..43b3087de 100644
--- a/queries/supercollider/highlights.scm
+++ b/queries/supercollider/highlights.scm
@@ -2,8 +2,8 @@
 ; See this for full list: https://github.com/nvim-treesitter/nvim-treesitter/blob/master/CONTRIBUTING.md
 
 ; comments
-(line_comment) @comment
-(block_comment) @comment
+(line_comment) @comment @spell
+(block_comment) @comment @spell
 
 ; Argument definition
 (argument name: (identifier) @parameter)
diff --git a/queries/surface/highlights.scm b/queries/surface/highlights.scm
index 0144193c9..35de877c9 100644
--- a/queries/surface/highlights.scm
+++ b/queries/surface/highlights.scm
@@ -2,7 +2,7 @@
 (text) @text
 
 ; Surface has two types of comments, both are highlighted as such
-(comment) @comment
+(comment) @comment @spell
 
 ; Surface attributes are highlighted as HTML attributes
 (attribute_name) @tag.attribute
diff --git a/queries/sxhkdrc/highlights.scm b/queries/sxhkdrc/highlights.scm
index 03b70221e..b4a58eb9a 100644
--- a/queries/sxhkdrc/highlights.scm
+++ b/queries/sxhkdrc/highlights.scm
@@ -5,6 +5,6 @@
 (punctuation) @punctuation.bracket
 (delimiter) @punctuation.delimiter
 (keysym) @variable
-(comment) @comment
+(comment) @comment @spell
 (range) @number
 "\\\n" @punctuation.special
diff --git a/queries/tiger/highlights.scm b/queries/tiger/highlights.scm
index c0dd7dadf..f4f666d8d 100644
--- a/queries/tiger/highlights.scm
+++ b/queries/tiger/highlights.scm
@@ -111,7 +111,7 @@
 ; }}}
 
 ; Misc {{{
-(comment) @comment
+(comment) @comment @spell
 
 (type_identifier) @type
 (field_identifier) @property
diff --git a/queries/tlaplus/highlights.scm b/queries/tlaplus/highlights.scm
index 2199359f8..0dd0fd939 100644
--- a/queries/tlaplus/highlights.scm
+++ b/queries/tlaplus/highlights.scm
@@ -232,8 +232,8 @@
 ; Comments and tags
 (block_comment "(*" @comment)
 (block_comment "*)" @comment)
-(block_comment_text) @comment
-(comment) @comment
+(block_comment_text) @comment @spell
+(comment) @comment @spell
 (single_line) @comment
 (_ label: (identifier) @label)
 (label name: (_) @label)
diff --git a/queries/turtle/highlights.scm b/queries/turtle/highlights.scm
index 0608f96ae..fac576781 100644
--- a/queries/turtle/highlights.scm
+++ b/queries/turtle/highlights.scm
@@ -48,7 +48,7 @@
   (anon)
 ] @punctuation.bracket
 
-(comment) @comment
+(comment) @comment @spell
 
 (echar) @string.escape
 
diff --git a/queries/ungrammar/highlights.scm b/queries/ungrammar/highlights.scm
index 027c6e008..c441eab70 100644
--- a/queries/ungrammar/highlights.scm
+++ b/queries/ungrammar/highlights.scm
@@ -1,4 +1,4 @@
-(comment) @comment
+(comment) @comment @spell
 
 (definition) @keyword
 
diff --git a/queries/wgsl/highlights.scm b/queries/wgsl/highlights.scm
index c46221916..d2fa7409a 100644
--- a/queries/wgsl/highlights.scm
+++ b/queries/wgsl/highlights.scm
@@ -101,6 +101,6 @@
 (attribute
     (identifier) @attribute)
 
-[(line_comment) (block_comment)] @comment
+[(line_comment) (block_comment)] @comment @spell
 
 (ERROR) @error
diff --git a/queries/wing/highlights.scm b/queries/wing/highlights.scm
index 7fdf3a8f3..0e8bd6492 100644
--- a/queries/wing/highlights.scm
+++ b/queries/wing/highlights.scm
@@ -36,7 +36,7 @@
 
 ; Special
 
-(comment) @comment
+(comment) @comment @spell
 
 [
   "("
diff --git a/queries/yang/highlights.scm b/queries/yang/highlights.scm
index 9604a39a8..c2c302a71 100644
--- a/queries/yang/highlights.scm
+++ b/queries/yang/highlights.scm
@@ -1,5 +1,5 @@
 
-(comment) @comment
+(comment) @comment @spell
 
 ; Module / submodule
 ["module" "submodule"] @keyword