diff --git a/queries/astro/highlights.scm b/queries/astro/highlights.scm
index 62e8ed247..91ccbffb3 100644
--- a/queries/astro/highlights.scm
+++ b/queries/astro/highlights.scm
@@ -3,3 +3,11 @@
 [ "---" ] @punctuation.delimiter
 
 [ "{" "}" ] @punctuation.special
+
+; custom components get `@type` highlighting
+((start_tag (tag_name) @type)
+ (#lua-match? @type "^[A-Z]"))
+((end_tag (tag_name) @type)
+ (#lua-match? @type "^[A-Z]"))
+((erroneous_end_tag (erroneous_end_tag_name) @type)
+ (#lua-match? @type "^[A-Z]"))