diff --git a/Vue Component.sublime-syntax b/Vue Component.sublime-syntax
index a234cb2..41c14f4 100644
--- a/Vue Component.sublime-syntax	
+++ b/Vue Component.sublime-syntax	
@@ -12,6 +12,9 @@ file_extensions:
   - wpy
 
 variables:
+  # CSS specific 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
@@ -44,14 +47,12 @@ variables:
     # 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* $
-    )
+
+  # Vue specific variables
+  # ======================
+
+  template_content_begin: ^|(?=[{{ascii_space}}]*\S)
+  template_content_end: (?=(?:^\s*)?</(?i:template){{tag_name_break}})
 
 contexts:
 
@@ -608,17 +609,10 @@ contexts:
 
   template-jade-content:
     - match: '{{template_content_begin}}'
-      captures:
-        1: comment.block.html punctuation.definition.comment.begin.html
-      pop: 1
       embed: scope:text.jade
       embed_scope: text.jade.embedded.html
       escape: '{{template_content_end}}'
-      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
+      pop: 1
 
   template-mustache:
     - meta_scope: meta.tag.template.begin.html
@@ -634,17 +628,10 @@ contexts:
 
   template-pug-content:
     - match: '{{template_content_begin}}'
-      captures:
-        1: comment.block.html punctuation.definition.comment.begin.html
-      pop: 1
       embed: scope:text.pug
       embed_scope: text.pug.embedded.html
       escape: '{{template_content_end}}'
-      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
+      pop: 1
 
   template-slim:
     - meta_scope: meta.tag.template.begin.html
@@ -655,17 +642,10 @@ contexts:
 
   template-slim-content:
     - match: '{{template_content_begin}}'
-      captures:
-        1: comment.block.html punctuation.definition.comment.begin.html
-      pop: 1
       embed: scope:text.slim
       embed_scope: text.slim.embedded.html
       escape: '{{template_content_end}}'
-      escape_captures:
-        1: text.slim.embedded.html
-        2: comment.block.html punctuation.definition.comment.end.html
-        3: text.slim.embedded.html
-        4: comment.block.html punctuation.definition.comment.end.html
+      pop: 1
 
 ###[ TAG ATTRIBUTES ]#########################################################
 
diff --git a/tests/syntax_test_script.vue b/tests/syntax_test_script.vue
index 7c23c8f..5ac0495 100644
--- a/tests/syntax_test_script.vue
+++ b/tests/syntax_test_script.vue
@@ -38,8 +38,6 @@
     var i = 0;
 // ^^^^^^^^^^^^ source.js.embedded.html - source source
     </script>
-// <- source.js.embedded.html - source source
-// ^ source.js.embedded.html - source source
 //  ^^^^^^^^^ meta.tag - source
 
 
@@ -47,13 +45,11 @@
     <!--
 //^^^^^^ - meta.tag - source
 //  ^^^^ comment.block.html punctuation.definition.comment.begin.html
-//      ^ source.js.embedded.html - source source - meta.tag - comment
     var i = 0;
 // ^^^^^^^^^^^^ source.js.embedded.html - source source - meta.tag
     -->
-//^^ source.js.embedded.html - meta.tag - comment
-//  ^^^^ - source - meta.tag
-//  ^^^ comment.block.html punctuation.definition.comment.end.html
+//  ^^^ comment.block.html punctuation.definition.comment.end.html - source
+//     ^ - comment - source
     var i = 0;
 // ^^^^^^^^^^^^ - source
     </script>
@@ -68,7 +64,6 @@
 //         ^ punctuation.definition.tag.end.html
 //          ^ - meta.tag - comment
 //           ^^^^ comment.block.html punctuation.definition.comment.begin.html
-//               ^ source.js.embedded.html - source source
 
     var foo = 100;
 // <- source.js.embedded.html - source source
@@ -77,12 +72,9 @@
 //     ^^^ source.js.embedded.html keyword.operator - comment
 
     --> </script>
