diff --git a/src/themes/theme-template-color-theme.json b/src/themes/theme-template-color-theme.json
index b080106..f2b734b 100644
--- a/src/themes/theme-template-color-theme.json
+++ b/src/themes/theme-template-color-theme.json
@@ -160,8 +160,10 @@
         "constant.language",
         "support.constant",
         "constant.character",
+        "constant.escape",
         "variable.parameter",
         "keyword.other.unit"
+        "keyword.other"
       ],
       "settings": {
         "foreground": "{{variant.scheme.base.orange}}"
@@ -186,8 +188,7 @@
     {
       "name": "Class, Support",
       "scope": [
-        "entity.name.class",
-        "entity.name.type.class",
+        "entity.name",
         "support.type",
         "support.class",
         "support.orther.namespace.use.php",
@@ -200,6 +201,15 @@
         "foreground": "{{variant.scheme.base.yellow}}"
       }
     },
+    {
+      "name": "Entity Types",
+      "scope": [
+        "support.type"
+      ],
+      "settings": {
+        "foreground": "{{variant.scheme.base.paleblue}}"
+      }
+    },
     {
       "name": "CSS Class and Support",
       "scope": [
diff --git a/themes/Material-Theme-Darker.json b/themes/Material-Theme-Darker.json
index 9b48e8f..81c22d4 100644
--- a/themes/Material-Theme-Darker.json
+++ b/themes/Material-Theme-Darker.json
@@ -186,8 +186,8 @@
     {
       "name": "Class, Support",
       "scope": [
-        "entity.name.class",
-        "entity.name.type.class",
+        "entity.name",
+        "entity.name.type",
         "support.type",
         "support.class",
         "support.orther.namespace.use.php",
diff --git a/themes/Material-Theme-Default.json b/themes/Material-Theme-Default.json
index eab705e..4007685 100644
--- a/themes/Material-Theme-Default.json
+++ b/themes/Material-Theme-Default.json
@@ -186,8 +186,8 @@
     {
       "name": "Class, Support",
       "scope": [
-        "entity.name.class",
-        "entity.name.type.class",
+        "entity.name",
+        "entity.name.type",
         "support.type",
         "support.class",
         "support.orther.namespace.use.php",
diff --git a/themes/Material-Theme-Lighter.json b/themes/Material-Theme-Lighter.json
index 2ba76dc..fe05ef2 100644
--- a/themes/Material-Theme-Lighter.json
+++ b/themes/Material-Theme-Lighter.json
@@ -186,8 +186,8 @@
     {
       "name": "Class, Support",
       "scope": [
-        "entity.name.class",
-        "entity.name.type.class",
+        "entity.name",
+        "entity.name.type",
         "support.type",
         "support.class",
         "support.orther.namespace.use.php",
diff --git a/themes/Material-Theme-Palenight.json b/themes/Material-Theme-Palenight.json
index 6e918c2..689086f 100644
--- a/themes/Material-Theme-Palenight.json
+++ b/themes/Material-Theme-Palenight.json
@@ -186,8 +186,8 @@
     {
       "name": "Class, Support",
       "scope": [
-        "entity.name.class",
-        "entity.name.type.class",
+        "entity.name",
+        "entity.name.type",
         "support.type",
         "support.class",
         "support.orther.namespace.use.php",