diff --git a/src/themes/theme-template-color-theme.json b/src/themes/theme-template-color-theme.json
index f2b734b..56217e2 100644
--- a/src/themes/theme-template-color-theme.json
+++ b/src/themes/theme-template-color-theme.json
@@ -41,22 +41,10 @@
       "name": "Invalid",
       "scope": [
         "invalid",
-        "invalid.illegal",
-        "invalid.broken"
+        "invalid.illegal"
       ],
       "settings": {
-        "background": "{{variant.scheme.base.red}}",
-        "foreground": "{{variant.scheme.base.white}}"
-      }
-    },
-    {
-      "name": "Invalid unimplemented",
-      "scope": [
-        "invalid.unimplemented"
-      ],
-      "settings": {
-        "background": "{{variant.scheme.base.green}}",
-        "foreground": "{{variant.scheme.base.white}}"
+        "foreground": "{{variant.scheme.base.red}}"
       }
     },
     {
@@ -65,8 +53,7 @@
         "invalid.deprecated"
       ],
       "settings": {
-        "background": "{{variant.scheme.base.purple}}",
-        "foreground": "{{variant.scheme.base.white}}"
+        "foreground": "{{variant.scheme.base.purple}}"
       }
     },
     {
@@ -162,7 +149,7 @@
         "constant.character",
         "constant.escape",
         "variable.parameter",
-        "keyword.other.unit"
+        "keyword.other.unit",
         "keyword.other"
       ],
       "settings": {
diff --git a/test/source.php b/test/source.php
index e69de29..387254a 100644
--- a/test/source.php
+++ b/test/source.php
@@ -0,0 +1,4 @@
+<?php
+/**
+function hello($world) {}
+*/
\ No newline at end of file
diff --git a/themes/Material-Theme-Darker.json b/themes/Material-Theme-Darker.json
index 81c22d4..b11ce0e 100644
--- a/themes/Material-Theme-Darker.json
+++ b/themes/Material-Theme-Darker.json
@@ -41,22 +41,10 @@
       "name": "Invalid",
       "scope": [
         "invalid",
-        "invalid.illegal",
-        "invalid.broken"
+        "invalid.illegal"
       ],
       "settings": {
-        "background": "#FF5370",
-        "foreground": "#ffffff"
-      }
-    },
-    {
-      "name": "Invalid unimplemented",
-      "scope": [
-        "invalid.unimplemented"
-      ],
-      "settings": {
-        "background": "#C3E88D",
-        "foreground": "#ffffff"
+        "foreground": "#FF5370"
       }
     },
     {
@@ -65,8 +53,7 @@
         "invalid.deprecated"
       ],
       "settings": {
-        "background": "#C792EA",
-        "foreground": "#ffffff"
+        "foreground": "#C792EA"
       }
     },
     {
@@ -160,8 +147,10 @@
         "constant.language",
         "support.constant",
         "constant.character",
+        "constant.escape",
         "variable.parameter",
-        "keyword.other.unit"
+        "keyword.other.unit",
+        "keyword.other"
       ],
       "settings": {
         "foreground": "#F78C6C"
@@ -187,7 +176,6 @@
       "name": "Class, Support",
       "scope": [
         "entity.name",
-        "entity.name.type",
         "support.type",
         "support.class",
         "support.orther.namespace.use.php",
@@ -200,6 +188,15 @@
         "foreground": "#FFCB6B"
       }
     },
+    {
+      "name": "Entity Types",
+      "scope": [
+        "support.type"
+      ],
+      "settings": {
+        "foreground": "#B2CCD6"
+      }
+    },
     {
       "name": "CSS Class and Support",
       "scope": [
diff --git a/themes/Material-Theme-Default.json b/themes/Material-Theme-Default.json
index 4007685..467d6fa 100644
--- a/themes/Material-Theme-Default.json
+++ b/themes/Material-Theme-Default.json
@@ -41,22 +41,10 @@
       "name": "Invalid",
       "scope": [
         "invalid",
-        "invalid.illegal",
-        "invalid.broken"
+        "invalid.illegal"
       ],
       "settings": {
-        "background": "#FF5370",
-        "foreground": "#ffffff"
-      }
-    },
-    {
-      "name": "Invalid unimplemented",
-      "scope": [
-        "invalid.unimplemented"
-      ],
-      "settings": {
-        "background": "#C3E88D",
-        "foreground": "#ffffff"
+        "foreground": "#FF5370"
       }
     },
     {
@@ -65,8 +53,7 @@
         "invalid.deprecated"
       ],
       "settings": {
-        "background": "#C792EA",
-        "foreground": "#ffffff"
+        "foreground": "#C792EA"
       }
     },
     {
@@ -160,8 +147,10 @@
         "constant.language",
         "support.constant",
         "constant.character",
+        "constant.escape",
         "variable.parameter",
-        "keyword.other.unit"
+        "keyword.other.unit",
+        "keyword.other"
       ],
       "settings": {
         "foreground": "#F78C6C"
@@ -187,7 +176,6 @@
       "name": "Class, Support",
       "scope": [
         "entity.name",
-        "entity.name.type",
         "support.type",
         "support.class",
         "support.orther.namespace.use.php",
@@ -200,6 +188,15 @@
         "foreground": "#FFCB6B"
       }
     },