-// ^ source.js.embedded.html - source source
-//  ^^^^^^^^^^^^^^ - source
-//     ^ - meta.tag - comment
-//      ^^^^^^^^^ meta.tag
-//               ^ - meta.tag
-//  ^^^ comment.block.html punctuation.definition.comment.end.html
+//  ^^^ comment.block.html punctuation.definition.comment.end.html - source
+//     ^ - comment - meta.tag - source
+//      ^^^^^^^^^ meta.tag - comment - source
 //      ^^ punctuation.definition.tag.begin.html
 //        ^^^^^^ entity.name.tag
 //              ^ punctuation.definition.tag.end.html
@@ -98,7 +90,6 @@
 //              ^ punctuation.separator.key-value.html
 //               ^^^^^^^^^^^^^^^^^ string.quoted.double.html
 //                                  ^^^^ comment.block.html punctuation.definition.comment.begin.html
-//                                      ^ source.js.embedded.html
 
     var foo = 100;
 // <- source.js.embedded.html - source source
@@ -107,12 +98,9 @@
 //     ^^^ source.js.embedded.html keyword.operator - comment
 
     --> </script>
-// ^ source.js.embedded.html - source source
-//  ^^^^^^^^^^^^^^ - source
-//     ^ - meta.tag - comment
-//      ^^^^^^^^^ meta.tag
-//               ^ - meta.tag
-//  ^^^ comment.block.html punctuation.definition.comment.end.html
+//  ^^^ comment.block.html punctuation.definition.comment.end.html - source
+//     ^ - comment - meta.tag - source
+//      ^^^^^^^^^ meta.tag - comment - source
 //      ^^ punctuation.definition.tag.begin.html
 //        ^^^^^^ entity.name.tag
 //              ^ punctuation.definition.tag.end.html
@@ -128,10 +116,13 @@
 // <- source.js.embedded.html - source source
 // ^^^^^^^^^^^^^^^^ source.js.embedded.html - source source
     </script>
-// <- source.js.embedded.html - source source
-// ^ source.js.embedded.html - source source
 //  ^^^^^^^^^ meta.tag - source
 
+
+    <!--
+     -- CoffeeScript
+     -->
+
     <script language="coffeescript">  </script>
 //  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.tag - meta.tag meta.tag - source
 //          ^^^^^^^^^^^^^^^^^^^^^^^ meta.attribute-with-value.lang.html - meta.attribute-with-value meta.attribute-with-value
@@ -148,109 +139,118 @@
 
 // <- source.coffee.embedded.html - source source
     </script>
-// <- source.coffee.embedded.html - source source
-//^^ source.coffee.embedded.html - source source
 //  ^^^^^^^^^ meta.tag - source
 
     <script lang="coffee">
         <!--
 // ^^^^^^^^^ - source
 //      ^^^^ comment.block.html punctuation.definition.comment.begin.html
-//          ^ source.coffee.embedded.html - source source
         -->
-// ^^^^^ source.coffee.embedded.html - source source
+// <- - comment
+//^^^^^^ - comment
 //      ^^^ comment.block.html punctuation.definition.comment.end.html - source
-//         ^ - source - comment - meta.tag
+//         ^ - comment - source
+    var i = 0;
+// ^^^^^^^^^^^^ - source
     </script>
-// <- - source - comment - meta.tag
-//^^ - source - comment - meta.tag
 //  ^^^^^^^^^ meta.tag - source
 
+
+    <!--
+     -- JSX
+     -->
+
     <script lang="jsx">
 
 // <- source.jsx.embedded.html - source source
     </script>
-// <- source.jsx.embedded.html - source source
-//^^ source.jsx.embedded.html - source source
 //  ^^^^^^^^^ meta.tag - source
 
     <script lang="jsx">
         <!--
 // ^^^^^^^^^ - source
 //      ^^^^ comment.block.html punctuation.definition.comment.begin.html
-//          ^ source.jsx.embedded.html - source source
         -->
-// ^^^^^ source.jsx.embedded.html - source source
+// <- - comment
+//^^^^^^ - comment
 //      ^^^ comment.block.html punctuation.definition.comment.end.html - source
-//         ^ - source - comment - meta.tag
+//         ^ - comment - source
+    var i = 0;
+// ^^^^^^^^^^^^ - source
     </script>
-// <- - source - comment - meta.tag
-//^^ - source - comment - meta.tag
 //  ^^^^^^^^^ meta.tag - source
 
