diff --git a/syntaxes/terraform.json b/syntaxes/terraform.json
index aa3b6919e..58c9381b0 100644
--- a/syntaxes/terraform.json
+++ b/syntaxes/terraform.json
@@ -36,6 +36,11 @@
       "match": "\\b(true|false|yes|no|on|off)\\b",
       "name": "constant.language.terraform"
     },
+    {
+      "comment": "Primitive types",
+      "match": "\\b(string|number|bool)\\b",
+      "name": "support.type.primitive.terraform"
+    },
     {
       "comment": "Numbers",
       "match": "\\b([0-9]+)([kKmMgG]b?)?\\b",
@@ -137,6 +142,24 @@
       "comment": "Value assignments (left hand side in double quotes)",
       "match": "(\")([\\w_-]+)(\")\\s*(=)\\s*"
     },
+    {
+      "captures": {
+        "0": {
+          "name": "entity.name.function.terraform"
+        }
+      },
+      "comment": "Function Calls",
+      "match": "([\\w-]+)\\s*\\("
+    },
+    {
+      "captures": {
+        "0": {
+          "name": "variable.other.terraform"
+        }
+      },
+      "comment": "Variables",
+      "match": "([\\w-]+)"
+    },
     {
       "captures": {
         "1": {