diff --git a/build-flavored-queries.py b/build-flavored-queries.py
index 69e00e3..089e7b2 100755
--- a/build-flavored-queries.py
+++ b/build-flavored-queries.py
@@ -447,7 +447,7 @@
 REPLACEMENTS_HELIX = [
     (r"@keyword.module", "@keyword.directive"),
     (r"@function.call", "@function"),
-    (r"@spell", ""),
+    (r"@spell ?", ""),
     # nothing more specific than reference
     (r"(@local.reference)[\w.]+", r"\1"),
 ]
diff --git a/queries-flavored/helix/highlights.scm b/queries-flavored/helix/highlights.scm
index 6fbb170..a7d0916 100644
--- a/queries-flavored/helix/highlights.scm
+++ b/queries-flavored/helix/highlights.scm
@@ -97,7 +97,6 @@
 
 ; Comments
 
-; FIXME: add  once all editors support it
 (comment) @comment.line
 
 (shebang) @comment
diff --git a/queries-flavored/lapce/highlights.scm b/queries-flavored/lapce/highlights.scm
index 6fbb170..a7d0916 100644
--- a/queries-flavored/lapce/highlights.scm
+++ b/queries-flavored/lapce/highlights.scm
@@ -97,7 +97,6 @@
 
 ; Comments
 
-; FIXME: add  once all editors support it
 (comment) @comment.line
 
 (shebang) @comment
diff --git a/queries-flavored/nvim-next/highlights.scm b/queries-flavored/nvim-next/highlights.scm
index 0aa1190..4dd2ea8 100644
--- a/queries-flavored/nvim-next/highlights.scm
+++ b/queries-flavored/nvim-next/highlights.scm
@@ -97,8 +97,7 @@
 
 ; Comments
 
-; FIXME: add @spell once all editors support it
-(comment) @comment
+(comment) @spell @comment
 
 (shebang) @comment
 
diff --git a/queries-flavored/zed/highlights.scm b/queries-flavored/zed/highlights.scm
index 6fbb170..a7d0916 100644
--- a/queries-flavored/zed/highlights.scm
+++ b/queries-flavored/zed/highlights.scm
@@ -97,7 +97,6 @@
 
 ; Comments
 
-; FIXME: add  once all editors support it
 (comment) @comment.line
 
 (shebang) @comment
diff --git a/queries-src/highlights.scm b/queries-src/highlights.scm
index 1a5b81d..6059d35 100644
--- a/queries-src/highlights.scm
+++ b/queries-src/highlights.scm
@@ -95,8 +95,7 @@
 
 ; Comments
 
-; FIXME: add @spell once all editors support it
-(comment) @comment.line
+(comment) @spell @comment.line
 
 (shebang) @comment
 
diff --git a/queries/just/highlights.scm b/queries/just/highlights.scm
index b8d08df..ee78824 100644
--- a/queries/just/highlights.scm
+++ b/queries/just/highlights.scm
@@ -97,8 +97,7 @@
 
 ; Comments
 
-; FIXME: add @spell once all editors support it
-(comment) @comment
+(comment) @spell @comment
 
 (shebang) @comment