+
+    <!--
+     -- LiveScript
+     -->
+
     <script lang="livescript">
 
 // <- source.livescript.embedded.html - source source
     </script>
-// <- source.livescript.embedded.html - source source
-//^^ source.livescript.embedded.html - source source
 //  ^^^^^^^^^ meta.tag - source
 
     <script lang="livescript">
         <!--
 // ^^^^^^^^^ - source
 //      ^^^^ comment.block.html punctuation.definition.comment.begin.html
-//          ^ source.livescript.embedded.html - source source
         -->
-// ^^^^^ source.livescript.embedded.html - source source
+// <- - comment
+//^^^^^^ - comment
 //      ^^^ comment.block.html punctuation.definition.comment.end.html - source
-//         ^ - source - comment - meta.tag
+//         ^ - comment - source
+    var i = 0;
+// ^^^^^^^^^^^^ - source
     </script>
-// <- - source - comment - meta.tag
-//^^ - source - comment - meta.tag
 //  ^^^^^^^^^ meta.tag - source
 
 
+    <!--
+     -- TypeScript
+     -->
+
     <script lang="ts">
 
 // <- source.ts.embedded.html - source source
     </script>
-// <- source.ts.embedded.html - source source
-//^^ source.ts.embedded.html - source source
 //  ^^^^^^^^^ meta.tag - source
 
     <script lang="ts">
         <!--
 // ^^^^^^^^^ - source
 //      ^^^^ comment.block.html punctuation.definition.comment.begin.html
-//          ^ source.ts.embedded.html - source source
         -->
-// ^^^^^ source.ts.embedded.html - source source
+// <- - comment
+//^^^^^^ - comment
 //      ^^^ comment.block.html punctuation.definition.comment.end.html - source
-//         ^ - source - comment - meta.tag
+//         ^ - comment - source
+    var i = 0;
+// ^^^^^^^^^^^^ - source
     </script>
-// <- - source - comment - meta.tag
-//^^ - source - comment - meta.tag
 //  ^^^^^^^^^ meta.tag - source
 
+
+    <!--
+     -- TSX
+     -->
+
     <script lang="tsx">
 
 // <- source.tsx.embedded.html - source source
     </script>
-// <- source.tsx.embedded.html - source source
-//^^ source.tsx.embedded.html - source source
 //  ^^^^^^^^^ meta.tag - source
 
     <script lang="tsx">
         <!--
 // ^^^^^^^^^ - source
 //      ^^^^ comment.block.html punctuation.definition.comment.begin.html
-//          ^ source.tsx.embedded.html - source source
         -->
-// ^^^^^ source.tsx.embedded.html - source source
+// <- - comment
+//^^^^^^ - comment
 //      ^^^ comment.block.html punctuation.definition.comment.end.html - source
-//         ^ - source - comment - meta.tag
+//         ^ - comment - source
+    var i = 0;
+// ^^^^^^^^^^^^ - source
     </script>
-// <- - source - comment - meta.tag
-//^^ - source - comment - meta.tag
 //  ^^^^^^^^^ meta.tag - source
diff --git a/tests/syntax_test_style.vue b/tests/syntax_test_style.vue
index 54de7e8..36a3fac 100644
--- a/tests/syntax_test_style.vue
+++ b/tests/syntax_test_style.vue
@@ -37,24 +37,20 @@
 // <- source.css.embedded.html
 
     </style>
-// <- source.css.embedded.html - source source
-// ^ source.css.embedded.html - source source
 //  ^^^^^^^^ meta.tag - source
 
 
     <style>
-    <!--
-//^^^^^^ - meta.tag - source
-//  ^^^^ comment.block.html punctuation.definition.comment.begin.html
-//      ^ source.css.embedded.html - source source - meta.tag - comment
-    h1 {}
-// ^^^^^^^ source.css.embedded.html - source source - meta.tag
-    -->
-//^^ source.css.embedded.html - meta.tag - comment
-//  ^^^^ - source - meta.tag
-//  ^^^ comment.block.html punctuation.definition.comment.end.html
-    var i = 0;
-// ^^^^^^^^^^^^ - source
+        <!--
+//^^^^^^^^^^ - meta.tag - source
+//      ^^^^ comment.block.html punctuation.definition.comment.begin.html
+        h1 {}
+// ^^^^^^^^^^^ source.css.embedded.html - source source - meta.tag
+        -->
+// <- - comment
+//^^^^^^ - comment
+//      ^^^ comment.block.html punctuation.definition.comment.end.html - source
+//         ^ - comment - source
     </style>
 //  ^^^^^^^^ meta.tag - source
 
