diff --git a/Vue Component.sublime-syntax b/Vue Component.sublime-syntax
index f377e4e..07248dc 100644
--- a/Vue Component.sublime-syntax	
+++ b/Vue Component.sublime-syntax	
@@ -2,7 +2,6 @@
 ---
 name: Vue Component
 file_extensions: [vue]
-first_line_match: (?i)<(!DOCTYPE\s*)?html
 scope: text.html.vue
 variables:
   attribute_char: (?:[^ "'>/=\x00-\x1f\x7f-\x9f])
@@ -639,15 +638,21 @@ contexts:
     - include: tag-event-attribute
     - include: tag-generic-attribute
   mustache-expression:
-    - match: '{{'
-      scope: punctuation.definition.template.begin.html
-      embed: scope:source.js
-      escape: '}}'
-      escape_captures:
-        0: punctuation.definition.template.end.html
+    - match: (?={{)
+      set:
+        - meta_scope: meta.template.vue
+        - match: '{{'
+          scope: punctuation.definition.template.begin.html
+          embed: scope:source.js
+          embed_scope: source.js.embedded.vue
+          escape: '}}'
+          escape_captures:
+            0: meta.template.vue punctuation.definition.template.end.html
+        - match: ''
+          pop: true
 
   template-tag:
-    - match: (<)((?i:template))\b
+    - match: (<)((?i:template(>| )))\b
       captures:
         0: meta.tag.template.begin.html
         1: punctuation.definition.tag.begin.html
@@ -674,12 +679,14 @@ contexts:
     - match: '"'
       scope: punctuation.definition.string.begin.html
       embed: scope:source.js
+      embed_scope: source.js.embedded.vue
       escape: '"'
       escape_captures:
         0: punctuation.definition.string.end.html
     - match: "'"
       scope: punctuation.definition.string.begin.html
       embed: scope:source.js
+      embed_scope: source.js.embedded.vue
       escape: "'"
       escape_captures:
         0: punctuation.definition.string.end.html
@@ -708,8 +715,8 @@ contexts:
               scope: punctuation.definition.tag.end.html
               set:
                 - include: style-close-tag
-                - match: ''
-                  embed_scope: source.sass.embedded.html
+                - embed_scope: source.sass.embedded.html
+                  match: ''
                   embed: scope:source.sass
                   escape: (?i)(?=(?:-->\s*)?</style)
         - tag-generic-attribute-meta
@@ -722,8 +729,8 @@ contexts:
               scope: punctuation.definition.tag.end.html
               set:
                 - include: style-close-tag
-                - match: ''
-                  embed_scope: source.scss.embedded.html
+                - embed_scope: source.scss.embedded.html
+                  match: ''
                   embed: scope:source.scss
                   escape: (?i)(?=(?:-->\s*)?</style)
         - tag-generic-attribute-meta
@@ -736,8 +743,8 @@ contexts:
               scope: punctuation.definition.tag.end.html
               set:
                 - include: style-close-tag
-                - match: ''
-                  embed_scope: source.stylus.embedded.html
+                - embed_scope: source.stylus.embedded.html
+                  match: ''
                   embed: scope:source.stylus
                   escape: (?i)(?=(?:-->\s*)?</style)
         - tag-generic-attribute-meta
@@ -750,8 +757,8 @@ contexts:
               scope: punctuation.definition.tag.end.html
               set:
                 - include: style-close-tag
-                - match: ''
-                  embed_scope: source.sss.embedded.html
+                - embed_scope: source.sss.embedded.html
+                  match: ''
                   embed: scope:source.sss
                   escape: (?i)(?=(?:-->\s*)?</style)
         - tag-generic-attribute-meta
@@ -764,8 +771,8 @@ contexts:
               scope: punctuation.definition.tag.end.html
               set:
                 - include: style-close-tag
-                - match: ''
-                  embed_scope: source.postcss.embedded.html
+                - embed_scope: source.postcss.embedded.html
+                  match: ''
                   embed: scope:source.postcss
                   escape: (?i)(?=(?:-->\s*)?</style)
         - tag-generic-attribute-meta
@@ -778,9 +785,9 @@ contexts:
               scope: punctuation.definition.tag.end.html
               set:
                 - include: style-close-tag
-                - match: ''
-                  embed_scope: source.css.less.embedded.html
-                  embed: scope:source.css.less
+                - embed_scope: source.less.embedded.html
+                  match: ''
+                  embed: scope:source.less
                   escape: (?i)(?=(?:-->\s*)?</style)
         - tag-generic-attribute-meta
         - tag-generic-attribute-value
@@ -812,8 +819,8 @@ contexts:
               scope: punctuation.definition.tag.end.html
               set:
                 - include: script-close-tag
-                - match: ''
-                  embed_scope: source.coffee.embedded.html
+                - embed_scope: source.coffee.embedded.html
+                  match: ''
                   embed: scope:source.coffee
                   escape: (?i)(?=(?:-->\s*)?</script)
         - tag-generic-attribute-meta
@@ -826,8 +833,8 @@ contexts:
               scope: punctuation.definition.tag.end.html
               set:
                 - include: script-close-tag
-                - match: ''
-                  embed_scope: source.livescript.embedded.html
+                - embed_scope: source.livescript.embedded.html
+                  match: ''
                   embed: scope:source.livescript
                   escape: (?i)(?=(?:-->\s*)?</script)
         - tag-generic-attribute-meta
@@ -840,8 +847,8 @@ contexts:
               scope: punctuation.definition.tag.end.html
               set:
                 - include: script-close-tag
-                - match: ''
-                  embed_scope: source.ts.embedded.html
+                - embed_scope: source.ts.embedded.html
+                  match: ''
                   embed: scope:source.ts
                   escape: (?i)(?=(?:-->\s*)?</script)
         - tag-generic-attribute-meta
@@ -900,8 +907,8 @@ contexts:
               scope: punctuation.definition.tag.end.html
               set:
                 - include: template-close-tag
-                - match: ''
-                  embed_scope: text.jade.embedded.html
+                - embed_scope: text.jade.embedded.html
+                  match: ''
                   embed: scope:text.jade
                   escape: (?i)(?=(?:-->\s*)?</template)
         - tag-generic-attribute-meta
@@ -914,8 +921,8 @@ contexts:
               scope: punctuation.definition.tag.end.html
               set:
                 - include: template-close-tag
-                - match: ''
-                  embed_scope: text.pug.embedded.html
+                - embed_scope: text.pug.embedded.html
+                  match: ''
                   embed: scope:text.pug
                   escape: (?i)(?=(?:-->\s*)?</template)
         - tag-generic-attribute-meta
@@ -928,8 +935,8 @@ contexts:
               scope: punctuation.definition.tag.end.html
               set:
                 - include: template-close-tag
-                - match: ''
-                  embed_scope: text.slm.embedded.html
+                - embed_scope: text.slm.embedded.html
+                  match: ''
                   embed: scope:text.slm
                   escape: (?i)(?=(?:-->\s*)?</template)
         - tag-generic-attribute-meta
diff --git a/Vue Component.sublime-syntax.yaml-macros b/Vue Component.sublime-syntax.yaml-macros
index 0a7c879..732b88a 100644
--- a/Vue Component.sublime-syntax.yaml-macros	
+++ b/Vue Component.sublime-syntax.yaml-macros	
@@ -14,18 +14,24 @@ contexts: !merge
     - include: mustache-expression
 
   mustache-expression:
-    - match: '{{'
-      scope: punctuation.definition.template.begin.html
-      embed: scope:source.js
-      escape: '}}'
-      escape_captures:
-        0: punctuation.definition.template.end.html
+    - match: '(?={{)'
+      set:
+        - meta_scope: meta.template.vue
+        - match: '{{'
+          scope: punctuation.definition.template.begin.html
+          embed: scope:source.js
+          embed_scope: source.js.embedded.vue
+          escape: '}}'
+          escape_captures:
+            0: meta.template.vue punctuation.definition.template.end.html
+        - match: ''
+          pop: true
 
   tag-attributes: !prepend
     - include: vue-directive
 
   template-tag:
-    - match: (<)((?i:template))\b
+    - match: (<)((?i:template(>| )))\b
       captures:
         0: meta.tag.template.begin.html
         1: punctuation.definition.tag.begin.html
@@ -52,12 +58,14 @@ contexts: !merge
     - match: '"'
       scope: punctuation.definition.string.begin.html
       embed: scope:source.js
+      embed_scope: source.js.embedded.vue
       escape: '"'
       escape_captures:
         0: punctuation.definition.string.end.html
     - match: "'"
       scope: punctuation.definition.string.begin.html
       embed: scope:source.js
+      embed_scope: source.js.embedded.vue
       escape: "'"
       escape_captures:
         0: punctuation.definition.string.end.html
@@ -86,7 +94,7 @@ contexts: !merge
     - !style_language [ stylus, source.stylus ]
     - !style_language [ postcss\?parser=sugarss, source.sss ]
     - !style_language [ postcss, source.postcss ]
-    - !style_language [ less, source.css.less ]
+    - !style_language [ less, source.less ]
     - match: (?=\S)
       set:
         - style-css

<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Transitional//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd'>
<html xmlns='http://www.w3.org/1999/xhtml'>
<head>
<title>pFad - Phonifier reborn</title>
<meta http-equiv='Content-Type' content='text/html; charset=utf-8' />
</head>
<body>
<h1>Pfad - The Proxy pFad of &#169; 2024 Garber Painting. All rights reserved.</h1>


<!-- Disclaimer -->
<p>Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.</p>
<br>
<p>Alternative Proxies:</p><p><a href="http://rainy.clevelandohioweatherforecast.com/php-proxy/index.php?q=https://github.com/vuejs/vue-syntax-highlight/compare/newsyntax-3.3.3...new.diff" target="_blank">Alternative Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/index.php?u=https://github.com/vuejs/vue-syntax-highlight/compare/newsyntax-3.3.3...new.diff" target="_blank">pFad Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/v3index.php?u=https://github.com/vuejs/vue-syntax-highlight/compare/newsyntax-3.3.3...new.diff" target="_blank">pFad v3 Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/v4index.php?u=https://github.com/vuejs/vue-syntax-highlight/compare/newsyntax-3.3.3...new.diff" target="_blank">pFad v4 Proxy</a></p></body>
</html>