diff --git a/package.json b/package.json
index e3d0dc2..8eb90ad 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
 	"name": "vscode-glimmer-syntax",
 	"displayName": "Glimmer Templates Syntax for VS Code",
 	"description": "Glimmer templates syntax",
-	"version": "2.0.0",
+	"version": "2.0.1",
 	"author": "Aleksandr Kanunnikov <lifeart92@gmail.com>",
 	"license": "MIT",
 	"publisher": "lifeart",
@@ -86,12 +86,14 @@
 			{
 				"injectTo": [
 					"source.js",
-					"source.ts"
+					"source.ts",
+					"source.gjs",
+					"source.gts"
 				],
 				"scopeName": "inline.template",
 				"path": "./syntaxes/inline-hbs.json",
 				"embeddedLanguages": {
-					"meta.embedded.block.html": "text.html.handlebars"
+					"meta.embedded.block.html": "handlebars"
 				}
 			}
 		],
diff --git a/syntaxes/inline-hbs.json b/syntaxes/inline-hbs.json
index 6923edd..049dfc3 100644
--- a/syntaxes/inline-hbs.json
+++ b/syntaxes/inline-hbs.json
@@ -44,6 +44,7 @@
       },
       {
         "begin": "((createTemplate|hbs|html|precompileTemplate))(\\()",
+        "contentName": "meta.embedded.block.html",
         "beginCaptures": {
           "1": {
             "name": "entity.name.function.ts"
@@ -95,6 +96,7 @@
       {
         "name": "meta.js.embeddedTemplateWithoutArgs",
         "begin": "\\s*(<)(template)\\s*(>)",
+        "contentName": "meta.embedded.block.html",
         "beginCaptures": {
           "1": {
             "name": "punctuation.definition.tag.html"
@@ -127,6 +129,7 @@
       {
         "name": "meta.js.embeddedTemplateWithArgs",
         "begin": "(<)(template)",
+        "contentName": "meta.embedded.block.html",
         "beginCaptures": {
           "1": {
             "name": "punctuation.definition.tag.html"