@@ -67,18 +63,16 @@
 //        ^ punctuation.definition.tag.end.html
 //         ^ - meta.tag - comment
 //          ^^^^ comment.block.html punctuation.definition.comment.begin.html
-//              ^ source.css.embedded.html - source source
 
     h1 {}
 // <- source.css.embedded.html - source source
 
     --> </style>
-// ^ source.css.embedded.html - source source
-//  ^^^^^^^^^^^^^ - source
-//     ^ - meta.tag - comment
-//      ^^^^^^^^ meta.tag
-//              ^ - meta.tag
-//  ^^^ comment.block.html punctuation.definition.comment.end.html
+// <- - comment
+//^^ - comment
+//  ^^^ comment.block.html punctuation.definition.comment.end.html - source
+//     ^ - comment - meta.tag - source
+//      ^^^^^^^^ meta.tag - comment - source
 //      ^^ punctuation.definition.tag.begin.html
 //        ^^^^^ entity.name.tag
 //             ^ punctuation.definition.tag.end.html
@@ -94,18 +88,16 @@
 //             ^ punctuation.separator.key-value.html
 //              ^^^^^^^^^^ string.quoted.double.html
 //                          ^^^^ comment.block.html punctuation.definition.comment.begin.html
-//                              ^ source.css.embedded.html
 
     h1 {}
 // <- source.css.embedded.html - source source
 
     --> </style>
-// ^ source.css.embedded.html - source source
-//  ^^^^^^^^^^^^^ - source
-//     ^ - meta.tag - comment
-//      ^^^^^^^^ meta.tag
-//              ^ - meta.tag
-//  ^^^ comment.block.html punctuation.definition.comment.end.html
+// <- - comment
+//^^ - comment
+//  ^^^ comment.block.html punctuation.definition.comment.end.html - source
+//     ^ - comment - meta.tag - source
+//      ^^^^^^^^ meta.tag - comment - source
 //      ^^ punctuation.definition.tag.begin.html
 //        ^^^^^ entity.name.tag
 //             ^ punctuation.definition.tag.end.html
@@ -122,11 +114,13 @@
 // <- source.css.embedded.html - source source
 
     </style>
-// <- source.css.embedded.html - source source
-// ^ source.css.embedded.html - source source
 //  ^^^^^^^^ meta.tag - source
 
 
+    <!--
+     -- Less
+     -->
+
     <style lang="less">  </style>
 //  ^^^^^^^^^^^^^^^^^^^ meta.tag - source
 //         ^^^^^^^^^^^ meta.attribute-with-value.lang.html - meta.attribute-with-value meta.attribute-with-value
@@ -138,112 +132,151 @@
 
 // <- source.less.embedded.html - source source
     </style>
-// <- source.less.embedded.html - source source
-//^^ source.less.embedded.html - source source
 //  ^^^^^^^^ meta.tag - source
 
+
     <style lang="less">
         <!--
 // ^^^^^^^^^ - source
 //      ^^^^ comment.block.html punctuation.definition.comment.begin.html
-//          ^ source.less.embedded.html - source source
+
+// <- source.less.embedded.html
         -->
-// ^^^^^ source.less.embedded.html - source source
+// <- - comment
+//^^^^^^ - comment
 //      ^^^ comment.block.html punctuation.definition.comment.end.html - source
-//         ^ - source - comment - meta.tag
+//         ^ - comment - source
     </style>
 // <- - source - comment - meta.tag
 //^^ - source - comment - meta.tag
 //  ^^^^^^^^ meta.tag - source
 
 
+    <!--
+     -- PostCSS
+     -->
+
     <style lang="postcss">
 
 // <- source.postcss.embedded.html
     </style>
