diff --git a/syntaxes/mist.tmLanguage.json b/syntaxes/mist.tmLanguage.json
index feccb82..591229f 100644
--- a/syntaxes/mist.tmLanguage.json
+++ b/syntaxes/mist.tmLanguage.json
@@ -6,6 +6,9 @@
     {
       "include": "#comments"
     },
+    {
+      "include": "#keywords"
+    },
     {
       "include": "#attributes"
     },
@@ -18,9 +21,6 @@
     {
       "include": "#type_declarations"
     },
-    {
-      "include": "#keywords"
-    },
     {
       "include": "#constants"
     },
@@ -129,12 +129,8 @@
           "name": "storage.modifier.mist"
         },
         {
-          "match": "\\b(impl|use|mod|new|void)\\b",
+          "match": "\\b(impl|use|mod|new|void|self)\\b",
           "name": "keyword.other.mist"
-        },
-        {
-          "match": "\\bself\\b",
-          "name": "variable.language.self.mist"
         }
       ]
     },
@@ -157,6 +153,15 @@
             }
           }
         },
+        {
+          "comment": "other types",
+          "match": "(?<![A-Za-z])(str|char|bool)\\b",
+          "captures": {
+            "1": {
+              "name": "entity.name.type.other.mist"
+            }
+          }
+        },
         {
           "comment": "parameterized types",
           "begin": "\\b(_?[A-Z][A-Za-z0-9_]*)(<)",
@@ -173,33 +178,7 @@
             "0": {
               "name": "punctuation.brackets.angle.mist"
             }
-          },
-          "patterns": [
-            {
-              "include": "#block-comments"
-            },
-            {
-              "include": "#comments"
-            },
-            {
-              "include": "#keywords"
-            },
-            {
-              "include": "#variables"
-            },
-            {
-              "include": "#lifetimes"
-            },
-            {
-              "include": "#punctuation"
-            },
-            {
-              "include": "#types"
-            },
-            {
-              "include": "#variables"
-            }
-          ]
+          }
         },
         {
           "comment": "trait declarations",