diff --git a/Syntaxes/Zig.YAML-tmLanguage b/Syntaxes/Zig.YAML-tmLanguage
index dab69ef..fd6a6a0 100644
--- a/Syntaxes/Zig.YAML-tmLanguage
+++ b/Syntaxes/Zig.YAML-tmLanguage
@@ -59,7 +59,7 @@ repository:
       '2':
         name: punctuation.separator.zig
 
-    end: '([a-zA-Z_][a-zA-Z0-9_.]*|@\".+\")(?:(,)|\s*(=)\s*|(?=\n|\r))'
+    end: '([a-zA-Z_][a-zA-Z0-9_.]*|@\".+\")\s*(?:(,)|(=)|(?=\n|\r))'
     endCaptures:
       '1':
         name: storage.type.zig
diff --git a/Syntaxes/Zig.tmLanguage b/Syntaxes/Zig.tmLanguage
index 7a79ade..0c36fd1 100644
--- a/Syntaxes/Zig.tmLanguage
+++ b/Syntaxes/Zig.tmLanguage
@@ -261,7 +261,7 @@
 				</dict>
 			</dict>
 			<key>end</key>
-			<string>([a-zA-Z_][a-zA-Z0-9_.]*|@\".+\")(?:(,)|\s*(=)\s*|(?=\n|\r))</string>
+			<string>([a-zA-Z_][a-zA-Z0-9_.]*|@\".+\")\s*(?:(,)|(=)|(?=\n|\r))</string>
 			<key>endCaptures</key>
 			<dict>
 				<key>1</key>
diff --git a/Syntaxes/Zig.tmLanguage.json b/Syntaxes/Zig.tmLanguage.json
index 2ae7a8e..2ba8e3e 100644
--- a/Syntaxes/Zig.tmLanguage.json
+++ b/Syntaxes/Zig.tmLanguage.json
@@ -1,93 +1,77 @@
 {
+    "scopeName": "source.zig", 
+    "fileTypes": [
+        "zig"
+    ], 
+    "name": "Zig", 
     "repository": {
-        "operators": {
+        "keywords": {
             "patterns": [
                 {
-                    "match": "\\b!\\b", 
-                    "name": "keyword.operator.zig"
-                }, 
-                {
-                    "match": "(==|(?:!|>|<)=?)", 
-                    "name": "keyword.operator.logical.zig"
-                }, 
-                {
-                    "match": "\\b(and|or)\\b", 
-                    "name": "keyword.operator.word.zig"
-                }, 
-                {
-                    "match": "((?:(?:\\+|-|\\*)\\%?|/|%|<<|>>|&|\\|(?=[^\\|])|\\^)?=)", 
-                    "name": "keyword.operator.assignment.zig"
-                }, 
-                {
-                    "match": "((?:\\+|-|\\*)\\%?|/(?!/)|%)", 
-                    "name": "keyword.operator.arithmetic.zig"
+                    "name": "keyword.control.zig", 
+                    "match": "\\b(while|for|break|return|continue|asm|defer|errdefer|unreachable)\\b"
                 }, 
                 {
-                    "match": "(<<|>>|&(?=[a-zA-Z_]|@\\\")|\\|(?=[^\\|])|\\^|~)", 
-                    "name": "keyword.operator.bitwise.zig"
+                    "name": "keyword.control.async.zig", 
+                    "match": "\\b(noasync|async|await|suspend|resume|cancel)\\b"
                 }, 
                 {
-                    "match": "(\\+\\+|\\*\\*|->|\\.\\?|\\.\\*|&(?=[a-zA-Z_]|@\\\")|\\?|\\|\\||\\.{2,3})", 
-                    "name": "keyword.operator.other.zig"
-                }
-            ]
-        }, 
-        "punctuation": {
-            "patterns": [
-                {
-                    "match": ",", 
-                    "name": "punctuation.separator.zig"
-                }, 
-                {
-                    "match": ";", 
-                    "name": "punctuation.terminator.zig"
+                    "name": "keyword.control.conditional.zig", 
+                    "match": "\\b(if|else|switch|try|catch|orelse)\\b"
                 }, 
                 {
-                    "match": "(\\()", 
-                    "name": "punctuation.section.parens.begin.zig"
+                    "name": "keyword.control.import.zig", 
+                    "match": "(?<!\\w)(@import|@cImport|@cInclude)\\b"
                 }, 
                 {
-                    "match": "(\\))", 
-                    "name": "punctuation.section.parens.end.zig"
+                    "name": "keyword.other.usingnamespace.zig", 
+                    "match": "\\b(usingnamespace)\\b"
                 }
             ]
         }, 
-        "container_decl": {
+        "strings": {
             "patterns": [
                 {
-                    "match": "\\b(?!\\d)([a-zA-Z_]\\w*|@\\\".+\\\")(?=\\s*=\\s*(?:(?:extern|packed)\\s+)?(?:union)\\s*[(\\{])", 
-                    "name": "entity.name.union.zig"
-                }, 
-                {
-                    "match": "\\b(?!\\d)([a-zA-Z_]\\w*|@\\\".+\\\")(?=\\s*=\\s*(?:(?:extern|packed)\\s+)?(?:struct)\\s*[(\\{])", 
-                    "name": "entity.name.struct.zig"
-                }, 
-                {
-                    "match": "\\b(?!\\d)([a-zA-Z_]\\w*|@\\\".+\\\")(?=\\s*=\\s*(?:(?:extern|packed)\\s+)?(?:enum)\\s*[(\\{])", 
-                    "name": "entity.name.enum.zig"
-                }, 
-                {
-                    "match": "\\b(?!\\d)([a-zA-Z_]\\w*|@\\\".+\\\")(?=\\s*=\\s*(?:error)\\s*[(\\{])", 
-                    "name": "entity.name.error.zig"
+                    "patterns": [
+                        {
+                            "include": "#character_escapes"
+                        }, 
+                        {
+                            "name": "invalid.illegal.character.zig", 
+                            "match": "\\\\[^\\'][^\\']*?"
+                        }
+                    ], 
+                    "begin": "\\'", 
+                    "end": "\\'", 
+                    "name": "string.quoted.single.zig"
                 }, 
                 {
-                    "match": "\\b(error)(\\.)([a-zA-Z_]\\w*|@\\\".+\\\")", 
-                    "captures": {
-                        "1": {
-                            "name": "storage.type.error.zig"
-                        }, 
-                        "3": {
-                            "name": "entity.name.error.zig"
+                    "patterns": [
+                        {
+                            "include": "#character_escapes"
                         }, 
-                        "2": {
-                            "name": "punctuation.accessor.zig"
+                        {
+                            "name": "invalid.illegal.character.zig", 
+                            "match": "\\\\[^\\'][^\\']*?"
                         }
-                    }
+                    ], 
+                    "begin": "c?\\\"", 
+                    "end": "\\\"", 
+                    "name": "string.quoted.double.zig"
+                }, 
+                {
+                    "begin": "c?\\\\\\\\", 
+                    "end": "$\\n?", 
+                    "name": "string.quoted.other.zig"
                 }
             ]
         }, 
         "block": {
-            "end": "(\\})", 
+            "endCaptures": {
+                "1": {
+                    "name": "punctuation.section.braces.end.zig"
+                }
+            }, 
             "begin": "([a-zA-Z_][a-zA-Z0-9_.]*|@\\\".+\\\")?\\s*(\\{)", 
             "beginCaptures": {
                 "1": {
@@ -97,264 +81,217 @@
                     "name": "punctuation.section.braces.begin.zig"
                 }
             }, 
-            "endCaptures": {
-                "1": {
-                    "name": "punctuation.section.braces.end.zig"
-                }
-            }, 
+            "end": "(\\})", 
             "patterns": [
                 {
                     "include": "#main"
                 }
             ]
         }, 
-        "var_decl": {
-            "end": "\\s*(=)", 
-            "begin": "\\b(const|var)\\s+([a-zA-Z_][a-zA-Z0-9_]*|@\\\".+\\\")\\s*(:)", 
-            "beginCaptures": {
+        "param_list": {
+            "endCaptures": {
                 "1": {
-                    "name": "storage.modifier.zig"
+                    "name": "storage.type.zig"
                 }, 
                 "3": {
-                    "name": "punctuation.separator.zig"
+                    "name": "punctuation.section.parens.end.zig"
                 }, 
                 "2": {
-                    "name": "variable.other.zig"
+                    "name": "punctuation.separator.zig"
                 }
             }, 
-            "endCaptures": {
+            "begin": "([a-zA-Z_][a-zA-Z0-9_]*|@\\\".+\\\")\\s*(:)\\s*", 
+            "beginCaptures": {
                 "1": {
-                    "name": "keyword.operator.assignment.zig"
+                    "name": "variable.parameter.zig"
+                }, 
+                "2": {
+                    "name": "punctuation.separator.zig"
                 }
             }, 
+            "end": "([a-zA-Z_][a-zA-Z0-9_.]*|@\\\".+\\\")?\\s*(?:(,)|(\\)))", 
             "patterns": [
                 {
                     "include": "#main"
                 }, 
                 {
-                    "match": "([a-zA-Z_][a-zA-Z0-9_.]*|@\\\".+\\\")", 
-                    "name": "storage.type.zig"
+                    "name": "storage.type.zig", 
+                    "match": "([a-zA-Z_][a-zA-Z0-9_.]*|@\\\".+\\\")"
                 }
             ]
         }, 
-        "strings": {
-            "patterns": [
-                {
-                    "end": "\\'", 
-                    "begin": "\\'", 
-                    "name": "string.quoted.single.zig", 
-                    "patterns": [
-                        {
-                            "include": "#character_escapes"
-                        }, 
-                        {
-                            "match": "\\\\[^\\'][^\\']*?", 
-                            "name": "invalid.illegal.character.zig"
-                        }
-                    ]
+        "enum_literal": {
+            "name": "constant.language.enum", 
+            "match": "(?<!\\w|\\))(\\.(?:[a-zA-Z_][a-zA-Z0-9_]*|@\\\".+\\\"))\\b(?!\\(|\\s*=\\s+)"
+        }, 
+        "function_def": {
+            "endCaptures": {
+                "1": {
+                    "name": "storage.type.zig"
                 }, 
-                {
-                    "end": "\\\"", 
-                    "begin": "c?\\\"", 
-                    "name": "string.quoted.double.zig", 
-                    "patterns": [
-                        {
-                            "include": "#character_escapes"
-                        }, 
-                        {
-                            "match": "\\\\[^\\'][^\\']*?", 
-                            "name": "invalid.illegal.character.zig"
-                        }
-                    ]
+                "3": {
+                    "name": "storage.type.zig"
                 }, 
-                {
-                    "end": "$\\n?", 
-                    "begin": "c?\\\\\\\\", 
-                    "name": "string.quoted.other.zig"
+                "2": {
+                    "name": "keyword.operator.zig"
                 }
-            ]
-        }, 
-        "keywords": {
-            "patterns": [
-                {
-                    "match": "\\b(while|for|break|return|continue|asm|defer|errdefer|unreachable)\\b", 
-                    "name": "keyword.control.zig"
+            }, 
+            "begin": "(?<=fn)\\s+([a-zA-Z_][a-zA-Z0-9_]*|@\\\".+\\\")(\\()", 
+            "beginCaptures": {
+                "1": {
+                    "name": "entity.name.function"
                 }, 
+                "2": {
+                    "name": "punctuation.section.parens.begin.zig"
+                }
+            }, 
+            "end": "(?<=\\)[^\\)])\\s*([a-zA-Z_][a-zA-Z0-9_.]*|@\\\".+\\\")?(!)?\\s*(?:([a-zA-Z_][a-zA-Z0-9_.]*|@\\\".+\\\")\\b(?!\\s*\\())?", 
+            "patterns": [
                 {
-                    "match": "\\b(noasync|async|await|suspend|resume|cancel)\\b", 
-                    "name": "keyword.control.async.zig"
+                    "include": "#label"
                 }, 
                 {
-                    "match": "\\b(if|else|switch|try|catch|orelse)\\b", 
-                    "name": "keyword.control.conditional.zig"
+                    "include": "#param_list"
                 }, 
                 {
-                    "match": "(?<!\\w)(@import|@cImport|@cInclude)\\b", 
-                    "name": "keyword.control.import.zig"
+                    "name": "storage.type.zig", 
+                    "match": "([a-zA-Z_][a-zA-Z0-9_.]*|@\\\".+\\\")"
                 }, 
                 {
-                    "match": "\\b(usingnamespace)\\b", 
-                    "name": "keyword.other.usingnamespace.zig"
+                    "include": "#main"
                 }
             ]
         }, 
-        "function_call": {
-            "match": "(?<!fn)\\b([a-zA-Z_][a-zA-Z0-9_]*|@\\\".+\\\")(?=\\s*\\()", 
-            "name": "variable.function.zig"
-        }, 
-        "label": {
-            "match": "\\b(break|continue)\\s*:\\s*([a-zA-Z_]\\w*|@\\\".+\\\")\\b|\\b(?!\\d)([a-zA-Z_]\\w*|@\\\".+\\\")\\b(?=\\s*:\\s*(?:\\{|while\\b))", 
-            "captures": {
-                "1": {
-                    "name": "keyword.control.zig"
-                }, 
-                "3": {
-                    "name": "entity.name.label.zig"
-                }, 
-                "2": {
-                    "name": "entity.name.label.zig"
-                }
-            }
-        }, 
-        "comments": {
+        "punctuation": {
             "patterns": [
                 {
-                    "end": "$\\n?", 
-                    "begin": "///", 
-                    "name": "comment.line.documentation.zig"
+                    "name": "punctuation.separator.zig", 
+                    "match": ","
                 }, 
                 {
-                    "end": "$\\n?", 
-                    "begin": "//[^/]\\s*TODO", 
-                    "name": "comment.line.todo.zig"
+                    "name": "punctuation.terminator.zig", 
+                    "match": ";"
                 }, 
                 {
-                    "end": "$\\n?", 
-                    "begin": "//[^/]*", 
-                    "name": "comment.line.zig"
+                    "name": "punctuation.section.parens.begin.zig", 
+                    "match": "(\\()"
+                }, 
+                {
+                    "name": "punctuation.section.parens.end.zig", 
+                    "match": "(\\))"
                 }
             ]
         }, 
-        "character_escapes": {
+        "storage": {
             "patterns": [
                 {
-                    "match": "\\\\n", 
-                    "name": "constant.character.escape.newline.zig"
+                    "name": "storage.type.zig", 
+                    "match": "\\b(bool|void|noreturn|type|anyerror)\\b"
                 }, 
                 {
-                    "match": "\\\\r", 
-                    "name": "constant.character.escape.carrigereturn.zig"
+                    "name": "storage.type.integer.zig", 
+                    "match": "\\b(?<!\\.)([iu][0-9]\\d*|[iu]size|comptime_int)\\b"
                 }, 
                 {
-                    "match": "\\\\t", 
-                    "name": "constant.character.escape.tabulator.zig"
+                    "name": "storage.type.float.zig", 
+                    "match": "\\b(f16|f32|f64|f128|comptime_float)\\b"
                 }, 
                 {
-                    "match": "\\\\\\\\", 
-                    "name": "constant.character.escape.backslash.zig"
+                    "name": "storage.type.c_compat.zig", 
+                    "match": "\\b(c_short|c_ushort|c_int|c_uint|c_long|c_ulong|c_longlong|c_ulonglong|c_longdouble|c_void)\\b"
                 }, 
                 {
-                    "match": "\\\\'", 
-                    "name": "constant.character.escape.single-quote.zig"
+                    "captures": {
+                        "1": {
+                            "name": "storage.type.zig"
+                        }, 
+                        "3": {
+                            "name": "storage.type.zig"
+                        }, 
+                        "2": {
+                            "name": "keyword.operator.zig"
+                        }
+                    }, 
+                    "match": "\\b(anyframe)\\b\\s*(->)?\\s*(?:([a-zA-Z_][a-zA-Z0-9_.]*|@\\\".+\\\")\\b(?!\\s*\\())?"
                 }, 
                 {
-                    "match": "\\\\\\\"", 
-                    "name": "constant.character.escape.double-quote.zig"
+                    "name": "storage.type.function.zig", 
+                    "match": "\\bfn\\b"
                 }, 
                 {
-                    "match": "\\\\x[a-fA-F0-9]{2}", 
-                    "name": "constant.character.escape.hexidecimal.zig"
+                    "name": "storage.type.test.zig", 
+                    "match": "\\btest\\b"
                 }, 
                 {
-                    "match": "\\\\u\\{[a-fA-F0-9]{1,6}\\}", 
-                    "name": "constant.character.escape.hexidecimal.zig"
-                }
-            ]
-        }, 
-        "param_list": {
-            "end": "([a-zA-Z_][a-zA-Z0-9_.]*|@\\\".+\\\")?\\s*(?:(,)|(\\)))", 
-            "begin": "([a-zA-Z_][a-zA-Z0-9_]*|@\\\".+\\\")\\s*(:)\\s*", 
-            "beginCaptures": {
-                "1": {
-                    "name": "variable.parameter.zig"
-                }, 
-                "2": {
-                    "name": "punctuation.separator.zig"
-                }
-            }, 
-            "endCaptures": {
-                "1": {
-                    "name": "storage.type.zig"
+                    "name": "storage.type.struct.zig", 
+                    "match": "\\bstruct\\b"
                 }, 
-                "3": {
-                    "name": "punctuation.section.parens.end.zig"
+                {
+                    "name": "storage.type.enum.zig", 
+                    "match": "\\benum\\b"
                 }, 
-                "2": {
-                    "name": "punctuation.separator.zig"
-                }
-            }, 
-            "patterns": [
                 {
-                    "include": "#main"
+                    "name": "storage.type.union.zig", 
+                    "match": "\\bunion\\b"
                 }, 
                 {
-                    "match": "([a-zA-Z_][a-zA-Z0-9_.]*|@\\\".+\\\")", 
-                    "name": "storage.type.zig"
+                    "name": "storage.type.error.zig", 
+                    "match": "\\berror\\b"
                 }
             ]
         }, 
-        "support": {
-            "match": "(?<!\\w)@[^\\\"\\d][a-zA-Z_]\\w*\\b", 
-            "name": "support.function.zig"
-        }, 
-        "constants": {
+        "operators": {
             "patterns": [
                 {
-                    "match": "\\b(null|undefined|true|false)\\b", 
-                    "name": "constant.language.zig"
+                    "name": "keyword.operator.zig", 
+                    "match": "\\b!\\b"
                 }, 
                 {
-                    "match": "\\b(?<!\\.)(-?[0-9]+)(?!\\.)\\b", 
-                    "name": "constant.numeric.integer.zig"
+                    "name": "keyword.operator.logical.zig", 
+                    "match": "(==|(?:!|>|<)=?)"
                 }, 
                 {
-                    "match": "\\b(?<!\\.)(0x[a-fA-F0-9]+)(?!\\.)\\b", 
-                    "name": "constant.numeric.integer.hexadecimal.zig"
+                    "name": "keyword.operator.word.zig", 
+                    "match": "\\b(and|or)\\b"
                 }, 
                 {
-                    "match": "\\b(?<!\\.)(0o[0-7]+)(?!\\.)\\b", 
-                    "name": "constant.numeric.integer.octal.zig"
+                    "name": "keyword.operator.assignment.zig", 
+                    "match": "((?:(?:\\+|-|\\*)\\%?|/|%|<<|>>|&|\\|(?=[^\\|])|\\^)?=)"
                 }, 
                 {
-                    "match": "\\b(?<!\\.)(0b[01]+)(?!\\.)\\b", 
-                    "name": "constant.numeric.integer.binary.zig"
+                    "name": "keyword.operator.arithmetic.zig", 
+                    "match": "((?:\\+|-|\\*)\\%?|/(?!/)|%)"
                 }, 
                 {
-                    "match": "(?<!\\.)(-?\\b[0-9]+(?:\\.[0-9]+)?(?:[eE][+-]?[0-9]+)?)(?!\\.)\\b", 
-                    "name": "constant.numeric.float.zig"
+                    "name": "keyword.operator.bitwise.zig", 
+                    "match": "(<<|>>|&(?=[a-zA-Z_]|@\\\")|\\|(?=[^\\|])|\\^|~)"
                 }, 
                 {
-                    "match": "(?<!\\.)(-?\\b0x[a-fA-F0-9]+(?:\\.[a-fA-F0-9]+)?[pP]?(?:[+-]?[0-9]+)?)(?!\\.)\\b", 
-                    "name": "constant.numeric.float.hexadecimal.zig"
+                    "name": "keyword.operator.other.zig", 
+                    "match": "(\\+\\+|\\*\\*|->|\\.\\?|\\.\\*|&(?=[a-zA-Z_]|@\\\")|\\?|\\|\\||\\.{2,3})"
                 }
             ]
         }, 
-        "storage_modifier": {
-            "match": "\\b(const|var|extern|packed|export|pub|noalias|inline|comptime|nakedcc|stdcallcc|volatile|align|linksection|threadlocal|allowzero)\\b", 
-            "name": "storage.modifier.zig"
-        }, 
-        "function_type": {
-            "endCaptures": {
-                "1": {
-                    "name": "storage.type.zig"
+        "comments": {
+            "patterns": [
+                {
+                    "begin": "///", 
+                    "end": "$\\n?", 
+                    "name": "comment.line.documentation.zig"
                 }, 
-                "3": {
-                    "name": "storage.type.zig"
+                {
+                    "begin": "//[^/]\\s*TODO", 
+                    "end": "$\\n?", 
+                    "name": "comment.line.todo.zig"
                 }, 
-                "2": {
-                    "name": "keyword.operator.zig"
+                {
+                    "begin": "//[^/]*", 
+                    "end": "$\\n?", 
+                    "name": "comment.line.zig"
                 }
-            }, 
+            ]
+        }, 
+        "function_type": {
             "patterns": [
                 {
                     "include": "#label"
@@ -363,15 +300,27 @@
                     "include": "#param_list"
                 }, 
                 {
-                    "match": "([a-zA-Z_][a-zA-Z0-9_.]*|@\\\".+\\\")", 
-                    "name": "storage.type.zig"
+                    "name": "storage.type.zig", 
+                    "match": "([a-zA-Z_][a-zA-Z0-9_.]*|@\\\".+\\\")"
                 }, 
                 {
                     "include": "#main"
                 }
             ], 
-            "end": "(?<=\\)|\\})\\s*([a-zA-Z_][a-zA-Z0-9_.]*|@\\\".+\\\")?\\s*(!)?\\s*([a-zA-Z_][a-zA-Z0-9_.]*|@\\\".+\\\")", 
             "begin": "\\b(fn)\\s*(\\()", 
+            "end": "(?<=\\)|\\})\\s*([a-zA-Z_][a-zA-Z0-9_.]*|@\\\".+\\\")?\\s*(!)?\\s*([a-zA-Z_][a-zA-Z0-9_.]*|@\\\".+\\\")", 
+            "endCaptures": {
+                "1": {
+                    "name": "storage.type.zig"
+                }, 
+                "3": {
+                    "name": "storage.type.zig"
+                }, 
+                "2": {
+                    "name": "keyword.operator.zig"
+                }
+            }, 
+            "contentName": "meta.function.parameters.zig", 
             "beginCaptures": {
                 "1": {
                     "name": "storage.type.function.zig"
@@ -379,201 +328,252 @@
                 "2": {
                     "name": "punctuation.section.parens.begin.zig"
                 }
-            }, 
-            "contentName": "meta.function.parameters.zig"
+            }
         }, 
-        "storage": {
+        "main": {
             "patterns": [
                 {
-                    "match": "\\b(bool|void|noreturn|type|anyerror)\\b", 
-                    "name": "storage.type.zig"
+                    "include": "#label"
                 }, 
                 {
-                    "match": "\\b(?<!\\.)([iu][0-9]\\d*|[iu]size|comptime_int)\\b", 
-                    "name": "storage.type.integer.zig"
+                    "include": "#function_type"
                 }, 
                 {
-                    "match": "\\b(f16|f32|f64|f128|comptime_float)\\b", 
-                    "name": "storage.type.float.zig"
+                    "include": "#var_decl"
                 }, 
                 {
-                    "match": "\\b(c_short|c_ushort|c_int|c_uint|c_long|c_ulong|c_longlong|c_ulonglong|c_longdouble|c_void)\\b", 
-                    "name": "storage.type.c_compat.zig"
+                    "include": "#punctuation"
                 }, 
                 {
-                    "match": "\\b(anyframe)\\b\\s*(->)?\\s*(?:([a-zA-Z_][a-zA-Z0-9_.]*|@\\\".+\\\")\\b(?!\\s*\\())?", 
-                    "captures": {
-                        "1": {
-                            "name": "storage.type.zig"
-                        }, 
-                        "3": {
-                            "name": "storage.type.zig"
-                        }, 
-                        "2": {
-                            "name": "keyword.operator.zig"
-                        }
-                    }
+                    "include": "#storage_modifier"
                 }, 
                 {
-                    "match": "\\bfn\\b", 
-                    "name": "storage.type.function.zig"
+                    "include": "#container_decl"
                 }, 
                 {
-                    "match": "\\btest\\b", 
-                    "name": "storage.type.test.zig"
+                    "include": "#constants"
                 }, 
                 {
-                    "match": "\\bstruct\\b", 
-                    "name": "storage.type.struct.zig"
+                    "include": "#comments"
                 }, 
                 {
-                    "match": "\\benum\\b", 
-                    "name": "storage.type.enum.zig"
+                    "include": "#strings"
                 }, 
                 {
-                    "match": "\\bunion\\b", 
-                    "name": "storage.type.union.zig"
+                    "include": "#storage"
                 }, 
                 {
-                    "match": "\\berror\\b", 
-                    "name": "storage.type.error.zig"
-                }
-            ]
-        }, 
-        "field_decl": {
-            "end": "([a-zA-Z_][a-zA-Z0-9_.]*|@\\\".+\\\")(?:(,)|\\s*(=)\\s*|(?=\\n|\\r))", 
-            "begin": "([a-zA-Z_][a-zA-Z0-9_]*|@\\\".+\\\")\\s*(:)\\s*", 
-            "beginCaptures": {
-                "1": {
-                    "name": "variable.other.member.zig"
+                    "include": "#keywords"
                 }, 
-                "2": {
-                    "name": "punctuation.separator.zig"
-                }
-            }, 
-            "endCaptures": {
-                "1": {
-                    "name": "storage.type.zig"
+                {
+                    "include": "#operators"
                 }, 
-                "3": {
-                    "name": "keyword.operator.assignment.zig"
+                {
+                    "include": "#support"
                 }, 
-                "2": {
-                    "name": "punctuation.separator.zig"
-                }
-            }, 
-            "patterns": [
                 {
-                    "include": "#main"
+                    "include": "#field_decl"
+                }, 
+                {
+                    "include": "#block"
+                }, 
+                {
+                    "include": "#function_def"
+                }, 
+                {
+                    "include": "#function_call"
+                }, 
+                {
+                    "include": "#enum_literal"
                 }
             ]
         }, 
-        "function_def": {
-            "end": "(?<=\\)[^\\)])\\s*([a-zA-Z_][a-zA-Z0-9_.]*|@\\\".+\\\")?(!)?\\s*(?:([a-zA-Z_][a-zA-Z0-9_.]*|@\\\".+\\\")\\b(?!\\s*\\())?", 
-            "begin": "(?<=fn)\\s+([a-zA-Z_][a-zA-Z0-9_]*|@\\\".+\\\")(\\()", 
-            "beginCaptures": {
-                "1": {
-                    "name": "entity.name.function"
+        "storage_modifier": {
+            "name": "storage.modifier.zig", 
+            "match": "\\b(const|var|extern|packed|export|pub|noalias|inline|comptime|nakedcc|stdcallcc|volatile|align|linksection|threadlocal|allowzero)\\b"
+        }, 
+        "constants": {
+            "patterns": [
+                {
+                    "name": "constant.language.zig", 
+                    "match": "\\b(null|undefined|true|false)\\b"
                 }, 
-                "2": {
-                    "name": "punctuation.section.parens.begin.zig"
-                }
-            }, 
-            "endCaptures": {
-                "1": {
-                    "name": "storage.type.zig"
+                {
+                    "name": "constant.numeric.integer.zig", 
+                    "match": "\\b(?<!\\.)(-?[0-9]+)(?!\\.)\\b"
                 }, 
-                "3": {
-                    "name": "storage.type.zig"
+                {
+                    "name": "constant.numeric.integer.hexadecimal.zig", 
+                    "match": "\\b(?<!\\.)(0x[a-fA-F0-9]+)(?!\\.)\\b"
                 }, 
-                "2": {
-                    "name": "keyword.operator.zig"
-                }
-            }, 
-            "patterns": [
                 {
-                    "include": "#label"
+                    "name": "constant.numeric.integer.octal.zig", 
+                    "match": "\\b(?<!\\.)(0o[0-7]+)(?!\\.)\\b"
                 }, 
                 {
-                    "include": "#param_list"
+                    "name": "constant.numeric.integer.binary.zig", 
+                    "match": "\\b(?<!\\.)(0b[01]+)(?!\\.)\\b"
                 }, 
                 {
-                    "match": "([a-zA-Z_][a-zA-Z0-9_.]*|@\\\".+\\\")", 
-                    "name": "storage.type.zig"
+                    "name": "constant.numeric.float.zig", 
+                    "match": "(?<!\\.)(-?\\b[0-9]+(?:\\.[0-9]+)?(?:[eE][+-]?[0-9]+)?)(?!\\.)\\b"
                 }, 
                 {
-                    "include": "#main"
+                    "name": "constant.numeric.float.hexadecimal.zig", 
+                    "match": "(?<!\\.)(-?\\b0x[a-fA-F0-9]+(?:\\.[a-fA-F0-9]+)?[pP]?(?:[+-]?[0-9]+)?)(?!\\.)\\b"
                 }
             ]
         }, 
-        "main": {
+        "character_escapes": {
             "patterns": [
                 {
-                    "include": "#label"
+                    "name": "constant.character.escape.newline.zig", 
+                    "match": "\\\\n"
                 }, 
                 {
-                    "include": "#function_type"
+                    "name": "constant.character.escape.carrigereturn.zig", 
+                    "match": "\\\\r"
                 }, 
                 {
-                    "include": "#var_decl"
+                    "name": "constant.character.escape.tabulator.zig", 
+                    "match": "\\\\t"
                 }, 
                 {
-                    "include": "#punctuation"
+                    "name": "constant.character.escape.backslash.zig", 
+                    "match": "\\\\\\\\"
                 }, 
                 {
-                    "include": "#storage_modifier"
+                    "name": "constant.character.escape.single-quote.zig", 
+                    "match": "\\\\'"
                 }, 
                 {
-                    "include": "#container_decl"
+                    "name": "constant.character.escape.double-quote.zig", 
+                    "match": "\\\\\\\""
                 }, 
                 {
-                    "include": "#constants"
+                    "name": "constant.character.escape.hexidecimal.zig", 
+                    "match": "\\\\x[a-fA-F0-9]{2}"
                 }, 
                 {
-                    "include": "#comments"
-                }, 
+                    "name": "constant.character.escape.hexidecimal.zig", 
+                    "match": "\\\\u\\{[a-fA-F0-9]{1,6}\\}"
+                }
+            ]
+        }, 
+        "container_decl": {
+            "patterns": [
                 {
-                    "include": "#strings"
+                    "name": "entity.name.union.zig", 
+                    "match": "\\b(?!\\d)([a-zA-Z_]\\w*|@\\\".+\\\")(?=\\s*=\\s*(?:(?:extern|packed)\\s+)?(?:union)\\s*[(\\{])"
                 }, 
                 {
-                    "include": "#storage"
+                    "name": "entity.name.struct.zig", 
+                    "match": "\\b(?!\\d)([a-zA-Z_]\\w*|@\\\".+\\\")(?=\\s*=\\s*(?:(?:extern|packed)\\s+)?(?:struct)\\s*[(\\{])"
                 }, 
                 {
-                    "include": "#keywords"
+                    "name": "entity.name.enum.zig", 
+                    "match": "\\b(?!\\d)([a-zA-Z_]\\w*|@\\\".+\\\")(?=\\s*=\\s*(?:(?:extern|packed)\\s+)?(?:enum)\\s*[(\\{])"
                 }, 
                 {
-                    "include": "#operators"
+                    "name": "entity.name.error.zig", 
+                    "match": "\\b(?!\\d)([a-zA-Z_]\\w*|@\\\".+\\\")(?=\\s*=\\s*(?:error)\\s*[(\\{])"
                 }, 
                 {
-                    "include": "#support"
+                    "captures": {
+                        "1": {
+                            "name": "storage.type.error.zig"
+                        }, 
+                        "3": {
+                            "name": "entity.name.error.zig"
+                        }, 
+                        "2": {
+                            "name": "punctuation.accessor.zig"
+                        }
+                    }, 
+                    "match": "\\b(error)(\\.)([a-zA-Z_]\\w*|@\\\".+\\\")"
+                }
+            ]
+        }, 
+        "function_call": {
+            "name": "variable.function.zig", 
+            "match": "(?<!fn)\\b([a-zA-Z_][a-zA-Z0-9_]*|@\\\".+\\\")(?=\\s*\\()"
+        }, 
+        "field_decl": {
+            "endCaptures": {
+                "1": {
+                    "name": "storage.type.zig"
                 }, 
-                {
-                    "include": "#field_decl"
+                "3": {
+                    "name": "keyword.operator.assignment.zig"
                 }, 
-                {
-                    "include": "#block"
+                "2": {
+                    "name": "punctuation.separator.zig"
+                }
+            }, 
+            "begin": "([a-zA-Z_][a-zA-Z0-9_]*|@\\\".+\\\")\\s*(:)\\s*", 
+            "beginCaptures": {
+                "1": {
+                    "name": "variable.other.member.zig"
                 }, 
+                "2": {
+                    "name": "punctuation.separator.zig"
+                }
+            }, 
+            "end": "([a-zA-Z_][a-zA-Z0-9_.]*|@\\\".+\\\")\\s*(?:(,)|(=)|(?=\\n|\\r))", 
+            "patterns": [
                 {
-                    "include": "#function_def"
+                    "include": "#main"
+                }
+            ]
+        }, 
+        "support": {
+            "name": "support.function.zig", 
+            "match": "(?<!\\w)@[^\\\"\\d][a-zA-Z_]\\w*\\b"
+        }, 
+        "var_decl": {
+            "endCaptures": {
+                "1": {
+                    "name": "keyword.operator.assignment.zig"
+                }
+            }, 
+            "begin": "\\b(const|var)\\s+([a-zA-Z_][a-zA-Z0-9_]*|@\\\".+\\\")\\s*(:)", 
+            "beginCaptures": {
+                "1": {
+                    "name": "storage.modifier.zig"
+                }, 
+                "3": {
+                    "name": "punctuation.separator.zig"
                 }, 
+                "2": {
+                    "name": "variable.other.zig"
+                }
+            }, 
+            "end": "\\s*(=)", 
+            "patterns": [
                 {
-                    "include": "#function_call"
+                    "include": "#main"
                 }, 
                 {
-                    "include": "#enum_literal"
+                    "name": "storage.type.zig", 
+                    "match": "([a-zA-Z_][a-zA-Z0-9_.]*|@\\\".+\\\")"
                 }
             ]
         }, 
-        "enum_literal": {
-            "match": "(?<!\\w|\\))(\\.(?:[a-zA-Z_][a-zA-Z0-9_]*|@\\\".+\\\"))\\b(?!\\(|\\s*=\\s+)", 
-            "name": "constant.language.enum"
+        "label": {
+            "captures": {
+                "1": {
+                    "name": "keyword.control.zig"
+                }, 
+                "3": {
+                    "name": "entity.name.label.zig"
+                }, 
+                "2": {
+                    "name": "entity.name.label.zig"
+                }
+            }, 
+            "match": "\\b(break|continue)\\s*:\\s*([a-zA-Z_]\\w*|@\\\".+\\\")\\b|\\b(?!\\d)([a-zA-Z_]\\w*|@\\\".+\\\")\\b(?=\\s*:\\s*(?:\\{|while\\b))"
         }
     }, 
-    "scopeName": "source.zig", 
-    "name": "Zig", 
-    "fileTypes": [
-        "zig"
-    ], 
     "patterns": [
         {
             "include": "#main"