diff --git a/Syntaxes/Zig.YAML-tmLanguage b/Syntaxes/Zig.YAML-tmLanguage
index 91e0a52..2ab4e43 100644
--- a/Syntaxes/Zig.YAML-tmLanguage
+++ b/Syntaxes/Zig.YAML-tmLanguage
@@ -29,7 +29,7 @@ repository:
         match: \\u\{[a-fA-F0-9]{1,6}\}
 
   param_list:
-    begin: '(?<=\(|,)\s*([a-zA-Z_][a-zA-Z0-9_]*|@\".+\")\s*(:)\s*'
+    begin: '([a-zA-Z_][a-zA-Z0-9_]*|@\".+\")\s*(:)\s*'
     beginCaptures:
       '1':
         name: variable.parameter.zig
@@ -287,6 +287,7 @@ repository:
         name: storage.type.zig
 
     patterns:
+      - include: '#label'
       - include: '#param_list'
       - include: '#main'
 
@@ -313,6 +314,7 @@ repository:
         name: storage.type.zig
 
     patterns:
+      - include: '#label'
       - include: '#param_list'
       - include: '#main'
 
@@ -341,7 +343,7 @@ repository:
         name: storage.type.zig
 
   enum_literal:
-    match: '(?<!\w|\))(\.(?:[a-zA-Z_][a-zA-Z0-9_]*|@\".+\"))'
+    match: '(?<!\w|\))(\.(?:[a-zA-Z_][a-zA-Z0-9_]*|@\".+\"))\b(?!\()'
     name: constant.language.enum
 
   main:
diff --git a/Syntaxes/Zig.tmLanguage b/Syntaxes/Zig.tmLanguage
index e8d888d..ae675fd 100644
--- a/Syntaxes/Zig.tmLanguage
+++ b/Syntaxes/Zig.tmLanguage
@@ -239,7 +239,7 @@
 		<key>enum_literal</key>
 		<dict>
 			<key>match</key>