+    {
+      "name": "Entity Types",
+      "scope": [
+        "support.type"
+      ],
+      "settings": {
+        "foreground": "#B2CCD6"
+      }
+    },
     {
       "name": "CSS Class and Support",
       "scope": [
diff --git a/themes/Material-Theme-Lighter.json b/themes/Material-Theme-Lighter.json
index fe05ef2..04f484d 100644
--- a/themes/Material-Theme-Lighter.json
+++ b/themes/Material-Theme-Lighter.json
@@ -41,22 +41,10 @@
       "name": "Invalid",
       "scope": [
         "invalid",
-        "invalid.illegal",
-        "invalid.broken"
+        "invalid.illegal"
       ],
       "settings": {
-        "background": "#E53935",
-        "foreground": "#FFFFFF"
-      }
-    },
-    {
-      "name": "Invalid unimplemented",
-      "scope": [
-        "invalid.unimplemented"
-      ],
-      "settings": {
-        "background": "#91B859",
-        "foreground": "#FFFFFF"
+        "foreground": "#E53935"
       }
     },
     {
@@ -65,8 +53,7 @@
         "invalid.deprecated"
       ],
       "settings": {
-        "background": "#7C4DFF",
-        "foreground": "#FFFFFF"
+        "foreground": "#7C4DFF"
       }
     },
     {
@@ -160,8 +147,10 @@
         "constant.language",
         "support.constant",
         "constant.character",
+        "constant.escape",
         "variable.parameter",
-        "keyword.other.unit"
+        "keyword.other.unit",
+        "keyword.other"
       ],
       "settings": {
         "foreground": "#F76D47"
@@ -187,7 +176,6 @@
       "name": "Class, Support",
       "scope": [
         "entity.name",
-        "entity.name.type",
         "support.type",
         "support.class",
         "support.orther.namespace.use.php",
@@ -200,6 +188,15 @@
         "foreground": "#FFB62C"
       }
     },
+    {
+      "name": "Entity Types",
+      "scope": [
+        "support.type"
+      ],
+      "settings": {
+        "foreground": "#8796B0"
+      }
+    },
     {
       "name": "CSS Class and Support",
       "scope": [
diff --git a/themes/Material-Theme-Palenight.json b/themes/Material-Theme-Palenight.json
index 689086f..5b41998 100644
--- a/themes/Material-Theme-Palenight.json
+++ b/themes/Material-Theme-Palenight.json
@@ -41,22 +41,10 @@
       "name": "Invalid",
       "scope": [
         "invalid",
-        "invalid.illegal",
-        "invalid.broken"
+        "invalid.illegal"
       ],
       "settings": {
-        "background": "#FF5370",
-        "foreground": "#ffffff"
-      }
-    },
-    {
-      "name": "Invalid unimplemented",
-      "scope": [
-        "invalid.unimplemented"
-      ],
-      "settings": {
-        "background": "#C3E88D",
-        "foreground": "#ffffff"
+        "foreground": "#FF5370"
       }
     },
     {
@@ -65,8 +53,7 @@
         "invalid.deprecated"
       ],
       "settings": {
-        "background": "#C792EA",
-        "foreground": "#ffffff"
+        "foreground": "#C792EA"
       }
     },
     {
@@ -160,8 +147,10 @@
         "constant.language",
         "support.constant",
         "constant.character",
+        "constant.escape",
         "variable.parameter",
-        "keyword.other.unit"
+        "keyword.other.unit",
+        "keyword.other"
       ],
       "settings": {
         "foreground": "#F78C6C"
@@ -187,7 +176,6 @@
       "name": "Class, Support",
       "scope": [
         "entity.name",
-        "entity.name.type",
         "support.type",
         "support.class",
         "support.orther.namespace.use.php",
@@ -200,6 +188,15 @@
         "foreground": "#FFCB6B"
       }
     },
+    {
+      "name": "Entity Types",
+      "scope": [
+        "support.type"
+      ],
+      "settings": {
+        "foreground": "#B2CCD6"
+      }
+    },
     {
       "name": "CSS Class and Support",
       "scope": [