diff --git a/Syntaxes/Zig.sublime-syntax b/Syntaxes/Zig.sublime-syntax
index 57a74bd..7b69043 100644
--- a/Syntaxes/Zig.sublime-syntax
+++ b/Syntaxes/Zig.sublime-syntax
@@ -121,7 +121,7 @@ contexts:
   function_def:
     - match: '\b(fn)\s+([a-zA-Z_]\w*|@\".+\")(\()'
       captures:
-        1: storage.type.function.zig
+        1: keyword.declaration.function.zig
         2: entity.name.function
         3: punctuation.section.parens.begin.zig
       push:
@@ -147,7 +147,7 @@ contexts:
   function_type:
     - match: \b(fn)\s*(\()
       captures:
-        1: storage.type.function.zig
+        1: keyword.declaration.function.zig
         2: punctuation.section.parens.begin.zig
       push:
         - meta_content_scope: meta.function.parameters.zig
@@ -234,19 +234,19 @@ contexts:
   storage:
     - match: '\b(anyframe)\b\s*(->)?\s*(?:([a-zA-Z_][\w.]*|@\".+\")\b(?!\s*\())?'
       captures:
-        1: storage.type.zig
+        1: keyword.declaration.anyframe.zig
         2: keyword.operator.zig
-        3: storage.type.zig
+        3: keyword.declaration.zig
     - match: \btest\b
-      scope: storage.type.test.zig
+      scope: keyword.declaration.test.zig
     - match: \bstruct\b
-      scope: storage.type.struct.zig
+      scope: keyword.declaration.struct.zig
     - match: \benum\b
-      scope: storage.type.enum.zig
+      scope: keyword.declaration.enum.zig
     - match: \bunion\b
-      scope: storage.type.union.zig
+      scope: keyword.declaration.union.zig
     - match: \berror\b
-      scope: storage.type.error.zig
+      scope: keyword.declaration.error.zig
   storage_modifier:
     - match: \b(const|var|extern|packed|export|pub|noalias|inline|noinline|comptime|volatile|align|linksection|threadlocal|allowzero)\b
       scope: storage.modifier.zig
@@ -280,10 +280,10 @@ contexts:
       scope: variable.constant.zig
 
     - match: '\b[_a-zA-Z][_a-zA-Z0-9]*_t\b'
-      scope: entity.name.type.zig
+      scope: storage.type.zig
 
     - match: '\b[A-Z][a-zA-Z0-9]*\b'
-      scope: entity.name.type.zig
+      scope: storage.type.zig
 
     - match: '\b[_a-zA-Z][_a-zA-Z0-9]*\b'
       scope: variable.zig
@@ -292,6 +292,6 @@ contexts:
     - match: \b(test)\b\s+(\")(.*)(\")
       captures:
         0: entity.name.function.test.zig
-        1: storage.type.zig keyword.declaration.test.zig
+        1: keyword.declaration.test.zig
         2: punctuation.string.start.zig
         4: punctuation.string.end.zig
diff --git a/Syntaxes/syntax_test.zig b/Syntaxes/syntax_test.zig
index ff9b321..f2df330 100644
--- a/Syntaxes/syntax_test.zig
+++ b/Syntaxes/syntax_test.zig
@@ -13,7 +13,7 @@ const std = @import("std");
 
 pub fn main() !void {
 //^ storage.modifier.zig
-//  ^^ storage.type.function.zig
+//  ^^ keyword.declaration.function.zig
 //     ^^^^ entity.name.function
 //         ^ punctuation.section.parens.begin.zig
 //          ^ punctuation.section.parens.end.zig
@@ -55,7 +55,7 @@ asd {
 }
 
    fn dump(
-// ^^ storage.type.function.zig
+// ^^ keyword.declaration.function.zig
 //    ^^^^ entity.name.function
 //        ^ punctuation.section.parens.begin.zig
     value: var.asda.ad.asd,
@@ -180,7 +180,7 @@ a.*
 a || b
 
     test "tests" {
-//  ^^^^ storage.type.zig keyword.declaration.test.zig
+//  ^^^^ keyword.declaration.test.zig
 //  ^^^^^^^^^^^^ entity.name.function.test.zig
 //               ^ punctuation.section.braces.begin.zig
     }
@@ -254,7 +254,7 @@ const \\ adsjfaf23n9
 const v = fn(aas, 2342, 23) as;
 
 fn foo(a:as) i32 {
-// <- storage.type.function.zig
+// <- keyword.declaration.function.zig
 // ^^^ entity.name.function
 //    ^ punctuation.section.parens.begin.zig
 //     ^ variable.parameter.zig
@@ -312,7 +312,7 @@ test "strings" {
     '💩';
 }
    fn(i13i,Foo) Bar;
-// ^^ storage.type.function.zig
+// ^^ keyword.declaration.function.zig
 //   ^ punctuation.section.parens.begin.zig
 //    ^^^^ meta.function.parameters.zig storage.type.zig
 //        ^ meta.function.parameters.zig punctuation.separator.zig
@@ -441,21 +441,21 @@ pub fn asBytes(ptr: var) asdsa!AsBytesReturnType(@typeOf(ptr)) {
 pub const LARGE_INTEGER = extern struct {
 // <- storage.modifier.zig
 //  ^^^^^ storage.modifier.zig
-//        ^^^^^^^^^^^^^ entity.name.struct.zig
+//        ^^^^^^^^^^^^^ entity.name.class.struct.zig
 //                      ^ keyword.operator.assignment.zig
 //                        ^^^^^^ storage.modifier.zig
-//                               ^^^^^^ storage.type.struct.zig
+//                               ^^^^^^ keyword.declaration.struct.zig
 //                                      ^ punctuation.section.braces.begin.zig
     _u2: extern struct {
 //  ^^^ variable.other.member.zig
 //     ^ punctuation.separator.zig
 //       ^^^^^^ storage.modifier.zig
-//              ^^^^^^ storage.type.struct.zig
+//              ^^^^^^ keyword.declaration.struct.zig
 //                     ^ punctuation.section.braces.begin.zig
         LowPart: fn(a, b, c)d,
 //      ^^^^^^^ variable.other.member.zig
 //             ^ punctuation.separator.zig
-//               ^^ storage.type.function.zig
+//               ^^ keyword.declaration.function.zig
 //                 ^ punctuation.section.parens.begin.zig
 //                  ^ meta.function.parameters.zig storage.type.zig
 //                   ^ meta.function.parameters.zig punctuation.separator.zig
@@ -481,10 +481,10 @@ pub const LARGE_INTEGER = extern struct {
 
 pub const GUID = extern struct {
 //  ^^^^^ storage.modifier.zig
-//        ^^^^ entity.name.struct.zig
+//        ^^^^ entity.name.class.struct.zig
 //             ^ keyword.operator.assignment.zig
 //               ^^^^^^ storage.modifier.zig
-//                      ^^^^^^ storage.type.struct.zig
+//                      ^^^^^^ keyword.declaration.struct.zig
 //                             ^ punctuation.section.braces.begin.zig
     Data1: c_ulong,
 //  ^^^^^ variable.other.member.zig
@@ -501,7 +501,7 @@ pub const GUID = extern struct {
 
 pub async fn function() Error!ReturnType {
 //  ^^^^^ keyword.control.async.zig
-//        ^^ storage.type.function.zig
+//        ^^ keyword.declaration.function.zig
 //           ^^^^^^^^ entity.name.function
 }