diff --git a/extensions/php/test/colorize-results/issue-28354_php.json b/extensions/php/test/colorize-results/issue-28354_php.json
index 10314265464..553ade314b5 100644
--- a/extensions/php/test/colorize-results/issue-28354_php.json
+++ b/extensions/php/test/colorize-results/issue-28354_php.json
@@ -89,7 +89,7 @@
 	},
 	{
 		"c": "foreach",
-		"t": "text.html.php meta.embedded.block.html source.js meta.embedded.block.php source.php keyword.control.php",
+		"t": "text.html.php meta.embedded.block.html source.js meta.embedded.block.php source.php keyword.control.foreach.php",
 		"r": {
 			"dark_plus": "keyword.control: #C586C0",
 			"light_plus": "keyword.control: #AF00DB",
@@ -210,7 +210,7 @@
 	},
 	{
 		"c": "{",
-		"t": "text.html.php meta.embedded.block.html source.js meta.embedded.block.php source.php punctuation.section.scope.begin.php",
+		"t": "text.html.php meta.embedded.block.html source.js meta.embedded.block.php source.php punctuation.definition.begin.bracket.curly.php",
 		"r": {
 			"dark_plus": "meta.embedded: #D4D4D4",
 			"light_plus": "meta.embedded: #000000",
@@ -430,7 +430,7 @@
 	},
 	{
 		"c": "}",
-		"t": "text.html.php meta.embedded.block.html source.js meta.embedded.block.php source.php punctuation.section.scope.end.php",
+		"t": "text.html.php meta.embedded.block.html source.js meta.embedded.block.php source.php punctuation.definition.end.bracket.curly.php",
 		"r": {
 			"dark_plus": "meta.embedded: #D4D4D4",
 			"light_plus": "meta.embedded: #000000",
diff --git a/extensions/php/test/colorize-results/test_php.json b/extensions/php/test/colorize-results/test_php.json
index 5f8cff26aa6..4cb58182b1a 100644
--- a/extensions/php/test/colorize-results/test_php.json
+++ b/extensions/php/test/colorize-results/test_php.json
@@ -298,7 +298,7 @@
 	},
 	{
 		"c": "{",
-		"t": "text.html.php meta.embedded.block.php source.php punctuation.section.scope.begin.php",
+		"t": "text.html.php meta.embedded.block.php source.php punctuation.definition.begin.bracket.curly.php",
 		"r": {
 			"dark_plus": "meta.embedded: #D4D4D4",
 			"light_plus": "meta.embedded: #000000",
@@ -353,7 +353,7 @@
 	},
 	{
 		"c": "}",
-		"t": "text.html.php meta.embedded.block.php source.php punctuation.section.scope.end.php",
+		"t": "text.html.php meta.embedded.block.php source.php punctuation.definition.end.bracket.curly.php",
 		"r": {
 			"dark_plus": "meta.embedded: #D4D4D4",
 			"light_plus": "meta.embedded: #000000",
@@ -1057,7 +1057,7 @@
 	},
 	{
 		"c": "for",
-		"t": "text.html.php meta.embedded.block.php source.php keyword.control.php",
+		"t": "text.html.php meta.embedded.block.php source.php keyword.control.for.php",
 		"r": {
 			"dark_plus": "keyword.control: #C586C0",
 			"light_plus": "keyword.control: #AF00DB",
@@ -1134,7 +1134,7 @@
 	},
 	{
 		"c": "0",
-		"t": "text.html.php meta.embedded.block.php source.php constant.numeric.php",
+		"t": "text.html.php meta.embedded.block.php source.php constant.numeric.decimal.php",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
 			"light_plus": "constant.numeric: #09885A",
@@ -1222,7 +1222,7 @@
 	},
 	{
 		"c": "52",
-		"t": "text.html.php meta.embedded.block.php source.php constant.numeric.php",
+		"t": "text.html.php meta.embedded.block.php source.php constant.numeric.decimal.php",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
 			"light_plus": "constant.numeric: #09885A",
@@ -1310,7 +1310,7 @@
 	},
 	{
 		"c": "{",
-		"t": "text.html.php meta.embedded.block.php source.php punctuation.section.scope.begin.php",
+		"t": "text.html.php meta.embedded.block.php source.php punctuation.definition.begin.bracket.curly.php",
 		"r": {
 			"dark_plus": "meta.embedded: #D4D4D4",
 			"light_plus": "meta.embedded: #000000",
@@ -1629,7 +1629,7 @@
 	},
 	{
 		"c": "if",
-		"t": "text.html.php meta.embedded.block.php source.php keyword.control.php",
+		"t": "text.html.php meta.embedded.block.php source.php keyword.control.if.php",
 		"r": {
 			"dark_plus": "keyword.control: #C586C0",
 			"light_plus": "keyword.control: #AF00DB",
@@ -1794,7 +1794,7 @@
 	},
 	{
 		"c": "{",
-		"t": "text.html.php meta.embedded.block.php source.php punctuation.section.scope.begin.php",
+		"t": "text.html.php meta.embedded.block.php source.php punctuation.definition.begin.bracket.curly.php",
 		"r": {
 			"dark_plus": "meta.embedded: #D4D4D4",
 			"light_plus": "meta.embedded: #000000",
@@ -1871,7 +1871,7 @@
 	},
 	{
 		"c": "}",
-		"t": "text.html.php meta.embedded.block.php source.php punctuation.section.scope.end.php",
+		"t": "text.html.php meta.embedded.block.php source.php punctuation.definition.end.bracket.curly.php",
 		"r": {
 			"dark_plus": "meta.embedded: #D4D4D4",
 			"light_plus": "meta.embedded: #000000",
@@ -1893,7 +1893,7 @@
 	},
 	{
 		"c": "else",
-		"t": "text.html.php meta.embedded.block.php source.php keyword.control.php",
+		"t": "text.html.php meta.embedded.block.php source.php keyword.control.else.php",
 		"r": {
 			"dark_plus": "keyword.control: #C586C0",
 			"light_plus": "keyword.control: #AF00DB",
@@ -1915,7 +1915,7 @@
 	},
 	{
 		"c": "{",
-		"t": "text.html.php meta.embedded.block.php source.php punctuation.section.scope.begin.php",
+		"t": "text.html.php meta.embedded.block.php source.php punctuation.definition.begin.bracket.curly.php",
 		"r": {
 			"dark_plus": "meta.embedded: #D4D4D4",
 			"light_plus": "meta.embedded: #000000",
@@ -2245,7 +2245,7 @@
 	},
 	{
 		"c": "}",
-		"t": "text.html.php meta.embedded.block.php source.php punctuation.section.scope.end.php",
+		"t": "text.html.php meta.embedded.block.php source.php punctuation.definition.end.bracket.curly.php",
 		"r": {
 			"dark_plus": "meta.embedded: #D4D4D4",
 			"light_plus": "meta.embedded: #000000",
@@ -2267,7 +2267,7 @@
 	},
 	{
 		"c": "}",
-		"t": "text.html.php meta.embedded.block.php source.php punctuation.section.scope.end.php",
+		"t": "text.html.php meta.embedded.block.php source.php punctuation.definition.end.bracket.curly.php",
 		"r": {
 			"dark_plus": "meta.embedded: #D4D4D4",
 			"light_plus": "meta.embedded: #000000",
@@ -2487,7 +2487,7 @@
 	},
 	{
 		"c": "51",
-		"t": "text.html.php meta.embedded.block.php source.php constant.numeric.php",
+		"t": "text.html.php meta.embedded.block.php source.php constant.numeric.decimal.php",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
 			"light_plus": "constant.numeric: #09885A",
@@ -2685,7 +2685,7 @@
 	},
 	{
 		"c": "for",
-		"t": "text.html.php meta.embedded.block.php source.php keyword.control.php",
+		"t": "text.html.php meta.embedded.block.php source.php keyword.control.for.php",
 		"r": {
 			"dark_plus": "keyword.control: #C586C0",
 			"light_plus": "keyword.control: #AF00DB",
@@ -2773,7 +2773,7 @@
 	},
 	{
 		"c": "0",
-		"t": "text.html.php meta.embedded.block.php source.php constant.numeric.php",
+		"t": "text.html.php meta.embedded.block.php source.php constant.numeric.decimal.php",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
 			"light_plus": "constant.numeric: #09885A",
@@ -2861,7 +2861,7 @@
 	},
 	{
 		"c": "52",
-		"t": "text.html.php meta.embedded.block.php source.php constant.numeric.php",
+		"t": "text.html.php meta.embedded.block.php source.php constant.numeric.decimal.php",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
 			"light_plus": "constant.numeric: #09885A",
@@ -2949,7 +2949,7 @@
 	},
 	{
 		"c": "{",
-		"t": "text.html.php meta.embedded.block.php source.php punctuation.section.scope.begin.php",
+		"t": "text.html.php meta.embedded.block.php source.php punctuation.definition.begin.bracket.curly.php",
 		"r": {
 			"dark_plus": "meta.embedded: #D4D4D4",
 			"light_plus": "meta.embedded: #000000",
@@ -2971,7 +2971,7 @@
 	},
 	{
 		"c": "if",
-		"t": "text.html.php meta.embedded.block.php source.php keyword.control.php",
+		"t": "text.html.php meta.embedded.block.php source.php keyword.control.if.php",
 		"r": {
 			"dark_plus": "keyword.control: #C586C0",
 			"light_plus": "keyword.control: #AF00DB",
@@ -3059,7 +3059,7 @@
 	},
 	{
 		"c": "52",
-		"t": "text.html.php meta.embedded.block.php source.php constant.numeric.php",
+		"t": "text.html.php meta.embedded.block.php source.php constant.numeric.decimal.php",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
 			"light_plus": "constant.numeric: #09885A",
@@ -3092,7 +3092,7 @@
 	},
 	{
 		"c": "{",
-		"t": "text.html.php meta.embedded.block.php source.php punctuation.section.scope.begin.php",
+		"t": "text.html.php meta.embedded.block.php source.php punctuation.definition.begin.bracket.curly.php",
 		"r": {
 			"dark_plus": "meta.embedded: #D4D4D4",
 			"light_plus": "meta.embedded: #000000",
@@ -3169,7 +3169,7 @@
 	},
 	{
 		"c": "0",
-		"t": "text.html.php meta.embedded.block.php source.php constant.numeric.php",
+		"t": "text.html.php meta.embedded.block.php source.php constant.numeric.decimal.php",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
 			"light_plus": "constant.numeric: #09885A",
@@ -3202,7 +3202,7 @@
 	},
 	{
 		"c": "}",
-		"t": "text.html.php meta.embedded.block.php source.php punctuation.section.scope.end.php",
+		"t": "text.html.php meta.embedded.block.php source.php punctuation.definition.end.bracket.curly.php",
 		"r": {
 			"dark_plus": "meta.embedded: #D4D4D4",
 			"light_plus": "meta.embedded: #000000",
@@ -3444,7 +3444,7 @@
 	},
 	{
 		"c": "}",
-		"t": "text.html.php meta.embedded.block.php source.php punctuation.section.scope.end.php",
+		"t": "text.html.php meta.embedded.block.php source.php punctuation.definition.end.bracket.curly.php",
 		"r": {
 			"dark_plus": "meta.embedded: #D4D4D4",
 			"light_plus": "meta.embedded: #000000",
@@ -3521,7 +3521,7 @@
 	},
 	{
 		"c": "{",
-		"t": "text.html.php meta.embedded.block.php source.php punctuation.section.scope.begin.php",
+		"t": "text.html.php meta.embedded.block.php source.php punctuation.definition.begin.bracket.curly.php",
 		"r": {
 			"dark_plus": "meta.embedded: #D4D4D4",
 			"light_plus": "meta.embedded: #000000",
@@ -3532,7 +3532,7 @@
 	},
 	{
 		"c": "}",
-		"t": "text.html.php meta.embedded.block.php source.php punctuation.section.scope.end.php",
+		"t": "text.html.php meta.embedded.block.php source.php punctuation.definition.end.bracket.curly.php",
 		"r": {
 			"dark_plus": "meta.embedded: #D4D4D4",
 			"light_plus": "meta.embedded: #000000",