diff --git a/syntaxes/mist.tmLanguage.json b/syntaxes/mist.tmLanguage.json
index 2126c72..dc59a17 100644
--- a/syntaxes/mist.tmLanguage.json
+++ b/syntaxes/mist.tmLanguage.json
@@ -269,19 +269,12 @@
           }
         },
         {
-          "match": "\\b(fn)\\s+([a-zA-Z_][a-zA-Z0-9_]*)\\s+([a-zA-Z_][a-zA-Z0-9_]*)",
+          "match": "\\b([a-zA-Z_][a-zA-Z0-9_]*)\\s+([a-zA-Z_][a-zA-Z0-9_]*)(?=\\s*(?:<[^;(){}]*>)?\\s*\\()",
           "captures": {
             "1": {
-              "name": "storage.type.mist"
+              "name": "entity.name.type.mist"
             },
             "2": {
-              "patterns": [
-                {
-                  "include": "#types"
-                }
-              ]
-            },
-            "3": {
               "name": "entity.name.function.mist"
             }
           }
@@ -473,7 +466,7 @@
       ]
     },
     "method_calls": {
-      "match": "\\.([a-zA-Z_][a-zA-Z0-9_]*)\\s*(?=\\()",
+      "match": "\\.([a-zA-Z_][a-zA-Z0-9_]*)(?=\\s*(?:<[^;(){}]*>)?\\s*\\()",
       "captures": {
         "1": {
           "name": "entity.name.function.mist"
@@ -505,8 +498,12 @@
       "name": "keyword.operator.arrow.mist"
     },
     "functions": {
-      "match": "\\b([a-zA-Z_][a-zA-Z0-9_]*)\\s*(?=\\()",
-      "name": "entity.name.function.mist"
+      "match": "\\b([a-zA-Z_][a-zA-Z0-9_]*)(?=\\s*(?:<[^;(){}]*>)?\\s*\\()",
+      "captures": {
+        "1": {
+          "name": "entity.name.function.mist"
+        }
+      }
     },
     "impl": {
       "patterns": [