diff --git a/Syntaxes/HTML (Astro).sublime-syntax b/Syntaxes/HTML (Astro).sublime-syntax
index 41d72b9..20ddd9f 100644
--- a/Syntaxes/HTML (Astro).sublime-syntax	
+++ b/Syntaxes/HTML (Astro).sublime-syntax	
@@ -3,7 +3,7 @@
 # https://github.com/withastro/language-tools/tree/main/packages/vscode/syntaxes
 # http://www.sublimetext.com/docs/syntax.html
 name: HTML (Astro)
-scope: text.html.astro
+scope: source.astro
 version: 2
 
 extends: Packages/HTML/HTML.sublime-syntax
diff --git a/Syntaxes/Markdown (Astro).sublime-syntax b/Syntaxes/Markdown (Astro).sublime-syntax
index 9b4d51e..50ce783 100644
--- a/Syntaxes/Markdown (Astro).sublime-syntax	
+++ b/Syntaxes/Markdown (Astro).sublime-syntax	
@@ -303,7 +303,7 @@ variables:
 contexts:
   prototype:
     - meta_prepend: true
-    - include: scope:text.html.astro#astro-interpolations
+    - include: scope:source.astro#astro-interpolations
 
   main:
     - meta_include_prototype: false
@@ -1045,8 +1045,8 @@ contexts:
         0: meta.code-fence.definition.begin.markdown-gfm
         2: punctuation.definition.raw.code-fence.begin.markdown
         5: constant.other.language-name.markdown
-      embed: scope:text.html.astro
-      embed_scope: markup.raw.code-fence.markdown-gfm text.html.astro
+      embed: scope:source.astro
+      embed_scope: markup.raw.code-fence.markdown-gfm source.astro
       escape: '{{fenced_code_block_escape}}'
       escape_captures:
         0: meta.code-fence.definition.end.markdown-gfm
@@ -1904,7 +1904,7 @@ contexts:
     - include: html-content
 
   html-content:
-    - include: scope:text.html.astro#html
+    - include: scope:source.astro#html
 
   html-entities:
     # https://spec.commonmark.org/0.30/#entity-and-numeric-character-references
diff --git a/preview.astro b/preview.astro
index 275d345..ca84ad5 100644
--- a/preview.astro
+++ b/preview.astro
@@ -29,5 +29,3 @@ const expressions = 'Lorem ipsum';
     })}
   </Markdown>
 </Layout>
-
-
diff --git a/tests/syntax_test_astro.astro b/tests/syntax_test_astro.astro
index 5d55dff..f53f179 100644
--- a/tests/syntax_test_astro.astro
+++ b/tests/syntax_test_astro.astro
@@ -65,7 +65,7 @@
 // ^ entity.name.tag
 //   ^^^^^ entity.other.attribute-name
 //        ^ punctuation.separator.key-value
-//         ^ punctuation.section.interpolation.begin.astro - source
+//         ^ punctuation.section.interpolation.begin.astro - source.tsx
 //          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ source.tsx.embedded.astro meta.string.js
 //           ^^^^^^^^^ meta.interpolation.js
 //           ^^ punctuation.section.interpolation.begin.js
@@ -73,16 +73,16 @@
 //                     ^^^^^^^^^ meta.interpolation.js
 //                     ^^ punctuation.section.interpolation.begin.js
 //                             ^ punctuation.section.interpolation.end.js
-//                                                ^ punctuation.section.interpolation.end.astro - source
+//                                                ^ punctuation.section.interpolation.end.astro - source.tsx
 //                                                  ^^^^ entity.other.attribute-name
 //                                                      ^ punctuation.separator.key-value
 //                                                       ^^^^^^ meta.path.url.html meta.string.html meta.interpolation.astro
 
   <ul>{posts.map(post => <li>{post.frontmatter.title}</li>)}</ul>
 //^^^^ meta.tag.block