-// <- source.postcss.embedded.html
-//^^ source.postcss.embedded.html
 //  ^^^^^^^^ meta.tag - source
 
+
     <style lang="postcss">
         <!--
 // ^^^^^^^^^ - source.postcss
 //      ^^^^ comment.block.html punctuation.definition.comment.begin.html
-//          ^ source.postcss.embedded.html
+
+// <- source.postcss.embedded.html
         -->
-// ^^^^^ source.postcss.embedded.html - source source
+// <- - comment
+//^^^^^^ - comment
 //      ^^^ comment.block.html punctuation.definition.comment.end.html - source
-//         ^ - source - comment - meta.tag
+//         ^ - comment - source
     </style>
-// <- - source - comment - meta.tag
-//^^ - source - comment - meta.tag
 //  ^^^^^^^^ meta.tag - source
 
 
+    <!--
+     -- SugarSS
+     -->
+
     <style lang="postcss?parser=sugarss">
 
 // <- source.sss.embedded.html - source source
     </style>
-// <- source.sss.embedded.html - source source
-//^^ source.sss.embedded.html - source source
 //  ^^^^^^^^ meta.tag - source
 
+
     <style lang="postcss?parser=sugarss">
         <!--
 // ^^^^^^^^^ - source
 //      ^^^^ comment.block.html punctuation.definition.comment.begin.html
-//          ^ source.sss.embedded.html - source source
+
+// <- source.sss.embedded.html
         -->
-// ^^^^^ source.sss.embedded.html - source source
+// <- - comment
+//^^^^^^ - comment
 //      ^^^ comment.block.html punctuation.definition.comment.end.html - source
-//         ^ - source - comment - meta.tag
+//         ^ - comment - source
     </style>
-// <- - source - comment - meta.tag
-//^^ - source - comment - meta.tag
 //  ^^^^^^^^ meta.tag - source
 
 
+    <!--
+     -- Sass
+     -->
+
     <style lang="sass">
 
 // <- source.sass.embedded.html - source source
     </style>
-// <- source.sass.embedded.html - source source
-//^^ source.sass.embedded.html - source source
 //  ^^^^^^^^ meta.tag - source
 
+
     <style lang="sass">
         <!--
 // ^^^^^^^^^ - source
 //      ^^^^ comment.block.html punctuation.definition.comment.begin.html
-//          ^ source.sass.embedded.html - source source
+
+// <- source.sass.embedded.html
         -->
-// ^^^^^ source.sass.embedded.html - source source
+// <- - comment
+//^^^^^^ - comment
 //      ^^^ comment.block.html punctuation.definition.comment.end.html - source
-//         ^ - source - comment - meta.tag
+//         ^ - comment - source
     </style>
-// <- - source - comment - meta.tag
-//^^ - source - comment - meta.tag
 //  ^^^^^^^^ meta.tag - source
 
 
+    <!--
+     -- SCSS
+     -->
+
     <style lang="scss">
 
 // <- source.scss.embedded.html - source source
     </style>
-// <- source.scss.embedded.html - source source
-//^^ source.scss.embedded.html - source source
 //  ^^^^^^^^ meta.tag - source
 
+
     <style lang="scss">
         <!--
 // ^^^^^^^^^ - source
 //      ^^^^ comment.block.html punctuation.definition.comment.begin.html
-//          ^ source.scss.embedded.html - source source
+
+// <- source.scss.embedded.html
         -->
-// ^^^^^ source.scss.embedded.html - source source
+// <- - comment
+//^^^^^^ - comment
 //      ^^^ comment.block.html punctuation.definition.comment.end.html - source
-//         ^ - source - comment - meta.tag
+//         ^ - comment - source
+    </style>
+//  ^^^^^^^^ meta.tag - source
+
+
+    <!--
+     -- Stylus
+     -->
+
+    <style lang="stylus">
+
+// <- source.stylus.embedded.html - source source
+    </style>
+//  ^^^^^^^^ meta.tag - source
+
+
+    <style lang="stylus">
+        <!--
+// ^^^^^^^^^ - source
+//      ^^^^ comment.block.html punctuation.definition.comment.begin.html
+
+// <- source.stylus.embedded.html
+        -->
+// <- - comment
+//^^^^^^ - comment
+//      ^^^ comment.block.html punctuation.definition.comment.end.html - source
+//         ^ - comment - source
     </style>
