diff --git a/languages.toml b/languages.toml
index 2d5bf388..c2e0549f 100644
--- a/languages.toml
+++ b/languages.toml
@@ -459,7 +459,7 @@ source = { git = "https://github.com/cstrahan/tree-sitter-nix", rev = "6b71a810c
 name = "ruby"
 scope = "source.ruby"
 injection-regex = "ruby"
-file-types = ["rb", "rake", "rakefile", "irb", "gemfile", "gemspec", "Rakefile", "Gemfile"]
+file-types = ["rb", "rake", "rakefile", "irb", "gemfile", "gemspec", "Rakefile", "Gemfile", "rabl", "jbuilder", "jb"]
 shebangs = ["ruby"]
 roots = []
 comment-token = "#"
diff --git a/runtime/queries/heex/highlights.scm b/runtime/queries/heex/highlights.scm
index 6d8816de..75537fa7 100644
--- a/runtime/queries/heex/highlights.scm
+++ b/runtime/queries/heex/highlights.scm
@@ -2,14 +2,10 @@
 ; HEEx delimiters
 [
   "<!"
-  "<!--"
   "<"
-  "<%!--"
   "<%#"
   ">"
   "</"
-  "--%>"
-  "-->"
   "/>"
   ; These could be `@keyword`s but the closing `>` wouldn't be highlighted
   ; as `@keyword`
@@ -34,7 +30,13 @@
 (doctype) @constant
 
 ; HEEx comments are highlighted as such
-(comment) @comment
+[
+  "<!--"
+  "-->"
+  "<%!--"
+  "--%>"
+  (comment)
+] @comment
 
 ; HEEx tags are highlighted as HTML
 (tag_name) @tag
diff --git a/runtime/queries/heex/injections.scm b/runtime/queries/heex/injections.scm
index ad4e4faa..d97e4b3e 100644
--- a/runtime/queries/heex/injections.scm
+++ b/runtime/queries/heex/injections.scm
@@ -19,3 +19,6 @@
 ;     <link href={ Routes.static_path(..) } />
 ((expression (expression_value) @injection.content)
  (#set! injection.language "elixir"))
+
+((comment) @injection.content 
+ (#set! injection.language "comment"))
\ No newline at end of file
diff --git a/runtime/queries/svelte/indents.scm b/runtime/queries/svelte/indents.scm
index 02aaaa58..ef494397 100644
--- a/runtime/queries/svelte/indents.scm
+++ b/runtime/queries/svelte/indents.scm
@@ -1,3 +1,5 @@
+; inherits: javascript
+
 [
   (element)
   (if_statement)