diff --git a/extensions/handlebars/test/colorize-results/test_handlebars.json b/extensions/handlebars/test/colorize-results/test_handlebars.json
index c7c94bd8aa79635b9cc0f0b089507017da3bef9e..938d434abd1fd17a42563377633c32ba3c37fd56 100644
--- a/extensions/handlebars/test/colorize-results/test_handlebars.json
+++ b/extensions/handlebars/test/colorize-results/test_handlebars.json
@@ -146,8 +146,8 @@
 		"c": "{{",
 		"t": "text.html.handlebars meta.function.inline.other.handlebars support.constant.handlebars",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
+			"dark_plus": "support.constant.handlebars: #9CDCFE",
+			"light_plus": "support.constant.handlebars: #001080",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF"
@@ -168,8 +168,8 @@
 		"c": "}}",
 		"t": "text.html.handlebars meta.function.inline.other.handlebars support.constant.handlebars",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
+			"dark_plus": "support.constant.handlebars: #9CDCFE",
+			"light_plus": "support.constant.handlebars: #001080",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF"
@@ -223,8 +223,8 @@
 		"c": "{{#if",
 		"t": "text.html.handlebars meta.function.block.start.handlebars support.constant.handlebars",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
+			"dark_plus": "support.constant.handlebars: #9CDCFE",
+			"light_plus": "support.constant.handlebars: #001080",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF"
@@ -256,8 +256,8 @@
 		"c": "}}",
 		"t": "text.html.handlebars meta.function.block.start.handlebars support.constant.handlebars",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
+			"dark_plus": "support.constant.handlebars: #9CDCFE",
+			"light_plus": "support.constant.handlebars: #001080",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF"
@@ -311,8 +311,8 @@
 		"c": "{{",
 		"t": "text.html.handlebars meta.function.inline.other.handlebars support.constant.handlebars",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
+			"dark_plus": "support.constant.handlebars: #9CDCFE",
+			"light_plus": "support.constant.handlebars: #001080",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF"
@@ -333,8 +333,8 @@
 		"c": "}}",
 		"t": "text.html.handlebars meta.function.inline.other.handlebars support.constant.handlebars",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
+			"dark_plus": "support.constant.handlebars: #9CDCFE",
+			"light_plus": "support.constant.handlebars: #001080",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF"
@@ -355,8 +355,8 @@
 		"c": "{{",
 		"t": "text.html.handlebars meta.function.inline.other.handlebars support.constant.handlebars",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
+			"dark_plus": "support.constant.handlebars: #9CDCFE",
+			"light_plus": "support.constant.handlebars: #001080",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF"
@@ -377,8 +377,8 @@
 		"c": "}}",
 		"t": "text.html.handlebars meta.function.inline.other.handlebars support.constant.handlebars",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
+			"dark_plus": "support.constant.handlebars: #9CDCFE",
+			"light_plus": "support.constant.handlebars: #001080",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF"
@@ -432,8 +432,8 @@
 		"c": "{{else}}",
 		"t": "text.html.handlebars meta.function.inline.else.handlebars support.constant.handlebars",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
+			"dark_plus": "support.constant.handlebars: #9CDCFE",
+			"light_plus": "support.constant.handlebars: #001080",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF"
@@ -542,8 +542,8 @@
 		"c": "{{/if}}",
 		"t": "text.html.handlebars meta.function.block.end.handlebars support.constant.handlebars",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
+			"dark_plus": "support.constant.handlebars: #9CDCFE",
+			"light_plus": "support.constant.handlebars: #001080",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF"
@@ -564,8 +564,8 @@
 		"c": "{{",
 		"t": "text.html.handlebars meta.function.inline.other.handlebars support.constant.handlebars",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
+			"dark_plus": "support.constant.handlebars: #9CDCFE",
+			"light_plus": "support.constant.handlebars: #001080",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF"
@@ -586,8 +586,8 @@
 		"c": "}}",
 		"t": "text.html.handlebars meta.function.inline.other.handlebars support.constant.handlebars",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