-// <- - source - comment - meta.tag
-//^^ - source - comment - meta.tag
 //  ^^^^^^^^ meta.tag - source
diff --git a/tests/syntax_test_template.vue b/tests/syntax_test_template.vue
index c725b3a..b2998d4 100644
--- a/tests/syntax_test_template.vue
+++ b/tests/syntax_test_template.vue
@@ -19,25 +19,17 @@
 
     <template lang="jade"> foo --> </template>
 //  ^^^^^^^^^^^^^^^^^^^^^^ meta.tag - source
-//                        ^^^^^ text.jade.embedded.html - meta.tag
-//                             ^^^^ - meta.tag - source
-//                             ^^^ comment.block.html punctuation.definition.comment.end.html
+//                        ^^^^^^^^^ text.jade.embedded.html - meta.tag - comment
 //                                 ^^^^^^^^^^^ meta.tag - source
 
     <template lang="jade"> <!-- foo </template>
 //  ^^^^^^^^^^^^^^^^^^^^^^ meta.tag - source
-//                        ^^^^^ - meta.tag - source
-//                         ^^^^ punctuation.definition.comment.begin.html
-//                             ^^^^^ text.jade.embedded.html - meta.tag
+//                        ^^^^^^^^^^ text.jade.embedded.html - meta.tag - comment
 //                                  ^^^^^^^^^^^ meta.tag - source
 
     <template lang="jade"> <!-- foo --> </template>
 //  ^^^^^^^^^^^^^^^^^^^^^^ meta.tag - source
-//                        ^^^^^ - meta.tag - source
-//                         ^^^^ punctuation.definition.comment.begin.html
-//                             ^^^^^ text.jade.embedded.html - meta.tag
-//                                  ^^^^ - meta.tag - source
-//                                  ^^^ comment.block.html punctuation.definition.comment.end.html
+//                        ^^^^^^^^^^^^^^ text.jade.embedded.html - meta.tag - comment
 //                                      ^^^^^^^^^^^ meta.tag - source
 
 
@@ -46,8 +38,6 @@
 // <- text.jade.embedded.html
 
     </template>
-// <- text.jade.embedded.html
-//^^ text.jade.embedded.html
 //  ^^^^^^^^^^^ meta.tag - meta.tag meta.tag - text.jade
 
 
@@ -60,12 +50,9 @@
 //            ^^^^ entity.other.attribute-name.html
 //                ^ punctuation.separator.key-value.html
 //                       ^ punctuation.definition.tag.end.html
-//                        ^ - text.jade
 
 // <- text.jade.embedded.html
     </template>
-// <- text.jade.embedded.html
-//^^ text.jade.embedded.html
 //  ^^^^^^^^^^^ meta.tag - meta.tag meta.tag - text.jade
 //  ^^ punctuation.definition.tag.begin.html
 //    ^^^^^^^^ entity.name.tag.template.html
@@ -80,12 +67,9 @@
 //            ^^^^ entity.other.attribute-name.html
 //                ^ punctuation.separator.key-value.html
 //                      ^ punctuation.definition.tag.end.html
-//                       ^ - text.pug
 
 // <- text.pug.embedded.html
     </template>
-// <- text.pug.embedded.html
-//^^ text.pug.embedded.html
 //  ^^^^^^^^^^^ meta.tag - meta.tag meta.tag - text.pug
 //  ^^ punctuation.definition.tag.begin.html
 //    ^^^^^^^^ entity.name.tag.template.html
@@ -100,12 +84,9 @@
 //            ^^^^ entity.other.attribute-name.html
 //                ^ punctuation.separator.key-value.html
 //                      ^ punctuation.definition.tag.end.html
-//                       ^ - text.slim
 
 // <- text.slim.embedded.html
     </template>
-// <- text.slim.embedded.html
-//^^ text.slim.embedded.html
 //  ^^^^^^^^^^^ meta.tag - meta.tag meta.tag - text.slm
 //  ^^ punctuation.definition.tag.begin.html
 //    ^^^^^^^^ entity.name.tag.template.html