diff --git a/packages/tm-grammars/NOTICE b/packages/tm-grammars/NOTICE
index 5907fa7..0ea58cc 100644
--- a/packages/tm-grammars/NOTICE
+++ b/packages/tm-grammars/NOTICE
@@ -2460,12 +2460,12 @@ SOFTWARE.
 
 =========================================================================================================
 Files:   glimmer-js.json, glimmer-ts.json
-License: https://raw.githubusercontent.com/IgnaceMaes/glimmer-textmate-grammar/main/LICENSE
+License: https://raw.githubusercontent.com/lifeart/vsc-ember-syntax/master/LICENSE
 SPDX:    MIT
 ---------------------------------------------------------------------------------------------------------
 MIT License
 
-Copyright (c) 2023 Ignace Maes
+Copyright (c) 2024 Alex Kanunnikov
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/packages/tm-grammars/README.md b/packages/tm-grammars/README.md
index 1720f56..66c7dd3 100644
--- a/packages/tm-grammars/README.md
+++ b/packages/tm-grammars/README.md
@@ -75,8 +75,8 @@ import { grammars } from 'tm-grammars'
 | `gherkin` |  | [alexkrechik/VSCucumberAutoComplete](https://github.com/alexkrechik/VSCucumberAutoComplete/blob/fc8da969b1c83e13ef5124b1ec90ba5211bc1e5f/gclient/syntaxes/feature.tmLanguage) | [MIT](https://raw.githubusercontent.com/alexkrechik/VSCucumberAutoComplete/master/LICENSE) |  | 12.13 kB |
 | `git-commit` |  | [microsoft/vscode](https://github.com/microsoft/vscode/blob/f8c3f89468fea14103d8790d59ea8594d6e644eb/extensions/git-base/syntaxes/git-commit.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/microsoft/vscode/main/LICENSE.txt) | `diff` | 1.36 kB |
 | `git-rebase` |  | [microsoft/vscode](https://github.com/microsoft/vscode/blob/e95c74c4c7af876e79ec58df262464467c06df28/extensions/git-base/syntaxes/git-rebase.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/microsoft/vscode/main/LICENSE.txt) | `shellscript` | 818.00 B |
-| `glimmer-js` | `gjs` | [IgnaceMaes/glimmer-textmate-grammar](https://github.com/IgnaceMaes/glimmer-textmate-grammar/blob/1d2850817ee189b5c7e83f02a60b7143e3cd099c/glimmer-js.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/IgnaceMaes/glimmer-textmate-grammar/main/LICENSE) | `javascript` `handlebars` | 1.27 kB |
-| `glimmer-ts` | `gts` | [IgnaceMaes/glimmer-textmate-grammar](https://github.com/IgnaceMaes/glimmer-textmate-grammar/blob/1d2850817ee189b5c7e83f02a60b7143e3cd099c/glimmer-ts.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/IgnaceMaes/glimmer-textmate-grammar/main/LICENSE) | `typescript` `handlebars` | 1.27 kB |
+| `glimmer-js` | `gjs` | [lifeart/vsc-ember-syntax](https://github.com/lifeart/vsc-ember-syntax/blob/f031ed7df2eeced760f4469fc9fe06f8688c531a/syntaxes/source.gjs.json) | [MIT](https://raw.githubusercontent.com/lifeart/vsc-ember-syntax/master/LICENSE) | `javascript` `typescript` `css` `html` | 19.08 kB |
+| `glimmer-ts` | `gts` | [lifeart/vsc-ember-syntax](https://github.com/lifeart/vsc-ember-syntax/blob/f031ed7df2eeced760f4469fc9fe06f8688c531a/syntaxes/source.gts.json) | [MIT](https://raw.githubusercontent.com/lifeart/vsc-ember-syntax/master/LICENSE) | `typescript` `css` `javascript` `html` | 19.08 kB |
 | `glsl` |  | [polym0rph/GLSL.tmbundle](https://github.com/polym0rph/GLSL.tmbundle/blob/6998d3bbd204e26746a5ca580cda4c650b9057b1/Syntaxes/GLSL.tmLanguage) |  | `c` | 3.69 kB |
 | `gnuplot` |  | [MarioSchwalbe/vscode-gnuplot](https://github.com/MarioSchwalbe/vscode-gnuplot/blob/c62c1a61c9b6b4658b43d76c397dc2ad43523b6a/syntaxes/gnuplot.tmLanguage) | [GPL-3.0](https://raw.githubusercontent.com/MarioSchwalbe/vscode-gnuplot/master/LICENSE) |  | 16.46 kB |
 | `go` |  | [microsoft/vscode](https://github.com/microsoft/vscode/blob/35d97bc7e439fce0f50f42074041ab2d8571b20a/extensions/go/syntaxes/go.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/microsoft/vscode/main/LICENSE.txt) |  | 41.19 kB |
diff --git a/packages/tm-grammars/grammars/glimmer-js.json b/packages/tm-grammars/grammars/glimmer-js.json
index e13a3d3..d3801c3 100644
--- a/packages/tm-grammars/grammars/glimmer-js.json
+++ b/packages/tm-grammars/grammars/glimmer-js.json
@@ -1,98 +1,1500 @@
 {
   "displayName": "Glimmer JS",
   "injections": {
-    "L:source.gjs -comment -string": {
+    "L:source.gjs -comment -(string -meta.embedded)": {
+      "patterns": [
+        {
+          "include": "#main"
+        }
+      ]
+    }
+  },
+  "name": "glimmer-js",
+  "patterns": [
+    {
+      "include": "source.js"
+    },
+    {
+      "include": "#main"
+    }
+  ],
+  "repository": {
+    "as-keyword": {
+      "match": "\\s\\b(as)\\b(?=\\s\\|)",
+      "name": "keyword.control",
+      "patterns": [
+      ]
+    },
+    "as-params": {
+      "begin": "(?<!\\|)(\\|)",
+      "beginCaptures": {
+        "1": {
+          "name": "constant.other.symbol.begin.ember-handlebars"
+        }
+      },
+      "end": "(\\|)(?!\\|)",
+      "endCaptures": {
+        "1": {
+          "name": "constant.other.symbol.end.ember-handlebars"
+        }
+      },
+      "name": "keyword.block-params.ember-handlebars",
+      "patterns": [
+        {
+          "include": "#variable"
+        }
+      ]
+    },
+    "attention": {
+      "match": "@?(TODO|FIXME|CHANGED|XXX|IDEA|HACK|NOTE|REVIEW|NB|BUG|QUESTION|TEMP)\\b",
+      "name": "storage.type.class.${1:/downcase}",
+      "patterns": [
+      ]
+    },
+    "boolean": {
+      "captures": {
+        "0": {
+          "name": "string.regexp"
+        },
+        "1": {
+          "name": "string.regexp"
+        },
+        "2": {
+          "name": "string.regexp"
+        }
+      },
+      "match": "true|false|undefined|null",
+      "patterns": [
+      ]
+    },
+    "component-tag": {
+      "begin": "(<\\/?)(@|this.)?([a-zA-Z0-9-_\\$:\\.]+)\\b",
+      "beginCaptures": {
+        "1": {
+          "name": "punctuation.definition.tag"
+        },
+        "2": {
+          "name": "support.function",
+          "patterns": [
+            {
+              "match": "(@|this)",
+              "name": "variable.language"
+            },
+            {
+              "match": "(\\.)+",
+              "name": "punctuation.definition.tag"
+            }
+          ]
+        },
+        "3": {
+          "name": "entity.name.type",
+          "patterns": [
+            {
+              "include": "#glimmer-component-path"
+            },
+            {
+              "match": "(@|:|\\$)",
+              "name": "markup.bold"
+            }
+          ]
+        }
+      },
+      "end": "(\\/?)(>)",
+      "endCaptures": {
+        "1": {
+          "name": "punctuation.definition.tag"
+        },
+        "2": {
+          "name": "punctuation.definition.tag"
+        }
+      },
+      "name": "meta.tag.any.ember-handlebars",
+      "patterns": [
+        {
+          "include": "#tag-like-content"
+        }
+      ]
+    },
+    "digit": {
+      "captures": {
+        "0": {
+          "name": "constant.numeric"
+        },
+        "1": {
+          "name": "constant.numeric"
+        },
+        "2": {
+          "name": "constant.numeric"
+        }
+      },
+      "match": "\\d*(\\.)?\\d+",
+      "patterns": [
+      ]
+    },
+    "entities": {
+      "patterns": [
+        {
+          "captures": {
+            "1": {
+              "name": "punctuation.definition.entity.html.ember-handlebars"
+            },
+            "3": {
+              "name": "punctuation.definition.entity.html.ember-handlebars"
+            }
+          },
+          "match": "(&)([a-zA-Z0-9]+|#[0-9]+|#x[0-9a-fA-F]+)(;)",
+          "name": "constant.character.entity.html.ember-handlebars"
+        },
+        {
+          "match": "&",
+          "name": "invalid.illegal.bad-ampersand.html.ember-handlebars"
+        }
+      ]
+    },
+    "glimmer-argument": {
+      "captures": {
+        "1": {
+          "name": "entity.other.attribute-name.ember-handlebars.argument",
+          "patterns": [
+            {
+              "match": "(@)",
+              "name": "markup.italic"
+            }
+          ]
+        },
+        "2": {
+          "name": "punctuation.separator.key-value.html.ember-handlebars"
+        }
+      },
+      "match": "\\s(@[a-zA-Z0-9:_.-]+)(=)?"
+    },
+    "glimmer-as-stuff": {
+      "patterns": [
+        {
+          "include": "#as-keyword"
+        },
+        {
+          "include": "#as-params"
+        }
+      ]
+    },
+    "glimmer-block": {
+      "begin": "({{~?)(#|/)(([@\\$a-zA-Z0-9_/.-]+))",
+      "captures": {
+        "1": {
+          "name": "punctuation.definition.tag"
+        },
+        "2": {
+          "name": "punctuation.definition.tag"
+        },
+        "3": {
+          "name": "keyword.control",
+          "patterns": [
+            {
+              "include": "#glimmer-component-path"
+            },
+            {
+              "match": "(\\/)+",
+              "name": "punctuation.definition.tag"
+            },
+            {
+              "match": "(\\.)+",
+              "name": "punctuation.definition.tag"
+            }
+          ]
+        }
+      },
+      "end": "(~?}})",
+      "name": "entity.expression.ember-handlebars",
+      "patterns": [
+        {
+          "include": "#glimmer-as-stuff"
+        },
+        {
+          "include": "#glimmer-supexp-content"
+        }
+      ]
+    },
+    "glimmer-bools": {
+      "captures": {
+        "0": {
+          "name": "keyword.operator"
+        },
+        "1": {
+          "name": "keyword.operator"
+        },
+        "2": {
+          "name": "string.regexp"
+        },
+        "3": {
+          "name": "string.regexp"
+        },
+        "4": {
+          "name": "keyword.operator"
+        }
+      },
+      "match": "({{~?)(true|false|null|undefined|\\d*(\\.)?\\d+)(~?}})",
+      "name": "entity.expression.ember-handlebars"
+    },
+    "glimmer-comment-block": {
+      "begin": "{{!--",
+      "captures": {
+        "0": {
+          "name": "punctuation.definition.block.comment.glimmer"
+        }
+      },
+      "end": "--}}",
+      "name": "comment.block.glimmer",
+      "patterns": [
+        {
+          "include": "#script"
+        },
+        {
+          "include": "#attention"
+        }
+      ]
+    },
+    "glimmer-comment-inline": {
+      "begin": "{{!",
+      "captures": {
+        "0": {
+          "name": "punctuation.definition.block.comment.glimmer"
+        }
+      },
+      "end": "}}",
+      "name": "comment.inline.glimmer",
+      "patterns": [
+        {
+          "include": "#script"
+        },
+        {
+          "include": "#attention"
+        }
+      ]
+    },
+    "glimmer-component-path": {
+      "captures": {
+        "1": {
+          "name": "punctuation.definition.tag"
+        }
+      },
+      "match": "(::|_|\\$|\\.)"
+    },
+    "glimmer-control-expression": {
+      "begin": "({{~?)(([-a-z/]+)\\s)",
+      "captures": {
+        "1": {
+          "name": "keyword.operator"
+        },
+        "2": {
+          "name": "keyword.operator"
+        },
+        "3": {
+          "name": "keyword.control"
+        }
+      },
+      "end": "(~?}})",
+      "name": "entity.expression.ember-handlebars",
+      "patterns": [
+        {
+          "include": "#glimmer-supexp-content"
+        }
+      ]
+    },
+    "glimmer-else-block": {
+      "captures": {
+        "0": {
+          "name": "punctuation.definition.tag"
+        },
+        "1": {
+          "name": "punctuation.definition.tag"
+        },
+        "2": {
+          "name": "keyword.control"
+        },
+        "3": {
+          "name": "keyword.control",
+          "patterns": [
+            {
+              "include": "#glimmer-subexp"
+            },
+            {
+              "include": "#string-single-quoted-handlebars"
+            },
+            {
+              "include": "#string-double-quoted-handlebars"
+            },
+            {
+              "include": "#boolean"
+            },
+            {
+              "include": "#digit"
+            },
+            {
+              "include": "#param"
+            },
+            {
+              "include": "#glimmer-parameter-name"
+            },
+            {
+              "include": "#glimmer-parameter-value"
+            }
+          ]
+        },
+        "4": {
+          "name": "punctuation.definition.tag"
+        }
+      },
+      "match": "({{~?)(else\\s[a-z]+\\s|else)([()@a-zA-Z0-9\\.\\s\\b]+)?(~?}})",
+      "name": "entity.expression.ember-handlebars"
+    },
+    "glimmer-expression": {
+      "begin": "({{~?)(([()\\s@a-zA-Z0-9_.-]+))",
+      "captures": {
+        "1": {
+          "name": "keyword.operator"
+        },
+        "2": {
+          "name": "keyword.operator"
+        },
+        "3": {
+          "name": "support.function",
+          "patterns": [
+            {
+              "match": "[(]+",
+              "name": "string.regexp"
+            },
+            {
+              "match": "[)]+",
+              "name": "string.regexp"
+            },
+            {
+              "match": "(\\.)+",
+              "name": "punctuation.definition.tag"
+            },
+            {
+              "include": "#glimmer-supexp-content"
+            }
+          ]
+        }
+      },
+      "end": "(~?}})",
+      "name": "entity.expression.ember-handlebars",
+      "patterns": [
+        {
+          "include": "#glimmer-supexp-content"
+        }
+      ]
+    },
+    "glimmer-expression-property": {
+      "begin": "({{~?)((@|this.)([a-zA-Z0-9_.-]+))",
+      "captures": {
+        "1": {
+          "name": "keyword.operator"
+        },
+        "2": {
+          "name": "keyword.operator"
+        },
+        "3": {
+          "name": "support.function",
+          "patterns": [
+            {
+              "match": "(@|this)",
+              "name": "variable.language"
+            },
+            {
+              "match": "(\\.)+",
+              "name": "punctuation.definition.tag"
+            }
+          ]
+        },
+        "4": {
+          "name": "support.function",
+          "patterns": [
+            {
+              "match": "(\\.)+",
+              "name": "punctuation.definition.tag"
+            }
+          ]
+        }
+      },
+      "end": "(~?}})",
+      "name": "entity.expression.ember-handlebars",
+      "patterns": [
+        {
+          "include": "#glimmer-supexp-content"
+        }
+      ]
+    },
+    "glimmer-parameter-name": {
+      "captures": {
+        "1": {
+          "name": "variable.parameter.name.ember-handlebars"
+        },
+        "2": {
+          "name": "punctuation.definition.expression.ember-handlebars"
+        }
+      },
+      "match": "\\b([a-zA-Z0-9_-]+)(\\s?=)",
+      "patterns": [
+      ]
+    },
+    "glimmer-parameter-value": {
+      "captures": {
+        "1": {
+          "name": "support.function",
+          "patterns": [
+            {
+              "match": "(\\.)+",
+              "name": "punctuation.definition.tag"
+            }
+          ]
+        }
+      },
+      "match": "\\b([a-zA-Z0-9:_.-]+)\\b(?!=)",
+      "patterns": [
+      ]
+    },
+    "glimmer-special-block": {
+      "captures": {
+        "0": {
+          "name": "keyword.operator"
+        },
+        "1": {
+          "name": "keyword.operator"
+        },
+        "2": {
+          "name": "keyword.control"
+        },
+        "3": {
+          "name": "keyword.operator"
+        }
+      },
+      "match": "({{~?)(yield|outlet)(~?}})",
+      "name": "entity.expression.ember-handlebars"
+    },
+    "glimmer-subexp": {
+      "begin": "(\\()([@a-zA-Z0-9.-]+)",
+      "captures": {
+        "1": {
+          "name": "keyword.other"
+        },
+        "2": {
+          "name": "keyword.control"
+        }
+      },
+      "end": "(\\))",
+      "name": "entity.subexpression.ember-handlebars",
+      "patterns": [
+        {
+          "include": "#glimmer-supexp-content"
+        }
+      ]
+    },
+    "glimmer-supexp-content": {
+      "patterns": [
+        {
+          "include": "#glimmer-subexp"
+        },
+        {
+          "include": "#string-single-quoted-handlebars"
+        },
+        {
+          "include": "#string-double-quoted-handlebars"
+        },
+        {
+          "include": "#boolean"
+        },
+        {
+          "include": "#digit"
+        },
+        {
+          "include": "#param"
+        },
+        {
+          "include": "#glimmer-parameter-name"
+        },
+        {
+          "include": "#glimmer-parameter-value"
+        }
+      ]
+    },
+    "glimmer-unescaped-expression": {
+      "begin": "{{{",
+      "captures": {
+        "0": {
+          "name": "keyword.operator"
+        }
+      },
+      "end": "}}}",
+      "name": "entity.unescaped.expression.ember-handlebars",
+      "patterns": [
+        {
+          "include": "#string-single-quoted-handlebars"
+        },
+        {
+          "include": "#string-double-quoted-handlebars"
+        },
+        {
+          "include": "#glimmer-subexp"
+        },
+        {
+          "include": "#param"
+        }
+      ]
+    },
+    "html-attribute": {
+      "captures": {
+        "1": {
+          "name": "entity.other.attribute-name.ember-handlebars",
+          "patterns": [
+            {
+              "match": "(\\.\\.\\.attributes)",
+              "name": "markup.bold"
+            }
+          ]
+        },
+        "2": {
+          "name": "punctuation.separator.key-value.html.ember-handlebars"
+        }
+      },
+      "match": "\\s([a-zA-Z0-9:_.-]+)(=)?"
+    },
+    "html-comment": {
+      "begin": "<!--",
+      "captures": {
+        "0": {
+          "name": "punctuation.definition.comment.html.ember-handlebars"
+        }
+      },
+      "end": "--\\s*>",
+      "name": "comment.block.html.ember-handlebars",
+      "patterns": [
+        {
+          "include": "#attention"
+        },
+        {
+          "match": "--",
+          "name": "invalid.illegal.bad-comments-or-CDATA.html.ember-handlebars"
+        }
+      ]
+    },
+    "html-tag": {
+      "begin": "(<\\/?)([a-z0-9-]+)(?!\\.|:)\\b",
+      "beginCaptures": {
+        "1": {
+          "name": "punctuation.definition.tag"
+        },
+        "2": {
+          "name": "entity.name.tag.html.ember-handlebars"
+        }
+      },
+      "end": "(\\/?)(>)",
+      "endCaptures": {
+        "1": {
+          "name": "punctuation.definition.tag"
+        },
+        "2": {
+          "name": "punctuation.definition.tag"
+        }
+      },
+      "name": "meta.tag.any.ember-handlebars",
+      "patterns": [
+        {
+          "include": "#tag-like-content"
+        }
+      ]
+    },
+    "main": {
       "patterns": [
         {
           "begin": "\\s*(<)(template)\\s*(>)",
           "beginCaptures": {
             "1": {
-              "name": "punctuation.definition.tag.html"
+              "name": "punctuation.definition.tag.html"
+            },
+            "2": {
+              "name": "entity.name.tag.other.html"
+            },
+            "3": {
+              "name": "punctuation.definition.tag.html"
+            }
+          },
+          "end": "(</)(template)(>)",
+          "endCaptures": {
+            "1": {
+              "name": "punctuation.definition.tag.html"
+            },
+            "2": {
+              "name": "entity.name.tag.other.html"
+            },
+            "3": {
+              "name": "punctuation.definition.tag.html"
+            }
+          },
+          "name": "meta.js.embeddedTemplateWithoutArgs",
+          "patterns": [
+            {
+              "include": "#style"
+            },
+            {
+              "include": "#script"
+            },
+            {
+              "include": "#glimmer-else-block"
+            },
+            {
+              "include": "#glimmer-bools"
+            },
+            {
+              "include": "#glimmer-special-block"
+            },
+            {
+              "include": "#glimmer-unescaped-expression"
+            },
+            {
+              "include": "#glimmer-comment-block"
+            },
+            {
+              "include": "#glimmer-comment-inline"
+            },
+            {
+              "include": "#glimmer-expression-property"
+            },
+            {
+              "include": "#glimmer-control-expression"
+            },
+            {
+              "include": "#glimmer-expression"
+            },
+            {
+              "include": "#glimmer-block"
+            },
+            {
+              "include": "#html-tag"
+            },
+            {
+              "include": "#component-tag"
+            },
+            {
+              "include": "#html-comment"
+            },
+            {
+              "include": "#entities"
+            }
+          ]
+        },
+        {
+          "begin": "(<)(template)",
+          "beginCaptures": {
+            "1": {
+              "name": "punctuation.definition.tag.html"
+            },
+            "2": {
+              "name": "entity.name.tag.other.html"
+            }
+          },
+          "end": "(</)(template)(>)",
+          "endCaptures": {
+            "1": {
+              "name": "punctuation.definition.tag.html"
+            },
+            "2": {
+              "name": "entity.name.tag.other.html"
+            },
+            "3": {
+              "name": "punctuation.definition.tag.html"
+            }
+          },
+          "name": "meta.js.embeddedTemplateWithArgs",
+          "patterns": [
+            {
+              "begin": "(?<=\\<template)",
+              "end": "(?=\\>)",
+              "patterns": [
+                {
+                  "include": "#tag-like-content"
+                }
+              ]
+            },
+            {
+              "begin": "(>)",
+              "beginCaptures": {
+                "1": {
+                  "name": "punctuation.definition.tag.end.js"
+                }
+              },
+              "contentName": "meta.html.embedded.block",
+              "end": "(?=</template>)",
+              "patterns": [
+                {
+                  "include": "#style"
+                },
+                {
+                  "include": "#script"
+                },
+                {
+                  "include": "#glimmer-else-block"
+                },
+                {
+                  "include": "#glimmer-bools"
+                },
+                {
+                  "include": "#glimmer-special-block"
+                },
+                {
+                  "include": "#glimmer-unescaped-expression"
+                },
+                {
+                  "include": "#glimmer-comment-block"
+                },
+                {
+                  "include": "#glimmer-comment-inline"
+                },
+                {
+                  "include": "#glimmer-expression-property"
+                },
+                {
+                  "include": "#glimmer-control-expression"
+                },
+                {
+                  "include": "#glimmer-expression"
+                },
+                {
+                  "include": "#glimmer-block"
+                },
+                {
+                  "include": "#html-tag"
+                },
+                {
+                  "include": "#component-tag"
+                },
+                {
+                  "include": "#html-comment"
+                },
+                {
+                  "include": "#entities"
+                }
+              ]
+            }
+          ]
+        },
+        {
+          "begin": "(?x)(\\b(?:\\w+\\.)*(?:hbs|html)\\s*)(`)",
+          "beginCaptures": {
+            "1": {
+              "name": "entity.name.function.tagged-template.js"
+            },
+            "2": {
+              "name": "punctuation.definition.string.template.begin.js"
+            }
+          },
+          "contentName": "meta.embedded.block.html",
+          "end": "(`)",
+          "endCaptures": {
+            "0": {
+              "name": "string.js"
+            },
+            "1": {
+              "name": "punctuation.definition.string.template.end.js"
+            }
+          },
+          "patterns": [
+            {
+              "include": "source.ts#template-substitution-element"
+            },
+            {
+              "include": "#style"
+            },
+            {
+              "include": "#script"
+            },
+            {
+              "include": "#glimmer-else-block"
+            },
+            {
+              "include": "#glimmer-bools"
+            },
+            {
+              "include": "#glimmer-special-block"
+            },
+            {
+              "include": "#glimmer-unescaped-expression"
+            },
+            {
+              "include": "#glimmer-comment-block"
+            },
+            {
+              "include": "#glimmer-comment-inline"
+            },
+            {
+              "include": "#glimmer-expression-property"
+            },
+            {
+              "include": "#glimmer-control-expression"
+            },
+            {
+              "include": "#glimmer-expression"
+            },
+            {
+              "include": "#glimmer-block"
+            },
+            {
+              "include": "#html-tag"
+            },
+            {
+              "include": "#component-tag"
+            },
+            {
+              "include": "#html-comment"
+            },
+            {
+              "include": "#entities"
+            }
+          ]
+        },
+        {
+          "begin": "((createTemplate|hbs|html))(\\()",
+          "beginCaptures": {
+            "1": {
+              "name": "entity.name.function.ts"
             },
             "2": {
-              "name": "entity.name.tag.other.html"
+              "name": "meta.function-call.ts"
             },
             "3": {
-              "name": "punctuation.definition.tag.html"
+              "name": "meta.brace.round.ts"
             }
           },
-          "end": "(</)(template)(>)",
+          "contentName": "meta.embedded.block.html",
+          "end": "(\\))",
           "endCaptures": {
             "1": {
-              "name": "punctuation.definition.tag.html"
+              "name": "meta.brace.round.ts"
+            }
+          },
+          "patterns": [
+            {
+              "begin": "((`|'|\"))",
+              "beginCaptures": {
+                "1": {
+                  "name": "string.template.ts"
+                },
+                "2": {
+                  "name": "punctuation.definition.string.template.begin.ts"
+                }
+              },
+              "end": "((`|'|\"))",
+              "endCaptures": {
+                "1": {
+                  "name": "string.template.ts"
+                },
+                "2": {
+                  "name": "punctuation.definition.string.template.end.ts"
+                }
+              },
+              "patterns": [
+                {
+                  "include": "#style"
+                },
+                {
+                  "include": "#script"
+                },
+                {
+                  "include": "#glimmer-else-block"
+                },
+                {
+                  "include": "#glimmer-bools"
+                },
+                {
+                  "include": "#glimmer-special-block"
+                },
+                {
+                  "include": "#glimmer-unescaped-expression"
+                },
+                {
+                  "include": "#glimmer-comment-block"
+                },
+                {
+                  "include": "#glimmer-comment-inline"
+                },
+                {
+                  "include": "#glimmer-expression-property"
+                },
+                {
+                  "include": "#glimmer-control-expression"
+                },
+                {
+                  "include": "#glimmer-expression"
+                },
+                {
+                  "include": "#glimmer-block"
+                },
+                {
+                  "include": "#html-tag"
+                },
+                {
+                  "include": "#component-tag"
+                },
+                {
+                  "include": "#html-comment"
+                },
+                {
+                  "include": "#entities"
+                }
+              ]
+            }
+          ]
+        },
+        {
+          "begin": "((precompileTemplate)\\s*)(\\()",
+          "beginCaptures": {
+            "1": {
+              "name": "entity.name.function.ts"
             },
             "2": {
-              "name": "entity.name.tag.other.html"
+              "name": "meta.function-call.ts"
             },
             "3": {
-              "name": "punctuation.definition.tag.html"
+              "name": "meta.brace.round.ts"
             }
           },
-          "name": "meta.js.embeddedTemplateWithoutArgs",
+          "end": "(\\))",
+          "endCaptures": {
+            "1": {
+              "name": "meta.brace.round.ts"
+            }
+          },
+          "patterns": [
+            {
+              "begin": "((`|'|\"))",
+              "beginCaptures": {
+                "1": {
+                  "name": "string.template.ts"
+                },
+                "2": {
+                  "name": "punctuation.definition.string.template.begin.ts"
+                }
+              },
+              "contentName": "meta.embedded.block.html",
+              "end": "((`|'|\"))",
+              "endCaptures": {
+                "1": {
+                  "name": "string.template.ts"
+                },
+                "2": {
+                  "name": "punctuation.definition.string.template.end.ts"
+                }
+              },
+              "patterns": [
+                {
+                  "include": "#style"
+                },
+                {
+                  "include": "#script"
+                },
+                {
+                  "include": "#glimmer-else-block"
+                },
+                {
+                  "include": "#glimmer-bools"
+                },
+                {
+                  "include": "#glimmer-special-block"
+                },
+                {
+                  "include": "#glimmer-unescaped-expression"
+                },
+                {
+                  "include": "#glimmer-comment-block"
+                },
+                {
+                  "include": "#glimmer-comment-inline"
+                },
+                {
+                  "include": "#glimmer-expression-property"
+                },
+                {
+                  "include": "#glimmer-control-expression"
+                },
+                {
+                  "include": "#glimmer-expression"
+                },
+                {
+                  "include": "#glimmer-block"
+                },
+                {
+                  "include": "#html-tag"
+                },
+                {
+                  "include": "#component-tag"
+                },
+                {
+                  "include": "#html-comment"
+                },
+                {
+                  "include": "#entities"
+                }
+              ]
+            },
+            {
+              "include": "source.ts#object-literal"
+            },
+            {
+              "include": "source.ts"
+            }
+          ]
+        }
+      ]
+    },
+    "param": {
+      "captures": {
+        "0": {
+          "name": "support.function",
           "patterns": [
             {
-              "include": "text.html.handlebars"
+              "match": "(@|this)",
+              "name": "variable.language"
+            },
+            {
+              "match": "(\\.)+",
+              "name": "punctuation.definition.tag"
             }
           ]
         },
+        "1": {
+          "name": "support.function",
+          "patterns": [
+            {
+              "match": "(\\.)+",
+              "name": "punctuation.definition.tag"
+            }
+          ]
+        }
+      },
+      "match": "(@|this.)([a-zA-Z0-9_.-]+)",
+      "patterns": [
+      ]
+    },
+    "script": {
+      "begin": "(^[ \\t]+)?(?=<(?i:script)\\b(?!-))",
+      "beginCaptures": {
+        "1": {
+          "name": "punctuation.whitespace.embedded.leading.html"
+        }
+      },
+      "end": "(?!\\G)([ \\t]*$\\n?)?",
+      "endCaptures": {
+        "1": {
+          "name": "punctuation.whitespace.embedded.trailing.html"
+        }
+      },
+      "patterns": [
         {
-          "begin": "(<)(template)",
+          "begin": "(<)((?i:script))\\b",
           "beginCaptures": {
+            "0": {
+              "name": "meta.tag.metadata.script.start.html"
+            },
             "1": {
-              "name": "punctuation.definition.tag.html"
+              "name": "punctuation.definition.tag.begin.html"
             },
             "2": {
-              "name": "entity.name.tag.other.html"
+              "name": "entity.name.tag.html"
             }
           },
-          "end": "(</)(template)(>)",
+          "end": "(/)((?i:script))(>)",
           "endCaptures": {
+            "0": {
+              "name": "meta.tag.metadata.script.end.html"
+            },
             "1": {
-              "name": "punctuation.definition.tag.html"
+              "name": "punctuation.definition.tag.begin.html"
             },
             "2": {
-              "name": "entity.name.tag.other.html"
+              "name": "entity.name.tag.html"
             },
             "3": {
-              "name": "punctuation.definition.tag.html"
+              "name": "punctuation.definition.tag.end.html"
             }
           },
-          "name": "meta.js.embeddedTemplateWithArgs",
+          "name": "meta.embedded.block.html",
           "patterns": [
             {
-              "begin": "(?<=\\<template)",
-              "end": "(?=\\>)",
+              "begin": "\\G",
+              "end": "(?=/)",
               "patterns": [
                 {
-                  "include": "text.html.handlebars#tag-stuff"
+                  "begin": "(>)",
+                  "beginCaptures": {
+                    "0": {
+                      "name": "meta.tag.metadata.script.start.html"
+                    },
+                    "1": {
+                      "name": "punctuation.definition.tag.end.html"
+                    }
+                  },
+                  "end": "((<))(?=/(?i:script))",
+                  "endCaptures": {
+                    "0": {
+                      "name": "meta.tag.metadata.script.end.html"
+                    },
+                    "1": {
+                      "name": "punctuation.definition.tag.begin.html"
+                    },
+                    "2": {
+                      "name": "source.js-ignored-vscode"
+                    }
+                  },
+                  "patterns": [
+                    {
+                      "begin": "\\G",
+                      "end": "(?=</(?i:script))",
+                      "name": "source.js",
+                      "patterns": [
+                        {
+                          "begin": "(^[ \\t]+)?(?=//)",
+                          "beginCaptures": {
+                            "1": {
+                              "name": "punctuation.whitespace.comment.leading.js"
+                            }
+                          },
+                          "end": "(?!\\G)",
+                          "patterns": [
+                            {
+                              "begin": "//",
+                              "beginCaptures": {
+                                "0": {
+                                  "name": "punctuation.definition.comment.js"
+                                }
+                              },
+                              "end": "(?=</script)|\\n",
+                              "name": "comment.line.double-slash.js"
+                            }
+                          ]
+                        },
+                        {
+                          "begin": "/\\*",
+                          "captures": {
+                            "0": {
+                              "name": "punctuation.definition.comment.js"
+                            }
+                          },
+                          "end": "\\*/|(?=</script)",
+                          "name": "comment.block.js"
+                        },
+                        {
+                          "include": "source.js"
+                        }
+                      ]
+                    }
+                  ]
+                },
+                {
+                  "begin": "(?ix:\n(?=\ntype\\s*=\\s*\n('|\"|)\ntext/\n(\nx-handlebars\n| (x-(handlebars-)?|ng-)?template\n| html\n)\n[\\s\"'>]\n)\n)",
+                  "end": "((<))(?=/(?i:script))",
+                  "endCaptures": {
+                    "0": {
+                      "name": "meta.tag.metadata.script.end.html"
+                    },
+                    "1": {
+                      "name": "punctuation.definition.tag.begin.html"
+                    },
+                    "2": {
+                      "name": "text.html.basic"
+                    }
+                  },
+                  "patterns": [
+                    {
+                      "begin": "(?!\\G)",
+                      "end": "(?=</(?i:script))",
+                      "name": "text.html.basic",
+                      "patterns": [
+                        {
+                          "include": "text.html.basic"
+                        }
+                      ]
+                    }
+                  ]
+                },
+                {
+                  "begin": "(?=(?i:type))",
+                  "end": "(<)(?=/(?i:script))",
+                  "endCaptures": {
+                    "0": {
+                      "name": "meta.tag.metadata.script.end.html"
+                    },
+                    "1": {
+                      "name": "punctuation.definition.tag.begin.html"
+                    }
+                  }
+                },
+                {
+                  "include": "#string-double-quoted-html"
+                },
+                {
+                  "include": "#string-single-quoted-html"
+                },
+                {
+                  "include": "#glimmer-argument"
+                },
+                {
+                  "include": "#html-attribute"
                 }
               ]
+            }
+          ]
+        }
+      ]
+    },
+    "string-double-quoted-handlebars": {
+      "begin": "\"",
+      "beginCaptures": {
+        "0": {
+          "name": "punctuation.definition.string.begin.ember-handlebars"
+        }
+      },
+      "end": "\"",
+      "endCaptures": {
+        "0": {
+          "name": "punctuation.definition.string.end.ember-handlebars"
+        }
+      },
+      "name": "string.quoted.double.ember-handlebars",
+      "patterns": [
+        {
+          "match": "\\\\\"",
+          "name": "constant.character.escape.ember-handlebars"
+        }
+      ]
+    },
+    "string-double-quoted-html": {
+      "begin": "\"",
+      "beginCaptures": {
+        "0": {
+          "name": "punctuation.definition.string.begin.ember-handlebars"
+        }
+      },
+      "end": "\"",
+      "endCaptures": {
+        "0": {
+          "name": "punctuation.definition.string.end.ember-handlebars"
+        }
+      },
+      "name": "string.quoted.double.html.ember-handlebars",
+      "patterns": [
+        {
+          "match": "\\\\\"",
+          "name": "constant.character.escape.ember-handlebars"
+        },
+        {
+          "include": "#glimmer-bools"
+        },
+        {
+          "include": "#glimmer-expression-property"
+        },
+        {
+          "include": "#glimmer-control-expression"
+        },
+        {
+          "include": "#glimmer-expression"
+        },
+        {
+          "include": "#glimmer-block"
+        }
+      ]
+    },
+    "string-single-quoted-handlebars": {
+      "begin": "'",
+      "beginCaptures": {
+        "0": {
+          "name": "punctuation.definition.string.begin.ember-handlebars"
+        }
+      },
+      "end": "'",
+      "endCaptures": {
+        "0": {
+          "name": "punctuation.definition.string.end.ember-handlebars"
+        }
+      },
+      "name": "string.quoted.single.ember-handlebars",
+      "patterns": [
+        {
+          "match": "\\\\'",
+          "name": "constant.character.escape.ember-handlebars"
+        }
+      ]
+    },
+    "string-single-quoted-html": {
+      "begin": "'",
+      "beginCaptures": {
+        "0": {
+          "name": "punctuation.definition.string.begin.ember-handlebars"
+        }
+      },
+      "end": "'",
+      "endCaptures": {
+        "0": {
+          "name": "punctuation.definition.string.end.ember-handlebars"
+        }
+      },
+      "name": "string.quoted.single.html.ember-handlebars",
+      "patterns": [
+        {
+          "match": "\\\\'",
+          "name": "constant.character.escape.ember-handlebars"
+        },
+        {
+          "include": "#glimmer-bools"
+        },
+        {
+          "include": "#glimmer-expression-property"
+        },
+        {
+          "include": "#glimmer-control-expression"
+        },
+        {
+          "include": "#glimmer-expression"
+        },
+        {
+          "include": "#glimmer-block"
+        }
+      ]
+    },
+    "style": {
+      "begin": "(^[ \\t]+)?(?=<(?i:style)\\b(?!-))",
+      "beginCaptures": {
+        "1": {
+          "name": "punctuation.whitespace.embedded.leading.html"
+        }
+      },
+      "end": "(?!\\G)([ \\t]*$\\n?)?",
+      "endCaptures": {
+        "1": {
+          "name": "punctuation.whitespace.embedded.trailing.html"
+        }
+      },
+      "patterns": [
+        {
+          "begin": "(?i)(<)(style)(?=\\s|/?>)",
+          "beginCaptures": {
+            "0": {
+              "name": "meta.tag.metadata.style.start.html"
+            },
+            "1": {
+              "name": "punctuation.definition.tag.begin.html"
+            },
+            "2": {
+              "name": "entity.name.tag.html"
+            }
+          },
+          "end": "(?i)((<)/)(style)\\s*(>)",
+          "endCaptures": {
+            "0": {
+              "name": "meta.tag.metadata.style.end.html"
+            },
+            "1": {
+              "name": "punctuation.definition.tag.begin.html"
+            },
+            "2": {
+              "name": "source.css-ignored-vscode"
+            },
+            "3": {
+              "name": "entity.name.tag.html"
             },
+            "4": {
+              "name": "punctuation.definition.tag.end.html"
+            }
+          },
+          "name": "meta.embedded.block.html",
+          "patterns": [
             {
-              "begin": "(>)",
-              "beginCaptures": {
+              "begin": "\\G",
+              "captures": {
                 "1": {
-                  "name": "punctuation.definition.tag.end.js"
+                  "name": "punctuation.definition.tag.end.html"
                 }
               },
-              "contentName": "meta.html.embedded.block",
-              "end": "(?=</template>)",
+              "end": "(>)",
+              "name": "meta.tag.metadata.style.start.html",
+              "patterns": [
+                {
+                  "include": "#glimmer-argument"
+                },
+                {
+                  "include": "#html-attribute"
+                }
+              ]
+            },
+            {
+              "begin": "(?!\\G)",
+              "end": "(?=</(?i:style))",
+              "name": "source.css",
               "patterns": [
                 {
-                  "include": "text.html.handlebars"
+                  "include": "source.css"
                 }
               ]
             }
           ]
         }
       ]
+    },
+    "tag-like-content": {
+      "patterns": [
+        {
+          "include": "#glimmer-bools"
+        },
+        {
+          "include": "#glimmer-unescaped-expression"
+        },
+        {
+          "include": "#glimmer-comment-block"
+        },
+        {
+          "include": "#glimmer-comment-inline"
+        },
+        {
+          "include": "#glimmer-expression-property"
+        },
+        {
+          "include": "#boolean"
+        },
+        {
+          "include": "#digit"
+        },
+        {
+          "include": "#glimmer-control-expression"
+        },
+        {
+          "include": "#glimmer-expression"
+        },
+        {
+          "include": "#glimmer-block"
+        },
+        {
+          "include": "#string-double-quoted-html"
+        },
+        {
+          "include": "#string-single-quoted-html"
+        },
+        {
+          "include": "#glimmer-as-stuff"
+        },
+        {
+          "include": "#glimmer-argument"
+        },
+        {
+          "include": "#html-attribute"
+        }
+      ]
+    },
+    "variable": {
+      "match": "\\b([a-zA-Z0-9-_]+)\\b",
+      "name": "support.function",
+      "patterns": [
+      ]
     }
   },
-  "name": "glimmer-js",
-  "patterns": [
-    {
-      "include": "source.js"
-    }
-  ],
   "scopeName": "source.gjs"
 }
diff --git a/packages/tm-grammars/grammars/glimmer-ts.json b/packages/tm-grammars/grammars/glimmer-ts.json
index cd2e085..06a7b15 100644
--- a/packages/tm-grammars/grammars/glimmer-ts.json
+++ b/packages/tm-grammars/grammars/glimmer-ts.json
@@ -1,98 +1,1500 @@
 {
   "displayName": "Glimmer TS",
   "injections": {
-    "L:source.gts -comment -string": {
+    "L:source.gts -comment -(string -meta.embedded)": {
+      "patterns": [
+        {
+          "include": "#main"
+        }
+      ]
+    }
+  },
+  "name": "glimmer-ts",
+  "patterns": [
+    {
+      "include": "source.ts"
+    },
+    {
+      "include": "#main"
+    }
+  ],
+  "repository": {
+    "as-keyword": {
+      "match": "\\s\\b(as)\\b(?=\\s\\|)",
+      "name": "keyword.control",
+      "patterns": [
+      ]
+    },
+    "as-params": {
+      "begin": "(?<!\\|)(\\|)",
+      "beginCaptures": {
+        "1": {
+          "name": "constant.other.symbol.begin.ember-handlebars"
+        }
+      },
+      "end": "(\\|)(?!\\|)",
+      "endCaptures": {
+        "1": {
+          "name": "constant.other.symbol.end.ember-handlebars"
+        }
+      },
+      "name": "keyword.block-params.ember-handlebars",
+      "patterns": [
+        {
+          "include": "#variable"
+        }
+      ]
+    },
+    "attention": {
+      "match": "@?(TODO|FIXME|CHANGED|XXX|IDEA|HACK|NOTE|REVIEW|NB|BUG|QUESTION|TEMP)\\b",
+      "name": "storage.type.class.${1:/downcase}",
+      "patterns": [
+      ]
+    },
+    "boolean": {
+      "captures": {
+        "0": {
+          "name": "string.regexp"
+        },
+        "1": {
+          "name": "string.regexp"
+        },
+        "2": {
+          "name": "string.regexp"
+        }
+      },
+      "match": "true|false|undefined|null",
+      "patterns": [
+      ]
+    },
+    "component-tag": {
+      "begin": "(<\\/?)(@|this.)?([a-zA-Z0-9-_\\$:\\.]+)\\b",
+      "beginCaptures": {
+        "1": {
+          "name": "punctuation.definition.tag"
+        },
+        "2": {
+          "name": "support.function",
+          "patterns": [
+            {
+              "match": "(@|this)",
+              "name": "variable.language"
+            },
+            {
+              "match": "(\\.)+",
+              "name": "punctuation.definition.tag"
+            }
+          ]
+        },
+        "3": {
+          "name": "entity.name.type",
+          "patterns": [
+            {
+              "include": "#glimmer-component-path"
+            },
+            {
+              "match": "(@|:|\\$)",
+              "name": "markup.bold"
+            }
+          ]
+        }
+      },
+      "end": "(\\/?)(>)",
+      "endCaptures": {
+        "1": {
+          "name": "punctuation.definition.tag"
+        },
+        "2": {
+          "name": "punctuation.definition.tag"
+        }
+      },
+      "name": "meta.tag.any.ember-handlebars",
+      "patterns": [
+        {
+          "include": "#tag-like-content"
+        }
+      ]
+    },
+    "digit": {
+      "captures": {
+        "0": {
+          "name": "constant.numeric"
+        },
+        "1": {
+          "name": "constant.numeric"
+        },
+        "2": {
+          "name": "constant.numeric"
+        }
+      },
+      "match": "\\d*(\\.)?\\d+",
+      "patterns": [
+      ]
+    },
+    "entities": {
+      "patterns": [
+        {
+          "captures": {
+            "1": {
+              "name": "punctuation.definition.entity.html.ember-handlebars"
+            },
+            "3": {
+              "name": "punctuation.definition.entity.html.ember-handlebars"
+            }
+          },
+          "match": "(&)([a-zA-Z0-9]+|#[0-9]+|#x[0-9a-fA-F]+)(;)",
+          "name": "constant.character.entity.html.ember-handlebars"
+        },
+        {
+          "match": "&",
+          "name": "invalid.illegal.bad-ampersand.html.ember-handlebars"
+        }
+      ]
+    },
+    "glimmer-argument": {
+      "captures": {
+        "1": {
+          "name": "entity.other.attribute-name.ember-handlebars.argument",
+          "patterns": [
+            {
+              "match": "(@)",
+              "name": "markup.italic"
+            }
+          ]
+        },
+        "2": {
+          "name": "punctuation.separator.key-value.html.ember-handlebars"
+        }
+      },
+      "match": "\\s(@[a-zA-Z0-9:_.-]+)(=)?"
+    },
+    "glimmer-as-stuff": {
+      "patterns": [
+        {
+          "include": "#as-keyword"
+        },
+        {
+          "include": "#as-params"
+        }
+      ]
+    },
+    "glimmer-block": {
+      "begin": "({{~?)(#|/)(([@\\$a-zA-Z0-9_/.-]+))",
+      "captures": {
+        "1": {
+          "name": "punctuation.definition.tag"
+        },
+        "2": {
+          "name": "punctuation.definition.tag"
+        },
+        "3": {
+          "name": "keyword.control",
+          "patterns": [
+            {
+              "include": "#glimmer-component-path"
+            },
+            {
+              "match": "(\\/)+",
+              "name": "punctuation.definition.tag"
+            },
+            {
+              "match": "(\\.)+",
+              "name": "punctuation.definition.tag"
+            }
+          ]
+        }
+      },
+      "end": "(~?}})",
+      "name": "entity.expression.ember-handlebars",
+      "patterns": [
+        {
+          "include": "#glimmer-as-stuff"
+        },
+        {
+          "include": "#glimmer-supexp-content"
+        }
+      ]
+    },
+    "glimmer-bools": {
+      "captures": {
+        "0": {
+          "name": "keyword.operator"
+        },
+        "1": {
+          "name": "keyword.operator"
+        },
+        "2": {
+          "name": "string.regexp"
+        },
+        "3": {
+          "name": "string.regexp"
+        },
+        "4": {
+          "name": "keyword.operator"
+        }
+      },
+      "match": "({{~?)(true|false|null|undefined|\\d*(\\.)?\\d+)(~?}})",
+      "name": "entity.expression.ember-handlebars"
+    },
+    "glimmer-comment-block": {
+      "begin": "{{!--",
+      "captures": {
+        "0": {
+          "name": "punctuation.definition.block.comment.glimmer"
+        }
+      },
+      "end": "--}}",
+      "name": "comment.block.glimmer",
+      "patterns": [
+        {
+          "include": "#script"
+        },
+        {
+          "include": "#attention"
+        }
+      ]
+    },
+    "glimmer-comment-inline": {
+      "begin": "{{!",
+      "captures": {
+        "0": {
+          "name": "punctuation.definition.block.comment.glimmer"
+        }
+      },
+      "end": "}}",
+      "name": "comment.inline.glimmer",
+      "patterns": [
+        {
+          "include": "#script"
+        },
+        {
+          "include": "#attention"
+        }
+      ]
+    },
+    "glimmer-component-path": {
+      "captures": {
+        "1": {
+          "name": "punctuation.definition.tag"
+        }
+      },
+      "match": "(::|_|\\$|\\.)"
+    },
+    "glimmer-control-expression": {
+      "begin": "({{~?)(([-a-z/]+)\\s)",
+      "captures": {
+        "1": {
+          "name": "keyword.operator"
+        },
+        "2": {
+          "name": "keyword.operator"
+        },
+        "3": {
+          "name": "keyword.control"
+        }
+      },
+      "end": "(~?}})",
+      "name": "entity.expression.ember-handlebars",
+      "patterns": [
+        {
+          "include": "#glimmer-supexp-content"
+        }
+      ]
+    },
+    "glimmer-else-block": {
+      "captures": {
+        "0": {
+          "name": "punctuation.definition.tag"
+        },
+        "1": {
+          "name": "punctuation.definition.tag"
+        },
+        "2": {
+          "name": "keyword.control"
+        },
+        "3": {
+          "name": "keyword.control",
+          "patterns": [
+            {
+              "include": "#glimmer-subexp"
+            },
+            {
+              "include": "#string-single-quoted-handlebars"
+            },
+            {
+              "include": "#string-double-quoted-handlebars"
+            },
+            {
+              "include": "#boolean"
+            },
+            {
+              "include": "#digit"
+            },
+            {
+              "include": "#param"
+            },
+            {
+              "include": "#glimmer-parameter-name"
+            },
+            {
+              "include": "#glimmer-parameter-value"
+            }
+          ]
+        },
+        "4": {
+          "name": "punctuation.definition.tag"
+        }
+      },
+      "match": "({{~?)(else\\s[a-z]+\\s|else)([()@a-zA-Z0-9\\.\\s\\b]+)?(~?}})",
+      "name": "entity.expression.ember-handlebars"
+    },
+    "glimmer-expression": {
+      "begin": "({{~?)(([()\\s@a-zA-Z0-9_.-]+))",
+      "captures": {
+        "1": {
+          "name": "keyword.operator"
+        },
+        "2": {
+          "name": "keyword.operator"
+        },
+        "3": {
+          "name": "support.function",
+          "patterns": [
+            {
+              "match": "[(]+",
+              "name": "string.regexp"
+            },
+            {
+              "match": "[)]+",
+              "name": "string.regexp"
+            },
+            {
+              "match": "(\\.)+",
+              "name": "punctuation.definition.tag"
+            },
+            {
+              "include": "#glimmer-supexp-content"
+            }
+          ]
+        }
+      },
+      "end": "(~?}})",
+      "name": "entity.expression.ember-handlebars",
+      "patterns": [
+        {
+          "include": "#glimmer-supexp-content"
+        }
+      ]
+    },
+    "glimmer-expression-property": {
+      "begin": "({{~?)((@|this.)([a-zA-Z0-9_.-]+))",
+      "captures": {
+        "1": {
+          "name": "keyword.operator"
+        },
+        "2": {
+          "name": "keyword.operator"
+        },
+        "3": {
+          "name": "support.function",
+          "patterns": [
+            {
+              "match": "(@|this)",
+              "name": "variable.language"
+            },
+            {
+              "match": "(\\.)+",
+              "name": "punctuation.definition.tag"
+            }
+          ]
+        },
+        "4": {
+          "name": "support.function",
+          "patterns": [
+            {
+              "match": "(\\.)+",
+              "name": "punctuation.definition.tag"
+            }
+          ]
+        }
+      },
+      "end": "(~?}})",
+      "name": "entity.expression.ember-handlebars",
+      "patterns": [
+        {
+          "include": "#glimmer-supexp-content"
+        }
+      ]
+    },
+    "glimmer-parameter-name": {
+      "captures": {
+        "1": {
+          "name": "variable.parameter.name.ember-handlebars"
+        },
+        "2": {
+          "name": "punctuation.definition.expression.ember-handlebars"
+        }
+      },
+      "match": "\\b([a-zA-Z0-9_-]+)(\\s?=)",
+      "patterns": [
+      ]
+    },
+    "glimmer-parameter-value": {
+      "captures": {
+        "1": {
+          "name": "support.function",
+          "patterns": [
+            {
+              "match": "(\\.)+",
+              "name": "punctuation.definition.tag"
+            }
+          ]
+        }
+      },
+      "match": "\\b([a-zA-Z0-9:_.-]+)\\b(?!=)",
+      "patterns": [
+      ]
+    },
+    "glimmer-special-block": {
+      "captures": {
+        "0": {
+          "name": "keyword.operator"
+        },
+        "1": {
+          "name": "keyword.operator"
+        },
+        "2": {
+          "name": "keyword.control"
+        },
+        "3": {
+          "name": "keyword.operator"
+        }
+      },
+      "match": "({{~?)(yield|outlet)(~?}})",
+      "name": "entity.expression.ember-handlebars"
+    },
+    "glimmer-subexp": {
+      "begin": "(\\()([@a-zA-Z0-9.-]+)",
+      "captures": {
+        "1": {
+          "name": "keyword.other"
+        },
+        "2": {
+          "name": "keyword.control"
+        }
+      },
+      "end": "(\\))",
+      "name": "entity.subexpression.ember-handlebars",
+      "patterns": [
+        {
+          "include": "#glimmer-supexp-content"
+        }
+      ]
+    },
+    "glimmer-supexp-content": {
+      "patterns": [
+        {
+          "include": "#glimmer-subexp"
+        },
+        {
+          "include": "#string-single-quoted-handlebars"
+        },
+        {
+          "include": "#string-double-quoted-handlebars"
+        },
+        {
+          "include": "#boolean"
+        },
+        {
+          "include": "#digit"
+        },
+        {
+          "include": "#param"
+        },
+        {
+          "include": "#glimmer-parameter-name"
+        },
+        {
+          "include": "#glimmer-parameter-value"
+        }
+      ]
+    },
+    "glimmer-unescaped-expression": {
+      "begin": "{{{",
+      "captures": {
+        "0": {
+          "name": "keyword.operator"
+        }
+      },
+      "end": "}}}",
+      "name": "entity.unescaped.expression.ember-handlebars",
+      "patterns": [
+        {
+          "include": "#string-single-quoted-handlebars"
+        },
+        {
+          "include": "#string-double-quoted-handlebars"
+        },
+        {
+          "include": "#glimmer-subexp"
+        },
+        {
+          "include": "#param"
+        }
+      ]
+    },
+    "html-attribute": {
+      "captures": {
+        "1": {
+          "name": "entity.other.attribute-name.ember-handlebars",
+          "patterns": [
+            {
+              "match": "(\\.\\.\\.attributes)",
+              "name": "markup.bold"
+            }
+          ]
+        },
+        "2": {
+          "name": "punctuation.separator.key-value.html.ember-handlebars"
+        }
+      },
+      "match": "\\s([a-zA-Z0-9:_.-]+)(=)?"
+    },
+    "html-comment": {
+      "begin": "<!--",
+      "captures": {
+        "0": {
+          "name": "punctuation.definition.comment.html.ember-handlebars"
+        }
+      },
+      "end": "--\\s*>",
+      "name": "comment.block.html.ember-handlebars",
+      "patterns": [
+        {
+          "include": "#attention"
+        },
+        {
+          "match": "--",
+          "name": "invalid.illegal.bad-comments-or-CDATA.html.ember-handlebars"
+        }
+      ]
+    },
+    "html-tag": {
+      "begin": "(<\\/?)([a-z0-9-]+)(?!\\.|:)\\b",
+      "beginCaptures": {
+        "1": {
+          "name": "punctuation.definition.tag"
+        },
+        "2": {
+          "name": "entity.name.tag.html.ember-handlebars"
+        }
+      },
+      "end": "(\\/?)(>)",
+      "endCaptures": {
+        "1": {
+          "name": "punctuation.definition.tag"
+        },
+        "2": {
+          "name": "punctuation.definition.tag"
+        }
+      },
+      "name": "meta.tag.any.ember-handlebars",
+      "patterns": [
+        {
+          "include": "#tag-like-content"
+        }
+      ]
+    },
+    "main": {
       "patterns": [
         {
           "begin": "\\s*(<)(template)\\s*(>)",
           "beginCaptures": {
             "1": {
-              "name": "punctuation.definition.tag.html"
+              "name": "punctuation.definition.tag.html"
+            },
+            "2": {
+              "name": "entity.name.tag.other.html"
+            },
+            "3": {
+              "name": "punctuation.definition.tag.html"
+            }
+          },
+          "end": "(</)(template)(>)",
+          "endCaptures": {
+            "1": {
+              "name": "punctuation.definition.tag.html"
+            },
+            "2": {
+              "name": "entity.name.tag.other.html"
+            },
+            "3": {
+              "name": "punctuation.definition.tag.html"
+            }
+          },
+          "name": "meta.js.embeddedTemplateWithoutArgs",
+          "patterns": [
+            {
+              "include": "#style"
+            },
+            {
+              "include": "#script"
+            },
+            {
+              "include": "#glimmer-else-block"
+            },
+            {
+              "include": "#glimmer-bools"
+            },
+            {
+              "include": "#glimmer-special-block"
+            },
+            {
+              "include": "#glimmer-unescaped-expression"
+            },
+            {
+              "include": "#glimmer-comment-block"
+            },
+            {
+              "include": "#glimmer-comment-inline"
+            },
+            {
+              "include": "#glimmer-expression-property"
+            },
+            {
+              "include": "#glimmer-control-expression"
+            },
+            {
+              "include": "#glimmer-expression"
+            },
+            {
+              "include": "#glimmer-block"
+            },
+            {
+              "include": "#html-tag"
+            },
+            {
+              "include": "#component-tag"
+            },
+            {
+              "include": "#html-comment"
+            },
+            {
+              "include": "#entities"
+            }
+          ]
+        },
+        {
+          "begin": "(<)(template)",
+          "beginCaptures": {
+            "1": {
+              "name": "punctuation.definition.tag.html"
+            },
+            "2": {
+              "name": "entity.name.tag.other.html"
+            }
+          },
+          "end": "(</)(template)(>)",
+          "endCaptures": {
+            "1": {
+              "name": "punctuation.definition.tag.html"
+            },
+            "2": {
+              "name": "entity.name.tag.other.html"
+            },
+            "3": {
+              "name": "punctuation.definition.tag.html"
+            }
+          },
+          "name": "meta.js.embeddedTemplateWithArgs",
+          "patterns": [
+            {
+              "begin": "(?<=\\<template)",
+              "end": "(?=\\>)",
+              "patterns": [
+                {
+                  "include": "#tag-like-content"
+                }
+              ]
+            },
+            {
+              "begin": "(>)",
+              "beginCaptures": {
+                "1": {
+                  "name": "punctuation.definition.tag.end.js"
+                }
+              },
+              "contentName": "meta.html.embedded.block",
+              "end": "(?=</template>)",
+              "patterns": [
+                {
+                  "include": "#style"
+                },
+                {
+                  "include": "#script"
+                },
+                {
+                  "include": "#glimmer-else-block"
+                },
+                {
+                  "include": "#glimmer-bools"
+                },
+                {
+                  "include": "#glimmer-special-block"
+                },
+                {
+                  "include": "#glimmer-unescaped-expression"
+                },
+                {
+                  "include": "#glimmer-comment-block"
+                },
+                {
+                  "include": "#glimmer-comment-inline"
+                },
+                {
+                  "include": "#glimmer-expression-property"
+                },
+                {
+                  "include": "#glimmer-control-expression"
+                },
+                {
+                  "include": "#glimmer-expression"
+                },
+                {
+                  "include": "#glimmer-block"
+                },
+                {
+                  "include": "#html-tag"
+                },
+                {
+                  "include": "#component-tag"
+                },
+                {
+                  "include": "#html-comment"
+                },
+                {
+                  "include": "#entities"
+                }
+              ]
+            }
+          ]
+        },
+        {
+          "begin": "(?x)(\\b(?:\\w+\\.)*(?:hbs|html)\\s*)(`)",
+          "beginCaptures": {
+            "1": {
+              "name": "entity.name.function.tagged-template.js"
+            },
+            "2": {
+              "name": "punctuation.definition.string.template.begin.js"
+            }
+          },
+          "contentName": "meta.embedded.block.html",
+          "end": "(`)",
+          "endCaptures": {
+            "0": {
+              "name": "string.js"
+            },
+            "1": {
+              "name": "punctuation.definition.string.template.end.js"
+            }
+          },
+          "patterns": [
+            {
+              "include": "source.ts#template-substitution-element"
+            },
+            {
+              "include": "#style"
+            },
+            {
+              "include": "#script"
+            },
+            {
+              "include": "#glimmer-else-block"
+            },
+            {
+              "include": "#glimmer-bools"
+            },
+            {
+              "include": "#glimmer-special-block"
+            },
+            {
+              "include": "#glimmer-unescaped-expression"
+            },
+            {
+              "include": "#glimmer-comment-block"
+            },
+            {
+              "include": "#glimmer-comment-inline"
+            },
+            {
+              "include": "#glimmer-expression-property"
+            },
+            {
+              "include": "#glimmer-control-expression"
+            },
+            {
+              "include": "#glimmer-expression"
+            },
+            {
+              "include": "#glimmer-block"
+            },
+            {
+              "include": "#html-tag"
+            },
+            {
+              "include": "#component-tag"
+            },
+            {
+              "include": "#html-comment"
+            },
+            {
+              "include": "#entities"
+            }
+          ]
+        },
+        {
+          "begin": "((createTemplate|hbs|html))(\\()",
+          "beginCaptures": {
+            "1": {
+              "name": "entity.name.function.ts"
             },
             "2": {
-              "name": "entity.name.tag.other.html"
+              "name": "meta.function-call.ts"
             },
             "3": {
-              "name": "punctuation.definition.tag.html"
+              "name": "meta.brace.round.ts"
             }
           },
-          "end": "(</)(template)(>)",
+          "contentName": "meta.embedded.block.html",
+          "end": "(\\))",
           "endCaptures": {
             "1": {
-              "name": "punctuation.definition.tag.html"
+              "name": "meta.brace.round.ts"
+            }
+          },
+          "patterns": [
+            {
+              "begin": "((`|'|\"))",
+              "beginCaptures": {
+                "1": {
+                  "name": "string.template.ts"
+                },
+                "2": {
+                  "name": "punctuation.definition.string.template.begin.ts"
+                }
+              },
+              "end": "((`|'|\"))",
+              "endCaptures": {
+                "1": {
+                  "name": "string.template.ts"
+                },
+                "2": {
+                  "name": "punctuation.definition.string.template.end.ts"
+                }
+              },
+              "patterns": [
+                {
+                  "include": "#style"
+                },
+                {
+                  "include": "#script"
+                },
+                {
+                  "include": "#glimmer-else-block"
+                },
+                {
+                  "include": "#glimmer-bools"
+                },
+                {
+                  "include": "#glimmer-special-block"
+                },
+                {
+                  "include": "#glimmer-unescaped-expression"
+                },
+                {
+                  "include": "#glimmer-comment-block"
+                },
+                {
+                  "include": "#glimmer-comment-inline"
+                },
+                {
+                  "include": "#glimmer-expression-property"
+                },
+                {
+                  "include": "#glimmer-control-expression"
+                },
+                {
+                  "include": "#glimmer-expression"
+                },
+                {
+                  "include": "#glimmer-block"
+                },
+                {
+                  "include": "#html-tag"
+                },
+                {
+                  "include": "#component-tag"
+                },
+                {
+                  "include": "#html-comment"
+                },
+                {
+                  "include": "#entities"
+                }
+              ]
+            }
+          ]
+        },
+        {
+          "begin": "((precompileTemplate)\\s*)(\\()",
+          "beginCaptures": {
+            "1": {
+              "name": "entity.name.function.ts"
             },
             "2": {
-              "name": "entity.name.tag.other.html"
+              "name": "meta.function-call.ts"
             },
             "3": {
-              "name": "punctuation.definition.tag.html"
+              "name": "meta.brace.round.ts"
             }
           },
-          "name": "meta.js.embeddedTemplateWithoutArgs",
+          "end": "(\\))",
+          "endCaptures": {
+            "1": {
+              "name": "meta.brace.round.ts"
+            }
+          },
+          "patterns": [
+            {
+              "begin": "((`|'|\"))",
+              "beginCaptures": {
+                "1": {
+                  "name": "string.template.ts"
+                },
+                "2": {
+                  "name": "punctuation.definition.string.template.begin.ts"
+                }
+              },
+              "contentName": "meta.embedded.block.html",
+              "end": "((`|'|\"))",
+              "endCaptures": {
+                "1": {
+                  "name": "string.template.ts"
+                },
+                "2": {
+                  "name": "punctuation.definition.string.template.end.ts"
+                }
+              },
+              "patterns": [
+                {
+                  "include": "#style"
+                },
+                {
+                  "include": "#script"
+                },
+                {
+                  "include": "#glimmer-else-block"
+                },
+                {
+                  "include": "#glimmer-bools"
+                },
+                {
+                  "include": "#glimmer-special-block"
+                },
+                {
+                  "include": "#glimmer-unescaped-expression"
+                },
+                {
+                  "include": "#glimmer-comment-block"
+                },
+                {
+                  "include": "#glimmer-comment-inline"
+                },
+                {
+                  "include": "#glimmer-expression-property"
+                },
+                {
+                  "include": "#glimmer-control-expression"
+                },
+                {
+                  "include": "#glimmer-expression"
+                },
+                {
+                  "include": "#glimmer-block"
+                },
+                {
+                  "include": "#html-tag"
+                },
+                {
+                  "include": "#component-tag"
+                },
+                {
+                  "include": "#html-comment"
+                },
+                {
+                  "include": "#entities"
+                }
+              ]
+            },
+            {
+              "include": "source.ts#object-literal"
+            },
+            {
+              "include": "source.ts"
+            }
+          ]
+        }
+      ]
+    },
+    "param": {
+      "captures": {
+        "0": {
+          "name": "support.function",
           "patterns": [
             {
-              "include": "text.html.handlebars"
+              "match": "(@|this)",
+              "name": "variable.language"
+            },
+            {
+              "match": "(\\.)+",
+              "name": "punctuation.definition.tag"
             }
           ]
         },
+        "1": {
+          "name": "support.function",
+          "patterns": [
+            {
+              "match": "(\\.)+",
+              "name": "punctuation.definition.tag"
+            }
+          ]
+        }
+      },
+      "match": "(@|this.)([a-zA-Z0-9_.-]+)",
+      "patterns": [
+      ]
+    },
+    "script": {
+      "begin": "(^[ \\t]+)?(?=<(?i:script)\\b(?!-))",
+      "beginCaptures": {
+        "1": {
+          "name": "punctuation.whitespace.embedded.leading.html"
+        }
+      },
+      "end": "(?!\\G)([ \\t]*$\\n?)?",
+      "endCaptures": {
+        "1": {
+          "name": "punctuation.whitespace.embedded.trailing.html"
+        }
+      },
+      "patterns": [
         {
-          "begin": "(<)(template)",
+          "begin": "(<)((?i:script))\\b",
           "beginCaptures": {
+            "0": {
+              "name": "meta.tag.metadata.script.start.html"
+            },
             "1": {
-              "name": "punctuation.definition.tag.html"
+              "name": "punctuation.definition.tag.begin.html"
             },
             "2": {
-              "name": "entity.name.tag.other.html"
+              "name": "entity.name.tag.html"
             }
           },
-          "end": "(</)(template)(>)",
+          "end": "(/)((?i:script))(>)",
           "endCaptures": {
+            "0": {
+              "name": "meta.tag.metadata.script.end.html"
+            },
             "1": {
-              "name": "punctuation.definition.tag.html"
+              "name": "punctuation.definition.tag.begin.html"
             },
             "2": {
-              "name": "entity.name.tag.other.html"
+              "name": "entity.name.tag.html"
             },
             "3": {
-              "name": "punctuation.definition.tag.html"
+              "name": "punctuation.definition.tag.end.html"
             }
           },
-          "name": "meta.js.embeddedTemplateWithArgs",
+          "name": "meta.embedded.block.html",
           "patterns": [
             {
-              "begin": "(?<=\\<template)",
-              "end": "(?=\\>)",
+              "begin": "\\G",
+              "end": "(?=/)",
               "patterns": [
                 {
-                  "include": "text.html.handlebars#tag-stuff"
+                  "begin": "(>)",
+                  "beginCaptures": {
+                    "0": {
+                      "name": "meta.tag.metadata.script.start.html"
+                    },
+                    "1": {
+                      "name": "punctuation.definition.tag.end.html"
+                    }
+                  },
+                  "end": "((<))(?=/(?i:script))",
+                  "endCaptures": {
+                    "0": {
+                      "name": "meta.tag.metadata.script.end.html"
+                    },
+                    "1": {
+                      "name": "punctuation.definition.tag.begin.html"
+                    },
+                    "2": {
+                      "name": "source.js-ignored-vscode"
+                    }
+                  },
+                  "patterns": [
+                    {
+                      "begin": "\\G",
+                      "end": "(?=</(?i:script))",
+                      "name": "source.js",
+                      "patterns": [
+                        {
+                          "begin": "(^[ \\t]+)?(?=//)",
+                          "beginCaptures": {
+                            "1": {
+                              "name": "punctuation.whitespace.comment.leading.js"
+                            }
+                          },
+                          "end": "(?!\\G)",
+                          "patterns": [
+                            {
+                              "begin": "//",
+                              "beginCaptures": {
+                                "0": {
+                                  "name": "punctuation.definition.comment.js"
+                                }
+                              },
+                              "end": "(?=</script)|\\n",
+                              "name": "comment.line.double-slash.js"
+                            }
+                          ]
+                        },
+                        {
+                          "begin": "/\\*",
+                          "captures": {
+                            "0": {
+                              "name": "punctuation.definition.comment.js"
+                            }
+                          },
+                          "end": "\\*/|(?=</script)",
+                          "name": "comment.block.js"
+                        },
+                        {
+                          "include": "source.js"
+                        }
+                      ]
+                    }
+                  ]
+                },
+                {
+                  "begin": "(?ix:\n(?=\ntype\\s*=\\s*\n('|\"|)\ntext/\n(\nx-handlebars\n| (x-(handlebars-)?|ng-)?template\n| html\n)\n[\\s\"'>]\n)\n)",
+                  "end": "((<))(?=/(?i:script))",
+                  "endCaptures": {
+                    "0": {
+                      "name": "meta.tag.metadata.script.end.html"
+                    },
+                    "1": {
+                      "name": "punctuation.definition.tag.begin.html"
+                    },
+                    "2": {
+                      "name": "text.html.basic"
+                    }
+                  },
+                  "patterns": [
+                    {
+                      "begin": "(?!\\G)",
+                      "end": "(?=</(?i:script))",
+                      "name": "text.html.basic",
+                      "patterns": [
+                        {
+                          "include": "text.html.basic"
+                        }
+                      ]
+                    }
+                  ]
+                },
+                {
+                  "begin": "(?=(?i:type))",
+                  "end": "(<)(?=/(?i:script))",
+                  "endCaptures": {
+                    "0": {
+                      "name": "meta.tag.metadata.script.end.html"
+                    },
+                    "1": {
+                      "name": "punctuation.definition.tag.begin.html"
+                    }
+                  }
+                },
+                {
+                  "include": "#string-double-quoted-html"
+                },
+                {
+                  "include": "#string-single-quoted-html"
+                },
+                {
+                  "include": "#glimmer-argument"
+                },
+                {
+                  "include": "#html-attribute"
                 }
               ]
+            }
+          ]
+        }
+      ]
+    },
+    "string-double-quoted-handlebars": {
+      "begin": "\"",
+      "beginCaptures": {
+        "0": {
+          "name": "punctuation.definition.string.begin.ember-handlebars"
+        }
+      },
+      "end": "\"",
+      "endCaptures": {
+        "0": {
+          "name": "punctuation.definition.string.end.ember-handlebars"
+        }
+      },
+      "name": "string.quoted.double.ember-handlebars",
+      "patterns": [
+        {
+          "match": "\\\\\"",
+          "name": "constant.character.escape.ember-handlebars"
+        }
+      ]
+    },
+    "string-double-quoted-html": {
+      "begin": "\"",
+      "beginCaptures": {
+        "0": {
+          "name": "punctuation.definition.string.begin.ember-handlebars"
+        }
+      },
+      "end": "\"",
+      "endCaptures": {
+        "0": {
+          "name": "punctuation.definition.string.end.ember-handlebars"
+        }
+      },
+      "name": "string.quoted.double.html.ember-handlebars",
+      "patterns": [
+        {
+          "match": "\\\\\"",
+          "name": "constant.character.escape.ember-handlebars"
+        },
+        {
+          "include": "#glimmer-bools"
+        },
+        {
+          "include": "#glimmer-expression-property"
+        },
+        {
+          "include": "#glimmer-control-expression"
+        },
+        {
+          "include": "#glimmer-expression"
+        },
+        {
+          "include": "#glimmer-block"
+        }
+      ]
+    },
+    "string-single-quoted-handlebars": {
+      "begin": "'",
+      "beginCaptures": {
+        "0": {
+          "name": "punctuation.definition.string.begin.ember-handlebars"
+        }
+      },
+      "end": "'",
+      "endCaptures": {
+        "0": {
+          "name": "punctuation.definition.string.end.ember-handlebars"
+        }
+      },
+      "name": "string.quoted.single.ember-handlebars",
+      "patterns": [
+        {
+          "match": "\\\\'",
+          "name": "constant.character.escape.ember-handlebars"
+        }
+      ]
+    },
+    "string-single-quoted-html": {
+      "begin": "'",
+      "beginCaptures": {
+        "0": {
+          "name": "punctuation.definition.string.begin.ember-handlebars"
+        }
+      },
+      "end": "'",
+      "endCaptures": {
+        "0": {
+          "name": "punctuation.definition.string.end.ember-handlebars"
+        }
+      },
+      "name": "string.quoted.single.html.ember-handlebars",
+      "patterns": [
+        {
+          "match": "\\\\'",
+          "name": "constant.character.escape.ember-handlebars"
+        },
+        {
+          "include": "#glimmer-bools"
+        },
+        {
+          "include": "#glimmer-expression-property"
+        },
+        {
+          "include": "#glimmer-control-expression"
+        },
+        {
+          "include": "#glimmer-expression"
+        },
+        {
+          "include": "#glimmer-block"
+        }
+      ]
+    },
+    "style": {
+      "begin": "(^[ \\t]+)?(?=<(?i:style)\\b(?!-))",
+      "beginCaptures": {
+        "1": {
+          "name": "punctuation.whitespace.embedded.leading.html"
+        }
+      },
+      "end": "(?!\\G)([ \\t]*$\\n?)?",
+      "endCaptures": {
+        "1": {
+          "name": "punctuation.whitespace.embedded.trailing.html"
+        }
+      },
+      "patterns": [
+        {
+          "begin": "(?i)(<)(style)(?=\\s|/?>)",
+          "beginCaptures": {
+            "0": {
+              "name": "meta.tag.metadata.style.start.html"
+            },
+            "1": {
+              "name": "punctuation.definition.tag.begin.html"
+            },
+            "2": {
+              "name": "entity.name.tag.html"
+            }
+          },
+          "end": "(?i)((<)/)(style)\\s*(>)",
+          "endCaptures": {
+            "0": {
+              "name": "meta.tag.metadata.style.end.html"
+            },
+            "1": {
+              "name": "punctuation.definition.tag.begin.html"
+            },
+            "2": {
+              "name": "source.css-ignored-vscode"
+            },
+            "3": {
+              "name": "entity.name.tag.html"
             },
+            "4": {
+              "name": "punctuation.definition.tag.end.html"
+            }
+          },
+          "name": "meta.embedded.block.html",
+          "patterns": [
             {
-              "begin": "(>)",
-              "beginCaptures": {
+              "begin": "\\G",
+              "captures": {
                 "1": {
-                  "name": "punctuation.definition.tag.end.js"
+                  "name": "punctuation.definition.tag.end.html"
                 }
               },
-              "contentName": "meta.html.embedded.block",
-              "end": "(?=</template>)",
+              "end": "(>)",
+              "name": "meta.tag.metadata.style.start.html",
+              "patterns": [
+                {
+                  "include": "#glimmer-argument"
+                },
+                {
+                  "include": "#html-attribute"
+                }
+              ]
+            },
+            {
+              "begin": "(?!\\G)",
+              "end": "(?=</(?i:style))",
+              "name": "source.css",
               "patterns": [
                 {
-                  "include": "text.html.handlebars"
+                  "include": "source.css"
                 }
               ]
             }
           ]
         }
       ]
+    },
+    "tag-like-content": {
+      "patterns": [
+        {
+          "include": "#glimmer-bools"
+        },
+        {
+          "include": "#glimmer-unescaped-expression"
+        },
+        {
+          "include": "#glimmer-comment-block"
+        },
+        {
+          "include": "#glimmer-comment-inline"
+        },
+        {
+          "include": "#glimmer-expression-property"
+        },
+        {
+          "include": "#boolean"
+        },
+        {
+          "include": "#digit"
+        },
+        {
+          "include": "#glimmer-control-expression"
+        },
+        {
+          "include": "#glimmer-expression"
+        },
+        {
+          "include": "#glimmer-block"
+        },
+        {
+          "include": "#string-double-quoted-html"
+        },
+        {
+          "include": "#string-single-quoted-html"
+        },
+        {
+          "include": "#glimmer-as-stuff"
+        },
+        {
+          "include": "#glimmer-argument"
+        },
+        {
+          "include": "#html-attribute"
+        }
+      ]
+    },
+    "variable": {
+      "match": "\\b([a-zA-Z0-9-_]+)\\b",
+      "name": "support.function",
+      "patterns": [
+      ]
     }
   },
-  "name": "glimmer-ts",
-  "patterns": [
-    {
-      "include": "source.ts"
-    }
-  ],
   "scopeName": "source.gts"
 }
diff --git a/packages/tm-grammars/index.js b/packages/tm-grammars/index.js
index a3e13b0..e051d71 100644
--- a/packages/tm-grammars/index.js
+++ b/packages/tm-grammars/index.js
@@ -798,37 +798,41 @@ export const grammars = [
     aliases: [
       'gjs',
     ],
-    byteSize: 1299,
+    byteSize: 19536,
     displayName: 'Glimmer JS',
     embedded: [
       'javascript',
-      'handlebars',
+      'typescript',
+      'css',
+      'html',
     ],
-    lastUpdate: '2023-07-03T16:07:58Z',
+    lastUpdate: '2024-01-18T05:06:13Z',
     license: 'MIT',
-    licenseUrl: 'https://raw.githubusercontent.com/IgnaceMaes/glimmer-textmate-grammar/main/LICENSE',
+    licenseUrl: 'https://raw.githubusercontent.com/lifeart/vsc-ember-syntax/master/LICENSE',
     name: 'glimmer-js',
     scopeName: 'source.gjs',
-    sha: '1d2850817ee189b5c7e83f02a60b7143e3cd099c',
-    source: 'https://github.com/IgnaceMaes/glimmer-textmate-grammar/blob/1d2850817ee189b5c7e83f02a60b7143e3cd099c/glimmer-js.tmLanguage.json',
+    sha: 'f031ed7df2eeced760f4469fc9fe06f8688c531a',
+    source: 'https://github.com/lifeart/vsc-ember-syntax/blob/f031ed7df2eeced760f4469fc9fe06f8688c531a/syntaxes/source.gjs.json',
   },
   {
     aliases: [
       'gts',
     ],
-    byteSize: 1299,
+    byteSize: 19536,
     displayName: 'Glimmer TS',
     embedded: [
       'typescript',
-      'handlebars',
+      'css',
+      'javascript',
+      'html',
     ],
-    lastUpdate: '2023-07-03T16:07:58Z',
+    lastUpdate: '2024-01-18T05:06:13Z',
     license: 'MIT',
-    licenseUrl: 'https://raw.githubusercontent.com/IgnaceMaes/glimmer-textmate-grammar/main/LICENSE',
+    licenseUrl: 'https://raw.githubusercontent.com/lifeart/vsc-ember-syntax/master/LICENSE',
     name: 'glimmer-ts',
     scopeName: 'source.gts',
-    sha: '1d2850817ee189b5c7e83f02a60b7143e3cd099c',
-    source: 'https://github.com/IgnaceMaes/glimmer-textmate-grammar/blob/1d2850817ee189b5c7e83f02a60b7143e3cd099c/glimmer-ts.tmLanguage.json',
+    sha: 'f031ed7df2eeced760f4469fc9fe06f8688c531a',
+    source: 'https://github.com/lifeart/vsc-ember-syntax/blob/f031ed7df2eeced760f4469fc9fe06f8688c531a/syntaxes/source.gts.json',
   },
   {
     byteSize: 3774,
diff --git a/samples/glimmer-js.sample b/samples/glimmer-js.sample
index ec4e2c2..63e40e2 100644
--- a/samples/glimmer-js.sample
+++ b/samples/glimmer-js.sample
@@ -15,4 +15,4 @@ const setScrollPosition = modifier((element, [position]) => {
   </div>
 </template>
 
-# From https://github.com/ember-template-imports/ember-template-imports
+// From https://github.com/ember-template-imports/ember-template-imports
diff --git a/samples/glimmer-ts.sample b/samples/glimmer-ts.sample
index 286d4d4..d1840a7 100644
--- a/samples/glimmer-ts.sample
+++ b/samples/glimmer-ts.sample
@@ -4,4 +4,4 @@ const Greet: TemplateOnlyComponent<{ name: string }> = <template>
   <p>Hello, {{@name}}!</p>
 </template>
 
-# From https://rfcs.emberjs.com/id/0779-first-class-component-templates
+// From https://rfcs.emberjs.com/id/0779-first-class-component-templates
diff --git a/sources-grammars.ts b/sources-grammars.ts
index 13597b9..c4e9803 100644
--- a/sources-grammars.ts
+++ b/sources-grammars.ts
@@ -503,12 +503,12 @@ export const sourcesCommunity: GrammarSource[] = [
   {
     name: 'glimmer-js',
     aliases: ['gjs'],
-    source: 'https://github.com/IgnaceMaes/glimmer-textmate-grammar/blob/main/glimmer-js.tmLanguage.json',
+    source: 'https://github.com/lifeart/vsc-ember-syntax/blob/master/syntaxes/source.gjs.json',
   },
   {
     name: 'glimmer-ts',
     aliases: ['gts'],
-    source: 'https://github.com/IgnaceMaes/glimmer-textmate-grammar/blob/main/glimmer-ts.tmLanguage.json',
+    source: 'https://github.com/lifeart/vsc-ember-syntax/blob/master/syntaxes/source.gts.json',
   },
   {
     name: 'glsl',