diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..3de85d3
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,9 @@
+root = true
+
+[*]
+insert_final_newline = true
+
+[*.json]
+charset = utf-8
+indent_style = space
+indent_size = 4
diff --git a/.vscode/launch.json b/.vscode/launch.json
index 8384213..5901239 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -10,4 +10,4 @@
             "args": ["--extensionDevelopmentPath=${workspaceRoot}" ]
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/language-configuration.json b/language-configuration.json
index aa25710..d796ba8 100644
--- a/language-configuration.json
+++ b/language-configuration.json
@@ -27,4 +27,4 @@
         ["\"", "\""],
         ["'", "'"]
     ]
-}
\ No newline at end of file
+}
diff --git a/package.json b/package.json
index e25704d..6d2ed4e 100644
--- a/package.json
+++ b/package.json
@@ -8,7 +8,7 @@
         "vscode": "^1.14.0"
     },
     "categories": [
-        "Languages"
+        "Programming Languages"
     ],
     "icon": "media/icon.png",
     "repository": {
@@ -28,4 +28,4 @@
             "path": "./syntaxes/fastbuild.tmLanguage.json"
         }]
     }
-}
\ No newline at end of file
+}
diff --git a/syntaxes/fastbuild.tmLanguage.json b/syntaxes/fastbuild.tmLanguage.json
index 35f9d7a..9030271 100644
--- a/syntaxes/fastbuild.tmLanguage.json
+++ b/syntaxes/fastbuild.tmLanguage.json
@@ -1,38 +1,47 @@
 {
-	"$schema": "https://raw.githubusercontent.com/martinring/tmlanguage/master/tmlanguage.json",
+    "$schema": "https://raw.githubusercontent.com/martinring/tmlanguage/master/tmlanguage.json",
     "name": "FASTBuild",
     "foldingStartMarker": "/\\*\\*(?!\\*)|^(?![^{]*?//|[^{]*?/\\*(?!.*?\\*/.*?\\{)).*?\\{\\s*($|//|/\\*(?!.*?\\*/.*\\S))",
     "foldingStopMarker": "(?<!\\*)\\*\\*/|^\\s*\\}",
-	"patterns": [
-		{
-			"include": "#keywords"
-        },
-		{
-			"include": "#functions"
-		},
-		{
-			"include": "#strings_single"
-		},
-		{
-			"include": "#strings_double"
-		},
-		{
-			"include": "#fastbuild_defines"
-		},
-		{
-			"include": "#directives"
-        },
-		{
-			"include": "#defined_variables"
-        },
-		{
-			"include": "#local_variables"
-        },
-		{
-			"include": "#comment"
+    "patterns": [
+        {
+            "include": "#keywords"
+        },
+        {
+            "include": "#functions"
+        },
+        {
+            "include": "#constants"
+        },
+        {
+            "include": "#strings_single"
+        },
+        {
+            "include": "#strings_double"
+        },
+        {
+            "include": "#fastbuild_defines"
+        },
+        {
+            "include": "#directives"
+        },
+        {
+            "include": "#directive_functions"
+        },
+        {
+            "include": "#import_env_variable"
+        },
+        {
+            "include": "#defined_variables"
+        },
+        {
+            "include": "#local_variables"
+        },
+        {
+            "include": "#comment"
         }
-	],
-	"repository": {
+    ],
+    "repository": {
         "string_highlight": {
             "patterns": [{
                 "name": "constant.character.escape.fastbuild",
@@ -40,80 +49,107 @@
             }]
         },
         "keywords": {
-			"patterns": [{
-				"name": "keyword.operator.fastbuild",
-				"match": "\\b(\\+\\-/\\*=)\\b"
+            "patterns": [{
+                "name": "keyword.operator.fastbuild",
+                "match": "[\\+\\-=]"
+            }]
+        },
+        "functions": {
+            "patterns": [{
+                "name": "support.function.fastbuild",
+                "match": "\\b(Alias|Compiler|Copy|CopyDir|CSAssembly|DLL|Exec|Executable|ForEach|If|Library|ListDependencies|ObjectList|Print|RemoveDir|Settings|Test|TextFile|Unity|Using|VCXProject|VSProjectExternal|VSSolution|XCodeProject)\\b"
             }]
         },
-		"functions": {
-			"patterns": [{
-				"name": "support.function.fastbuild",
-				"match": "\\b(Alias|Compiler|Copy|CopyDir|CSAssembly|DLL|Exec|Executable|ForEach|Library|ObjectList|Print|RemoveDir|Settings|Test|Unity|Using|VCXProject|VSSolution|XCodeProject)\\b"
+        "constants": {
+            "patterns": [{
+                "name": "constant.language.fastbuild",
+                "match": "\\b(true|false)\\b"
             }]
         },
-		"strings_single": {
-			"name": "string.quoted.single.fastbuild",
-			"begin": "'",
-			"end": "'",
-			"patterns": [
-				{
-                    "include": "#string_highlight"
-                }
-			]
-        },
-		"strings_double": {
-			"name": "string.quoted.double.fastbuild",
-			"begin": "\"",
-			"end": "\"",
-			"patterns": [
-				{
-                    "include": "#string_highlight"
-                }
-			]
+        "strings_single": {
+            "name": "string.quoted.single.fastbuild",
+            "begin": "'",
+            "end": "'",
+            "patterns": [{
+                "include": "#string_highlight"
+            }]
+        },
+        "strings_double": {
+            "name": "string.quoted.double.fastbuild",
+            "begin": "\"",
+            "end": "\"",
+            "patterns": [{
+                "include": "#string_highlight"
+            }]
         },
         "fastbuild_defines": {
-            "patterns": [
-                {
-                    "name": "variable.language.fastbuild",
-                    "match": "__WINDOWS__|__OSX__|__LINUX__"
+            "patterns": [{
+                "name": "variable.language.fastbuild",
+                "match": "__WINDOWS__|__OSX__|__LINUX__|_CURRENT_BFF_DIR_|_FASTBUILD_VERSION_STRING_|_FASTBUILD_VERSION_|_WORKING_DIR_"
+            }]
+        },
+        "directives": {
+            "patterns": [{
+                "name": "keyword.other.fastbuild",
+                "match": "(#)(undef|if|else|endif|include|once)",
+                "captures": {
+                    "0": {
+                        "name": "meta.preprocessor.fastbuild"
+                    }
+                }
+            }]
+        },
+        "directive_functions": {
+            "patterns": [{
+                "name": "keyword.function.fastbuild",
+                "match": "\\b(exists|file_exists|in)\\b"
+            }]
+        },
+        "import_env_variable": {
+            "patterns": [{
+                "name": "keyword.other.fastbuild",
+                "match": "#import\\s+([\\w\\d]+)",
+                "captures": {
+                    "1": {
+                        "name": "meta.parameter.type.variable.fastbuild"
+                    }
                 }
-            ]
-        },       
-		"directives": {
-			"patterns": [{
-				"name": "keyword.other.fastbuild",
-				"match": "#(undef|if|else|endif|exists|import|include|once)"
-			}]
+            }]
         },
         "defined_variables": {
-			"patterns": [{
-				"name": "keyword.other.fastbuild",
+            "patterns": [{
+                "name": "keyword.other.fastbuild",
                 "match": "#define\\s+([\\w\\d]+)",
                 "captures": {
                     "1": {
                         "name": "meta.parameter.type.variable.fastbuild"
                     }
                 }
-			}]
+            }]
         },
         "local_variables": {
-			"patterns": [{
-                "match": "[\\s^]\\.(['\"]?)([\\w\\d\\$]+)\\1?",
+            "patterns": [{
+                "match": "(\\b)?[\\.^]([\\w\\d\\$]+)\\b",
                 "captures": {
                     "2": {
                         "name": "variable.other.fastbuild"
                     }
                 }
-			}]
+            }, {
+                "match": "(\\b)?[\\.^]['\"](.+)['\"]\\b",
+                "captures": {
+                    "2": {
+                        "name": "variable.other.fastbuild"
+                    }
+                }
+            }]
         },
         "comment": {
-			"patterns": [
-				{
-					"name": "comment.line.double-slash.fastbuild",
-					"match": "(//|;).*"
-				}
-			]
+            "patterns": [{
+                "name": "comment.line.double-slash.fastbuild",
+                "match": "(//|;).*"
+            }]
         }
-	},
-	"scopeName": "source.fastbuild"
-}
\ No newline at end of file
+    },
+    "scopeName": "source.fastbuild"
+}