diff --git a/lib/generated/tokens/primitives.g.dart b/lib/generated/tokens/primitives.g.dart
index 733ec4b7..ce0ca7e7 100644
--- a/lib/generated/tokens/primitives.g.dart
+++ b/lib/generated/tokens/primitives.g.dart
@@ -8,60 +8,60 @@ import 'package:zeta_flutter/zeta_flutter.dart';
 
 /// Interface used for zeta color primitives
 abstract interface class ZetaPrimitives {
-  /// Pure
+  /// Blue
   ///
   /// {@macro zeta-colors-swatch}
-  ZetaPureColorSwatch get pure;
+  ZetaColorSwatch get blue;
 
   /// Cool
   ///
   /// {@macro zeta-colors-swatch}
   ZetaColorSwatch get cool;
 
-  /// Warm
-  ///
-  /// {@macro zeta-colors-swatch}
-  ZetaColorSwatch get warm;
-
-  /// Blue
+  /// Green
   ///
   /// {@macro zeta-colors-swatch}
-  ZetaColorSwatch get blue;
+  ZetaColorSwatch get green;
 
-  /// Green
+  /// Orange
   ///
   /// {@macro zeta-colors-swatch}
-  ZetaColorSwatch get green;
+  ZetaColorSwatch get orange;
 
-  /// Red
+  /// Pink
   ///
   /// {@macro zeta-colors-swatch}
-  ZetaColorSwatch get red;
+  ZetaColorSwatch get pink;
 
-  /// Orange
+  /// Pure
   ///
   /// {@macro zeta-colors-swatch}
-  ZetaColorSwatch get orange;
+  ZetaPureColorSwatch get pure;
 
   /// Purple
   ///
   /// {@macro zeta-colors-swatch}
   ZetaColorSwatch get purple;
 
-  /// Yellow
+  /// Red
   ///
   /// {@macro zeta-colors-swatch}
-  ZetaColorSwatch get yellow;
+  ZetaColorSwatch get red;
 
   /// Teal
   ///
   /// {@macro zeta-colors-swatch}
   ZetaColorSwatch get teal;
 
-  /// Pink
+  /// Warm
   ///
   /// {@macro zeta-colors-swatch}
-  ZetaColorSwatch get pink;
+  ZetaColorSwatch get warm;
+
+  /// Yellow
+  ///
+  /// {@macro zeta-colors-swatch}
+  ZetaColorSwatch get yellow;
 
   /// 0dp space
   double get x0;
@@ -135,17 +135,24 @@ abstract interface class ZetaPrimitives {
 
 /// Light primitives
 final class ZetaPrimitivesLight implements ZetaPrimitives {
-  /// Pure
+  /// Blue
   ///
   /// {@macro zeta-colors-swatch}
   @override
-  ZetaPureColorSwatch pure = const ZetaPureColorSwatch(
+  ZetaColorSwatch blue = const ZetaColorSwatch(
     swatch: {
-      0: Color(0xFFffffff),
-      500: Color(0xFF151519),
-      1000: Color(0xFF151519),
+      10: Color(0xFFf1f8ff),
+      20: Color(0xFFe2f1ff),
+      30: Color(0xFFb7dbff),
+      40: Color(0xFF7ebeff),
+      50: Color(0xFF599fe5),
+      60: Color(0xFF0073e6),
+      70: Color(0xFF0061c2),
+      80: Color(0xFF004d99),
+      90: Color(0xFF002c58),
+      100: Color(0xFF101b25),
     },
-    primary: 0xFF151519,
+    primary: 0xFF0073e6,
   );
 
   /// Cool
@@ -168,46 +175,6 @@ final class ZetaPrimitivesLight implements ZetaPrimitives {
     primary: 0xFF7a8190,
   );
 
-  /// Warm
-  ///
-  /// {@macro zeta-colors-swatch}
-  @override
-  ZetaColorSwatch warm = const ZetaColorSwatch(
-    swatch: {
-      10: Color(0xFFfafafa),
-      20: Color(0xFFf6f6f6),
-      30: Color(0xFFececec),
-      40: Color(0xFFdedede),
-      50: Color(0xFFb9b9b9),
-      60: Color(0xFF858585),
-      70: Color(0xFF585858),
-      80: Color(0xFF313131),
-      90: Color(0xFF1d1e23),
-      100: Color(0xFF151519),
-    },
-    primary: 0xFF858585,
-  );
-
-  /// Blue
-  ///
-  /// {@macro zeta-colors-swatch}
-  @override
-  ZetaColorSwatch blue = const ZetaColorSwatch(
-    swatch: {
-      10: Color(0xFFf1f8ff),
-      20: Color(0xFFe2f1ff),
-      30: Color(0xFFb7dbff),
-      40: Color(0xFF7ebeff),
-      50: Color(0xFF599fe5),
-      60: Color(0xFF0073e6),
-      70: Color(0xFF0061c2),
-      80: Color(0xFF004d99),
-      90: Color(0xFF002c58),
-      100: Color(0xFF101b25),
-    },
-    primary: 0xFF0073e6,
-  );
-
   /// Green
   ///
   /// {@macro zeta-colors-swatch}
@@ -228,26 +195,6 @@ final class ZetaPrimitivesLight implements ZetaPrimitives {
     primary: 0xFF00864f,
   );
 
-  /// Red
-  ///
-  /// {@macro zeta-colors-swatch}
-  @override
-  ZetaColorSwatch red = const ZetaColorSwatch(
-    swatch: {
-      10: Color(0xFFfff0f1),
-      20: Color(0xFFffe1e4),
-      30: Color(0xFFffb3bb),
-      40: Color(0xFFf98c97),
-      50: Color(0xFFf36170),
-      60: Color(0xFFd70015),
-      70: Color(0xFFb50012),
-      80: Color(0xFF8f000e),
-      90: Color(0xFF520008),
-      100: Color(0xFF220f11),
-    },
-    primary: 0xFFd70015,
-  );
-
   /// Orange
   ///
   /// {@macro zeta-colors-swatch}
@@ -268,6 +215,39 @@ final class ZetaPrimitivesLight implements ZetaPrimitives {
     primary: 0xFFae6500,
   );
 
+  /// Pink
+  ///
+  /// {@macro zeta-colors-swatch}
+  @override
+  ZetaColorSwatch pink = const ZetaColorSwatch(
+    swatch: {
+      10: Color(0xFFfff7fc),
+      20: Color(0xFFffe3f5),
+      30: Color(0xFFffbee7),
+      40: Color(0xFFff94d8),
+      50: Color(0xFFee78c3),
+      60: Color(0xFFd30589),
+      70: Color(0xFFab006d),
+      80: Color(0xFF840054),
+      90: Color(0xFF640040),
+      100: Color(0xFF2e001e),
+    },
+    primary: 0xFFd30589,
+  );
+
+  /// Pure
+  ///
+  /// {@macro zeta-colors-swatch}
+  @override
+  ZetaPureColorSwatch pure = const ZetaPureColorSwatch(
+    swatch: {
+      0: Color(0xFFffffff),
+      500: Color(0xFF151519),
+      1000: Color(0xFF151519),
+    },
+    primary: 0xFF151519,
+  );
+
   /// Purple
   ///
   /// {@macro zeta-colors-swatch}
@@ -288,24 +268,24 @@ final class ZetaPrimitivesLight implements ZetaPrimitives {
     primary: 0xFF7e0cff,
   );
 
-  /// Yellow
+  /// Red
   ///
   /// {@macro zeta-colors-swatch}
   @override
-  ZetaColorSwatch yellow = const ZetaColorSwatch(
+  ZetaColorSwatch red = const ZetaColorSwatch(
     swatch: {
-      10: Color(0xFFfff7d4),
-      20: Color(0xFFffea89),
-      30: Color(0xFFf3d961),
-      40: Color(0xFFdbb91c),
-      50: Color(0xFFc2a728),
-      60: Color(0xFF8d7400),
-      70: Color(0xFF766200),
-      80: Color(0xFF564908),
-      90: Color(0xFF352b00),
-      100: Color(0xFF181400),
+      10: Color(0xFFfff0f1),
+      20: Color(0xFFffe1e4),
+      30: Color(0xFFffb3bb),
+      40: Color(0xFFf98c97),
+      50: Color(0xFFf36170),
+      60: Color(0xFFd70015),
+      70: Color(0xFFb50012),
+      80: Color(0xFF8f000e),
+      90: Color(0xFF520008),
+      100: Color(0xFF220f11),
     },
-    primary: 0xFF8d7400,
+    primary: 0xFFd70015,
   );
 
   /// Teal
@@ -328,24 +308,44 @@ final class ZetaPrimitivesLight implements ZetaPrimitives {
     primary: 0xFF1a8080,
   );
 
-  /// Pink
+  /// Warm
   ///
   /// {@macro zeta-colors-swatch}
   @override
-  ZetaColorSwatch pink = const ZetaColorSwatch(
+  ZetaColorSwatch warm = const ZetaColorSwatch(
     swatch: {
-      10: Color(0xFFfff7fc),
-      20: Color(0xFFffe3f5),
-      30: Color(0xFFffbee7),
-      40: Color(0xFFff94d8),
-      50: Color(0xFFee78c3),
-      60: Color(0xFFd30589),
-      70: Color(0xFFab006d),
-      80: Color(0xFF840054),
-      90: Color(0xFF640040),
-      100: Color(0xFF2e001e),
+      10: Color(0xFFfafafa),
+      20: Color(0xFFf6f6f6),
+      30: Color(0xFFececec),
+      40: Color(0xFFdedede),
+      50: Color(0xFFb9b9b9),
+      60: Color(0xFF858585),
+      70: Color(0xFF585858),
+      80: Color(0xFF313131),
+      90: Color(0xFF1d1e23),
+      100: Color(0xFF151519),
     },
-    primary: 0xFFd30589,
+    primary: 0xFF858585,
+  );
+
+  /// Yellow
+  ///
+  /// {@macro zeta-colors-swatch}
+  @override
+  ZetaColorSwatch yellow = const ZetaColorSwatch(
+    swatch: {
+      10: Color(0xFFfff7d4),
+      20: Color(0xFFffea89),
+      30: Color(0xFFf3d961),
+      40: Color(0xFFdbb91c),
+      50: Color(0xFFc2a728),
+      60: Color(0xFF8d7400),
+      70: Color(0xFF766200),
+      80: Color(0xFF564908),
+      90: Color(0xFF352b00),
+      100: Color(0xFF181400),
+    },
+    primary: 0xFF8d7400,
   );
 
   /// 0dp space
@@ -429,17 +429,24 @@ final class ZetaPrimitivesLight implements ZetaPrimitives {
 
 /// Dark primitives
 final class ZetaPrimitivesDark implements ZetaPrimitives {
-  /// Pure
+  /// Blue
   ///
   /// {@macro zeta-colors-swatch}
   @override
-  ZetaPureColorSwatch pure = const ZetaPureColorSwatch(
+  ZetaColorSwatch blue = const ZetaColorSwatch(
     swatch: {
-      0: Color(0xFF151519),
-      500: Color(0xFF1d1e23),
-      1000: Color(0xFFffffff),
+      10: Color(0xFF101b25),
+      20: Color(0xFF002c58),
+      30: Color(0xFF004d99),
+      40: Color(0xFF0061c2),
+      50: Color(0xFF0073e6),
+      60: Color(0xFF599fe5),
+      70: Color(0xFF7ebeff),
+      80: Color(0xFFb7dbff),
+      90: Color(0xFFe2f1ff),
+      100: Color(0xFFf1f8ff),
     },
-    primary: 0xFF1d1e23,
+    primary: 0xFF599fe5,
   );
 
   /// Cool
@@ -462,46 +469,6 @@ final class ZetaPrimitivesDark implements ZetaPrimitives {
     primary: 0xFF8d95a3,
   );
 
-  /// Warm
-  ///
-  /// {@macro zeta-colors-swatch}
-  @override
-  ZetaColorSwatch warm = const ZetaColorSwatch(
-    swatch: {
-      10: Color(0xFF151519),
-      20: Color(0xFF1d1e23),
-      30: Color(0xFF313131),
-      40: Color(0xFF585858),
-      50: Color(0xFF858585),
-      60: Color(0xFFb9b9b9),
-      70: Color(0xFFdedede),
-      80: Color(0xFFececec),
-      90: Color(0xFFf6f6f6),
-      100: Color(0xFFfafafa),
-    },
-    primary: 0xFFb9b9b9,
-  );
-
-  /// Blue
-  ///
-  /// {@macro zeta-colors-swatch}
-  @override
-  ZetaColorSwatch blue = const ZetaColorSwatch(
-    swatch: {
-      10: Color(0xFF101b25),
-      20: Color(0xFF002c58),
-      30: Color(0xFF004d99),
-      40: Color(0xFF0061c2),
-      50: Color(0xFF0073e6),
-      60: Color(0xFF599fe5),
-      70: Color(0xFF7ebeff),
-      80: Color(0xFFb7dbff),
-      90: Color(0xFFe2f1ff),
-      100: Color(0xFFf1f8ff),
-    },
-    primary: 0xFF599fe5,
-  );
-
   /// Green
   ///
   /// {@macro zeta-colors-swatch}
@@ -522,26 +489,6 @@ final class ZetaPrimitivesDark implements ZetaPrimitives {
     primary: 0xFF67b796,
   );
 
-  /// Red
-  ///
-  /// {@macro zeta-colors-swatch}
-  @override
-  ZetaColorSwatch red = const ZetaColorSwatch(
-    swatch: {
-      10: Color(0xFF220f11),
-      20: Color(0xFF520008),
-      30: Color(0xFF8f000e),
-      40: Color(0xFFb50012),
-      50: Color(0xFFd70015),
-      60: Color(0xFFf36170),
-      70: Color(0xFFf98c97),
-      80: Color(0xFFffb3bb),
-      90: Color(0xFFffe1e4),
-      100: Color(0xFFfff0f1),
-    },
-    primary: 0xFFf36170,
-  );
-
   /// Orange
   ///
   /// {@macro zeta-colors-swatch}
@@ -562,6 +509,39 @@ final class ZetaPrimitivesDark implements ZetaPrimitives {
     primary: 0xFFd78d26,
   );
 
+  /// Pink
+  ///
+  /// {@macro zeta-colors-swatch}
+  @override
+  ZetaColorSwatch pink = const ZetaColorSwatch(
+    swatch: {
+      10: Color(0xFF2e001e),
+      20: Color(0xFF640040),
+      30: Color(0xFF840054),
+      40: Color(0xFFab006d),
+      50: Color(0xFFd30589),
+      60: Color(0xFFee78c3),
+      70: Color(0xFFff94d8),
+      80: Color(0xFFffbee7),
+      90: Color(0xFFffe3f5),
+      100: Color(0xFFfff7fc),
+    },
+    primary: 0xFFee78c3,
+  );
+
+  /// Pure
+  ///
+  /// {@macro zeta-colors-swatch}
+  @override
+  ZetaPureColorSwatch pure = const ZetaPureColorSwatch(
+    swatch: {
+      0: Color(0xFF151519),
+      500: Color(0xFF1d1e23),
+      1000: Color(0xFFffffff),
+    },
+    primary: 0xFF1d1e23,
+  );
+
   /// Purple
   ///
   /// {@macro zeta-colors-swatch}
@@ -582,24 +562,24 @@ final class ZetaPrimitivesDark implements ZetaPrimitives {
     primary: 0xFF9b71df,
   );
 
-  /// Yellow
+  /// Red
   ///
   /// {@macro zeta-colors-swatch}
   @override
-  ZetaColorSwatch yellow = const ZetaColorSwatch(
+  ZetaColorSwatch red = const ZetaColorSwatch(
     swatch: {
-      10: Color(0xFF181400),
-      20: Color(0xFF352b00),
-      30: Color(0xFF564908),
-      40: Color(0xFF766200),
-      50: Color(0xFF8d7400),
-      60: Color(0xFFc2a728),
-      70: Color(0xFFdbb91c),
-      80: Color(0xFFf3d961),
-      90: Color(0xFFffea89),
-      100: Color(0xFFfff7d4),
+      10: Color(0xFF220f11),
+      20: Color(0xFF520008),
+      30: Color(0xFF8f000e),
+      40: Color(0xFFb50012),
+      50: Color(0xFFd70015),
+      60: Color(0xFFf36170),
+      70: Color(0xFFf98c97),
+      80: Color(0xFFffb3bb),
+      90: Color(0xFFffe1e4),
+      100: Color(0xFFfff0f1),
     },
-    primary: 0xFFc2a728,
+    primary: 0xFFf36170,
   );
 
   /// Teal
@@ -622,24 +602,44 @@ final class ZetaPrimitivesDark implements ZetaPrimitives {
     primary: 0xFF65c4c4,
   );
 
-  /// Pink
+  /// Warm
   ///
   /// {@macro zeta-colors-swatch}
   @override
-  ZetaColorSwatch pink = const ZetaColorSwatch(
+  ZetaColorSwatch warm = const ZetaColorSwatch(
     swatch: {
-      10: Color(0xFF2e001e),
-      20: Color(0xFF640040),
-      30: Color(0xFF840054),
-      40: Color(0xFFab006d),
-      50: Color(0xFFd30589),
-      60: Color(0xFFee78c3),
-      70: Color(0xFFff94d8),
-      80: Color(0xFFffbee7),
-      90: Color(0xFFffe3f5),
-      100: Color(0xFFfff7fc),
+      10: Color(0xFF151519),
+      20: Color(0xFF1d1e23),
+      30: Color(0xFF313131),
+      40: Color(0xFF585858),
+      50: Color(0xFF858585),
+      60: Color(0xFFb9b9b9),
+      70: Color(0xFFdedede),
+      80: Color(0xFFececec),
+      90: Color(0xFFf6f6f6),
+      100: Color(0xFFfafafa),
     },
-    primary: 0xFFee78c3,
+    primary: 0xFFb9b9b9,
+  );
+
+  /// Yellow
+  ///
+  /// {@macro zeta-colors-swatch}
+  @override
+  ZetaColorSwatch yellow = const ZetaColorSwatch(
+    swatch: {
+      10: Color(0xFF181400),
+      20: Color(0xFF352b00),
+      30: Color(0xFF564908),
+      40: Color(0xFF766200),
+      50: Color(0xFF8d7400),
+      60: Color(0xFFc2a728),
+      70: Color(0xFFdbb91c),
+      80: Color(0xFFf3d961),
+      90: Color(0xFFffea89),
+      100: Color(0xFFfff7d4),
+    },
+    primary: 0xFFc2a728,
   );
 
   /// 0dp space
diff --git a/lib/generated/tokens/semantics.g.dart b/lib/generated/tokens/semantics.g.dart
index c024754a..8498e081 100644
--- a/lib/generated/tokens/semantics.g.dart
+++ b/lib/generated/tokens/semantics.g.dart
@@ -9,56 +9,17 @@ abstract interface class ZetaSemanticColors {
   /// The primitives for the colors
   ZetaPrimitives get primitives;
 
-  /// Main
-  ZetaSemanticMainColors get main;
-
   /// Border
   ZetaSemanticBorderColors get border;
 
-  /// Surface
-  ZetaSemanticSurfaceColors get surface;
+  /// Main
+  ZetaSemanticMainColors get main;
 
   /// State
   ZetaSemanticStateColors get state;
-}
-
-/// The semantic tokens for Main
-abstract interface class ZetaSemanticMainColors {
-  /// The primitives for the colors
-  ZetaPrimitives get primitives;
-
-  /// Default Color
-  Color get defaultColor;
-
-  /// Subtle
-  Color get subtle;
-
-  /// Light
-  Color get light;
-
-  /// Inverse
-  Color get inverse;
-
-  /// Disabled
-  Color get disabled;
-
-  /// Primary
-  Color get primary;
-
-  /// Secondary
-  Color get secondary;
-
-  /// Positive
-  Color get positive;
-
-  /// Warning
-  Color get warning;
 
-  /// Negative
-  Color get negative;
-
-  /// Info
-  Color get info;
+  /// Surface
+  ZetaSemanticSurfaceColors get surface;
 }
 
 /// The semantic tokens for Border
@@ -69,137 +30,80 @@ abstract interface class ZetaSemanticBorderColors {
   /// Default Color
   Color get defaultColor;
 
-  /// Subtle
-  Color get subtle;
+  /// Disabled
+  Color get disabled;
 
   /// Hover
   Color get hover;
 
-  /// Selected
-  Color get selected;
+  /// Info
+  Color get info;
 
-  /// Disabled
-  Color get disabled;
+  /// Negative
+  Color get negative;
 
-  /// Pure
-  Color get pure;
+  /// Positive
+  Color get positive;
+
+  /// Primary
+  Color get primary;
 
   /// Primary Main
   Color get primaryMain;
 
-  /// Primary
-  Color get primary;
+  /// Pure
+  Color get pure;
 
   /// Secondary
   Color get secondary;
 
-  /// Positive
-  Color get positive;
+  /// Selected
+  Color get selected;
+
+  /// Subtle
+  Color get subtle;
 
   /// Warning
   Color get warning;
-
-  /// Negative
-  Color get negative;
-
-  /// Info
-  Color get info;
 }
 
-/// The semantic tokens for Surface
-abstract interface class ZetaSemanticSurfaceColors {
+/// The semantic tokens for Main
+abstract interface class ZetaSemanticMainColors {
   /// The primitives for the colors
   ZetaPrimitives get primitives;
 
   /// Default Color
   Color get defaultColor;
 
-  /// Default Inverse
-  Color get defaultInverse;
-
-  /// Hover
-  Color get hover;
+  /// Disabled
+  Color get disabled;
 
-  /// Selected
-  Color get selected;
+  /// Info
+  Color get info;
 
-  /// Selected Hover
-  Color get selectedHover;
+  /// Inverse
+  Color get inverse;
 
-  /// Disabled
-  Color get disabled;
+  /// Light
+  Color get light;
 
-  /// Cool
-  Color get cool;
+  /// Negative
+  Color get negative;
 
-  /// Warm
-  Color get warm;
+  /// Positive
+  Color get positive;
 
   /// Primary
   Color get primary;
 
-  /// Primary Subtle
-  Color get primarySubtle;
-
   /// Secondary
   Color get secondary;
 
-  /// Avatar
-  ZetaSemanticAvatarColors get avatar;
-
-  /// Secondary Subtle
-  Color get secondarySubtle;
-
-  /// Positive
-  Color get positive;
-
-  /// Positive Subtle
-  Color get positiveSubtle;
+  /// Subtle
+  Color get subtle;
 
   /// Warning
   Color get warning;
-
-  /// Warning Subtle
-  Color get warningSubtle;
-
-  /// Negative
-  Color get negative;
-
-  /// Negative Subtle
-  Color get negativeSubtle;
-
-  /// Info
-  Color get info;
-
-  /// Info Subtle
-  Color get infoSubtle;
-}
-
-/// The semantic tokens for Avatar
-abstract interface class ZetaSemanticAvatarColors {
-  /// The primitives for the colors
-  ZetaPrimitives get primitives;
-
-  /// Blue
-  Color get blue;
-
-  /// Green
-  Color get green;
-
-  /// Orange
-  Color get orange;
-
-  /// Pink
-  Color get pink;
-
-  /// Purple
-  Color get purple;
-
-  /// Teal
-  Color get teal;
-
-  /// Yellow
-  Color get yellow;
 }
 
 /// The semantic tokens for State
@@ -207,38 +111,47 @@ abstract interface class ZetaSemanticStateColors {
   /// The primitives for the colors
   ZetaPrimitives get primitives;
 
-  /// Disabled
-  ZetaSemanticDisabledColors get disabled;
+  ///  Inverse
+  ZetaSemanticInverseColors get inverse;
 
   /// Default
   ZetaSemanticDefaultColors get defaultColor;
 
-  /// Primary
-  ZetaSemanticPrimaryColors get primary;
-
-  /// Secondary
-  ZetaSemanticSecondaryColors get secondary;
+  /// Disabled
+  ZetaSemanticDisabledColors get disabled;
 
-  /// Positive
-  ZetaSemanticPositiveColors get positive;
+  /// Info
+  ZetaSemanticInfoColors get info;
 
   /// Negative
   ZetaSemanticNegativeColors get negative;
 
-  /// Info
-  ZetaSemanticInfoColors get info;
+  /// Positive
+  ZetaSemanticPositiveColors get positive;
 
-  ///  Inverse
-  ZetaSemanticInverseColors get inverse;
+  /// Primary
+  ZetaSemanticPrimaryColors get primary;
+
+  /// Secondary
+  ZetaSemanticSecondaryColors get secondary;
 }
 
-/// The semantic tokens for Disabled
-abstract interface class ZetaSemanticDisabledColors {
+/// The semantic tokens for Inverse
+abstract interface class ZetaSemanticInverseColors {
   /// The primitives for the colors
   ZetaPrimitives get primitives;
 
-  /// Disabled
-  Color get disabled;
+  /// Enabled
+  Color get enabled;
+
+  /// Focus
+  Color get focus;
+
+  /// Hover
+  Color get hover;
+
+  /// Selected
+  Color get selected;
 }
 
 /// The semantic tokens for Default
@@ -249,50 +162,59 @@ abstract interface class ZetaSemanticDefaultColors {
   /// Enabled
   Color get enabled;
 
+  /// Focus
+  Color get focus;
+
   /// Hover
   Color get hover;
 
   /// Selected
   Color get selected;
+}
 
-  /// Focus
-  Color get focus;
+/// The semantic tokens for Disabled
+abstract interface class ZetaSemanticDisabledColors {
+  /// The primitives for the colors
+  ZetaPrimitives get primitives;
+
+  /// Disabled
+  Color get disabled;
 }
 
-/// The semantic tokens for Primary
-abstract interface class ZetaSemanticPrimaryColors {
+/// The semantic tokens for Info
+abstract interface class ZetaSemanticInfoColors {
   /// The primitives for the colors
   ZetaPrimitives get primitives;
 
   /// Enabled
   Color get enabled;
 
+  /// Focus
+  Color get focus;
+
   /// Hover
   Color get hover;
 
   /// Selected
   Color get selected;
-
-  /// Focus
-  Color get focus;
 }
 
-/// The semantic tokens for Secondary
-abstract interface class ZetaSemanticSecondaryColors {
+/// The semantic tokens for Negative
+abstract interface class ZetaSemanticNegativeColors {
   /// The primitives for the colors
   ZetaPrimitives get primitives;
 
   /// Enabled
   Color get enabled;
 
+  /// Focus
+  Color get focus;
+
   /// Hover
   Color get hover;
 
   /// Selected
   Color get selected;
-
-  /// Focus
-  Color get focus;
 }
 
 /// The semantic tokens for Positive
@@ -303,68 +225,146 @@ abstract interface class ZetaSemanticPositiveColors {
   /// Enabled
   Color get enabled;
 
+  /// Focus
+  Color get focus;
+
   /// Hover
   Color get hover;
 
   /// Selected
   Color get selected;
-
-  /// Focus
-  Color get focus;
 }
 
-/// The semantic tokens for Negative
-abstract interface class ZetaSemanticNegativeColors {
+/// The semantic tokens for Primary
+abstract interface class ZetaSemanticPrimaryColors {
   /// The primitives for the colors
   ZetaPrimitives get primitives;
 
   /// Enabled
   Color get enabled;
 
+  /// Focus
+  Color get focus;
+
   /// Hover
   Color get hover;
 
   /// Selected
   Color get selected;
-
-  /// Focus
-  Color get focus;
 }
 
-/// The semantic tokens for Info
-abstract interface class ZetaSemanticInfoColors {
+/// The semantic tokens for Secondary
+abstract interface class ZetaSemanticSecondaryColors {
   /// The primitives for the colors
   ZetaPrimitives get primitives;
 
   /// Enabled
   Color get enabled;
 
+  /// Focus
+  Color get focus;
+
   /// Hover
   Color get hover;
 
   /// Selected
   Color get selected;
-
-  /// Focus
-  Color get focus;
 }
 
-/// The semantic tokens for Inverse
-abstract interface class ZetaSemanticInverseColors {
+/// The semantic tokens for Surface
+abstract interface class ZetaSemanticSurfaceColors {
   /// The primitives for the colors
   ZetaPrimitives get primitives;
 
-  /// Enabled
-  Color get enabled;
+  /// Avatar
+  ZetaSemanticAvatarColors get avatar;
+
+  /// Cool
+  Color get cool;
+
+  /// Default Color
+  Color get defaultColor;
+
+  /// Default Inverse
+  Color get defaultInverse;
+
+  /// Disabled
+  Color get disabled;
 
   /// Hover
   Color get hover;
 
+  /// Info
+  Color get info;
+
+  /// Info Subtle
+  Color get infoSubtle;
+
+  /// Negative
+  Color get negative;
+
+  /// Negative Subtle
+  Color get negativeSubtle;
+
+  /// Positive
+  Color get positive;
+
+  /// Positive Subtle
+  Color get positiveSubtle;
+
+  /// Primary
+  Color get primary;
+
+  /// Primary Subtle
+  Color get primarySubtle;
+
+  /// Secondary
+  Color get secondary;
+
+  /// Secondary Subtle
+  Color get secondarySubtle;
+
   /// Selected
   Color get selected;
 
-  /// Focus
-  Color get focus;
+  /// Selected Hover
+  Color get selectedHover;
+
+  /// Warm
+  Color get warm;
+
+  /// Warning
+  Color get warning;
+
+  /// Warning Subtle
+  Color get warningSubtle;
+}
+
+/// The semantic tokens for Avatar
+abstract interface class ZetaSemanticAvatarColors {
+  /// The primitives for the colors
+  ZetaPrimitives get primitives;
+
+  /// Blue
+  Color get blue;
+
+  /// Green
+  Color get green;
+
+  /// Orange
+  Color get orange;
+
+  /// Pink
+  Color get pink;
+
+  /// Purple
+  Color get purple;
+
+  /// Teal
+  Color get teal;
+
+  /// Yellow
+  Color get yellow;
 }
 
 /// Semantic tokens for Size.
@@ -454,53 +454,21 @@ final class ZetaSemanticColorsAA implements ZetaSemanticColors {
   @override
   final ZetaPrimitives primitives;
 
-  /// Main
-  @override
-  ZetaSemanticMainColors get main => ZetaSemanticMainColorsAA(primitives: primitives);
-
   /// Border
   @override
   ZetaSemanticBorderColors get border => ZetaSemanticBorderColorsAA(primitives: primitives);
 
-  /// Surface
+  /// Main
   @override
-  ZetaSemanticSurfaceColors get surface => ZetaSemanticSurfaceColorsAA(primitives: primitives);
+  ZetaSemanticMainColors get main => ZetaSemanticMainColorsAA(primitives: primitives);
 
   /// State
   @override
   ZetaSemanticStateColors get state => ZetaSemanticStateColorsAA(primitives: primitives);
-}
-
-/// Implementation of ZetaSemanticMainColors
-final class ZetaSemanticMainColorsAA implements ZetaSemanticMainColors {
-  /// Constructor for ZetaSemanticMainColorsAA
-  const ZetaSemanticMainColorsAA({required this.primitives});
 
-  /// The primitives for this sizes
-  @override
-  final ZetaPrimitives primitives;
-  @override
-  Color get defaultColor => primitives.cool.shade90;
-  @override
-  Color get subtle => primitives.cool.shade70;
-  @override
-  Color get light => primitives.cool.shade30;
-  @override
-  Color get inverse => primitives.cool.shade20;
-  @override
-  Color get disabled => primitives.cool.shade50;
-  @override
-  Color get primary => primitives.blue.shade60;
-  @override
-  Color get secondary => primitives.yellow.shade60;
-  @override
-  Color get positive => primitives.green.shade60;
-  @override
-  Color get warning => primitives.orange.shade60;
-  @override
-  Color get negative => primitives.red.shade60;
+  /// Surface
   @override
-  Color get info => primitives.purple.shade60;
+  ZetaSemanticSurfaceColors get surface => ZetaSemanticSurfaceColorsAA(primitives: primitives);
 }
 
 /// Implementation of ZetaSemanticBorderColors
@@ -514,107 +482,61 @@ final class ZetaSemanticBorderColorsAA implements ZetaSemanticBorderColors {
   @override
   Color get defaultColor => primitives.cool.shade40;
   @override
-  Color get subtle => primitives.cool.shade30;
+  Color get disabled => primitives.cool.shade20;
   @override
   Color get hover => primitives.cool.shade90;
   @override
-  Color get selected => primitives.cool.shade90;
+  Color get info => primitives.purple.shade50;
   @override
-  Color get disabled => primitives.cool.shade20;
+  Color get negative => primitives.red.shade50;
   @override
-  Color get pure => primitives.pure.shade0;
+  Color get positive => primitives.green.shade50;
+  @override
+  Color get primary => primitives.blue.shade50;
   @override
   Color get primaryMain => primitives.blue.shade60;
   @override
-  Color get primary => primitives.blue.shade50;
+  Color get pure => primitives.pure.shade0;
   @override
   Color get secondary => primitives.yellow.shade50;
   @override
-  Color get positive => primitives.green.shade50;
-  @override
-  Color get warning => primitives.orange.shade50;
+  Color get selected => primitives.cool.shade90;
   @override
-  Color get negative => primitives.red.shade50;
+  Color get subtle => primitives.cool.shade30;
   @override
-  Color get info => primitives.purple.shade50;
+  Color get warning => primitives.orange.shade50;
 }
 
-/// Implementation of ZetaSemanticSurfaceColors
-final class ZetaSemanticSurfaceColorsAA implements ZetaSemanticSurfaceColors {
-  /// Constructor for ZetaSemanticSurfaceColorsAA
-  const ZetaSemanticSurfaceColorsAA({required this.primitives});
+/// Implementation of ZetaSemanticMainColors
+final class ZetaSemanticMainColorsAA implements ZetaSemanticMainColors {
+  /// Constructor for ZetaSemanticMainColorsAA
+  const ZetaSemanticMainColorsAA({required this.primitives});
 
   /// The primitives for this sizes
   @override
   final ZetaPrimitives primitives;
   @override
-  Color get defaultColor => primitives.pure.shade0;
-  @override
-  Color get defaultInverse => primitives.warm.shade100;
+  Color get defaultColor => primitives.cool.shade90;
   @override
-  Color get hover => primitives.cool.shade20;
+  Color get disabled => primitives.cool.shade50;
   @override
-  Color get selected => primitives.blue.shade10;
+  Color get info => primitives.purple.shade60;
   @override
-  Color get selectedHover => primitives.blue.shade20;
+  Color get inverse => primitives.cool.shade20;
   @override
-  Color get disabled => primitives.cool.shade30;
+  Color get light => primitives.cool.shade30;
   @override
-  Color get cool => primitives.cool.shade10;
+  Color get negative => primitives.red.shade60;
   @override
-  Color get warm => primitives.warm.shade10;
+  Color get positive => primitives.green.shade60;
   @override
   Color get primary => primitives.blue.shade60;
   @override
-  Color get primarySubtle => primitives.blue.shade10;
-  @override
   Color get secondary => primitives.yellow.shade60;
-
-  /// Avatar
-  @override
-  ZetaSemanticAvatarColors get avatar => ZetaSemanticAvatarColorsAA(primitives: primitives);
-  @override
-  Color get secondarySubtle => primitives.yellow.shade10;
   @override
-  Color get positive => primitives.green.shade60;
-  @override
-  Color get positiveSubtle => primitives.green.shade10;
+  Color get subtle => primitives.cool.shade70;
   @override
   Color get warning => primitives.orange.shade60;
-  @override
-  Color get warningSubtle => primitives.orange.shade10;
-  @override
-  Color get negative => primitives.red.shade60;
-  @override
-  Color get negativeSubtle => primitives.red.shade10;
-  @override
-  Color get info => primitives.purple.shade60;
-  @override
-  Color get infoSubtle => primitives.purple.shade10;
-}
-
-/// Implementation of ZetaSemanticAvatarColors
-final class ZetaSemanticAvatarColorsAA implements ZetaSemanticAvatarColors {
-  /// Constructor for ZetaSemanticAvatarColorsAA
-  const ZetaSemanticAvatarColorsAA({required this.primitives});
-
-  /// The primitives for this sizes
-  @override
-  final ZetaPrimitives primitives;
-  @override
-  Color get blue => primitives.blue.shade80;
-  @override
-  Color get green => primitives.green.shade60;
-  @override
-  Color get orange => primitives.orange.shade50;
-  @override
-  Color get pink => primitives.pink.shade80;
-  @override
-  Color get purple => primitives.purple.shade80;
-  @override
-  Color get teal => primitives.teal.shade80;
-  @override
-  Color get yellow => primitives.yellow.shade50;
 }
 
 /// Implementation of ZetaSemanticStateColors
@@ -626,49 +548,55 @@ final class ZetaSemanticStateColorsAA implements ZetaSemanticStateColors {
   @override
   final ZetaPrimitives primitives;
 
-  /// Disabled
+  ///  Inverse
   @override
-  ZetaSemanticDisabledColors get disabled => ZetaSemanticDisabledColorsAA(primitives: primitives);
+  ZetaSemanticInverseColors get inverse => ZetaSemanticInverseColorsAA(primitives: primitives);
 
   /// Default
   @override
   ZetaSemanticDefaultColors get defaultColor => ZetaSemanticDefaultColorsAA(primitives: primitives);
 
-  /// Primary
-  @override
-  ZetaSemanticPrimaryColors get primary => ZetaSemanticPrimaryColorsAA(primitives: primitives);
-
-  /// Secondary
+  /// Disabled
   @override
-  ZetaSemanticSecondaryColors get secondary => ZetaSemanticSecondaryColorsAA(primitives: primitives);
+  ZetaSemanticDisabledColors get disabled => ZetaSemanticDisabledColorsAA(primitives: primitives);
 
-  /// Positive
+  /// Info
   @override
-  ZetaSemanticPositiveColors get positive => ZetaSemanticPositiveColorsAA(primitives: primitives);
+  ZetaSemanticInfoColors get info => ZetaSemanticInfoColorsAA(primitives: primitives);
 
   /// Negative
   @override
   ZetaSemanticNegativeColors get negative => ZetaSemanticNegativeColorsAA(primitives: primitives);
 
-  /// Info
+  /// Positive
   @override
-  ZetaSemanticInfoColors get info => ZetaSemanticInfoColorsAA(primitives: primitives);
+  ZetaSemanticPositiveColors get positive => ZetaSemanticPositiveColorsAA(primitives: primitives);
 
-  ///  Inverse
+  /// Primary
   @override
-  ZetaSemanticInverseColors get inverse => ZetaSemanticInverseColorsAA(primitives: primitives);
+  ZetaSemanticPrimaryColors get primary => ZetaSemanticPrimaryColorsAA(primitives: primitives);
+
+  /// Secondary
+  @override
+  ZetaSemanticSecondaryColors get secondary => ZetaSemanticSecondaryColorsAA(primitives: primitives);
 }
 
-/// Implementation of ZetaSemanticDisabledColors
-final class ZetaSemanticDisabledColorsAA implements ZetaSemanticDisabledColors {
-  /// Constructor for ZetaSemanticDisabledColorsAA
-  const ZetaSemanticDisabledColorsAA({required this.primitives});
+/// Implementation of ZetaSemanticInverseColors
+final class ZetaSemanticInverseColorsAA implements ZetaSemanticInverseColors {
+  /// Constructor for ZetaSemanticInverseColorsAA
+  const ZetaSemanticInverseColorsAA({required this.primitives});
 
   /// The primitives for this sizes
   @override
   final ZetaPrimitives primitives;
   @override
-  Color get disabled => primitives.cool.shade30;
+  Color get enabled => primitives.cool.shade100;
+  @override
+  Color get focus => primitives.cool.shade100;
+  @override
+  Color get hover => primitives.cool.shade90;
+  @override
+  Color get selected => primitives.cool.shade100;
 }
 
 /// Implementation of ZetaSemanticDefaultColors
@@ -682,47 +610,59 @@ final class ZetaSemanticDefaultColorsAA implements ZetaSemanticDefaultColors {
   @override
   Color get enabled => primitives.pure.shade0;
   @override
+  Color get focus => primitives.pure.shade0;
+  @override
   Color get hover => primitives.cool.shade20;
   @override
   Color get selected => primitives.blue.shade10;
+}
+
+/// Implementation of ZetaSemanticDisabledColors
+final class ZetaSemanticDisabledColorsAA implements ZetaSemanticDisabledColors {
+  /// Constructor for ZetaSemanticDisabledColorsAA
+  const ZetaSemanticDisabledColorsAA({required this.primitives});
+
+  /// The primitives for this sizes
   @override
-  Color get focus => primitives.pure.shade0;
+  final ZetaPrimitives primitives;
+  @override
+  Color get disabled => primitives.cool.shade30;
 }
 
-/// Implementation of ZetaSemanticPrimaryColors
-final class ZetaSemanticPrimaryColorsAA implements ZetaSemanticPrimaryColors {
-  /// Constructor for ZetaSemanticPrimaryColorsAA
-  const ZetaSemanticPrimaryColorsAA({required this.primitives});
+/// Implementation of ZetaSemanticInfoColors
+final class ZetaSemanticInfoColorsAA implements ZetaSemanticInfoColors {
+  /// Constructor for ZetaSemanticInfoColorsAA
+  const ZetaSemanticInfoColorsAA({required this.primitives});
 
   /// The primitives for this sizes
   @override
   final ZetaPrimitives primitives;
   @override
-  Color get enabled => primitives.blue.shade60;
+  Color get enabled => primitives.purple.shade60;
   @override
-  Color get hover => primitives.blue.shade50;
+  Color get focus => primitives.purple.shade60;
   @override
-  Color get selected => primitives.blue.shade70;
+  Color get hover => primitives.purple.shade50;
   @override
-  Color get focus => primitives.blue.shade60;
+  Color get selected => primitives.purple.shade70;
 }
 
-/// Implementation of ZetaSemanticSecondaryColors
-final class ZetaSemanticSecondaryColorsAA implements ZetaSemanticSecondaryColors {
-  /// Constructor for ZetaSemanticSecondaryColorsAA
-  const ZetaSemanticSecondaryColorsAA({required this.primitives});
+/// Implementation of ZetaSemanticNegativeColors
+final class ZetaSemanticNegativeColorsAA implements ZetaSemanticNegativeColors {
+  /// Constructor for ZetaSemanticNegativeColorsAA
+  const ZetaSemanticNegativeColorsAA({required this.primitives});
 
   /// The primitives for this sizes
   @override
   final ZetaPrimitives primitives;
   @override
-  Color get enabled => primitives.yellow.shade40;
+  Color get enabled => primitives.red.shade60;
   @override
-  Color get hover => primitives.yellow.shade30;
+  Color get focus => primitives.red.shade60;
   @override
-  Color get selected => primitives.yellow.shade50;
+  Color get hover => primitives.red.shade50;
   @override
-  Color get focus => primitives.yellow.shade40;
+  Color get selected => primitives.red.shade70;
 }
 
 /// Implementation of ZetaSemanticPositiveColors
@@ -736,237 +676,219 @@ final class ZetaSemanticPositiveColorsAA implements ZetaSemanticPositiveColors {
   @override
   Color get enabled => primitives.green.shade60;
   @override
+  Color get focus => primitives.green.shade60;
+  @override
   Color get hover => primitives.green.shade50;
   @override
   Color get selected => primitives.green.shade70;
-  @override
-  Color get focus => primitives.green.shade60;
 }
 
-/// Implementation of ZetaSemanticNegativeColors
-final class ZetaSemanticNegativeColorsAA implements ZetaSemanticNegativeColors {
-  /// Constructor for ZetaSemanticNegativeColorsAA
-  const ZetaSemanticNegativeColorsAA({required this.primitives});
+/// Implementation of ZetaSemanticPrimaryColors
+final class ZetaSemanticPrimaryColorsAA implements ZetaSemanticPrimaryColors {
+  /// Constructor for ZetaSemanticPrimaryColorsAA
+  const ZetaSemanticPrimaryColorsAA({required this.primitives});
 
   /// The primitives for this sizes
   @override
   final ZetaPrimitives primitives;
   @override
-  Color get enabled => primitives.red.shade60;
+  Color get enabled => primitives.blue.shade60;
   @override
-  Color get hover => primitives.red.shade50;
+  Color get focus => primitives.blue.shade60;
   @override
-  Color get selected => primitives.red.shade70;
+  Color get hover => primitives.blue.shade50;
   @override
-  Color get focus => primitives.red.shade60;
+  Color get selected => primitives.blue.shade70;
 }
 
-/// Implementation of ZetaSemanticInfoColors
-final class ZetaSemanticInfoColorsAA implements ZetaSemanticInfoColors {
-  /// Constructor for ZetaSemanticInfoColorsAA
-  const ZetaSemanticInfoColorsAA({required this.primitives});
+/// Implementation of ZetaSemanticSecondaryColors
+final class ZetaSemanticSecondaryColorsAA implements ZetaSemanticSecondaryColors {
+  /// Constructor for ZetaSemanticSecondaryColorsAA
+  const ZetaSemanticSecondaryColorsAA({required this.primitives});
 
   /// The primitives for this sizes
   @override
   final ZetaPrimitives primitives;
   @override
-  Color get enabled => primitives.purple.shade60;
+  Color get enabled => primitives.yellow.shade40;
   @override
-  Color get hover => primitives.purple.shade50;
+  Color get focus => primitives.yellow.shade40;
   @override
-  Color get selected => primitives.purple.shade70;
+  Color get hover => primitives.yellow.shade30;
   @override
-  Color get focus => primitives.purple.shade60;
+  Color get selected => primitives.yellow.shade50;
 }
 
-/// Implementation of ZetaSemanticInverseColors
-final class ZetaSemanticInverseColorsAA implements ZetaSemanticInverseColors {
-  /// Constructor for ZetaSemanticInverseColorsAA
-  const ZetaSemanticInverseColorsAA({required this.primitives});
+/// Implementation of ZetaSemanticSurfaceColors
+final class ZetaSemanticSurfaceColorsAA implements ZetaSemanticSurfaceColors {
+  /// Constructor for ZetaSemanticSurfaceColorsAA
+  const ZetaSemanticSurfaceColorsAA({required this.primitives});
 
   /// The primitives for this sizes
   @override
   final ZetaPrimitives primitives;
+
+  /// Avatar
   @override
-  Color get enabled => primitives.cool.shade100;
+  ZetaSemanticAvatarColors get avatar => ZetaSemanticAvatarColorsAA(primitives: primitives);
   @override
-  Color get hover => primitives.cool.shade90;
+  Color get cool => primitives.cool.shade10;
   @override
-  Color get selected => primitives.cool.shade100;
+  Color get defaultColor => primitives.pure.shade0;
   @override
-  Color get focus => primitives.cool.shade100;
-}
-
-/// Implementation of ZetaSemanticColors
-final class ZetaSemanticColorsAAA implements ZetaSemanticColors {
-  /// Constructor for ZetaSemanticColorsAAA
-  const ZetaSemanticColorsAAA({required this.primitives});
-
-  /// The primitives for this sizes
+  Color get defaultInverse => primitives.warm.shade100;
   @override
-  final ZetaPrimitives primitives;
-
-  /// Main
+  Color get disabled => primitives.cool.shade30;
   @override
-  ZetaSemanticMainColors get main => ZetaSemanticMainColorsAAA(primitives: primitives);
-
-  /// Border
+  Color get hover => primitives.cool.shade20;
   @override
-  ZetaSemanticBorderColors get border => ZetaSemanticBorderColorsAAA(primitives: primitives);
-
-  /// Surface
+  Color get info => primitives.purple.shade60;
   @override
-  ZetaSemanticSurfaceColors get surface => ZetaSemanticSurfaceColorsAAA(primitives: primitives);
-
-  /// State
+  Color get infoSubtle => primitives.purple.shade10;
   @override
-  ZetaSemanticStateColors get state => ZetaSemanticStateColorsAAA(primitives: primitives);
-}
-
-/// Implementation of ZetaSemanticMainColors
-final class ZetaSemanticMainColorsAAA implements ZetaSemanticMainColors {
-  /// Constructor for ZetaSemanticMainColorsAAA
-  const ZetaSemanticMainColorsAAA({required this.primitives});
-
-  /// The primitives for this sizes
+  Color get negative => primitives.red.shade60;
   @override
-  final ZetaPrimitives primitives;
+  Color get negativeSubtle => primitives.red.shade10;
   @override
-  Color get defaultColor => primitives.cool.shade100;
+  Color get positive => primitives.green.shade60;
   @override
-  Color get subtle => primitives.cool.shade90;
+  Color get positiveSubtle => primitives.green.shade10;
   @override
-  Color get light => primitives.pure.shade0;
+  Color get primary => primitives.blue.shade60;
   @override
-  Color get inverse => primitives.pure.shade0;
+  Color get primarySubtle => primitives.blue.shade10;
   @override
-  Color get disabled => primitives.cool.shade60;
+  Color get secondary => primitives.yellow.shade60;
   @override
-  Color get primary => primitives.blue.shade80;
+  Color get secondarySubtle => primitives.yellow.shade10;
   @override
-  Color get secondary => primitives.yellow.shade80;
+  Color get selected => primitives.blue.shade10;
   @override
-  Color get positive => primitives.green.shade80;
+  Color get selectedHover => primitives.blue.shade20;
   @override
-  Color get warning => primitives.orange.shade80;
+  Color get warm => primitives.warm.shade10;
   @override
-  Color get negative => primitives.red.shade80;
+  Color get warning => primitives.orange.shade60;
   @override
-  Color get info => primitives.purple.shade80;
+  Color get warningSubtle => primitives.orange.shade10;
 }
 
-/// Implementation of ZetaSemanticBorderColors
-final class ZetaSemanticBorderColorsAAA implements ZetaSemanticBorderColors {
-  /// Constructor for ZetaSemanticBorderColorsAAA
-  const ZetaSemanticBorderColorsAAA({required this.primitives});
+/// Implementation of ZetaSemanticAvatarColors
+final class ZetaSemanticAvatarColorsAA implements ZetaSemanticAvatarColors {
+  /// Constructor for ZetaSemanticAvatarColorsAA
+  const ZetaSemanticAvatarColorsAA({required this.primitives});
 
   /// The primitives for this sizes
   @override
   final ZetaPrimitives primitives;
   @override
-  Color get defaultColor => primitives.cool.shade100;
-  @override
-  Color get subtle => primitives.cool.shade80;
-  @override
-  Color get hover => primitives.cool.shade90;
-  @override
-  Color get selected => primitives.cool.shade90;
-  @override
-  Color get disabled => primitives.cool.shade20;
-  @override
-  Color get pure => primitives.pure.shade0;
-  @override
-  Color get primaryMain => primitives.blue.shade80;
+  Color get blue => primitives.blue.shade80;
   @override
-  Color get primary => primitives.blue.shade70;
+  Color get green => primitives.green.shade60;
   @override
-  Color get secondary => primitives.yellow.shade70;
+  Color get orange => primitives.orange.shade50;
   @override
-  Color get positive => primitives.green.shade70;
+  Color get pink => primitives.pink.shade80;
   @override
-  Color get warning => primitives.orange.shade70;
+  Color get purple => primitives.purple.shade80;
   @override
-  Color get negative => primitives.red.shade70;
+  Color get teal => primitives.teal.shade80;
   @override
-  Color get info => primitives.purple.shade70;
+  Color get yellow => primitives.yellow.shade50;
 }
 
-/// Implementation of ZetaSemanticSurfaceColors
-final class ZetaSemanticSurfaceColorsAAA implements ZetaSemanticSurfaceColors {
-  /// Constructor for ZetaSemanticSurfaceColorsAAA
-  const ZetaSemanticSurfaceColorsAAA({required this.primitives});
+/// Implementation of ZetaSemanticColors
+final class ZetaSemanticColorsAAA implements ZetaSemanticColors {
+  /// Constructor for ZetaSemanticColorsAAA
+  const ZetaSemanticColorsAAA({required this.primitives});
 
   /// The primitives for this sizes
   @override
   final ZetaPrimitives primitives;
+
+  /// Border
   @override
-  Color get defaultColor => primitives.pure.shade0;
-  @override
-  Color get defaultInverse => primitives.pure.shade1000;
-  @override
-  Color get hover => primitives.cool.shade20;
-  @override
-  Color get selected => primitives.blue.shade10;
+  ZetaSemanticBorderColors get border => ZetaSemanticBorderColorsAAA(primitives: primitives);
+
+  /// Main
   @override
-  Color get selectedHover => primitives.blue.shade20;
+  ZetaSemanticMainColors get main => ZetaSemanticMainColorsAAA(primitives: primitives);
+
+  /// State
   @override
-  Color get disabled => primitives.cool.shade30;
+  ZetaSemanticStateColors get state => ZetaSemanticStateColorsAAA(primitives: primitives);
+
+  /// Surface
   @override
-  Color get cool => primitives.cool.shade10;
+  ZetaSemanticSurfaceColors get surface => ZetaSemanticSurfaceColorsAAA(primitives: primitives);
+}
+
+/// Implementation of ZetaSemanticBorderColors
+final class ZetaSemanticBorderColorsAAA implements ZetaSemanticBorderColors {
+  /// Constructor for ZetaSemanticBorderColorsAAA
+  const ZetaSemanticBorderColorsAAA({required this.primitives});
+
+  /// The primitives for this sizes
   @override
-  Color get warm => primitives.warm.shade10;
+  final ZetaPrimitives primitives;
   @override
-  Color get primary => primitives.blue.shade80;
+  Color get defaultColor => primitives.cool.shade100;
   @override
-  Color get primarySubtle => primitives.blue.shade10;
+  Color get disabled => primitives.cool.shade20;
   @override
-  Color get secondary => primitives.yellow.shade80;
-
-  /// Avatar
+  Color get hover => primitives.cool.shade90;
   @override
-  ZetaSemanticAvatarColors get avatar => ZetaSemanticAvatarColorsAAA(primitives: primitives);
+  Color get info => primitives.purple.shade70;
   @override
-  Color get secondarySubtle => primitives.yellow.shade10;
+  Color get negative => primitives.red.shade70;
   @override
-  Color get positive => primitives.green.shade80;
+  Color get positive => primitives.green.shade70;
   @override
-  Color get positiveSubtle => primitives.green.shade10;
+  Color get primary => primitives.blue.shade70;
   @override
-  Color get warning => primitives.orange.shade80;
+  Color get primaryMain => primitives.blue.shade80;
   @override
-  Color get warningSubtle => primitives.orange.shade10;
+  Color get pure => primitives.pure.shade0;
   @override
-  Color get negative => primitives.red.shade80;
+  Color get secondary => primitives.yellow.shade70;
   @override
-  Color get negativeSubtle => primitives.red.shade10;
+  Color get selected => primitives.cool.shade90;
   @override
-  Color get info => primitives.purple.shade80;
+  Color get subtle => primitives.cool.shade80;
   @override
-  Color get infoSubtle => primitives.purple.shade10;
+  Color get warning => primitives.orange.shade70;
 }
 
-/// Implementation of ZetaSemanticAvatarColors
-final class ZetaSemanticAvatarColorsAAA implements ZetaSemanticAvatarColors {
-  /// Constructor for ZetaSemanticAvatarColorsAAA
-  const ZetaSemanticAvatarColorsAAA({required this.primitives});
+/// Implementation of ZetaSemanticMainColors
+final class ZetaSemanticMainColorsAAA implements ZetaSemanticMainColors {
+  /// Constructor for ZetaSemanticMainColorsAAA
+  const ZetaSemanticMainColorsAAA({required this.primitives});
 
   /// The primitives for this sizes
   @override
   final ZetaPrimitives primitives;
   @override
-  Color get blue => primitives.blue.shade80;
+  Color get defaultColor => primitives.cool.shade100;
   @override
-  Color get green => primitives.green.shade60;
+  Color get disabled => primitives.cool.shade60;
   @override
-  Color get orange => primitives.orange.shade50;
+  Color get info => primitives.purple.shade80;
   @override
-  Color get pink => primitives.pink.shade80;
+  Color get inverse => primitives.pure.shade0;
   @override
-  Color get purple => primitives.purple.shade80;
+  Color get light => primitives.pure.shade0;
   @override
-  Color get teal => primitives.teal.shade80;
+  Color get negative => primitives.red.shade80;
   @override
-  Color get yellow => primitives.yellow.shade50;
+  Color get positive => primitives.green.shade80;
+  @override
+  Color get primary => primitives.blue.shade80;
+  @override
+  Color get secondary => primitives.yellow.shade80;
+  @override
+  Color get subtle => primitives.cool.shade90;
+  @override
+  Color get warning => primitives.orange.shade80;
 }
 
 /// Implementation of ZetaSemanticStateColors
@@ -978,49 +900,55 @@ final class ZetaSemanticStateColorsAAA implements ZetaSemanticStateColors {
   @override
   final ZetaPrimitives primitives;
 
-  /// Disabled
+  ///  Inverse
   @override
-  ZetaSemanticDisabledColors get disabled => ZetaSemanticDisabledColorsAAA(primitives: primitives);
+  ZetaSemanticInverseColors get inverse => ZetaSemanticInverseColorsAAA(primitives: primitives);
 
   /// Default
   @override
   ZetaSemanticDefaultColors get defaultColor => ZetaSemanticDefaultColorsAAA(primitives: primitives);
 
-  /// Primary
-  @override
-  ZetaSemanticPrimaryColors get primary => ZetaSemanticPrimaryColorsAAA(primitives: primitives);
-
-  /// Secondary
+  /// Disabled
   @override
-  ZetaSemanticSecondaryColors get secondary => ZetaSemanticSecondaryColorsAAA(primitives: primitives);
+  ZetaSemanticDisabledColors get disabled => ZetaSemanticDisabledColorsAAA(primitives: primitives);
 
-  /// Positive
+  /// Info
   @override
-  ZetaSemanticPositiveColors get positive => ZetaSemanticPositiveColorsAAA(primitives: primitives);
+  ZetaSemanticInfoColors get info => ZetaSemanticInfoColorsAAA(primitives: primitives);
 
   /// Negative
   @override
   ZetaSemanticNegativeColors get negative => ZetaSemanticNegativeColorsAAA(primitives: primitives);
 
-  /// Info
+  /// Positive
   @override
-  ZetaSemanticInfoColors get info => ZetaSemanticInfoColorsAAA(primitives: primitives);
+  ZetaSemanticPositiveColors get positive => ZetaSemanticPositiveColorsAAA(primitives: primitives);
 
-  ///  Inverse
+  /// Primary
   @override
-  ZetaSemanticInverseColors get inverse => ZetaSemanticInverseColorsAAA(primitives: primitives);
+  ZetaSemanticPrimaryColors get primary => ZetaSemanticPrimaryColorsAAA(primitives: primitives);
+
+  /// Secondary
+  @override
+  ZetaSemanticSecondaryColors get secondary => ZetaSemanticSecondaryColorsAAA(primitives: primitives);
 }
 
-/// Implementation of ZetaSemanticDisabledColors
-final class ZetaSemanticDisabledColorsAAA implements ZetaSemanticDisabledColors {
-  /// Constructor for ZetaSemanticDisabledColorsAAA
-  const ZetaSemanticDisabledColorsAAA({required this.primitives});
+/// Implementation of ZetaSemanticInverseColors
+final class ZetaSemanticInverseColorsAAA implements ZetaSemanticInverseColors {
+  /// Constructor for ZetaSemanticInverseColorsAAA
+  const ZetaSemanticInverseColorsAAA({required this.primitives});
 
   /// The primitives for this sizes
   @override
   final ZetaPrimitives primitives;
   @override
-  Color get disabled => primitives.cool.shade30;
+  Color get enabled => primitives.pure.shade1000;
+  @override
+  Color get focus => primitives.pure.shade1000;
+  @override
+  Color get hover => primitives.cool.shade90;
+  @override
+  Color get selected => primitives.pure.shade1000;
 }
 
 /// Implementation of ZetaSemanticDefaultColors
@@ -1034,47 +962,59 @@ final class ZetaSemanticDefaultColorsAAA implements ZetaSemanticDefaultColors {
   @override
   Color get enabled => primitives.pure.shade0;
   @override
+  Color get focus => primitives.pure.shade0;
+  @override
   Color get hover => primitives.cool.shade20;
   @override
   Color get selected => primitives.blue.shade10;
+}
+
+/// Implementation of ZetaSemanticDisabledColors
+final class ZetaSemanticDisabledColorsAAA implements ZetaSemanticDisabledColors {
+  /// Constructor for ZetaSemanticDisabledColorsAAA
+  const ZetaSemanticDisabledColorsAAA({required this.primitives});
+
+  /// The primitives for this sizes
   @override
-  Color get focus => primitives.pure.shade0;
+  final ZetaPrimitives primitives;
+  @override
+  Color get disabled => primitives.cool.shade30;
 }
 
-/// Implementation of ZetaSemanticPrimaryColors
-final class ZetaSemanticPrimaryColorsAAA implements ZetaSemanticPrimaryColors {
-  /// Constructor for ZetaSemanticPrimaryColorsAAA
-  const ZetaSemanticPrimaryColorsAAA({required this.primitives});
+/// Implementation of ZetaSemanticInfoColors
+final class ZetaSemanticInfoColorsAAA implements ZetaSemanticInfoColors {
+  /// Constructor for ZetaSemanticInfoColorsAAA
+  const ZetaSemanticInfoColorsAAA({required this.primitives});
 
   /// The primitives for this sizes
   @override
   final ZetaPrimitives primitives;
   @override
-  Color get enabled => primitives.blue.shade80;
+  Color get enabled => primitives.purple.shade80;
   @override
-  Color get hover => primitives.blue.shade70;
+  Color get focus => primitives.purple.shade80;
   @override
-  Color get selected => primitives.blue.shade90;
+  Color get hover => primitives.purple.shade70;
   @override
-  Color get focus => primitives.blue.shade80;
+  Color get selected => primitives.purple.shade90;
 }
 
-/// Implementation of ZetaSemanticSecondaryColors
-final class ZetaSemanticSecondaryColorsAAA implements ZetaSemanticSecondaryColors {
-  /// Constructor for ZetaSemanticSecondaryColorsAAA
-  const ZetaSemanticSecondaryColorsAAA({required this.primitives});
+/// Implementation of ZetaSemanticNegativeColors
+final class ZetaSemanticNegativeColorsAAA implements ZetaSemanticNegativeColors {
+  /// Constructor for ZetaSemanticNegativeColorsAAA
+  const ZetaSemanticNegativeColorsAAA({required this.primitives});
 
   /// The primitives for this sizes
   @override
   final ZetaPrimitives primitives;
   @override
-  Color get enabled => primitives.yellow.shade80;
+  Color get enabled => primitives.red.shade80;
   @override
-  Color get hover => primitives.yellow.shade70;
+  Color get focus => primitives.red.shade80;
   @override
-  Color get selected => primitives.yellow.shade90;
+  Color get hover => primitives.red.shade70;
   @override
-  Color get focus => primitives.yellow.shade80;
+  Color get selected => primitives.red.shade90;
 }
 
 /// Implementation of ZetaSemanticPositiveColors
@@ -1088,65 +1028,125 @@ final class ZetaSemanticPositiveColorsAAA implements ZetaSemanticPositiveColors
   @override
   Color get enabled => primitives.green.shade80;
   @override
+  Color get focus => primitives.green.shade80;
+  @override
   Color get hover => primitives.green.shade70;
   @override
   Color get selected => primitives.green.shade90;
+}
+
+/// Implementation of ZetaSemanticPrimaryColors
+final class ZetaSemanticPrimaryColorsAAA implements ZetaSemanticPrimaryColors {
+  /// Constructor for ZetaSemanticPrimaryColorsAAA
+  const ZetaSemanticPrimaryColorsAAA({required this.primitives});
+
+  /// The primitives for this sizes
   @override
-  Color get focus => primitives.green.shade80;
+  final ZetaPrimitives primitives;
+  @override
+  Color get enabled => primitives.blue.shade80;
+  @override
+  Color get focus => primitives.blue.shade80;
+  @override
+  Color get hover => primitives.blue.shade70;
+  @override
+  Color get selected => primitives.blue.shade90;
 }
 
-/// Implementation of ZetaSemanticNegativeColors
-final class ZetaSemanticNegativeColorsAAA implements ZetaSemanticNegativeColors {
-  /// Constructor for ZetaSemanticNegativeColorsAAA
-  const ZetaSemanticNegativeColorsAAA({required this.primitives});
+/// Implementation of ZetaSemanticSecondaryColors
+final class ZetaSemanticSecondaryColorsAAA implements ZetaSemanticSecondaryColors {
+  /// Constructor for ZetaSemanticSecondaryColorsAAA
+  const ZetaSemanticSecondaryColorsAAA({required this.primitives});
 
   /// The primitives for this sizes
   @override
   final ZetaPrimitives primitives;
   @override
-  Color get enabled => primitives.red.shade80;
+  Color get enabled => primitives.yellow.shade80;
   @override
-  Color get hover => primitives.red.shade70;
+  Color get focus => primitives.yellow.shade80;
   @override
-  Color get selected => primitives.red.shade90;
+  Color get hover => primitives.yellow.shade70;
   @override
-  Color get focus => primitives.red.shade80;
+  Color get selected => primitives.yellow.shade90;
 }
 
-/// Implementation of ZetaSemanticInfoColors
-final class ZetaSemanticInfoColorsAAA implements ZetaSemanticInfoColors {
-  /// Constructor for ZetaSemanticInfoColorsAAA
-  const ZetaSemanticInfoColorsAAA({required this.primitives});
+/// Implementation of ZetaSemanticSurfaceColors
+final class ZetaSemanticSurfaceColorsAAA implements ZetaSemanticSurfaceColors {
+  /// Constructor for ZetaSemanticSurfaceColorsAAA
+  const ZetaSemanticSurfaceColorsAAA({required this.primitives});
 
   /// The primitives for this sizes
   @override
   final ZetaPrimitives primitives;
+
+  /// Avatar
   @override
-  Color get enabled => primitives.purple.shade80;
+  ZetaSemanticAvatarColors get avatar => ZetaSemanticAvatarColorsAAA(primitives: primitives);
   @override
-  Color get hover => primitives.purple.shade70;
+  Color get cool => primitives.cool.shade10;
   @override
-  Color get selected => primitives.purple.shade90;
+  Color get defaultColor => primitives.pure.shade0;
   @override
-  Color get focus => primitives.purple.shade80;
+  Color get defaultInverse => primitives.pure.shade1000;
+  @override
+  Color get disabled => primitives.cool.shade30;
+  @override
+  Color get hover => primitives.cool.shade20;
+  @override
+  Color get info => primitives.purple.shade80;
+  @override
+  Color get infoSubtle => primitives.purple.shade10;
+  @override
+  Color get negative => primitives.red.shade80;
+  @override
+  Color get negativeSubtle => primitives.red.shade10;
+  @override
+  Color get positive => primitives.green.shade80;
+  @override
+  Color get positiveSubtle => primitives.green.shade10;
+  @override
+  Color get primary => primitives.blue.shade80;
+  @override
+  Color get primarySubtle => primitives.blue.shade10;
+  @override
+  Color get secondary => primitives.yellow.shade80;
+  @override
+  Color get secondarySubtle => primitives.yellow.shade10;
+  @override
+  Color get selected => primitives.blue.shade10;
+  @override
+  Color get selectedHover => primitives.blue.shade20;
+  @override
+  Color get warm => primitives.warm.shade10;
+  @override
+  Color get warning => primitives.orange.shade80;
+  @override
+  Color get warningSubtle => primitives.orange.shade10;
 }
 
-/// Implementation of ZetaSemanticInverseColors
-final class ZetaSemanticInverseColorsAAA implements ZetaSemanticInverseColors {
-  /// Constructor for ZetaSemanticInverseColorsAAA
-  const ZetaSemanticInverseColorsAAA({required this.primitives});
+/// Implementation of ZetaSemanticAvatarColors
+final class ZetaSemanticAvatarColorsAAA implements ZetaSemanticAvatarColors {
+  /// Constructor for ZetaSemanticAvatarColorsAAA
+  const ZetaSemanticAvatarColorsAAA({required this.primitives});
 
   /// The primitives for this sizes
   @override
   final ZetaPrimitives primitives;
   @override
-  Color get enabled => primitives.pure.shade1000;
+  Color get blue => primitives.blue.shade80;
   @override
-  Color get hover => primitives.cool.shade90;
+  Color get green => primitives.green.shade60;
   @override
-  Color get selected => primitives.pure.shade1000;
+  Color get orange => primitives.orange.shade50;
   @override
-  Color get focus => primitives.pure.shade1000;
+  Color get pink => primitives.pink.shade80;
+  @override
+  Color get purple => primitives.purple.shade80;
+  @override
+  Color get teal => primitives.teal.shade80;
+  @override
+  Color get yellow => primitives.yellow.shade50;
 }
 
 /// The semantic sizes for AA