diff --git a/queries/vue/highlights.scm b/queries/vue/highlights.scm
index 093598b74..ae89d65a0 100644
--- a/queries/vue/highlights.scm
+++ b/queries/vue/highlights.scm
@@ -1,20 +1,23 @@
 ; inherits: html_tags
 
 [
-  (template_element)
-  (directive_attribute)
   (directive_dynamic_argument)
   (directive_dynamic_argument_value)
-  (component)
 ] @tag
 
-(element) @string
 (interpolation) @punctuation.special
 (interpolation
   (raw_text) @none)
 
+(directive_name) @tag.attribute
+
+(directive_attribute
+  (quoted_attribute_value) @punctuation.special)
+
+(directive_attribute
+  (quoted_attribute_value (attribute_value) @none))
+
 [
   (directive_modifier)
-  (directive_name)
   (directive_argument)
 ] @method