diff --git a/README.md b/README.md
index efde56a..8f9e0f7 100644
--- a/README.md
+++ b/README.md
@@ -1,11 +1,12 @@
 # Vue Syntax Highlight
 
-**Note**: the `st4` branch hosts the new syntax that only works in Sublime build > 4107. 
+Sublime Text Syntax highlighting for single-file [Vue.js](http://vuejs.org) components.
 
-* For Sublime Text 2 support (`.tmlanguage` files), see `master` branch.
-* For Sublime Text 3 support, see `new` branch.
+The `main` branch targets Sublime Text 4.
+For the Sublime Text 2 and 3 support (`.tmlanguage` files), see `st2` branch.
 
-Sublime Text Syntax highlighting for single-file [Vue.js](http://vuejs.org) components (enabled by [vue-loader](https://github.com/vuejs/vue-loader) or [vueify](https://github.com/vuejs/vueify)).
+This repository is a fork of [vuejs/vue-syntax-highlight](https://github.com/vuejs/vue-syntax-highlight)
+with a focus on providing syntax highlighting only for Sublime Text.
 
 <p align="center">
   <img width="809px" src="https://raw.githubusercontent.com/vuejs/vue-syntax-highlight/new/samples/screenshot.png">
@@ -18,20 +19,6 @@ Sublime Text Syntax highlighting for single-file [Vue.js](http://vuejs.org) comp
 
 **NOTE:** You still need to install corresponding packages for pre-processors (e.g. Pug, SASS, CoffeeScript) to get proper syntax highlighting for them.
 
-### Enabling JSX Highlighting
-
-The `<script>` block uses the syntax highlighting currently active for you normal `.js` files. To support JSX highlighting inside Vue files:
-
-1. Install and set [Babel javascript highlighting package](https://packagecontrol.io/packages/Babel), which supports JSX, as your default JS highlighting.
-
-2. Explicitly disable Sublime's default `JavaScript` package. This allows the Babel package to be applied the embedded `<script>` in `*.vue` files. You may need to restart Sublime for this to take effect.
-
-### Development
-
-- The development of this syntax relies on the [YAML-Macros](https://github.com/Thom1729/YAML-Macros) package. You can install it from Package Control.
-
-- Do not edit `Vue Component.sublime-syntax` directly. Work in `Vue Component.sublime-syntax.yaml-macros` instead. Once done editing, run "Build With: YAML Macros" from Sublime's command palette. This will update the actual `Vue Component.sublime-syntax` file.
-
 ### License
 
 [MIT](http://opensource.org/licenses/MIT)
diff --git a/Vue Component.sublime-syntax b/Vue Component.sublime-syntax
index f2de041..f5d78a5 100644
--- a/Vue Component.sublime-syntax	
+++ b/Vue Component.sublime-syntax	
@@ -133,65 +133,65 @@ contexts:
   script-lang-decider:
     - match: (?i)(?=coffee{{unquoted_attribute_break}}|\'coffee\'|"coffee")
       set:
-        -   - meta_scope: meta.tag.script.begin.html
-            - match: '>'
-              scope: punctuation.definition.tag.end.html
-              set:
-                - match: '{{script_content_begin}}'
-                  embed_scope: source.coffee.embedded.html
-                  escape_captures:
-                    1: source.coffee.embedded.html
-                    2: comment.block.html punctuation.definition.comment.end.html
-                    3: source.coffee.embedded.html
-                    4: comment.block.html punctuation.definition.comment.end.html
-                  captures:
-                    1: comment.block.html punctuation.definition.comment.begin.html
-                  pop: 1
-                  embed: scope:source.coffee
-                  escape: '{{script_content_end}}'
-            - include: script-common
+        - - meta_scope: meta.tag.script.begin.html
+          - match: '>'
+            scope: punctuation.definition.tag.end.html
+            set:
+              - match: '{{script_content_begin}}'
+                embed_scope: source.coffee.embedded.html
+                escape_captures:
+                  1: source.coffee.embedded.html
+                  2: comment.block.html punctuation.definition.comment.end.html
+                  3: source.coffee.embedded.html
+                  4: comment.block.html punctuation.definition.comment.end.html
+                captures:
+                  1: comment.block.html punctuation.definition.comment.begin.html
+                pop: 1
+                embed: scope:source.coffee
+                escape: '{{script_content_end}}'
+          - include: script-common
         - tag-generic-attribute-meta
         - tag-generic-attribute-value
     - match: (?i)(?=livescript{{unquoted_attribute_break}}|\'livescript\'|"livescript")
       set:
-        -   - meta_scope: meta.tag.script.begin.html
-            - match: '>'
-              scope: punctuation.definition.tag.end.html
-              set:
-                - match: '{{script_content_begin}}'
-                  embed_scope: source.livescript.embedded.html
-                  escape_captures:
-                    1: source.livescript.embedded.html
-                    2: comment.block.html punctuation.definition.comment.end.html
-                    3: source.livescript.embedded.html
-                    4: comment.block.html punctuation.definition.comment.end.html
-                  captures:
-                    1: comment.block.html punctuation.definition.comment.begin.html
-                  pop: 1
-                  embed: scope:source.livescript
-                  escape: '{{script_content_end}}'
-            - include: script-common
+        - - meta_scope: meta.tag.script.begin.html
+          - match: '>'
+            scope: punctuation.definition.tag.end.html
+            set:
+              - match: '{{script_content_begin}}'
+                embed_scope: source.livescript.embedded.html
+                escape_captures:
+                  1: source.livescript.embedded.html
+                  2: comment.block.html punctuation.definition.comment.end.html
+                  3: source.livescript.embedded.html
+                  4: comment.block.html punctuation.definition.comment.end.html
+                captures:
+                  1: comment.block.html punctuation.definition.comment.begin.html
+                pop: 1
+                embed: scope:source.livescript
+                escape: '{{script_content_end}}'
+          - include: script-common
         - tag-generic-attribute-meta
         - tag-generic-attribute-value
     - match: (?i)(?=ts{{unquoted_attribute_break}}|\'ts\'|"ts")
       set:
-        -   - meta_scope: meta.tag.script.begin.html
-            - match: '>'
-              scope: punctuation.definition.tag.end.html
-              set:
-                - match: '{{script_content_begin}}'
-                  embed_scope: source.ts.embedded.html
-                  escape_captures:
-                    1: source.ts.embedded.html
-                    2: comment.block.html punctuation.definition.comment.end.html
-                    3: source.ts.embedded.html
-                    4: comment.block.html punctuation.definition.comment.end.html
-                  captures:
-                    1: comment.block.html punctuation.definition.comment.begin.html
-                  pop: 1
-                  embed: scope:source.ts
-                  escape: '{{script_content_end}}'
-            - include: script-common
+        - - meta_scope: meta.tag.script.begin.html
+          - match: '>'
+            scope: punctuation.definition.tag.end.html
+            set:
+              - match: '{{script_content_begin}}'
+                embed_scope: source.ts.embedded.html
+                escape_captures:
+                  1: source.ts.embedded.html
+                  2: comment.block.html punctuation.definition.comment.end.html
+                  3: source.ts.embedded.html
+                  4: comment.block.html punctuation.definition.comment.end.html
+                captures:
+                  1: comment.block.html punctuation.definition.comment.begin.html
+                pop: 1
+                embed: scope:source.ts
+                escape: '{{script_content_end}}'
+          - include: script-common
         - tag-generic-attribute-meta
         - tag-generic-attribute-value
     - match: (?=\S)
@@ -268,128 +268,128 @@ contexts:
   style-lang-decider:
     - match: (?i)(?=sass{{unquoted_attribute_break}}|\'sass\'|"sass")
       set:
-        -   - meta_scope: meta.tag.style.begin.html
-            - match: '>'
-              scope: punctuation.definition.tag.end.html
-              set:
-                - match: '{{style_content_begin}}'
-                  embed_scope: source.sass.embedded.html
-                  escape_captures:
-                    1: source.sass.embedded.html
-                    2: comment.block.html punctuation.definition.comment.end.html
-                    3: source.sass.embedded.html
-                    4: comment.block.html punctuation.definition.comment.end.html
-                  captures:
-                    1: comment.block.html punctuation.definition.comment.begin.html
-                  pop: 1
-                  embed: scope:source.sass
-                  escape: '{{style_content_end}}'
-            - include: style-common
+        - - meta_scope: meta.tag.style.begin.html
+          - match: '>'
+            scope: punctuation.definition.tag.end.html
+            set:
+              - match: '{{style_content_begin}}'
+                embed_scope: source.sass.embedded.html
+                escape_captures:
+                  1: source.sass.embedded.html
+                  2: comment.block.html punctuation.definition.comment.end.html
+                  3: source.sass.embedded.html
+                  4: comment.block.html punctuation.definition.comment.end.html
+                captures:
+                  1: comment.block.html punctuation.definition.comment.begin.html
+                pop: 1
+                embed: scope:source.sass
+                escape: '{{style_content_end}}'
+          - include: style-common
         - tag-generic-attribute-meta
         - tag-generic-attribute-value
     - match: (?i)(?=scss{{unquoted_attribute_break}}|\'scss\'|"scss")
       set:
-        -   - meta_scope: meta.tag.style.begin.html
-            - match: '>'
-              scope: punctuation.definition.tag.end.html
-              set:
-                - match: '{{style_content_begin}}'
-                  embed_scope: source.scss.embedded.html
-                  escape_captures:
-                    1: source.scss.embedded.html
-                    2: comment.block.html punctuation.definition.comment.end.html
-                    3: source.scss.embedded.html
-                    4: comment.block.html punctuation.definition.comment.end.html
-                  captures:
-                    1: comment.block.html punctuation.definition.comment.begin.html
-                  pop: 1
-                  embed: scope:source.scss
-                  escape: '{{style_content_end}}'
-            - include: style-common
+        - - meta_scope: meta.tag.style.begin.html
+          - match: '>'
+            scope: punctuation.definition.tag.end.html
+            set:
+              - match: '{{style_content_begin}}'
+                embed_scope: source.scss.embedded.html
+                escape_captures:
+                  1: source.scss.embedded.html
+                  2: comment.block.html punctuation.definition.comment.end.html
+                  3: source.scss.embedded.html
+                  4: comment.block.html punctuation.definition.comment.end.html
+                captures:
+                  1: comment.block.html punctuation.definition.comment.begin.html
+                pop: 1
+                embed: scope:source.scss
+                escape: '{{style_content_end}}'
+          - include: style-common
         - tag-generic-attribute-meta
         - tag-generic-attribute-value
     - match: (?i)(?=stylus{{unquoted_attribute_break}}|\'stylus\'|"stylus")
       set:
-        -   - meta_scope: meta.tag.style.begin.html
-            - match: '>'
-              scope: punctuation.definition.tag.end.html
-              set:
-                - match: '{{style_content_begin}}'
-                  embed_scope: source.stylus.embedded.html
-                  escape_captures:
-                    1: source.stylus.embedded.html
-                    2: comment.block.html punctuation.definition.comment.end.html
-                    3: source.stylus.embedded.html
-                    4: comment.block.html punctuation.definition.comment.end.html
-                  captures:
-                    1: comment.block.html punctuation.definition.comment.begin.html
-                  pop: 1
-                  embed: scope:source.stylus
-                  escape: '{{style_content_end}}'
-            - include: style-common
+        - - meta_scope: meta.tag.style.begin.html
+          - match: '>'
+            scope: punctuation.definition.tag.end.html
+            set:
+              - match: '{{style_content_begin}}'
+                embed_scope: source.stylus.embedded.html
+                escape_captures:
+                  1: source.stylus.embedded.html
+                  2: comment.block.html punctuation.definition.comment.end.html
+                  3: source.stylus.embedded.html
+                  4: comment.block.html punctuation.definition.comment.end.html
+                captures:
+                  1: comment.block.html punctuation.definition.comment.begin.html
+                pop: 1
+                embed: scope:source.stylus
+                escape: '{{style_content_end}}'
+          - include: style-common
         - tag-generic-attribute-meta
         - tag-generic-attribute-value
     - match: (?i)(?=postcss\?parser=sugarss{{unquoted_attribute_break}}|\'postcss\?parser=sugarss\'|"postcss\?parser=sugarss")
       set:
-        -   - meta_scope: meta.tag.style.begin.html
-            - match: '>'
-              scope: punctuation.definition.tag.end.html
-              set:
-                - match: '{{style_content_begin}}'
-                  embed_scope: source.sss.embedded.html
-                  escape_captures:
-                    1: source.sss.embedded.html
-                    2: comment.block.html punctuation.definition.comment.end.html
-                    3: source.sss.embedded.html
-                    4: comment.block.html punctuation.definition.comment.end.html
-                  captures:
-                    1: comment.block.html punctuation.definition.comment.begin.html
-                  pop: 1
-                  embed: scope:source.sss
-                  escape: '{{style_content_end}}'
-            - include: style-common
+        - - meta_scope: meta.tag.style.begin.html
+          - match: '>'
+            scope: punctuation.definition.tag.end.html
+            set:
+              - match: '{{style_content_begin}}'
+                embed_scope: source.sss.embedded.html
+                escape_captures:
+                  1: source.sss.embedded.html
+                  2: comment.block.html punctuation.definition.comment.end.html
+                  3: source.sss.embedded.html
+                  4: comment.block.html punctuation.definition.comment.end.html
+                captures:
+                  1: comment.block.html punctuation.definition.comment.begin.html
+                pop: 1
+                embed: scope:source.sss
+                escape: '{{style_content_end}}'
+          - include: style-common
         - tag-generic-attribute-meta
         - tag-generic-attribute-value
     - match: (?i)(?=postcss{{unquoted_attribute_break}}|\'postcss\'|"postcss")
       set:
-        -   - meta_scope: meta.tag.style.begin.html
-            - match: '>'
-              scope: punctuation.definition.tag.end.html
-              set:
-                - match: '{{style_content_begin}}'
-                  embed_scope: source.postcss.embedded.html
-                  escape_captures:
-                    1: source.postcss.embedded.html
-                    2: comment.block.html punctuation.definition.comment.end.html
-                    3: source.postcss.embedded.html
-                    4: comment.block.html punctuation.definition.comment.end.html
-                  captures:
-                    1: comment.block.html punctuation.definition.comment.begin.html
-                  pop: 1
-                  embed: scope:source.postcss
-                  escape: '{{style_content_end}}'
-            - include: style-common
+        - - meta_scope: meta.tag.style.begin.html
+          - match: '>'
+            scope: punctuation.definition.tag.end.html
+            set:
+              - match: '{{style_content_begin}}'
+                embed_scope: source.postcss.embedded.html
+                escape_captures:
+                  1: source.postcss.embedded.html
+                  2: comment.block.html punctuation.definition.comment.end.html
+                  3: source.postcss.embedded.html
+                  4: comment.block.html punctuation.definition.comment.end.html
+                captures:
+                  1: comment.block.html punctuation.definition.comment.begin.html
+                pop: 1
+                embed: scope:source.postcss
+                escape: '{{style_content_end}}'
+          - include: style-common
         - tag-generic-attribute-meta
         - tag-generic-attribute-value
     - match: (?i)(?=less{{unquoted_attribute_break}}|\'less\'|"less")
       set:
-        -   - meta_scope: meta.tag.style.begin.html
-            - match: '>'
-              scope: punctuation.definition.tag.end.html
-              set:
-                - match: '{{style_content_begin}}'
-                  embed_scope: source.less.embedded.html
-                  escape_captures:
-                    1: source.less.embedded.html
-                    2: comment.block.html punctuation.definition.comment.end.html
-                    3: source.less.embedded.html
-                    4: comment.block.html punctuation.definition.comment.end.html
-                  captures:
-                    1: comment.block.html punctuation.definition.comment.begin.html
-                  pop: 1
-                  embed: scope:source.less
-                  escape: '{{style_content_end}}'
-            - include: style-common
+        - - meta_scope: meta.tag.style.begin.html
+          - match: '>'
+            scope: punctuation.definition.tag.end.html
+            set:
+              - match: '{{style_content_begin}}'
+                embed_scope: source.less.embedded.html
+                escape_captures:
+                  1: source.less.embedded.html
+                  2: comment.block.html punctuation.definition.comment.end.html
+                  3: source.less.embedded.html
+                  4: comment.block.html punctuation.definition.comment.end.html
+                captures:
+                  1: comment.block.html punctuation.definition.comment.begin.html
+                pop: 1
+                embed: scope:source.less
+                escape: '{{style_content_end}}'
+          - include: style-common
         - tag-generic-attribute-meta
         - tag-generic-attribute-value
     - match: (?=\S)
@@ -448,65 +448,65 @@ contexts:
   template-lang-decider:
     - match: (?i)(?=jade{{unquoted_attribute_break}}|\'jade\'|"jade")
       set:
-        -   - meta_scope: meta.tag.template.begin.html
-            - match: '>'
-              scope: punctuation.definition.tag.end.html
-              set:
-                - match: '{{template_content_begin}}'
-                  embed_scope: text.jade.embedded.html
-                  escape_captures:
-                    1: text.jade.embedded.html
-                    2: comment.block.html punctuation.definition.comment.end.html
-                    3: text.jade.embedded.html
-                    4: comment.block.html punctuation.definition.comment.end.html
-                  captures:
-                    1: comment.block.html punctuation.definition.comment.begin.html
-                  pop: 1
-                  embed: scope:text.jade
-                  escape: '{{template_content_end}}'
-            - include: template-common
+        - - meta_scope: meta.tag.template.begin.html
+          - match: '>'
+            scope: punctuation.definition.tag.end.html
+            set:
+              - match: '{{template_content_begin}}'
+                embed_scope: text.jade.embedded.html
+                escape_captures:
+                  1: text.jade.embedded.html
+                  2: comment.block.html punctuation.definition.comment.end.html
+                  3: text.jade.embedded.html
+                  4: comment.block.html punctuation.definition.comment.end.html
+                captures:
+                  1: comment.block.html punctuation.definition.comment.begin.html
+                pop: 1
+                embed: scope:text.jade
+                escape: '{{template_content_end}}'
+          - include: template-common
         - tag-generic-attribute-meta
         - tag-generic-attribute-value
     - match: (?i)(?=pug{{unquoted_attribute_break}}|\'pug\'|"pug")
       set:
-        -   - meta_scope: meta.tag.template.begin.html
-            - match: '>'
-              scope: punctuation.definition.tag.end.html
-              set:
-                - match: '{{template_content_begin}}'
-                  embed_scope: text.pug.embedded.html
-                  escape_captures:
-                    1: text.pug.embedded.html
-                    2: comment.block.html punctuation.definition.comment.end.html
-                    3: text.pug.embedded.html
-                    4: comment.block.html punctuation.definition.comment.end.html
-                  captures:
-                    1: comment.block.html punctuation.definition.comment.begin.html
-                  pop: 1
-                  embed: scope:text.pug
-                  escape: '{{template_content_end}}'
-            - include: template-common
+        - - meta_scope: meta.tag.template.begin.html
+          - match: '>'
+            scope: punctuation.definition.tag.end.html
+            set:
+              - match: '{{template_content_begin}}'
+                embed_scope: text.pug.embedded.html
+                escape_captures:
+                  1: text.pug.embedded.html
+                  2: comment.block.html punctuation.definition.comment.end.html
+                  3: text.pug.embedded.html
+                  4: comment.block.html punctuation.definition.comment.end.html
+                captures:
+                  1: comment.block.html punctuation.definition.comment.begin.html
+                pop: 1
+                embed: scope:text.pug
+                escape: '{{template_content_end}}'
+          - include: template-common
         - tag-generic-attribute-meta
         - tag-generic-attribute-value
     - match: (?i)(?=slm{{unquoted_attribute_break}}|\'slm\'|"slm")
       set:
-        -   - meta_scope: meta.tag.template.begin.html
-            - match: '>'
-              scope: punctuation.definition.tag.end.html
-              set:
-                - match: '{{template_content_begin}}'
-                  embed_scope: text.slm.embedded.html
-                  escape_captures:
-                    1: text.slm.embedded.html
-                    2: comment.block.html punctuation.definition.comment.end.html
-                    3: text.slm.embedded.html
-                    4: comment.block.html punctuation.definition.comment.end.html
-                  captures:
-                    1: comment.block.html punctuation.definition.comment.begin.html
-                  pop: 1
-                  embed: scope:text.slm
-                  escape: '{{template_content_end}}'
-            - include: template-common
+        - - meta_scope: meta.tag.template.begin.html
+          - match: '>'
+            scope: punctuation.definition.tag.end.html
+            set:
+              - match: '{{template_content_begin}}'
+                embed_scope: text.slm.embedded.html
+                escape_captures:
+                  1: text.slm.embedded.html
+                  2: comment.block.html punctuation.definition.comment.end.html
+                  3: text.slm.embedded.html
+                  4: comment.block.html punctuation.definition.comment.end.html
+                captures:
+                  1: comment.block.html punctuation.definition.comment.begin.html
+                pop: 1
+                embed: scope:text.slm
+                escape: '{{template_content_end}}'
+          - include: template-common
         - tag-generic-attribute-meta
         - tag-generic-attribute-value
     - match: (?=\S)
diff --git a/Vue Component.sublime-syntax.yaml-macros b/Vue Component.sublime-syntax.yaml-macros
deleted file mode 100644
index d060bca..0000000
--- a/Vue Component.sublime-syntax.yaml-macros	
+++ /dev/null
@@ -1,405 +0,0 @@
-%YAML 1.2
-%TAG ! tag:yaml-macros:src.macros:
----
-name: Vue Component
-scope: text.html.vue
-version: 2
-
-extends: Packages/HTML/HTML.sublime-syntax
-
-file_extensions:
-  - vue
-
-variables:
-  # Embedded script and style syntaxes may be wrapped into html comments for
-  # historical reasons. The following patterns match them, while maintaining
-  # correct boundaries of embedded source scopes. That's required to enable
-  # embedded syntax's comment toggling in the first and last line.
-  #
-  # see:
-  # - https://github.com/sublimehq/Packages/issues/2322
-  # - https://github.com/sublimehq/sublime_text/issues/4701
-  script_content_begin: |-
-    (?x:
-    # whitespace followed by opening html comment begin punctuation
-      \s*(<!--)
-    # or any other non-whitespace character ahead
-    | (?=\s*(?!<!--)\S)
-    # or beginning of a line
-    | ^
-    )
-  script_content_end: |-
-    (?x:
-    # optional html comment end punctuation followed by </script> tag
-      (?: (\s*) (-->) \s* )? (?=</(?i:script){{tag_name_break_char}})
-    # or standalone html comment end punctuation in a line
-    |   ^ (\s*) (-->) \s* $
-    )
-  style_content_begin: '{{script_content_begin}}'
-  style_content_end: |-
-    (?x:
-    # optional html comment end punctuation followed by </style> tag
-      (?: (\s*) (-->) \s* )? (?=</(?i:style){{tag_name_break_char}})
-    # or standalone html comment end punctuation in a line
-    |   ^ (\s*) (-->) \s* $
-    )
-  template_content_begin: '{{script_content_begin}}'
-  template_content_end: |-
-    (?x:
-    # optional html comment end punctuation followed by </template> tag
-      (?: (\s*) (-->) \s* )? (?=</(?i:template){{tag_name_break_char}})
-    # or standalone html comment end punctuation in a line
-    |   ^ (\s*) (-->) \s* $
-    )
-
-contexts:
-
-###[ HTML TAGS ]##############################################################
-
-  prototype:
-    - meta_prepend: true
-    - include: mustache-templates
-
-  tag-html:
-    - meta_prepend: true
-    - include: script-tag
-    - include: style-tag
-    - include: template-tag
-
-###[ SCRIPT TAG ]#############################################################
-
-  script-tag:
-    # for compatibility with ST builds before 4114
-    - match: (<)((?i:script)){{tag_name_break}}
-      captures:
-        1: punctuation.definition.tag.begin.html
-        2: entity.name.tag.script.html
-      push: script-javascript
-    - match: (</)((?i:script){{tag_name_break}})
-      captures:
-        1: punctuation.definition.tag.begin.html
-        2: entity.name.tag.script.html
-      push: script-close-tag-content
-
-  script-close-tag-content:
-    - meta_scope: meta.tag.script.end.html
-    - include: tag-end
-
-  script-common:
-    - meta_prepend: true
-    - include: script-lang-attribute
-
-  script-javascript:
-    # for compatibility with ST builds before 4114
-    - meta_scope: meta.tag.script.begin.html
-    - match: '>'
-      scope: punctuation.definition.tag.end.html
-      set: script-javascript-content
-    - include: script-common
-
-  script-javascript-content:
-    # for compatibility with ST builds before 4114
-    - meta_include_prototype: false
-    - match: '{{script_content_begin}}'
-      captures:
-        1: comment.block.html punctuation.definition.comment.begin.html
-      pop: 1  # make sure to match only once
-      embed: scope:source.js
-      embed_scope: source.js.embedded.html
-      escape: '{{script_content_end}}'
-      escape_captures:
-        1: source.js.embedded.html
-        2: comment.block.html punctuation.definition.comment.end.html
-        3: source.js.embedded.html
-        4: comment.block.html punctuation.definition.comment.end.html
-
-  script-lang-attribute:
-    - match: (?i:lang){{attribute_name_break}}
-      scope: meta.attribute-with-value.html entity.other.attribute-name.html
-      set: script-lang-attribute-assignment
-
-  script-lang-attribute-assignment:
-    - meta_content_scope: meta.tag.script.begin.html meta.attribute-with-value.html
-    - match: =
-      scope: punctuation.separator.key-value.html
-      set: script-lang-attribute-value
-    - match: (?=\S)
-      set: script-javascript
-
-  script-lang-attribute-value:
-    - meta_include_prototype: false
-    - meta_scope: meta.tag.script.begin.html meta.attribute-with-value.html
-    - include: script-lang-decider
-
-  script-lang-decider:
-    - !script_language [ coffee, source.coffee ]
-    - !script_language [ livescript, source.livescript ]
-    - !script_language [ ts, source.ts ]
-    - match: (?=\S)
-      set:
-        - script-javascript
-        - tag-generic-attribute-meta
-        - tag-generic-attribute-value
-
-###[ STYLE TAG ]##############################################################
-
-  style-tag:
-    # for compatibility with ST builds before 4114
-    - match: (<)((?i:style)){{tag_name_break}}
-      captures:
-        1: punctuation.definition.tag.begin.html
-        2: entity.name.tag.style.html
-      push: style-css
-    - match: (</)((?i:style){{tag_name_break}})
-      captures:
-        1: punctuation.definition.tag.begin.html
-        2: entity.name.tag.style.html
-      push: style-close-tag-content
-
-  style-close-tag-content:
-    - meta_scope: meta.tag.style.end.html
-    - include: tag-end
-
-  style-common:
-    - meta_prepend: true
-    - include: style-lang-attribute
-
-  style-css:
-    # for compatibility with ST builds before 4114
-    - meta_scope: meta.tag.style.begin.html
-    - match: '>'
-      scope: punctuation.definition.tag.end.html
-      set: style-css-content
-    - include: style-common
-
-  style-css-content:
-    # for compatibility with ST builds before 4114
-    - meta_include_prototype: false
-    - match: '{{style_content_begin}}'
-      captures:
-        1: comment.block.html punctuation.definition.comment.begin.html
-      pop: 1  # make sure to match only once
-      embed: scope:source.css
-      embed_scope: source.css.embedded.html
-      escape: '{{style_content_end}}'
-      escape_captures:
-        1: source.css.embedded.html
-        2: comment.block.html punctuation.definition.comment.end.html
-        3: source.css.embedded.html
-        4: comment.block.html punctuation.definition.comment.end.html
-
-  style-lang-attribute:
-    - match: (?i:lang){{attribute_name_break}}
-      scope: meta.attribute-with-value.html entity.other.attribute-name.html
-      set: style-lang-attribute-assignment
-
-  style-lang-attribute-assignment:
-    - meta_content_scope: meta.tag.style.begin.html meta.attribute-with-value.html
-    - match: =
-      scope: punctuation.separator.key-value.html
-      set: style-lang-attribute-value
-    - match: (?=\S)
-      set: style-css
-
-  style-lang-attribute-value:
-    - meta_include_prototype: false
-    - meta_scope: meta.tag.style.begin.html meta.attribute-with-value.html
-    - include: style-lang-decider
-
-  style-lang-decider:
-    - !style_language [ sass, source.sass ]
-    - !style_language [ scss, source.scss ]
-    - !style_language [ stylus, source.stylus ]
-    - !style_language [ postcss\?parser=sugarss, source.sss ]
-    - !style_language [ postcss, source.postcss ]
-    - !style_language [ less, source.less ]
-    - match: (?=\S)
-      set:
-        - style-css
-        - tag-generic-attribute-meta
-        - tag-generic-attribute-value
-
-###[ TEMPLATE TAG ]###########################################################
-
-  template-tag:
-    - match: (<)((?i:template)){{tag_name_break}}
-      captures:
-        1: punctuation.definition.tag.begin.html
-        2: entity.name.tag.template.html
-      push: template-mustache
-    - match: (</)((?i:template))
-      captures:
-        1: punctuation.definition.tag.begin.html
-        2: entity.name.tag.template.html
-        3: punctuation.definition.tag.end.html
-      push: template-tag-content
-
-  template-tag-content:
-    - meta_scope: meta.tag.template.end.html
-    - include: tag-end
-
-  template-common:
-    - include: template-lang-attribute
-    - include: tag-attributes
-    - include: tag-end-self-closing
-
-  template-mustache:
-    - meta_scope: meta.tag.template.begin.html
-    - include: tag-end
-    - include: template-common
-
-  template-lang-attribute:
-    - match: (?i:lang){{attribute_name_break}}
-      scope: meta.attribute-with-value.html entity.other.attribute-name.html
-      set: template-lang-attribute-assignment
-
-  template-lang-attribute-assignment:
-    - meta_content_scope: meta.tag.template.begin.html meta.attribute-with-value.html
-    - match: =
-      scope: punctuation.separator.key-value.html
-      set: template-lang-attribute-value
-    - match: (?=\S)
-      set: template-mustache
-
-  template-lang-attribute-value:
-    - meta_include_prototype: false
-    - meta_scope: meta.tag.template.begin.html meta.attribute-with-value.html
-    - include: template-lang-decider
-
-  template-lang-decider:
-    - !template_language [ jade, text.jade ]
-    - !template_language [ pug, text.pug ]
-    - !template_language [ slm, text.slm ]
-    - match: (?=\S)
-      set:
-        - template-mustache
-        - tag-generic-attribute-meta
-        - tag-generic-attribute-value
-
-###[ TAG ATTRIBUTES ]#########################################################
-
-  tag-attributes:
-    - meta_prepend: true
-    - include: vue-directive
-
-  tag-class-attribute-value:
-    # for compatibility with ST builds before 4114
-    - meta_prepend: true
-    - meta_include_prototype: false
-
-  tag-generic-attribute-value:
-    # for compatibility with ST builds before 4114
-    - meta_prepend: true
-    - meta_include_prototype: false
-
-  tag-href-attribute-value:
-    # for compatibility with ST builds before 4114
-    - meta_prepend: true
-    - meta_include_prototype: false
-
-  tag-id-attribute-value:
-    # for compatibility with ST builds before 4114
-    - meta_prepend: true
-    - meta_include_prototype: false
-
-  tag-attribute-value-content:
-    - meta_prepend: true
-    - include: mustache-interpolations
-
-  strings-common-content:
-    - meta_prepend: true
-    - include: mustache-interpolations
-
-###[ MUSTAGE TEMPLATES ]######################################################
-
-  mustache-interpolations:
-    - match: (?={{)
-      push: mustache-interpolation-content
-
-  mustache-interpolation-content:
-    - clear_scopes: 1
-    - include: mustache-templates
-    - include: immediately-pop
-
-  mustache-templates:
-    - match: '{{'
-      scope: meta.interpolation.vue punctuation.section.interpolation.begin.html
-      embed: scope:source.js
-      embed_scope: meta.interpolation.vue source.js.embedded.vue
-      escape: '}}'
-      escape_captures:
-        0: meta.interpolation.vue punctuation.section.interpolation.end.html
-
-###[ VUE DIRECTIVES ]#########################################################
-
-  vue-directive:
-    - match: (?=v-)
-      push:
-        - vue-directive-meta
-        - vue-directive-assignment
-        - tag-generic-attribute-name
-    - match: (?::|@|#)
-      scope: punctuation.definition.attribute.html
-      push:
-        - vue-directive-meta
-        - vue-directive-assignment
-        - tag-generic-attribute-name
-
-  vue-directive-meta:
-    - meta_include_prototype: false
-    - meta_scope: meta.attribute-with-value.directive.html
-    - include: immediately-pop
-
-  vue-directive-assignment:
-    - match: =
-      scope: punctuation.separator.key-value.html
-      set: vue-directive-value
-    - include: else-pop
-
-  vue-directive-value:
-    - match: \"
-      scope:
-        meta.string.html string.quoted.double.html
-        punctuation.definition.string.begin.html
-      embed: scope:source.js#expression-statement
-      embed_scope:
-        meta.string.html meta.interpolation.vue
-        source.js.embedded.vue
-      escape: \"
-      escape_captures:
-        0:
-          meta.attribute-with-value.directive.html
-          meta.string.html string.quoted.double.html
-          punctuation.definition.string.end.html
-    - match: \'
-      scope:
-        meta.string.html string.quoted.single.html
-        punctuation.definition.string.begin.html
-      embed: scope:source.js#expression-statement
-      embed_scope:
-        meta.string.html meta.interpolation.vue
-        source.js.embedded.vue
-      escape: \'
-      escape_captures:
-        0:
-          meta.attribute-with-value.directive.html
-          meta.string.html string.quoted.single.html
-          punctuation.definition.string.end.html
-    - include: else-pop
-
-  tag-generic-attribute-name:
-    - meta_prepend: true
-    # https://vuejs.org/guide/essentials/template-syntax.html#dynamic-arguments
-    - match: (?=\[)
-      push: vue-dynamic-attribute-name
-
-  vue-dynamic-attribute-name:
-    - clear_scopes: 1  # clear `entity.other.attribute-name`
-    - match: \[
-      scope: meta.interpolation.vue punctuation.section.interpolation.begin.vue
-      embed: scope:source.js#expression-statement
-      embed_scope: meta.interpolation.vue source.js.embedded.vue
-      escape: \]
-      escape_captures:
-        0: meta.interpolation.vue punctuation.section.interpolation.end.vue
-    - include: immediately-pop
diff --git a/src/macros.py b/src/macros.py
deleted file mode 100644
index 9884d5a..0000000
--- a/src/macros.py
+++ /dev/null
@@ -1,45 +0,0 @@
-from YAMLMacros.lib.syntax import rule as _rule
-
-def script_language(match, embed):
-    return embed_language_in_tag('script', match, embed)
-
-def style_language(match, embed):
-    return embed_language_in_tag('style', match, embed)
-
-def template_language(match, embed):
-    return embed_language_in_tag('template', match, embed)
-
-def embed_language_in_tag(tag, match, embed):
-    return _rule(
-        match=r'(?i)(?={0}{{{{unquoted_attribute_break}}}}|\'{0}\'|"{0}")'.format(match),
-        set=[
-            [
-                _rule(meta_scope='meta.tag.%s.begin.html' % tag),
-                _rule(
-                    match='>',
-                    scope='punctuation.definition.tag.end.html',
-                    set=[
-                        _rule(
-                            match=r'{{%s_content_begin}}' % tag,
-                            captures={
-                                1: 'comment.block.html punctuation.definition.comment.begin.html',
-                            },
-                            pop=1,
-                            embed=('scope:%s' % embed),
-                            embed_scope=('%s.embedded.html' % embed),
-                            escape='{{%s_content_end}}' % tag,
-                            escape_captures={
-                              1: ('%s.embedded.html' % embed),
-                              2: 'comment.block.html punctuation.definition.comment.end.html',
-                              3: ('%s.embedded.html' % embed),
-                              4: 'comment.block.html punctuation.definition.comment.end.html',
-                            },
-                        )
-                    ]
-                ),
-                _rule(include='%s-common' % tag),
-            ],
-            'tag-generic-attribute-meta',
-            'tag-generic-attribute-value',
-        ]
-    )