+			"dark_plus": "support.constant.handlebars: #9CDCFE",
+			"light_plus": "support.constant.handlebars: #001080",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF"
@@ -630,8 +630,8 @@
 		"c": "{{#unless",
 		"t": "text.html.handlebars meta.function.block.start.handlebars support.constant.handlebars",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
+			"dark_plus": "support.constant.handlebars: #9CDCFE",
+			"light_plus": "support.constant.handlebars: #001080",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF"
@@ -663,8 +663,8 @@
 		"c": "}}",
 		"t": "text.html.handlebars meta.function.block.start.handlebars support.constant.handlebars",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
+			"dark_plus": "support.constant.handlebars: #9CDCFE",
+			"light_plus": "support.constant.handlebars: #001080",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF"
@@ -828,8 +828,8 @@
 		"c": "{{/unless}}",
 		"t": "text.html.handlebars meta.function.block.end.handlebars support.constant.handlebars",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
+			"dark_plus": "support.constant.handlebars: #9CDCFE",
+			"light_plus": "support.constant.handlebars: #001080",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF"
@@ -993,8 +993,8 @@
 		"c": "{{#each",
 		"t": "text.html.handlebars meta.function.block.start.handlebars support.constant.handlebars",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
+			"dark_plus": "support.constant.handlebars: #9CDCFE",
+			"light_plus": "support.constant.handlebars: #001080",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF"
@@ -1026,8 +1026,8 @@
 		"c": "}}",
 		"t": "text.html.handlebars meta.function.block.start.handlebars support.constant.handlebars",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
+			"dark_plus": "support.constant.handlebars: #9CDCFE",
+			"light_plus": "support.constant.handlebars: #001080",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF"
@@ -1081,8 +1081,8 @@
 		"c": "{{",
 		"t": "text.html.handlebars meta.function.inline.other.handlebars support.constant.handlebars",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
+			"dark_plus": "support.constant.handlebars: #9CDCFE",
+			"light_plus": "support.constant.handlebars: #001080",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF"
@@ -1103,8 +1103,8 @@
 		"c": "}}",
 		"t": "text.html.handlebars meta.function.inline.other.handlebars support.constant.handlebars",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
+			"dark_plus": "support.constant.handlebars: #9CDCFE",
+			"light_plus": "support.constant.handlebars: #001080",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF"
@@ -1158,8 +1158,8 @@
 		"c": "{{/each}}",
 		"t": "text.html.handlebars meta.function.block.end.handlebars support.constant.handlebars",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
+			"dark_plus": "support.constant.handlebars: #9CDCFE",
+			"light_plus": "support.constant.handlebars: #001080",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF"
@@ -1433,8 +1433,8 @@
 		"c": "{{#each",
 		"t": "text.html.handlebars meta.function.block.start.handlebars support.constant.handlebars",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
+			"dark_plus": "support.constant.handlebars: #9CDCFE",
+			"light_plus": "support.constant.handlebars: #001080",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF"
@@ -1466,8 +1466,8 @@
 		"c": "}}",
 		"t": "text.html.handlebars meta.function.block.start.handlebars support.constant.handlebars",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
