diff --git a/extensions/vue/languages/vue/highlights.scm b/extensions/vue/languages/vue/highlights.scm
index 1a80c84f68edadf0417cd159c91840102719add7..548f57d26762a37b5e6218ec0f205084aee5e21c 100644
--- a/extensions/vue/languages/vue/highlights.scm
+++ b/extensions/vue/languages/vue/highlights.scm
@@ -7,8 +7,8 @@
 ((tag_name) @type
  (#match? @type "^[A-Z]"))
 
-((directive_name) @keyword
- (#match? @keyword "^v-"))
+(directive_name) @keyword
+(directive_argument) @constant
 
 (start_tag) @tag
 (end_tag) @tag
diff --git a/extensions/vue/languages/vue/injections.scm b/extensions/vue/languages/vue/injections.scm
index 9084e373f217b95cf70bad9cc907d5d9cd127391..0cb0ec1804037b6704828b0d221b608cdbc3c60b 100644
--- a/extensions/vue/languages/vue/injections.scm
+++ b/extensions/vue/languages/vue/injections.scm
@@ -1,7 +1,60 @@
-(script_element
-  (raw_text) @content
+; <script>
+((script_element
+    (start_tag) @_no_lang
+    (raw_text) @content)
+  (#not-match? @_no_lang "lang=")
   (#set! "language" "javascript"))
 
+; <script lang="js">
+((script_element
+  (start_tag
+    (attribute
+      (attribute_name) @_lang
+      (quoted_attribute_value
+        (attribute_value) @_js)))
+  (raw_text) @content)
+  (#eq? @_lang "lang")
+  (#eq? @_js "js")
+  (#set! "language" "javascript"))
+
+; <script lang="ts">
+((script_element
+  (start_tag
+    (attribute
+      (attribute_name) @_lang
+      (quoted_attribute_value
+        (attribute_value) @_ts)))
+  (raw_text) @content)
+  (#eq? @_lang "lang")
+  (#eq? @_ts "ts")
+  (#set! "language" "typescript"))
+
+; <script lang="tsx">
+; <script lang="jsx">
+; Zed built-in tsx, we mark it as tsx ^:)
+(script_element
+  (start_tag
+    (attribute
+      (attribute_name) @_attr
+      (quoted_attribute_value
+        (attribute_value) @language)))
+  (#eq? @_attr "lang")
+  (#any-of? @language "tsx" "jsx")
+  (raw_text) @content)
+
+
+; {{ }}
+((interpolation
+  (raw_text) @content)
+  (#set! "language" "typescript"))
+
+; v-
+(directive_attribute
+  (quoted_attribute_value
+    (attribute_value) @content
+    (#set! "language" "typescript")))
+
+; TODO: support less/sass/scss
 (style_element
   (raw_text) @content
   (#set! "language" "css"))