diff --git a/languages/astro/brackets.scm b/languages/astro/brackets.scm
index f5990c1..0267f50 100644
--- a/languages/astro/brackets.scm
+++ b/languages/astro/brackets.scm
@@ -1,5 +1,16 @@
-("{" @open "}" @close)
-("<" @open ">" @close)
-("\"" @open "\"" @close)
+("{" @open
+  "}" @close)
 
-((element (start_tag) @open [(end_tag) (erroneous_end_tag)] @close) (#set! newline.only))
+("<" @open
+  ">" @close)
+
+("\"" @open
+  "\"" @close)
+
+((element
+  (start_tag) @open
+  [
+    (end_tag)
+    (erroneous_end_tag)
+  ] @close)
+  (#set! newline.only))
diff --git a/languages/astro/highlights.scm b/languages/astro/highlights.scm
index a565e22..20825e2 100644
--- a/languages/astro/highlights.scm
+++ b/languages/astro/highlights.scm
@@ -1,8 +1,13 @@
 (tag_name) @tag
+
 (erroneous_end_tag_name) @keyword
+
 (doctype) @tag.doctype
+
 (attribute_name) @property
+
 (attribute_value) @string
+
 (comment) @comment
 
 [
diff --git a/languages/astro/indents.scm b/languages/astro/indents.scm
index 9c14a34..1079492 100644
--- a/languages/astro/indents.scm
+++ b/languages/astro/indents.scm
@@ -1,3 +1,6 @@
 (element
   (start_tag) @start
-  [(end_tag) (erroneous_end_tag)]? @end) @indent
+  [
+    (end_tag)
+    (erroneous_end_tag)
+  ]? @end) @indent
diff --git a/languages/astro/injections.scm b/languages/astro/injections.scm
index 858bd32..300ba98 100644
--- a/languages/astro/injections.scm
+++ b/languages/astro/injections.scm
@@ -52,3 +52,6 @@
   (raw_text) @injection.content
   (#not-match? @_start_tag "lang=")
   (#set! injection.language "css"))
+
+((comment) @injection.content
+  (#set! injection.language "comment"))