+			"dark_plus": "support.constant.handlebars: #9CDCFE",
+			"light_plus": "support.constant.handlebars: #001080",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF"
@@ -1598,8 +1598,8 @@
 		"c": "{{",
 		"t": "text.html.handlebars meta.tag.inline.any.html string.quoted.double.handlebars meta.function.inline.other.handlebars support.constant.handlebars",
 		"r": {
-			"dark_plus": "string: #CE9178",
-			"light_plus": "string.quoted.double.handlebars: #0000FF",
+			"dark_plus": "support.constant.handlebars: #9CDCFE",
+			"light_plus": "support.constant.handlebars: #001080",
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.handlebars: #0000FF",
 			"hc_black": "string: #CE9178"
@@ -1620,8 +1620,8 @@
 		"c": "}}",
 		"t": "text.html.handlebars meta.tag.inline.any.html string.quoted.double.handlebars meta.function.inline.other.handlebars support.constant.handlebars",
 		"r": {
-			"dark_plus": "string: #CE9178",
-			"light_plus": "string.quoted.double.handlebars: #0000FF",
+			"dark_plus": "support.constant.handlebars: #9CDCFE",
+			"light_plus": "support.constant.handlebars: #001080",
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.handlebars: #0000FF",
 			"hc_black": "string: #CE9178"
@@ -1642,8 +1642,8 @@
 		"c": "{{",
 		"t": "text.html.handlebars meta.tag.inline.any.html string.quoted.double.handlebars meta.function.inline.other.handlebars support.constant.handlebars",
 		"r": {
-			"dark_plus": "string: #CE9178",
-			"light_plus": "string.quoted.double.handlebars: #0000FF",
+			"dark_plus": "support.constant.handlebars: #9CDCFE",
+			"light_plus": "support.constant.handlebars: #001080",
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.handlebars: #0000FF",
 			"hc_black": "string: #CE9178"
@@ -1664,8 +1664,8 @@
 		"c": "}}",
 		"t": "text.html.handlebars meta.tag.inline.any.html string.quoted.double.handlebars meta.function.inline.other.handlebars support.constant.handlebars",
 		"r": {
-			"dark_plus": "string: #CE9178",
-			"light_plus": "string.quoted.double.handlebars: #0000FF",
+			"dark_plus": "support.constant.handlebars: #9CDCFE",
+			"light_plus": "support.constant.handlebars: #001080",
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.handlebars: #0000FF",
 			"hc_black": "string: #CE9178"
@@ -1697,8 +1697,8 @@
 		"c": "{{",
 		"t": "text.html.handlebars meta.function.inline.other.handlebars support.constant.handlebars",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
+			"dark_plus": "support.constant.handlebars: #9CDCFE",
+			"light_plus": "support.constant.handlebars: #001080",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF"
@@ -1719,8 +1719,8 @@
 		"c": "}}",
 		"t": "text.html.handlebars meta.function.inline.other.handlebars support.constant.handlebars",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
+			"dark_plus": "support.constant.handlebars: #9CDCFE",
+			"light_plus": "support.constant.handlebars: #001080",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF"
@@ -1840,8 +1840,8 @@
 		"c": "{{",
 		"t": "text.html.handlebars meta.function.inline.other.handlebars support.constant.handlebars",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
+			"dark_plus": "support.constant.handlebars: #9CDCFE",
+			"light_plus": "support.constant.handlebars: #001080",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF"
@@ -1862,8 +1862,8 @@
 		"c": "}}",
 		"t": "text.html.handlebars meta.function.inline.other.handlebars support.constant.handlebars",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
+			"dark_plus": "support.constant.handlebars: #9CDCFE",
+			"light_plus": "support.constant.handlebars: #001080",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF"
@@ -1917,8 +1917,8 @@
 		"c": "{{/each}}",
 		"t": "text.html.handlebars meta.function.block.end.handlebars support.constant.handlebars",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
+			"dark_plus": "support.constant.handlebars: #9CDCFE",
+			"light_plus": "support.constant.handlebars: #001080",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF"
diff --git a/extensions/handlebars/test/colorize-results/test_hbs.json b/extensions/handlebars/test/colorize-results/test_hbs.json
index 0a26b54a49f1ad011a785ce23e2c060ead48fda5..fed3b445d91103c27334818987e8a0d424f02be7 100644
--- a/extensions/handlebars/test/colorize-results/test_hbs.json
+++ b/extensions/handlebars/test/colorize-results/test_hbs.json
@@ -190,8 +190,8 @@
 		"c": "{{#each",
 		"t": "text.html.handlebars meta.function.block.start.handlebars support.constant.handlebars",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
+			"dark_plus": "support.constant.handlebars: #9CDCFE",
+			"light_plus": "support.constant.handlebars: #001080",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF"
@@ -223,8 +223,8 @@
 		"c": "}}",
 		"t": "text.html.handlebars meta.function.block.start.handlebars support.constant.handlebars",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
+			"dark_plus": "support.constant.handlebars: #9CDCFE",
+			"light_plus": "support.constant.handlebars: #001080",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF"
@@ -355,8 +355,8 @@
 		"c": "{{",
 		"t": "text.html.handlebars meta.tag.inline.any.html string.quoted.double.handlebars meta.function.inline.other.handlebars support.constant.handlebars",
 		"r": {
-			"dark_plus": "string: #CE9178",
-			"light_plus": "string.quoted.double.handlebars: #0000FF",
+			"dark_plus": "support.constant.handlebars: #9CDCFE",
+			"light_plus": "support.constant.handlebars: #001080",
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.handlebars: #0000FF",
 			"hc_black": "string: #CE9178"
@@ -377,8 +377,8 @@
 		"c": "}}",
 		"t": "text.html.handlebars meta.tag.inline.any.html string.quoted.double.handlebars meta.function.inline.other.handlebars support.constant.handlebars",
 		"r": {
-			"dark_plus": "string: #CE9178",
-			"light_plus": "string.quoted.double.handlebars: #0000FF",
+			"dark_plus": "support.constant.handlebars: #9CDCFE",
+			"light_plus": "support.constant.handlebars: #001080",
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.handlebars: #0000FF",
 			"hc_black": "string: #CE9178"
@@ -399,8 +399,8 @@
 		"c": "{{",
 		"t": "text.html.handlebars meta.tag.inline.any.html string.quoted.double.handlebars meta.function.inline.other.handlebars support.constant.handlebars",
 		"r": {
-			"dark_plus": "string: #CE9178",
-			"light_plus": "string.quoted.double.handlebars: #0000FF",
+			"dark_plus": "support.constant.handlebars: #9CDCFE",
+			"light_plus": "support.constant.handlebars: #001080",
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.handlebars: #0000FF",
 			"hc_black": "string: #CE9178"
@@ -421,8 +421,8 @@
 		"c": "}}",
 		"t": "text.html.handlebars meta.tag.inline.any.html string.quoted.double.handlebars meta.function.inline.other.handlebars support.constant.handlebars",
 		"r": {
-			"dark_plus": "string: #CE9178",
-			"light_plus": "string.quoted.double.handlebars: #0000FF",
+			"dark_plus": "support.constant.handlebars: #9CDCFE",
+			"light_plus": "support.constant.handlebars: #001080",
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string.quoted.double.handlebars: #0000FF",
 			"hc_black": "string: #CE9178"
@@ -454,8 +454,8 @@
 		"c": "{{",
 		"t": "text.html.handlebars meta.function.inline.other.handlebars support.constant.handlebars",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
+			"dark_plus": "support.constant.handlebars: #9CDCFE",
+			"light_plus": "support.constant.handlebars: #001080",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF"
@@ -476,8 +476,8 @@
 		"c": "}}",
 		"t": "text.html.handlebars meta.function.inline.other.handlebars support.constant.handlebars",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
+			"dark_plus": "support.constant.handlebars: #9CDCFE",
+			"light_plus": "support.constant.handlebars: #001080",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF"
@@ -597,8 +597,8 @@
 		"c": "{{",
 		"t": "text.html.handlebars meta.function.inline.other.handlebars support.constant.handlebars",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
+			"dark_plus": "support.constant.handlebars: #9CDCFE",
+			"light_plus": "support.constant.handlebars: #001080",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF"
@@ -619,8 +619,8 @@
 		"c": "}}",
 		"t": "text.html.handlebars meta.function.inline.other.handlebars support.constant.handlebars",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
+			"dark_plus": "support.constant.handlebars: #9CDCFE",
+			"light_plus": "support.constant.handlebars: #001080",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF"
@@ -674,8 +674,8 @@
 		"c": "{{/each}}",
 		"t": "text.html.handlebars meta.function.block.end.handlebars support.constant.handlebars",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
+			"dark_plus": "support.constant.handlebars: #9CDCFE",
+			"light_plus": "support.constant.handlebars: #001080",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF"
@@ -729,8 +729,8 @@
 		"c": "{{",
 		"t": "text.html.handlebars meta.function.inline.other.handlebars support.constant.handlebars",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
+			"dark_plus": "support.constant.handlebars: #9CDCFE",
+			"light_plus": "support.constant.handlebars: #001080",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF"
@@ -751,8 +751,8 @@
 		"c": "}}",
 		"t": "text.html.handlebars meta.function.inline.other.handlebars support.constant.handlebars",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
+			"dark_plus": "support.constant.handlebars: #9CDCFE",
+			"light_plus": "support.constant.handlebars: #001080",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF"
@@ -773,8 +773,8 @@
 		"c": "{{",
 		"t": "text.html.handlebars meta.function.inline.other.handlebars support.constant.handlebars",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
+			"dark_plus": "support.constant.handlebars: #9CDCFE",
+			"light_plus": "support.constant.handlebars: #001080",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF"
@@ -795,8 +795,8 @@
 		"c": "}}",
 		"t": "text.html.handlebars meta.function.inline.other.handlebars support.constant.handlebars",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
+			"dark_plus": "support.constant.handlebars: #9CDCFE",
+			"light_plus": "support.constant.handlebars: #001080",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF"
@@ -817,8 +817,8 @@
 		"c": "{{",
 		"t": "text.html.handlebars meta.function.inline.other.handlebars support.constant.handlebars",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
+			"dark_plus": "support.constant.handlebars: #9CDCFE",
+			"light_plus": "support.constant.handlebars: #001080",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF"
@@ -839,8 +839,8 @@
 		"c": "}}",
 		"t": "text.html.handlebars meta.function.inline.other.handlebars support.constant.handlebars",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
+			"dark_plus": "support.constant.handlebars: #9CDCFE",
+			"light_plus": "support.constant.handlebars: #001080",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF"
@@ -1048,8 +1048,8 @@
 		"c": "{{#if",
 		"t": "text.html.handlebars meta.function.block.start.handlebars support.constant.handlebars",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
+			"dark_plus": "support.constant.handlebars: #9CDCFE",
+			"light_plus": "support.constant.handlebars: #001080",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF"
@@ -1081,8 +1081,8 @@
 		"c": "}}",
 		"t": "text.html.handlebars meta.function.block.start.handlebars support.constant.handlebars",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
+			"dark_plus": "support.constant.handlebars: #9CDCFE",
+			"light_plus": "support.constant.handlebars: #001080",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF"
@@ -1136,8 +1136,8 @@
 		"c": "{{",
 		"t": "text.html.handlebars meta.function.inline.other.handlebars support.constant.handlebars",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
+			"dark_plus": "support.constant.handlebars: #9CDCFE",
+			"light_plus": "support.constant.handlebars: #001080",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF"
@@ -1158,8 +1158,8 @@
 		"c": "}}",
 		"t": "text.html.handlebars meta.function.inline.other.handlebars support.constant.handlebars",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
+			"dark_plus": "support.constant.handlebars: #9CDCFE",
+			"light_plus": "support.constant.handlebars: #001080",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF"
@@ -1180,8 +1180,8 @@
 		"c": "{{",
 		"t": "text.html.handlebars meta.function.inline.other.handlebars support.constant.handlebars",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
+			"dark_plus": "support.constant.handlebars: #9CDCFE",
+			"light_plus": "support.constant.handlebars: #001080",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF"
@@ -1202,8 +1202,8 @@
 		"c": "}}",
 		"t": "text.html.handlebars meta.function.inline.other.handlebars support.constant.handlebars",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
+			"dark_plus": "support.constant.handlebars: #9CDCFE",
+			"light_plus": "support.constant.handlebars: #001080",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF"
@@ -1257,8 +1257,8 @@
 		"c": "{{/if}}",
 		"t": "text.html.handlebars meta.function.block.end.handlebars support.constant.handlebars",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
+			"dark_plus": "support.constant.handlebars: #9CDCFE",
+			"light_plus": "support.constant.handlebars: #001080",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF"
@@ -1411,8 +1411,8 @@
 		"c": "{{>",
 		"t": "text.html.handlebars meta.function.inline.other.handlebars support.constant.handlebars",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
+			"dark_plus": "support.constant.handlebars: #9CDCFE",
+			"light_plus": "support.constant.handlebars: #001080",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF"
@@ -1521,8 +1521,8 @@
 		"c": "}}",
 		"t": "text.html.handlebars meta.function.inline.other.handlebars support.constant.handlebars",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
+			"dark_plus": "support.constant.handlebars: #9CDCFE",
+			"light_plus": "support.constant.handlebars: #001080",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF"
@@ -1631,8 +1631,8 @@
 		"c": "{{#each",
 		"t": "text.html.handlebars meta.function.block.start.handlebars support.constant.handlebars",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
+			"dark_plus": "support.constant.handlebars: #9CDCFE",
+			"light_plus": "support.constant.handlebars: #001080",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF"
@@ -1664,8 +1664,8 @@
 		"c": "}}",
 		"t": "text.html.handlebars meta.function.block.start.handlebars support.constant.handlebars",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
+			"dark_plus": "support.constant.handlebars: #9CDCFE",
+			"light_plus": "support.constant.handlebars: #001080",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF"
@@ -1686,8 +1686,8 @@
 		"c": "{{>",
 		"t": "text.html.handlebars meta.function.inline.other.handlebars support.constant.handlebars",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
+			"dark_plus": "support.constant.handlebars: #9CDCFE",
+			"light_plus": "support.constant.handlebars: #001080",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF"
@@ -1796,8 +1796,8 @@
 		"c": "}}",
 		"t": "text.html.handlebars meta.function.inline.other.handlebars support.constant.handlebars",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
+			"dark_plus": "support.constant.handlebars: #9CDCFE",
+			"light_plus": "support.constant.handlebars: #001080",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF"
@@ -1818,8 +1818,8 @@
 		"c": "{{/each}}",
 		"t": "text.html.handlebars meta.function.block.end.handlebars support.constant.handlebars",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
+			"dark_plus": "support.constant.handlebars: #9CDCFE",
+			"light_plus": "support.constant.handlebars: #001080",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF"
diff --git a/extensions/theme-defaults/themes/dark_plus.json b/extensions/theme-defaults/themes/dark_plus.json
index d45875d88cb9633e2bfce5a184106bd8f3e811ed..561a9615e8993438446f347cd12431356e4e7a4f 100644
--- a/extensions/theme-defaults/themes/dark_plus.json
+++ b/extensions/theme-defaults/themes/dark_plus.json
@@ -74,7 +74,9 @@
 			"scope": [
 				"variable",
 				"meta.definition.variable.name",
-				"support.variable"
+				"support.variable",
+
+				"support.constant.handlebars"
 			],
 			"settings": {
 				"foreground": "#9CDCFE"
diff --git a/extensions/theme-defaults/themes/light_plus.json b/extensions/theme-defaults/themes/light_plus.json
index d3505d1dc770e9f5330f20da23f7c3d5678a7a31..f9f9c9c052c7b933df0728edb0373a2b9ee90bae 100644
--- a/extensions/theme-defaults/themes/light_plus.json
+++ b/extensions/theme-defaults/themes/light_plus.json
@@ -74,7 +74,9 @@
 			"scope": [
 				"variable",
 				"meta.definition.variable.name",
-				"support.variable"
+				"support.variable",
+
+				"support.constant.handlebars"
 			],
 			"settings": {
 				"foreground": "#001080"