-//    ^ meta.interpolation.astro punctuation.section.interpolation.begin.astro - source
-//     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.interpolation.astro source.tsx.embedded.astro meta.function-call.method.js
-//                                                         ^ meta.interpolation.astro punctuation.section.interpolation.end.astro - source
+//    ^ meta.interpolation.astro punctuation.section.interpolation.begin.astro - source.tsx
+//     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.interpolation.astro source.tsx.embedded.astro
+//                                                         ^ meta.interpolation.astro punctuation.section.interpolation.end.astro - source.tsx
 //                                                          ^^^^^ meta.tag.block
 
   <raw.Component attr:value is:raw attr:value=Value> <p>Text</p> </raw.Component>
diff --git a/tests/syntax_test_astro.md b/tests/syntax_test_astro.md
index cb5ab48..e414d27 100644
--- a/tests/syntax_test_astro.md
+++ b/tests/syntax_test_astro.md
@@ -86,19 +86,19 @@ The {frontmatter.author} is {frontmatter.age} and lives in Toronto, Canada.
 
 ```astro
 ---
-| <- markup.raw.code-fence.markdown-gfm text.html.astro meta.frontmatter.astro punctuation.section.frontmatter.begin.astro
-|^^^ markup.raw.code-fence.markdown-gfm text.html.astro meta.frontmatter.astro
+| <- markup.raw.code-fence.markdown-gfm source.astro meta.frontmatter.astro punctuation.section.frontmatter.begin.astro
+|^^^ markup.raw.code-fence.markdown-gfm source.astro meta.frontmatter.astro
 |^^ punctuation.section.frontmatter.begin.astro
 
-| <- markup.raw.code-fence.markdown-gfm text.html.astro meta.frontmatter.astro source.ts.embedded.astro
+| <- markup.raw.code-fence.markdown-gfm source.astro meta.frontmatter.astro source.ts.embedded.astro
 ---
-| <- markup.raw.code-fence.markdown-gfm text.html.astro meta.frontmatter.astro punctuation.section.frontmatter.end.astro
-|^^^ markup.raw.code-fence.markdown-gfm text.html.astro meta.frontmatter.astro
+| <- markup.raw.code-fence.markdown-gfm source.astro meta.frontmatter.astro punctuation.section.frontmatter.end.astro
+|^^^ markup.raw.code-fence.markdown-gfm source.astro meta.frontmatter.astro
 |^^ punctuation.section.frontmatter.end.astro
 
 <ul>
   {posts.map(post => <li>{post.frontmatter.title}</li>)}
-| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ markup.raw.code-fence.markdown-gfm text.html.astro meta.interpolation.astro
+| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ markup.raw.code-fence.markdown-gfm source.astro meta.interpolation.astro
 | ^ punctuation.section.interpolation.begin.astro
 |  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ source.tsx.embedded.astro
 |                                                      ^ punctuation.section.interpolation.end.astro
diff --git a/tests/syntax_test_script.astro b/tests/syntax_test_script.astro
index 3db3b28..d69f528 100644
--- a/tests/syntax_test_script.astro
+++ b/tests/syntax_test_script.astro
@@ -4,81 +4,81 @@
 //  ^^^^^^^^^ meta.tag.script.end.html
 
     <script> var i = 0; </script>
-//  ^^^^^^^^ meta.tag - source
+//  ^^^^^^^^ meta.tag - source.ts
 //          ^^^^^^^^^^^^ source.ts.embedded.html - meta.tag
-//                      ^^^^^^^^^ meta.tag - source
+//                      ^^^^^^^^^ meta.tag - source.ts
 
     <script> var i = 0; --> </script>
-//  ^^^^^^^^ meta.tag - source
+//  ^^^^^^^^ meta.tag - source.ts
 //          ^^^^^^^^^^^^ source.ts.embedded.html - meta.tag
-//                      ^^^^ - meta.tag - source
+//                      ^^^^ - meta.tag - source.ts
 //                      ^^^ comment.block.html punctuation.definition.comment.end.html
-//                          ^^^^^^^^^ meta.tag - source
+//                          ^^^^^^^^^ meta.tag - source.ts
 
     <script> <!-- var i = 0; </script>
-//  ^^^^^^^^ meta.tag - source
-//          ^^^^^ - meta.tag - source
+//  ^^^^^^^^ meta.tag - source.ts
+//          ^^^^^ - meta.tag - source.ts
 //               ^^^^^^^^^^^^ source.ts.embedded.html - meta.tag
-//                           ^^^^^^^^^ meta.tag - source
+//                           ^^^^^^^^^ meta.tag - source.ts
 //           ^^^^ punctuation.definition.comment.begin.html
 
     <script> <!-- var i = 0; --> </script>
-//  ^^^^^^^^ meta.tag - source
-//          ^^^^^ - meta.tag - source
+//  ^^^^^^^^ meta.tag - source.ts
+//          ^^^^^ - meta.tag - source.ts
 //           ^^^^ punctuation.definition.comment.begin.html
 //               ^^^^^^^^^^^^ source.ts.embedded.html - meta.tag
-//                           ^^^^ - meta.tag - source
+//                           ^^^^ - meta.tag - source.ts
 //                           ^^^ comment.block.html punctuation.definition.comment.end.html
-//                               ^^^^^^^^^ meta.tag - source
+//                               ^^^^^^^^^ meta.tag - source.ts
 
 
     <script>
 
 // <- source.ts.embedded.html
     var i = 0;
-// ^^^^^^^^^^^^ source.ts.embedded.html - source source
+// ^^^^^^^^^^^^ source.ts.embedded.html - source.ts source.ts
     </script>
-// <- source.ts.embedded.html - source source
-// ^ source.ts.embedded.html - source source
-//  ^^^^^^^^^ meta.tag - source
+// <- source.ts.embedded.html - source.ts source.ts
+// ^ source.ts.embedded.html - source.ts source.ts
+//  ^^^^^^^^^ meta.tag - source.ts
 
 
     <script>
     <!--
-//^^^^^^ - meta.tag - source
+//^^^^^^ - meta.tag - source.ts
 //  ^^^^ comment.block.html punctuation.definition.comment.begin.html
-//      ^ source.ts.embedded.html - source source - meta.tag - comment
+//      ^ source.ts.embedded.html - source.ts source.ts - meta.tag - comment
     var i = 0;
-// ^^^^^^^^^^^^ source.ts.embedded.html - source source - meta.tag
+// ^^^^^^^^^^^^ source.ts.embedded.html - source.ts source.ts - meta.tag
     -->
 //^^ source.ts.embedded.html - meta.tag - comment
-//  ^^^^ - source - meta.tag
+//  ^^^^ - source.ts - meta.tag
 //  ^^^ comment.block.html punctuation.definition.comment.end.html
     var i = 0;
-// ^^^^^^^^^^^^ - source
+// ^^^^^^^^^^^^ - source.ts
     </script>
-//  ^^^^^^^^^ meta.tag - source
+//  ^^^^^^^^^ meta.tag - source.ts
 
 
     <script> <!--
-//  ^^^^^^^^^^^^^ - source
+//  ^^^^^^^^^^^^^ - source.ts
 //  ^^^^^^^^ meta.tag
 //  ^ punctuation.definition.tag.begin.html
 //   ^^^^^^ entity.name.tag
 //         ^ punctuation.definition.tag.end.html
 //          ^ - meta.tag - comment
 //           ^^^^ comment.block.html punctuation.definition.comment.begin.html
-//               ^ source.ts.embedded.html - source source
+//               ^ source.ts.embedded.html - source.ts source.ts
 
     var foo = 100;
-// <- source.ts.embedded.html - source source
+// <- source.ts.embedded.html - source.ts source.ts
 
     (a --> b);
 //     ^^^ source.ts.embedded.html keyword.operator - comment
 
     --> </script>
-// ^ source.ts.embedded.html - source source
-//  ^^^^^^^^^^^^^^ - source
+// ^ source.ts.embedded.html - source.ts source.ts
+//  ^^^^^^^^^^^^^^ - source.ts
 //     ^ - meta.tag - comment
 //      ^^^^^^^^^ meta.tag
 //               ^ - meta.tag
@@ -89,10 +89,10 @@
 
 
     <script type="text/javascript"> <!--
-//  ^^^^^^^^ meta.tag - meta.attribute-with-value - source
-//          ^^^^^^^^^^^^^^^^^^^^^^ meta.tag meta.attribute-with-value.html - meta.attribute-with-value meta.attribute-with-value - source
-//                                ^ meta.tag - meta.attribute-with-value - source
-//                                 ^^^^^ - meta.tag - source
+//  ^^^^^^^^ meta.tag - meta.attribute-with-value - source.ts
+//          ^^^^^^^^^^^^^^^^^^^^^^ meta.tag meta.attribute-with-value.html - meta.attribute-with-value meta.attribute-with-value - source.ts
+//                                ^ meta.tag - meta.attribute-with-value - source.ts
+//                                 ^^^^^ - meta.tag - source.ts
 //   ^^^^^^ entity.name.tag
 //          ^^^^ entity.other.attribute-name.html
 //              ^ punctuation.separator.key-value.html
@@ -101,14 +101,14 @@
 //                                      ^ source.js.embedded.html
 
     var foo = 100;
-// <- source.js.embedded.html - source source
+// <- source.js.embedded.html - source.ts source.ts
 
     (a --> b);
 //     ^^^ source.js.embedded.html keyword.operator - comment
 
     --> </script>
-// ^ source.js.embedded.html - source source
-//  ^^^^^^^^^^^^^^ - source
+// ^ source.js.embedded.html - source.ts source.ts
+//  ^^^^^^^^^^^^^^ - source.ts
 //     ^ - meta.tag - comment
 //      ^^^^^^^^^ meta.tag
 //               ^ - meta.tag
@@ -125,12 +125,12 @@
     application/jAvAsCrIpT>
 //  ^^^^^^^^^^^^^^^^^^^^^^ meta.tag meta.attribute-with-value.html - meta.attribute-with-value meta.attribute-with-value
     var foo = 100;
-// <- source.ts.embedded.html - source source
-// ^^^^^^^^^^^^^^^^ source.ts.embedded.html - source source
+// <- source.ts.embedded.html - source.ts source.ts
+// ^^^^^^^^^^^^^^^^ source.ts.embedded.html - source.ts source.ts
     </script>
-// <- source.ts.embedded.html - source source
-// ^ source.ts.embedded.html - source source
-//  ^^^^^^^^^ meta.tag - source
+// <- source.ts.embedded.html - source.ts source.ts
+// ^ source.ts.embedded.html - source.ts source.ts
+//  ^^^^^^^^^ meta.tag - source.ts
 //  ^^ punctuation.definition.tag.begin.html
 //    ^^^^^^ entity.name.tag.script.html
 //          ^ punctuation.definition.tag.end.html
@@ -147,11 +147,11 @@
 //                   ^ punctuation.definition.tag.end.html
 //                    ^ - meta.tag
 
-// <- source.ts.embedded.html - source source
+// <- source.ts.embedded.html - source.ts source.ts
     </script>
-// <- source.ts.embedded.html - source source
-//^^ source.ts.embedded.html - source source
-//  ^^^^^^^^^ meta.tag - source
+// <- source.ts.embedded.html - source.ts source.ts
+//^^ source.ts.embedded.html - source.ts source.ts
+//  ^^^^^^^^^ meta.tag - source.ts
 //  ^^ punctuation.definition.tag.begin.html
 //    ^^^^^^ entity.name.tag.script.html
 //          ^ punctuation.definition.tag.end.html
@@ -159,27 +159,27 @@
 
     <script lang="ts">
         <!--
-// ^^^^^^^^^ - source
+// ^^^^^^^^^ - source.ts
 //      ^^^^ comment.block.html punctuation.definition.comment.begin.html
-//          ^ source.ts.embedded.html - source source
+//          ^ source.ts.embedded.html - source.ts source.ts
         -->
-// ^^^^^ source.ts.embedded.html - source source
-//      ^^^ comment.block.html punctuation.definition.comment.end.html - source
-//         ^ - source - comment - meta.tag
+// ^^^^^ source.ts.embedded.html - source.ts source.ts
+//      ^^^ comment.block.html punctuation.definition.comment.end.html - source.ts
+//         ^ - source.ts - comment - meta.tag
     </script>
-// <- - source - comment - meta.tag
-//^^ - source - comment - meta.tag
-//  ^^^^^^^^^ meta.tag - source
+// <- - source.ts - comment - meta.tag
+//^^ - source.ts - comment - meta.tag
+//  ^^^^^^^^^ meta.tag - source.ts
 //  ^^ punctuation.definition.tag.begin.html
 //    ^^^^^^ entity.name.tag.script.html
 //          ^ punctuation.definition.tag.end.html
 
 
     <script lang="other">  </script>
-//  ^^^^^^^^^^^^^^^^^^^^^ meta.tag - meta.tag meta.tag - source
+//  ^^^^^^^^^^^^^^^^^^^^^ meta.tag - meta.tag meta.tag - source.ts
 //          ^^^^^^^^^^^^ meta.attribute-with-value.html - meta.attribute-with-value meta.attribute-with-value
-//                       ^^ - meta.tag - source
-//                         ^^^^^^^^^ meta.tag - source
+//                       ^^ - meta.tag - source.ts
+//                         ^^^^^^^^^ meta.tag - source.ts
 
 
   <script src={Astro.resolve('../scripts/main.js')} hoist></script>
@@ -190,9 +190,9 @@
 //        ^^^ entity.other.attribute-name.href.html
 //           ^ punctuation.separator.key-value.html
 //            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.path.url.html meta.string.html meta.interpolation.astro
-//            ^ punctuation.section.interpolation.begin.astro - source
-//             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ source.tsx.embedded.astro meta.function-call.method.js
-//                                                ^ punctuation.section.interpolation.end.astro - source
+//            ^ punctuation.section.interpolation.begin.astro - source.ts
+//                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ source.tsx.embedded.astro meta.function-call
+//                                                ^ punctuation.section.interpolation.end.astro - source.ts
 //                                                  ^^^^^ meta.attribute-with-value.html entity.other.attribute-name.html
 //                                                       ^ punctuation.definition.tag.end.html
 
@@ -215,7 +215,7 @@
 // ^^^^^^^^^^^^^^^^^^^ source.ts.embedded.html
 //    ^^^^^ variable.function.js
     </script>
-//  ^^^^^^^^^ meta.tag - source
+//  ^^^^^^^^^ meta.tag - source.ts
 //  ^^ punctuation.definition.tag.begin.html
 //    ^^^^^^ entity.name.tag.script.html
 //          ^ punctuation.definition.tag.end.html
diff --git a/tests/syntax_test_style.astro b/tests/syntax_test_style.astro
index 8fb30b6..92cb9d0 100644
--- a/tests/syntax_test_style.astro
+++ b/tests/syntax_test_style.astro
@@ -4,32 +4,32 @@
 //  ^^^^^^^^ meta.tag.style.end.html
 
     <style> h1 {} </style>
-//  ^^^^^^^ meta.tag - source
+//  ^^^^^^^ meta.tag - source.css
 //         ^^^^^^^ source.css.embedded.html - meta.tag
-//                ^^^^^^^^ meta.tag - source
+//                ^^^^^^^^ meta.tag - source.css
 
     <style> h1 {} --> </style>
-//  ^^^^^^^ meta.tag - source
+//  ^^^^^^^ meta.tag - source.css
 //         ^^^^^^^ source.css.embedded.html - meta.tag
-//                ^^^^ - meta.tag - source
+//                ^^^^ - meta.tag - source.css
 //                ^^^ comment.block.html punctuation.definition.comment.end.html
-//                    ^^^^^^^^ meta.tag - source
+//                    ^^^^^^^^ meta.tag - source.css
 
     <style> <!-- h1 {} </style>
-//  ^^^^^^^ meta.tag - source
-//         ^^^^^ - meta.tag - source
+//  ^^^^^^^ meta.tag - source.css
+//         ^^^^^ - meta.tag - source.css
 //              ^^^^^^^ source.css.embedded.html - meta.tag
-//                     ^^^^^^^^ meta.tag - source
+//                     ^^^^^^^^ meta.tag - source.css
 //          ^^^^ punctuation.definition.comment.begin.html
 
     <style> <!-- h1 {} --> </style>
-//  ^^^^^^^ meta.tag - source
-//         ^^^^^ - meta.tag - source
+//  ^^^^^^^ meta.tag - source.css
+//         ^^^^^ - meta.tag - source.css
 //          ^^^^ punctuation.definition.comment.begin.html
 //              ^^^^^^^ source.css.embedded.html - meta.tag
-//                     ^^^^ - meta.tag - source
+//                     ^^^^ - meta.tag - source.css
 //                     ^^^ comment.block.html punctuation.definition.comment.end.html
-//                         ^^^^^^^^ meta.tag - source
+//                         ^^^^^^^^ meta.tag - source.css
 
 
     <style>
@@ -37,9 +37,9 @@
 // <- source.css.embedded.html
 
     </style>
-// <- source.css.embedded.html - source source
-// ^ source.css.embedded.html - source source
-//  ^^^^^^^^ meta.tag - source
+// <- source.css.embedded.html - source.css source.css
+// ^ source.css.embedded.html - source.css source.css
+//  ^^^^^^^^ meta.tag - source.css
 //  ^^ punctuation.definition.tag.begin.html
 //    ^^^^^ entity.name.tag.style.html
 //         ^ punctuation.definition.tag.end.html
@@ -47,40 +47,40 @@
 
     <style>
     <!--
-//^^^^^^ - meta.tag - source
+//^^^^^^ - meta.tag - source.css
 //  ^^^^ comment.block.html punctuation.definition.comment.begin.html
-//      ^ source.css.embedded.html - source source - meta.tag - comment
+//      ^ source.css.embedded.html - source.css source.css - meta.tag - comment
     h1 {}
-// ^^^^^^^ source.css.embedded.html - source source - meta.tag
+// ^^^^^^^ source.css.embedded.html - source.css source.css - meta.tag
     -->
 //^^ source.css.embedded.html - meta.tag - comment
-//  ^^^^ - source - meta.tag
+//  ^^^^ - source.css - meta.tag
 //  ^^^ comment.block.html punctuation.definition.comment.end.html
     var i = 0;
-// ^^^^^^^^^^^^ - source
+// ^^^^^^^^^^^^ - source.css
     </style>
-//  ^^^^^^^^ meta.tag - source
+//  ^^^^^^^^ meta.tag - source.css
 //  ^^ punctuation.definition.tag.begin.html
 //    ^^^^^ entity.name.tag.style.html
 //         ^ punctuation.definition.tag.end.html
 
 
     <style> <!--
-//  ^^^^^^^^^^^^ - source
+//  ^^^^^^^^^^^^ - source.css
 //  ^^^^^^^ meta.tag
 //  ^ punctuation.definition.tag.begin.html
 //   ^^^^^ entity.name.tag
 //        ^ punctuation.definition.tag.end.html
 //         ^ - meta.tag - comment
 //          ^^^^ comment.block.html punctuation.definition.comment.begin.html
-//              ^ source.css.embedded.html - source source
+//              ^ source.css.embedded.html - source.css source.css
 
     h1 {}
-// <- source.css.embedded.html - source source
+// <- source.css.embedded.html - source.css source.css
 
     --> </style>
-// ^ source.css.embedded.html - source source
-//  ^^^^^^^^^^^^^ - source
+// ^ source.css.embedded.html - source.css source.css
+//  ^^^^^^^^^^^^^ - source.css
 //     ^ - meta.tag - comment
 //      ^^^^^^^^ meta.tag
 //              ^ - meta.tag
@@ -91,10 +91,10 @@
 
 
     <style type="text/css"> <!--
-//  ^^^^^^^ meta.tag - meta.attribute-with-value - source
-//         ^^^^^^^^^^^^^^^ meta.tag meta.attribute-with-value.html - meta.attribute-with-value meta.attribute-with-value - source
-//                        ^ meta.tag - meta.attribute-with-value - source
-//                         ^^^^^ - meta.tag - source
+//  ^^^^^^^ meta.tag - meta.attribute-with-value - source.css
+//         ^^^^^^^^^^^^^^^ meta.tag meta.attribute-with-value.html - meta.attribute-with-value meta.attribute-with-value - source.css
+//                        ^ meta.tag - meta.attribute-with-value - source.css
+//                         ^^^^^ - meta.tag - source.css
 //   ^^^^^ entity.name.tag
 //         ^^^^ entity.other.attribute-name.html
 //             ^ punctuation.separator.key-value.html
@@ -103,11 +103,11 @@
 //                              ^ source.css.embedded.html
 
     h1 {}
-// <- source.css.embedded.html - source source
+// <- source.css.embedded.html - source.css source.css
 
     --> </style>
-// ^ source.css.embedded.html - source source
-//  ^^^^^^^^^^^^^ - source
+// ^ source.css.embedded.html - source.css source.css
+//  ^^^^^^^^^^^^^ - source.css
 //     ^ - meta.tag - comment
 //      ^^^^^^^^ meta.tag
 //              ^ - meta.tag
@@ -125,22 +125,22 @@
 //  ^^^^^^^^ meta.tag meta.attribute-with-value.html - meta.attribute-with-value meta.attribute-with-value
 
     h1 {}
-// <- source.css.embedded.html - source source
+// <- source.css.embedded.html - source.css source.css
 
     </style>
-// <- source.css.embedded.html - source source
-// ^ source.css.embedded.html - source source
-//  ^^^^^^^^ meta.tag - source
+// <- source.css.embedded.html - source.css source.css
+// ^ source.css.embedded.html - source.css source.css
+//  ^^^^^^^^ meta.tag - source.css
 //  ^^ punctuation.definition.tag.begin.html
 //    ^^^^^ entity.name.tag.style.html
 //         ^ punctuation.definition.tag.end.html
 
 
     <style lang="less">  </style>
-//  ^^^^^^^^^^^^^^^^^^^ meta.tag - source
+//  ^^^^^^^^^^^^^^^^^^^ meta.tag - source.css
 //         ^^^^^^^^^^^ meta.attribute-with-value.html - meta.attribute-with-value meta.attribute-with-value
 //                     ^^ source.less.embedded.html - meta.tag
-//                       ^^^^^^^^ meta.tag - source
+//                       ^^^^^^^^ meta.tag - source.css
 //                       ^^ punctuation.definition.tag.begin.html
 //                         ^^^^^ entity.name.tag.style.html
 //                              ^ punctuation.definition.tag.end.html
@@ -156,28 +156,28 @@
 //              ^^^^^^ meta.string.html string.quoted.double.html
 //                    ^ punctuation.definition.tag.end.html
 
-// <- source.less.embedded.html - source source
+// <- source.less.embedded.html - source.css source.css
     </style>
-// <- source.less.embedded.html - source source
-//^^ source.less.embedded.html - source source
-//  ^^^^^^^^ meta.tag - source
+// <- source.less.embedded.html - source.css source.css
+//^^ source.less.embedded.html - source.css source.css
+//  ^^^^^^^^ meta.tag - source.css
 //  ^^ punctuation.definition.tag.begin.html
 //    ^^^^^ entity.name.tag.style.html
 //         ^ punctuation.definition.tag.end.html
 
     <style lang="less">
         <!--
-// ^^^^^^^^^ - source
+// ^^^^^^^^^ - source.css
 //      ^^^^ comment.block.html punctuation.definition.comment.begin.html
-//          ^ source.less.embedded.html - source source
+//          ^ source.less.embedded.html - source.css source.css
         -->
-// ^^^^^ source.less.embedded.html - source source
-//      ^^^ comment.block.html punctuation.definition.comment.end.html - source
-//         ^ - source - comment - meta.tag
+// ^^^^^ source.less.embedded.html - source.css source.css
+//      ^^^ comment.block.html punctuation.definition.comment.end.html - source.css
+//         ^ - source.css - comment - meta.tag
     </style>
-// <- - source - comment - meta.tag
-//^^ - source - comment - meta.tag
-//  ^^^^^^^^ meta.tag - source
+// <- - source.css - comment - meta.tag
+//^^ - source.css - comment - meta.tag
+//  ^^^^^^^^ meta.tag - source.css
 //  ^^ punctuation.definition.tag.begin.html
 //    ^^^^^ entity.name.tag.style.html
 //         ^ punctuation.definition.tag.end.html
@@ -193,28 +193,28 @@
 //              ^^^^^^ meta.string.html string.quoted.double.html
 //                    ^ punctuation.definition.tag.end.html
 
-// <- source.sass.embedded.html - source source
+// <- source.sass.embedded.html - source.css source.css
     </style>
-// <- source.sass.embedded.html - source source
-//^^ source.sass.embedded.html - source source
-//  ^^^^^^^^ meta.tag - source
+// <- source.sass.embedded.html - source.css source.css
+//^^ source.sass.embedded.html - source.css source.css
+//  ^^^^^^^^ meta.tag - source.css
 //  ^^ punctuation.definition.tag.begin.html
 //    ^^^^^ entity.name.tag.style.html
 //         ^ punctuation.definition.tag.end.html
 
     <style lang="sass">
         <!--
-// ^^^^^^^^^ - source
+// ^^^^^^^^^ - source.css
 //      ^^^^ comment.block.html punctuation.definition.comment.begin.html
-//          ^ source.sass.embedded.html - source source
+//          ^ source.sass.embedded.html - source.css source.css
         -->
-// ^^^^^ source.sass.embedded.html - source source
-//      ^^^ comment.block.html punctuation.definition.comment.end.html - source
-//         ^ - source - comment - meta.tag
+// ^^^^^ source.sass.embedded.html - source.css source.css
+//      ^^^ comment.block.html punctuation.definition.comment.end.html - source.css
+//         ^ - source.css - comment - meta.tag
     </style>
-// <- - source - comment - meta.tag
-//^^ - source - comment - meta.tag
-//  ^^^^^^^^ meta.tag - source
+// <- - source.css - comment - meta.tag
+//^^ - source.css - comment - meta.tag
+//  ^^^^^^^^ meta.tag - source.css
 //  ^^ punctuation.definition.tag.begin.html
 //    ^^^^^ entity.name.tag.style.html
 //         ^ punctuation.definition.tag.end.html
@@ -230,28 +230,28 @@
 //              ^^^^^^ meta.string.html string.quoted.double.html
 //                    ^ punctuation.definition.tag.end.html
 
-// <- source.scss.embedded.html - source source
+// <- source.scss.embedded.html - source.css source.css
     </style>
-// <- source.scss.embedded.html - source source
-//^^ source.scss.embedded.html - source source
-//  ^^^^^^^^ meta.tag - source
+// <- source.scss.embedded.html - source.css source.css
+//^^ source.scss.embedded.html - source.css source.css
+//  ^^^^^^^^ meta.tag - source.css
 //  ^^ punctuation.definition.tag.begin.html
 //    ^^^^^ entity.name.tag.style.html
 //         ^ punctuation.definition.tag.end.html
 
     <style lang="scss">
         <!--
-// ^^^^^^^^^ - source
+// ^^^^^^^^^ - source.css
 //      ^^^^ comment.block.html punctuation.definition.comment.begin.html
-//          ^ source.scss.embedded.html - source source
+//          ^ source.scss.embedded.html - source.css source.css
         -->
-// ^^^^^ source.scss.embedded.html - source source
-//      ^^^ comment.block.html punctuation.definition.comment.end.html - source
-//         ^ - source - comment - meta.tag
+// ^^^^^ source.scss.embedded.html - source.css source.css
+//      ^^^ comment.block.html punctuation.definition.comment.end.html - source.css
+//         ^ - source.css - comment - meta.tag
     </style>
-// <- - source - comment - meta.tag
-//^^ - source - comment - meta.tag
-//  ^^^^^^^^ meta.tag - source
+// <- - source.css - comment - meta.tag
+//^^ - source.css - comment - meta.tag
+//  ^^^^^^^^ meta.tag - source.css
 //  ^^ punctuation.definition.tag.begin.html
 //    ^^^^^ entity.name.tag.style.html
 //         ^ punctuation.definition.tag.end.html
@@ -284,9 +284,9 @@
 //             ^ punctuation.separator.key-value.astro
 //              ^^^^ variable.parameter.astro
 //                  ^ punctuation.separator.key-value.html
-//                   ^ punctuation.section.interpolation.begin.astro - source
+//                   ^ punctuation.section.interpolation.begin.astro - source.css
 //                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ source.tsx.embedded.astro meta.block.js
-//                                                                   ^ punctuation.section.interpolation.end.astro - source
+//                                                                   ^ punctuation.section.interpolation.end.astro - source.css
 //                                                                    ^ punctuation.definition.tag.end.html
   h1 {
     background-color: var(--backgroundColor);