-			<string>(?&lt;!\w|\))(\.(?:[a-zA-Z_][a-zA-Z0-9_]*|@\".+\"))</string>
+			<string>(?&lt;!\w|\))(\.(?:[a-zA-Z_][a-zA-Z0-9_]*|@\".+\"))\b(?!\()</string>
 			<key>name</key>
 			<string>constant.language.enum</string>
 		</dict>
@@ -324,6 +324,10 @@
 			</dict>
 			<key>patterns</key>
 			<array>
+				<dict>
+					<key>include</key>
+					<string>#label</string>
+				</dict>
 				<dict>
 					<key>include</key>
 					<string>#param_list</string>
@@ -371,6 +375,10 @@
 			</dict>
 			<key>patterns</key>
 			<array>
+				<dict>
+					<key>include</key>
+					<string>#label</string>
+				</dict>
 				<dict>
 					<key>include</key>
 					<string>#param_list</string>
@@ -575,7 +583,7 @@
 		<key>param_list</key>
 		<dict>
 			<key>begin</key>
-			<string>(?&lt;=\(|,)\s*([a-zA-Z_][a-zA-Z0-9_]*|@\".+\")\s*(:)\s*</string>
+			<string>([a-zA-Z_][a-zA-Z0-9_]*|@\".+\")\s*(:)\s*</string>
 			<key>beginCaptures</key>
 			<dict>
 				<key>1</key>
diff --git a/Syntaxes/Zig.tmLanguage.json b/Syntaxes/Zig.tmLanguage.json
index 8298c40..413e185 100644
--- a/Syntaxes/Zig.tmLanguage.json
+++ b/Syntaxes/Zig.tmLanguage.json
@@ -1,98 +1,30 @@
 {
+    "fileTypes": [
+        "zig"
+    ], 
     "patterns": [
         {
             "include": "#main"
         }
     ], 
-    "name": "Zig", 
-    "scopeName": "source.zig", 
-    "fileTypes": [
-        "zig"
-    ], 
     "repository": {
-        "character_escapes": {
-            "patterns": [
-                {
-                    "name": "constant.character.escape.newline.zig", 
-                    "match": "\\\\n"
-                }, 
-                {
-                    "name": "constant.character.escape.carrigereturn.zig", 
-                    "match": "\\\\r"
-                }, 
-                {
-                    "name": "constant.character.escape.tabulator.zig", 
-                    "match": "\\\\t"
-                }, 
-                {
-                    "name": "constant.character.escape.backslash.zig", 
-                    "match": "\\\\\\\\"
-                }, 
-                {
-                    "name": "constant.character.escape.single-quote.zig", 
-                    "match": "\\\\'"
-                }, 
-                {
-                    "name": "constant.character.escape.double-quote.zig", 
-                    "match": "\\\\\\\""
-                }, 
-                {
-                    "name": "constant.character.escape.hexidecimal.zig", 
-                    "match": "\\\\x[a-fA-F0-9]{2}"
-                }, 
-                {
-                    "name": "constant.character.escape.hexidecimal.zig", 
-                    "match": "\\\\u\\{[a-fA-F0-9]{1,6}\\}"
-                }
-            ]
+        "function_call": {
+            "match": "(?<!fn)\\b([a-zA-Z_][a-zA-Z0-9_]*|@\\\".+\\\")(?=\\s*\\()", 
+            "name": "variable.function.zig"
         }, 
-        "function_def": {
-            "endCaptures": {
-                "1": {
-                    "name": "storage.type.zig"
-                }
-            }, 
-            "patterns": [
-                {
-                    "include": "#param_list"
-                }, 
-                {
-                    "include": "#main"
-                }, 
-                {
-                    "name": "storage.type.zig", 
-                    "match": "([a-zA-Z_][a-zA-Z0-9_.]*|@\\\".+\\\")(?=;)"
-                }
-            ], 
-            "begin": "(?<=fn)\\s+([a-zA-Z_][a-zA-Z0-9_]*|@\\\".+\\\")(\\()", 
-            "end": "(?<=\\))([a-zA-Z_][a-zA-Z0-9_.]*|@\\\".+\\\")", 
-            "beginCaptures": {
+        "label": {
+            "captures": {
                 "1": {
-                    "name": "entity.name.function"
+                    "name": "keyword.control.zig"
                 }, 
                 "2": {
-                    "name": "punctuation.section.parens.begin.zig"
-                }
-            }
-        }, 
-        "comments": {
-            "patterns": [
-                {
-                    "begin": "//[^/]\\s*TODO", 
-                    "name": "comment.line.todo.zig", 
-                    "end": "$\\n?"
-                }, 
-                {
-                    "begin": "//[^/]", 
-                    "name": "comment.line.zig", 
-                    "end": "$\\n?"
+                    "name": "entity.name.label.zig"
                 }, 
-                {
-                    "begin": "///", 
-                    "name": "comment.line.documentation.zig", 
-                    "end": "$\\n?"
+                "3": {
+                    "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))"
         }, 
         "main": {
             "patterns": [
@@ -152,133 +84,67 @@
                 }
             ]
         }, 
-        "operators": {
+        "punctuation": {
             "patterns": [
                 {
-                    "name": "keyword.operator.zig", 
-                    "match": "\\b!\\b"
-                }, 
-                {
-                    "name": "keyword.operator.logical.zig", 
-                    "match": "(==|(?:!|>|<)=?)"
-                }, 
-                {
-                    "name": "keyword.operator.word.zig", 
-                    "match": "\\b(and|or)\\b"
-                }, 
-                {
-                    "name": "keyword.operator.assignment.zig", 
-                    "match": "((?:(?:\\+|-|\\*)\\%?|/|%|<<|>>|&|\\|(?=[^\\|])|\\^)?=)"
+                    "match": ",", 
+                    "name": "punctuation.separator.zig"
                 }, 
                 {
-                    "name": "keyword.operator.arithmetic.zig", 
-                    "match": "((?:\\+|-|\\*)\\%?|/(?!/)|%)"
+                    "match": ";", 
+                    "name": "punctuation.terminator.zig"
                 }, 
                 {
-                    "name": "keyword.operator.bitwise.zig", 
-                    "match": "(<<|>>|&(?=[a-zA-Z_]|@\\\")|\\|(?=[^\\|])|\\^|~)"
+                    "match": "(\\()", 
+                    "name": "punctuation.section.parens.begin.zig"
                 }, 
                 {
-                    "name": "keyword.operator.other.zig", 
-                    "match": "(\\+\\+|\\*\\*|->|\\.\\?|\\.\\*|&(?=[a-zA-Z_]|@\\\")|\\?|\\|\\||\\.{2,3})"
+                    "match": "(\\))", 
+                    "name": "punctuation.section.parens.end.zig"
                 }
             ]
         }, 
-        "block": {
-            "endCaptures": {
-                "1": {
-                    "name": "punctuation.section.braces.end.zig"
-                }
-            }, 
-            "patterns": [
-                {
-                    "include": "#main"
-                }
-            ], 
-            "begin": "([a-zA-Z_][a-zA-Z0-9_.]*|@\\\".+\\\")?\\s*(\\{)", 
-            "end": "(\\})", 
-            "beginCaptures": {
-                "1": {
-                    "name": "storage.type.zig"
-                }, 
-                "2": {
-                    "name": "punctuation.section.braces.begin.zig"
-                }
-            }
-        }, 
-        "field_decl": {
-            "endCaptures": {
-                "1": {
-                    "name": "storage.type.zig"
-                }, 
-                "2": {
-                    "name": "punctuation.separator.zig"
-                }, 
-                "3": {
-                    "name": "keyword.operator.assignment.zig"
-                }
-            }, 
-            "patterns": [
-                {
-                    "include": "#main"
-                }
-            ], 
-            "begin": "([a-zA-Z_][a-zA-Z0-9_]*|@\\\".+\\\")\\s*(:)\\s*", 
-            "end": "([a-zA-Z_][a-zA-Z0-9_.]*|@\\\".+\\\")(?:(,)|\\s*(=)\\s*|(?=\\n|\\r))", 
-            "beginCaptures": {
-                "1": {
-                    "name": "variable.other.member.zig"
-                }, 
-                "2": {
-                    "name": "punctuation.separator.zig"
-                }
-            }
-        }, 
         "keywords": {
             "patterns": [
                 {
-                    "name": "keyword.control.zig", 
-                    "match": "\\b(while|for|break|return|continue|asm|defer|errdefer|unreachable)\\b"
+                    "match": "\\b(while|for|break|return|continue|asm|defer|errdefer|unreachable)\\b", 
+                    "name": "keyword.control.zig"
                 }, 
                 {
-                    "name": "keyword.control.async.zig", 
-                    "match": "\\b(noasync|async|await|suspend|resume|cancel)\\b"
+                    "match": "\\b(noasync|async|await|suspend|resume|cancel)\\b", 
+                    "name": "keyword.control.async.zig"
                 }, 
                 {
-                    "name": "keyword.control.conditional.zig", 
-                    "match": "\\b(if|else|switch|try|catch|orelse)\\b"
+                    "match": "\\b(if|else|switch|try|catch|orelse)\\b", 
+                    "name": "keyword.control.conditional.zig"
                 }, 
                 {
-                    "name": "keyword.control.import.zig", 
-                    "match": "(?<!\\w)(@import|@cImport|@cInclude)\\b"
+                    "match": "(?<!\\w)(@import|@cImport|@cInclude)\\b", 
+                    "name": "keyword.control.import.zig"
                 }, 
                 {
-                    "name": "keyword.other.usingnamespace.zig", 
-                    "match": "\\b(usingnamespace)\\b"
+                    "match": "\\b(usingnamespace)\\b", 
+                    "name": "keyword.other.usingnamespace.zig"
                 }
             ]
         }, 
-        "enum_literal": {
-            "name": "constant.language.enum", 
-            "match": "(?<!\\w)(\\.(?:[a-zA-Z_][a-zA-Z0-9_]*|@\\\".+\\\"))"
-        }, 
         "container_decl": {
             "patterns": [
                 {
-                    "name": "entity.name.union.zig", 
-                    "match": "\\b(?!\\d)([a-zA-Z_]\\w*|@\\\".+\\\")(?=\\s*=\\s*(?:(?:extern|packed)\\s+)?(?:union)\\s*[(\\{])"
+                    "match": "\\b(?!\\d)([a-zA-Z_]\\w*|@\\\".+\\\")(?=\\s*=\\s*(?:(?:extern|packed)\\s+)?(?:union)\\s*[(\\{])", 
+                    "name": "entity.name.union.zig"
                 }, 
                 {
-                    "name": "entity.name.struct.zig", 
-                    "match": "\\b(?!\\d)([a-zA-Z_]\\w*|@\\\".+\\\")(?=\\s*=\\s*(?:(?:extern|packed)\\s+)?(?:struct)\\s*[(\\{])"
+                    "match": "\\b(?!\\d)([a-zA-Z_]\\w*|@\\\".+\\\")(?=\\s*=\\s*(?:(?:extern|packed)\\s+)?(?:struct)\\s*[(\\{])", 
+                    "name": "entity.name.struct.zig"
                 }, 
                 {
-                    "name": "entity.name.enum.zig", 
-                    "match": "\\b(?!\\d)([a-zA-Z_]\\w*|@\\\".+\\\")(?=\\s*=\\s*(?:(?:extern|packed)\\s+)?(?:enum)\\s*[(\\{])"
+                    "match": "\\b(?!\\d)([a-zA-Z_]\\w*|@\\\".+\\\")(?=\\s*=\\s*(?:(?:extern|packed)\\s+)?(?:enum)\\s*[(\\{])", 
+                    "name": "entity.name.enum.zig"
                 }, 
                 {
-                    "name": "entity.name.error.zig", 
-                    "match": "\\b(?!\\d)([a-zA-Z_]\\w*|@\\\".+\\\")(?=\\s*=\\s*(?:error)\\s*[(\\{])"
+                    "match": "\\b(?!\\d)([a-zA-Z_]\\w*|@\\\".+\\\")(?=\\s*=\\s*(?:error)\\s*[(\\{])", 
+                    "name": "entity.name.error.zig"
                 }, 
                 {
                     "captures": {
@@ -296,120 +162,133 @@
                 }
             ]
         }, 
-        "function_type": {
-            "endCaptures": {
-                "1": {
-                    "name": "storage.type.zig"
-                }
-            }, 
+        "operators": {
             "patterns": [
                 {
-                    "include": "#param_list"
+                    "match": "\\b!\\b", 
+                    "name": "keyword.operator.zig"
                 }, 
                 {
-                    "include": "#main"
+                    "match": "(==|(?:!|>|<)=?)", 
+                    "name": "keyword.operator.logical.zig"
                 }, 
                 {
-                    "name": "storage.type.zig", 
-                    "match": "([a-zA-Z_][a-zA-Z0-9_.]*|@\\\".+\\\")"
-                }
-            ], 
-            "beginCaptures": {
-                "1": {
-                    "name": "storage.type.function.zig"
+                    "match": "\\b(and|or)\\b", 
+                    "name": "keyword.operator.word.zig"
                 }, 
-                "2": {
-                    "name": "punctuation.section.parens.begin.zig"
-                }
-            }, 
-            "contentName": "meta.function.parameters.zig", 
-            "begin": "\\b(fn)\\s*(\\()", 
-            "end": "(?<=\\))\\s*([a-zA-Z_][a-zA-Z0-9_.]*|@\\\".+\\\")"
-        }, 
-        "support": {
-            "name": "support.function.zig", 
-            "match": "(?<!\\w)@[^\\\"\\d][a-zA-Z_]\\w*\\b"
-        }, 
-        "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"
-        }, 
-        "storage": {
-            "patterns": [
                 {
-                    "name": "storage.type.zig", 
-                    "match": "\\b(bool|void|noreturn|type|anyerror|anyframe)\\b"
+                    "match": "((?:(?:\\+|-|\\*)\\%?|/|%|<<|>>|&|\\|(?=[^\\|])|\\^)?=)", 
+                    "name": "keyword.operator.assignment.zig"
                 }, 
                 {
-                    "name": "storage.type.integer.zig", 
-                    "match": "\\b(?<!\\.)([iu][0-9]\\d*|[iu]size|comptime_int)\\b"
+                    "match": "((?:\\+|-|\\*)\\%?|/(?!/)|%)", 
+                    "name": "keyword.operator.arithmetic.zig"
                 }, 
                 {
-                    "name": "storage.type.float.zig", 
-                    "match": "\\b(f16|f32|f64|f128|comptime_float)\\b"
+                    "match": "(<<|>>|&(?=[a-zA-Z_]|@\\\")|\\|(?=[^\\|])|\\^|~)", 
+                    "name": "keyword.operator.bitwise.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": "(\\+\\+|\\*\\*|->|\\.\\?|\\.\\*|&(?=[a-zA-Z_]|@\\\")|\\?|\\|\\||\\.{2,3})", 
+                    "name": "keyword.operator.other.zig"
+                }
+            ]
+        }, 
+        "comments": {
+            "patterns": [
+                {
+                    "end": "$\\n?", 
+                    "begin": "//[^/]\\s*TODO", 
+                    "name": "comment.line.todo.zig"
                 }, 
                 {
-                    "name": "storage.type.function.zig", 
-                    "match": "\\bfn\\b"
+                    "end": "$\\n?", 
+                    "begin": "//[^/]", 
+                    "name": "comment.line.zig"
                 }, 
                 {
-                    "name": "storage.type.test.zig", 
-                    "match": "\\btest\\b"
+                    "end": "$\\n?", 
+                    "begin": "///", 
+                    "name": "comment.line.documentation.zig"
+                }
+            ]
+        }, 
+        "support": {
+            "match": "(?<!\\w)@[^\\\"\\d][a-zA-Z_]\\w*\\b", 
+            "name": "support.function.zig"
+        }, 
+        "function_def": {
+            "endCaptures": {
+                "1": {
+                    "name": "storage.type.zig"
+                }
+            }, 
+            "end": "(?<=\\))([a-zA-Z_][a-zA-Z0-9_.]*|@\\\".+\\\")", 
+            "beginCaptures": {
+                "1": {
+                    "name": "entity.name.function"
                 }, 
+                "2": {
+                    "name": "punctuation.section.parens.begin.zig"
+                }
+            }, 
+            "begin": "(?<=fn)\\s+([a-zA-Z_][a-zA-Z0-9_]*|@\\\".+\\\")(\\()", 
+            "patterns": [
                 {
-                    "name": "storage.type.struct.zig", 
-                    "match": "\\bstruct\\b"
+                    "include": "#label"
                 }, 
                 {
-                    "name": "storage.type.enum.zig", 
-                    "match": "\\benum\\b"
+                    "include": "#param_list"
                 }, 
                 {
-                    "name": "storage.type.union.zig", 
-                    "match": "\\bunion\\b"
+                    "include": "#main"
                 }, 
                 {
-                    "name": "storage.type.error.zig", 
-                    "match": "\\berror\\b"
+                    "match": "([a-zA-Z_][a-zA-Z0-9_.]*|@\\\".+\\\")(?=;)", 
+                    "name": "storage.type.zig"
                 }
             ]
         }, 
-        "constants": {
+        "character_escapes": {
             "patterns": [
                 {
-                    "name": "constant.language.zig", 
-                    "match": "\\b(null|undefined|true|false)\\b"
+                    "match": "\\\\n", 
+                    "name": "constant.character.escape.newline.zig"
                 }, 
                 {
-                    "name": "constant.numeric.integer.zig", 
-                    "match": "\\b(?<!\\.)(-?[0-9]+)(?!\\.)\\b"
+                    "match": "\\\\r", 
+                    "name": "constant.character.escape.carrigereturn.zig"
                 }, 
                 {
-                    "name": "constant.numeric.integer.hexadecimal.zig", 
-                    "match": "\\b(?<!\\.)(0x[a-fA-F0-9]+)(?!\\.)\\b"
+                    "match": "\\\\t", 
+                    "name": "constant.character.escape.tabulator.zig"
                 }, 
                 {
-                    "name": "constant.numeric.integer.octal.zig", 
-                    "match": "\\b(?<!\\.)(0o[0-7]+)(?!\\.)\\b"
+                    "match": "\\\\\\\\", 
+                    "name": "constant.character.escape.backslash.zig"
                 }, 
                 {
-                    "name": "constant.numeric.integer.binary.zig", 
-                    "match": "\\b(?<!\\.)(0b[01]+)(?!\\.)\\b"
+                    "match": "\\\\'", 
+                    "name": "constant.character.escape.single-quote.zig"
                 }, 
                 {
-                    "name": "constant.numeric.float.zig", 
-                    "match": "(?<!\\.)(-?\\b[0-9]+(?:\\.[0-9]+)?(?:[eE][+-]?[0-9]+)?)(?!\\.)\\b"
+                    "match": "\\\\\\\"", 
+                    "name": "constant.character.escape.double-quote.zig"
                 }, 
                 {
-                    "name": "constant.numeric.float.hexadecimal.zig", 
-                    "match": "(?<!\\.)(-?\\b0x[a-fA-F0-9]+(?:\\.[a-fA-F0-9]+)?[pP]?(?:[+-]?[0-9]+)?)(?!\\.)\\b"
+                    "match": "\\\\x[a-fA-F0-9]{2}", 
+                    "name": "constant.character.escape.hexidecimal.zig"
+                }, 
+                {
+                    "match": "\\\\u\\{[a-fA-F0-9]{1,6}\\}", 
+                    "name": "constant.character.escape.hexidecimal.zig"
                 }
             ]
         }, 
+        "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"
+        }, 
         "param_list": {
             "endCaptures": {
                 "1": {
@@ -422,16 +301,6 @@
                     "name": "punctuation.section.parens.end.zig"
                 }
             }, 
-            "patterns": [
-                {
-                    "include": "#main"
-                }, 
-                {
-                    "name": "storage.type.zig", 
-                    "match": "([a-zA-Z_][a-zA-Z0-9_.]*|@\\\".+\\\")"
-                }
-            ], 
-            "begin": "(?<=\\(|,)\\s*([a-zA-Z_][a-zA-Z0-9_]*|@\\\".+\\\")\\s*(:)\\s*", 
             "end": "([a-zA-Z_][a-zA-Z0-9_.]*|@\\\".+\\\")?\\s*(?:(\\))|(,))", 
             "beginCaptures": {
                 "1": {
@@ -440,99 +309,224 @@
                 "2": {
                     "name": "punctuation.separator.zig"
                 }
-            }
+            }, 
+            "begin": "([a-zA-Z_][a-zA-Z0-9_]*|@\\\".+\\\")\\s*(:)\\s*", 
+            "patterns": [
+                {
+                    "include": "#main"
+                }, 
+                {
+                    "match": "([a-zA-Z_][a-zA-Z0-9_.]*|@\\\".+\\\")", 
+                    "name": "storage.type.zig"
+                }
+            ]
         }, 
-        "punctuation": {
+        "enum_literal": {
+            "match": "(?<!\\w|\\))(\\.(?:[a-zA-Z_][a-zA-Z0-9_]*|@\\\".+\\\"))\\b(?!\\()", 
+            "name": "constant.language.enum"
+        }, 
+        "constants": {
             "patterns": [
                 {
-                    "name": "punctuation.separator.zig", 
-                    "match": ","
+                    "match": "\\b(null|undefined|true|false)\\b", 
+                    "name": "constant.language.zig"
                 }, 
                 {
-                    "name": "punctuation.terminator.zig", 
-                    "match": ";"
+                    "match": "\\b(?<!\\.)(-?[0-9]+)(?!\\.)\\b", 
+                    "name": "constant.numeric.integer.zig"
                 }, 
                 {
-                    "name": "punctuation.section.parens.begin.zig", 
-                    "match": "(\\()"
+                    "match": "\\b(?<!\\.)(0x[a-fA-F0-9]+)(?!\\.)\\b", 
+                    "name": "constant.numeric.integer.hexadecimal.zig"
                 }, 
                 {
-                    "name": "punctuation.section.parens.end.zig", 
-                    "match": "(\\))"
+                    "match": "\\b(?<!\\.)(0o[0-7]+)(?!\\.)\\b", 
+                    "name": "constant.numeric.integer.octal.zig"
+                }, 
+                {
+                    "match": "\\b(?<!\\.)(0b[01]+)(?!\\.)\\b", 
+                    "name": "constant.numeric.integer.binary.zig"
+                }, 
+                {
+                    "match": "(?<!\\.)(-?\\b[0-9]+(?:\\.[0-9]+)?(?:[eE][+-]?[0-9]+)?)(?!\\.)\\b", 
+                    "name": "constant.numeric.float.zig"
+                }, 
+                {
+                    "match": "(?<!\\.)(-?\\b0x[a-fA-F0-9]+(?:\\.[a-fA-F0-9]+)?[pP]?(?:[+-]?[0-9]+)?)(?!\\.)\\b", 
+                    "name": "constant.numeric.float.hexadecimal.zig"
                 }
             ]
         }, 
-        "function_call": {
-            "name": "variable.function.zig", 
-            "match": "(?<!fn)\\b([a-zA-Z_][a-zA-Z0-9_]*|@\\\".+\\\")(?=\\s*\\()"
-        }, 
         "strings": {
             "patterns": [
                 {
+                    "end": "\\'", 
                     "patterns": [
                         {
                             "include": "#character_escapes"
                         }, 
                         {
-                            "name": "invalid.illegal.character.zig", 
-                            "match": "\\\\[^\\'][^\\']*?"
+                            "match": "\\\\[^\\'][^\\']*?", 
+                            "name": "invalid.illegal.character.zig"
                         }
                     ], 
                     "begin": "\\'", 
-                    "name": "string.quoted.single.zig", 
-                    "end": "\\'"
+                    "name": "string.quoted.single.zig"
                 }, 
                 {
+                    "end": "\\\"", 
                     "patterns": [
                         {
                             "include": "#character_escapes"
                         }, 
                         {
-                            "name": "invalid.illegal.character.zig", 
-                            "match": "\\\\[^\\'][^\\']*?"
+                            "match": "\\\\[^\\'][^\\']*?", 
+                            "name": "invalid.illegal.character.zig"
                         }
                     ], 
                     "begin": "c?\\\"", 
-                    "name": "string.quoted.double.zig", 
-                    "end": "\\\""
+                    "name": "string.quoted.double.zig"
                 }, 
                 {
+                    "end": "$\\n?", 
                     "begin": "c?\\\\\\\\", 
-                    "name": "string.quoted.other.zig", 
-                    "end": "$\\n?"
+                    "name": "string.quoted.other.zig"
                 }
             ]
         }, 
-        "label": {
-            "captures": {
+        "block": {
+            "endCaptures": {
                 "1": {
-                    "name": "keyword.control.zig"
+                    "name": "punctuation.section.braces.end.zig"
+                }
+            }, 
+            "end": "(\\})", 
+            "beginCaptures": {
+                "1": {
+                    "name": "storage.type.zig"
                 }, 
                 "2": {
-                    "name": "entity.name.label.zig"
+                    "name": "punctuation.section.braces.begin.zig"
+                }
+            }, 
+            "begin": "([a-zA-Z_][a-zA-Z0-9_.]*|@\\\".+\\\")?\\s*(\\{)", 
+            "patterns": [
+                {
+                    "include": "#main"
+                }
+            ]
+        }, 
+        "storage": {
+            "patterns": [
+                {
+                    "match": "\\b(bool|void|noreturn|type|anyerror|anyframe)\\b", 
+                    "name": "storage.type.zig"
+                }, 
+                {
+                    "match": "\\b(?<!\\.)([iu][0-9]\\d*|[iu]size|comptime_int)\\b", 
+                    "name": "storage.type.integer.zig"
+                }, 
+                {
+                    "match": "\\b(f16|f32|f64|f128|comptime_float)\\b", 
+                    "name": "storage.type.float.zig"
+                }, 
+                {
+                    "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"
+                }, 
+                {
+                    "match": "\\bfn\\b", 
+                    "name": "storage.type.function.zig"
+                }, 
+                {
+                    "match": "\\btest\\b", 
+                    "name": "storage.type.test.zig"
+                }, 
+                {
+                    "match": "\\bstruct\\b", 
+                    "name": "storage.type.struct.zig"
+                }, 
+                {
+                    "match": "\\benum\\b", 
+                    "name": "storage.type.enum.zig"
+                }, 
+                {
+                    "match": "\\bunion\\b", 
+                    "name": "storage.type.union.zig"
+                }, 
+                {
+                    "match": "\\berror\\b", 
+                    "name": "storage.type.error.zig"
+                }
+            ]
+        }, 
+        "field_decl": {
+            "endCaptures": {
+                "1": {
+                    "name": "storage.type.zig"
+                }, 
+                "2": {
+                    "name": "punctuation.separator.zig"
                 }, 
                 "3": {
-                    "name": "entity.name.label.zig"
+                    "name": "keyword.operator.assignment.zig"
                 }
             }, 
-            "match": "\\b(break|continue)\\s*:\\s*([a-zA-Z_]\\w*|@\\\".+\\\")\\b|\\b(?!\\d)([a-zA-Z_]\\w*|@\\\".+\\\")\\b(?=\\s*:\\s*(?:\\{|while\\b))"
+            "end": "([a-zA-Z_][a-zA-Z0-9_.]*|@\\\".+\\\")(?:(,)|\\s*(=)\\s*|(?=\\n|\\r))", 
+            "beginCaptures": {
+                "1": {
+                    "name": "variable.other.member.zig"
+                }, 
+                "2": {
+                    "name": "punctuation.separator.zig"
+                }
+            }, 
+            "begin": "([a-zA-Z_][a-zA-Z0-9_]*|@\\\".+\\\")\\s*(:)\\s*", 
+            "patterns": [
+                {
+                    "include": "#main"
+                }
+            ]
         }, 
-        "var_decl": {
+        "function_type": {
             "endCaptures": {
                 "1": {
-                    "name": "keyword.operator.assignment.zig"
+                    "name": "storage.type.zig"
                 }
             }, 
+            "beginCaptures": {
+                "1": {
+                    "name": "storage.type.function.zig"
+                }, 
+                "2": {
+                    "name": "punctuation.section.parens.begin.zig"
+                }
+            }, 
+            "begin": "\\b(fn)\\s*(\\()", 
+            "contentName": "meta.function.parameters.zig", 
+            "end": "(?<=\\))\\s*([a-zA-Z_][a-zA-Z0-9_.]*|@\\\".+\\\")", 
             "patterns": [
+                {
+                    "include": "#label"
+                }, 
+                {
+                    "include": "#param_list"
+                }, 
                 {
                     "include": "#main"
                 }, 
                 {
-                    "name": "storage.type.zig", 
-                    "match": "([a-zA-Z_][a-zA-Z0-9_.]*|@\\\".+\\\")"
+                    "match": "([a-zA-Z_][a-zA-Z0-9_.]*|@\\\".+\\\")", 
+                    "name": "storage.type.zig"
                 }
-            ], 
-            "begin": "\\b(const|var)\\s+([a-zA-Z_][a-zA-Z0-9_]*|@\\\".+\\\")\\s*(:)", 
+            ]
+        }, 
+        "var_decl": {
+            "endCaptures": {
+                "1": {
+                    "name": "keyword.operator.assignment.zig"
+                }
+            }, 
             "end": "\\s*(=)", 
             "beginCaptures": {
                 "1": {
@@ -544,7 +538,19 @@
                 "3": {
                     "name": "punctuation.separator.zig"
                 }
-            }
+            }, 
+            "begin": "\\b(const|var)\\s+([a-zA-Z_][a-zA-Z0-9_]*|@\\\".+\\\")\\s*(:)", 
+            "patterns": [
+                {
+                    "include": "#main"
+                }, 
+                {
+                    "match": "([a-zA-Z_][a-zA-Z0-9_.]*|@\\\".+\\\")", 
+                    "name": "storage.type.zig"
+                }
+            ]
         }
-    }
+    }, 
+    "name": "Zig", 
+    "scopeName": "source.zig"
 }
\ No newline at end of file
diff --git a/Syntaxes/samples.zig b/Syntaxes/samples.zig
index 8a9f59e..c579b93 100644
--- a/Syntaxes/samples.zig
+++ b/Syntaxes/samples.zig
@@ -332,4 +332,4 @@ const alignment = blk: {
     if (a > 0) break :blk a;
     break :blk 1;
 };
-    std.debug.warn(run_qemu.getEnvMap().get("PATH"));
+    std.debug.warn(run_qemu.getEnvMap() .get("PATH"));