diff --git a/system/Vanguard.nix b/system/Vanguard.nix
index e25e7758..73caca2f 100644
--- a/system/Vanguard.nix
+++ b/system/Vanguard.nix
@@ -35,7 +35,7 @@
     blender
     freecad
     openscad
-    kicad-small
+    openscad-lsp
     wineWowPackages.waylandFull
     winetricks
     lutris
diff --git a/system/default.nix b/system/default.nix
index 40ea5567..61e0e8a5 100644
--- a/system/default.nix
+++ b/system/default.nix
@@ -108,18 +108,18 @@
       fonts.fontconfig = {
         enable = true;
         defaultFonts =
-          with config.stylix.fonts;
           let
+            inherit (config.stylix) fonts;
             symbols = [
-              emoji.name
+              fonts.emoji.name
               "Symbols Nerd Font"
             ];
           in
           {
             emoji = symbols;
-            monospace = [ monospace.name ] ++ symbols;
-            sansSerif = [ sansSerif.name ] ++ symbols;
-            serif = [ serif.name ] ++ symbols;
+            monospace = [ fonts.monospace.name ] ++ symbols;
+            sansSerif = [ fonts.sansSerif.name ] ++ symbols;
+            serif = [ fonts.serif.name ] ++ symbols;
           };
       };
     };
@@ -203,7 +203,7 @@
     enable = true;
     image = ./wallpapers/default.png;
     base16Scheme = lib.mkDefault ./themes/catppuccin-macchiato.yaml;
-    polarity = config.lib.stylix.scheme.variant;
+    polarity = config.lib.stylix.colors.variant;
     opacity = {
       applications = 1.0;
       terminal = 0.8125; # 0x0.D
diff --git a/system/desktop.nix b/system/desktop.nix
index 22574f6b..f6a871e1 100644
--- a/system/desktop.nix
+++ b/system/desktop.nix
@@ -82,7 +82,7 @@
   qt = {
     enable = true;
     platformTheme = "gnome";
-    style = if config.lib.stylix.scheme.variant == "light" then "adwaita" else "adwaita-dark";
+    style = if config.lib.stylix.colors.variant == "light" then "adwaita" else "adwaita-dark";
   };
   services = {
     xserver.xkb.layout = "gb";
@@ -163,10 +163,10 @@
         gtk2.configLocation = "${config.xdg.configHome}/gtk-2.0/gtkrc";
         iconTheme = {
           package = (pkgs.papirus-icon-theme.override { color = "violet"; });
-          name = if config.lib.stylix.scheme.variant == "light" then "Papirus-Light" else "Papirus-Dark";
+          name = if config.lib.stylix.colors.variant == "light" then "Papirus-Light" else "Papirus-Dark";
         };
       };
-      stylix.targets.gtk.extraCss = with config.lib.stylix.scheme.withHashtag; ''
+      stylix.targets.gtk.extraCss = with config.lib.stylix.colors.withHashtag; ''
         @define-color accent_color ${base0E-hex};
         @define-color accent_bg_color ${base0E-hex};
       '';
@@ -197,18 +197,22 @@
           "gtk-4.0/gtk.css".force = true;
           "gtk-4.0/settings.ini".force = true;
           # Set Swappy config so that it saves to Screenshots directory
-          "swappy/config".text = ''
-            [Default]
-            save_dir=${config.xdg.userDirs.pictures}/Screenshots/
-            save_filename_format=swappy-%Y%m%d-%H%M%S.png
-            show_panel=false
-            line_size=5
-            text_size=${toString config.stylix.fonts.sizes.desktop}
-            text_font=${config.stylix.fonts.sansSerif.name}
-            paint_mode=brush
-            early_exit=false
-            fill_shape=false
-          '';
+          "swappy/config".text =
+            let
+              inherit (config.stylix) fonts;
+            in
+            ''
+              [Default]
+              save_dir=${config.xdg.userDirs.pictures}/Screenshots/
+              save_filename_format=swappy-%Y%m%d-%H%M%S.png
+              show_panel=false
+              line_size=5
+              text_size=${toString fonts.sizes.desktop}
+              text_font=${fonts.sansSerif.name}
+              paint_mode=brush
+              early_exit=false
+              fill_shape=false
+            '';
           # Matplotlib default figure sizes and font settings
           "matplotlib/matplotlibrc".text =
             let
@@ -227,7 +231,7 @@
           # WhatsApp config
           "whatsapp-for-linux/settings.conf" =
             let
-              inherit (config.lib.stylix.scheme) variant;
+              inherit (config.lib.stylix.colors) variant;
             in
             {
               force = true;
diff --git a/system/home/avizo.nix b/system/home/avizo.nix
index dc964f8f..c125ff74 100644
--- a/system/home/avizo.nix
+++ b/system/home/avizo.nix
@@ -6,9 +6,9 @@
       image-opacity = lib.mkForce "1.0";
       border-color =
         let
-          scheme = config.lib.stylix.scheme;
+          inherit (config.lib.stylix) colors;
         in
-        lib.mkForce "rgba(${scheme.base0E-rgb-r}, ${scheme.base0E-rgb-g}, ${scheme.base0E-rgb-b}, 1.0)";
+        lib.mkForce "rgba(${colors.base0E-rgb-r}, ${colors.base0E-rgb-g}, ${colors.base0E-rgb-b}, 1.0)";
     };
   };
 }
diff --git a/system/home/browser/nyxt.nix b/system/home/browser/nyxt.nix
index ddc391a9..bf3feff5 100644
--- a/system/home/browser/nyxt.nix
+++ b/system/home/browser/nyxt.nix
@@ -5,45 +5,43 @@
     configFile = {
       "nyxt/config.lisp".text =
         let
-          inherit (config.lib.stylix.scheme) variant;
-          fonts = config.stylix.fonts;
-          scheme = config.lib.stylix.scheme.withHashtag;
-          accent = scheme.base0E;
+          inherit (config.lib.stylix) colors;
+          inherit (config.stylix) fonts;
         in
         ''
           ;; Import custom configuration
           (nyxt::load-lisp "${./config.lisp}")
           ;; Set theme variant from GTK_THEME if available
-          (setf (uiop/os:getenv "GTK_THEME") "Adwaita:${variant}")
+          (setf (uiop/os:getenv "GTK_THEME") "Adwaita:${colors.variant}")
           ;; Define custom theme
           (define-configuration browser
             ((theme (make-instance 'theme:theme
                                    :font-family "${fonts.sansSerif.name}"
                                    :monospace-font-family "${fonts.monospace.name}"
-                                   :text-color "${scheme.base05}"
-                                   :contrast-text-color "${scheme.base01}"
-                                   :background-color "${scheme.base00}"
-                                   :primary-color "${scheme.base04}"
-                                   :secondary-color "${scheme.base03}"
-                                   :tertiary-color "${scheme.base02}"
-                                   :quaternary-color "${scheme.base02}"
-                                   :accent-color "${accent}"
-                                   :action-color "${scheme.cyan}"
-                                   :success-color "${scheme.green}"
-                                   :warning-color "${scheme.yellow}"
-                                   :highlight-color "${scheme.base04}"
-                                   :codeblock-color "${scheme.base01}"
-                                   :on-background-color "${scheme.base05}"
-                                   :on-primary-color "${scheme.base00}"
-                                   :on-secondary-color "${scheme.base01}"
-                                   :on-tertiary-color "${scheme.base04}"
-                                   :on-quaternary-color "${scheme.base04}"
-                                   :on-accent-color "${scheme.base01}"
-                                   :on-action-color "${scheme.base01}"
-                                   :on-success-color "${scheme.base01}"
-                                   :on-warning-color "${scheme.base01}"
-                                   :on-highlight-color "${scheme.base01}"
-                                   :on-codeblock-color "${scheme.base05}"
+                                   :text-color "${colors.withHashtag.base05}"
+                                   :contrast-text-color "${colors.withHashtag.base01}"
+                                   :background-color "${colors.withHashtag.base00}"
+                                   :primary-color "${colors.withHashtag.base04}"
+                                   :secondary-color "${colors.withHashtag.base03}"
+                                   :tertiary-color "${colors.withHashtag.base02}"
+                                   :quaternary-color "${colors.withHashtag.base02}"
+                                   :accent-color "${colors.withHashtag.magenta}"
+                                   :action-color "${colors.withHashtag.cyan}"
+                                   :success-color "${colors.withHashtag.green}"
+                                   :warning-color "${colors.withHashtag.yellow}"
+                                   :highlight-color "${colors.withHashtag.base04}"
+                                   :codeblock-color "${colors.withHashtag.base01}"
+                                   :on-background-color "${colors.withHashtag.base05}"
+                                   :on-primary-color "${colors.withHashtag.base00}"
+                                   :on-secondary-color "${colors.withHashtag.base01}"
+                                   :on-tertiary-color "${colors.withHashtag.base04}"
+                                   :on-quaternary-color "${colors.withHashtag.base04}"
+                                   :on-accent-color "${colors.withHashtag.base01}"
+                                   :on-action-color "${colors.withHashtag.base01}"
+                                   :on-success-color "${colors.withHashtag.base01}"
+                                   :on-warning-color "${colors.withHashtag.base01}"
+                                   :on-highlight-color "${colors.withHashtag.base01}"
+                                   :on-codeblock-color "${colors.withHashtag.base05}"
                                    ))))
         '';
     };
diff --git a/system/home/fuzzel.nix b/system/home/fuzzel.nix
index 4569216f..b01b0e6e 100644
--- a/system/home/fuzzel.nix
+++ b/system/home/fuzzel.nix
@@ -18,7 +18,7 @@
         width = 2;
         radius = 10;
       };
-      colors.border = lib.mkForce "${config.lib.stylix.scheme.base0E}ff";
+      colors.border = lib.mkForce "${config.lib.stylix.colors.magenta}ff";
     };
   };
 }
diff --git a/system/home/hyprland.nix b/system/home/hyprland.nix
index 275875f7..3911f00b 100644
--- a/system/home/hyprland.nix
+++ b/system/home/hyprland.nix
@@ -57,8 +57,8 @@
     waybar.systemd.target = "hyprland-session.target";
     hyprlock =
       let
-        scheme = config.lib.stylix.scheme;
-        accent = scheme.base0E;
+        inherit (config.lib.stylix) colors;
+        accent = colors.magenta;
       in
       {
         enable = true;
@@ -81,7 +81,7 @@
             {
               monitor = "";
               size = "395, 185";
-              color = "0xff${scheme.base00}";
+              color = "0xff${colors.base00}";
               rounding = 10;
               border_size = 2;
               border_color = "0xff${accent}";
@@ -98,7 +98,7 @@
               {
                 monitor = "";
                 text = "cmd[update:30000] echo \"$(date +\"%R\")\"";
-                color = "0xff${scheme.base05}";
+                color = "0xff${colors.base05}";
                 font_size = 90;
                 font_family = font;
                 position = "-30, 0";
@@ -108,7 +108,7 @@
               {
                 monitor = "";
                 text = "cmd[update:43200000] echo \"$(date +\"%F\")\"";
-                color = "0xff${scheme.base05}";
+                color = "0xff${colors.base05}";
                 font_size = 25;
                 font_family = font;
                 position = "-40, -150";
@@ -136,12 +136,12 @@
               dots_spacing = 0.2; # Scale of dots' absolute size, 0.0 - 1.0
               dots_center = true;
               outer_color = "0xff${accent}";
-              inner_color = "0xff${scheme.base00}";
-              font_color = "0xff${scheme.base05}";
+              inner_color = "0xff${colors.base00}";
+              font_color = "0xff${colors.base05}";
               fade_on_empty = false;
               placeholder_text = "󰌾  Logged in as <span foreground=\"##${accent}\">$USER</span>";
-              check_color = "0xff${scheme.blue}";
-              fail_color = "0xff${scheme.red}";
+              check_color = "0xff${colors.blue}";
+              fail_color = "0xff${colors.red}";
               fail_text = "<i>$FAIL <b>($ATTEMPTS)</b></i>";
               hide_input = false;
               position = "0, -50";
@@ -171,7 +171,7 @@
         layout = "master";
         gaps_in = 3;
         gaps_out = 5;
-        "col.active_border" = lib.mkForce "rgb(${config.lib.stylix.scheme.base0E})";
+        "col.active_border" = lib.mkForce "rgb(${config.lib.stylix.colors.base0E})";
       };
       master = {
         allow_small_split = true;
@@ -203,7 +203,7 @@
           range = 4;
           render_power = 3;
           ignore_window = true;
-          color = lib.mkForce "rgba(${config.lib.stylix.scheme.base00}0d)";
+          color = lib.mkForce "rgba(${config.lib.stylix.colors.base00}0d)";
         };
       };
       animations = {
diff --git a/system/home/mako.nix b/system/home/mako.nix
index e3a6be85..bf068b72 100644
--- a/system/home/mako.nix
+++ b/system/home/mako.nix
@@ -12,7 +12,7 @@
     iconPath = with config.gtk.iconTheme; "${package}/share/icons/${name}";
     borderRadius = 10;
     borderSize = 2;
-    borderColor = lib.mkForce config.lib.stylix.scheme.withHashtag.base0E;
+    borderColor = lib.mkForce config.lib.stylix.colors.withHashtag.magenta;
     defaultTimeout = (builtins.mul 5 1000); # 5s timeout
   };
 }
diff --git a/system/home/shell/default.nix b/system/home/shell/default.nix
index 04eb7af5..8b2f54f0 100644
--- a/system/home/shell/default.nix
+++ b/system/home/shell/default.nix
@@ -116,7 +116,7 @@
       settings = rec {
         preset = if light_dark == "light" then "pansexual" else "transgender";
         mode = "rgb";
-        light_dark = config.lib.stylix.scheme.variant;
+        light_dark = config.lib.stylix.colors.variant;
         lightness = 0.4;
         color_align = {
           mode = "horizontal";
diff --git a/system/home/waybar.nix b/system/home/waybar.nix
index fb74bb7e..6261d15b 100644
--- a/system/home/waybar.nix
+++ b/system/home/waybar.nix
@@ -160,14 +160,14 @@
             on-scroll = 1;
             format =
               let
-                scheme = config.lib.stylix.scheme.withHashtag;
+                inherit (config.lib.stylix) colors;
               in
               {
-                months = "<span color='${scheme.red}'><b>{}</b></span>";
-                weeks = "<span color='${scheme.cyan}'><i>W{}</i></span>";
-                weekdays = "<span color='${scheme.orange}'><u>{}</u></span>";
-                days = "<span color='${scheme.base05}'>{}</span>";
-                today = "<span color='${scheme.magenta}'><b><u>{}</u></b></span>";
+                months = "<span color='${colors.withHashtag.red}'><b>{}</b></span>";
+                weeks = "<span color='${colors.withHashtag.cyan}'><i>W{}</i></span>";
+                weekdays = "<span color='${colors.withHashtag.orange}'><u>{}</u></span>";
+                days = "<span color='${colors.withHashtag.base05}'>{}</span>";
+                today = "<span color='${colors.withHashtag.magenta}'><b><u>{}</u></b></span>";
               };
           };
           actions = {
@@ -260,14 +260,14 @@
     };
     style =
       let
-        scheme = config.lib.stylix.scheme.withHashtag;
-        opacity = config.stylix.opacity.desktop;
+        inherit (config.lib.stylix) colors;
+        inherit (config.stylix) fonts opacity;
       in
       ''
         * {
             all: unset;
-            font-family: ${config.stylix.fonts.monospace.name};
-            font-size: ${toString config.stylix.fonts.sizes.desktop}pt;
+            font-family: ${fonts.monospace.name};
+            font-size: ${toString fonts.sizes.desktop}pt;
         }
 
         window {
@@ -277,93 +277,93 @@
         }
 
         window > box {
-            color: ${scheme.base05};
-            background: alpha(${scheme.base00}, ${toString opacity});
+            color: ${colors.withHashtag.base05};
+            background: alpha(${colors.withHashtag.base00}, ${toString opacity.desktop});
             margin: 5px 0px 5px 6px;
             padding: 2px;
-            border: 1px solid ${scheme.base04};
+            border: 1px solid ${colors.withHashtag.base04};
             border-radius: 10px;
         }
 
         tooltip {
-            background: ${scheme.base00};
-            border: 2px solid ${scheme.base0E};
+            background: ${colors.withHashtag.base00};
+            border: 2px solid ${colors.withHashtag.base0E};
             border-radius: 10px;
             box-shadow: none;
             padding: 10px;
         }
 
         tooltip label {
-            color: ${scheme.base05};
+            color: ${colors.withHashtag.base05};
             border: none;
             padding: 5px;
             margin: 0px;
         }
 
         #workspaces {
-            background: ${scheme.base00};
+            background: ${colors.withHashtag.base00};
             border-radius: 5px;
             margin: 3px 2px;
             padding: 2px 3px;
         }
 
         #workspaces button.empty {
-            color: ${scheme.base03};
+            color: ${colors.withHashtag.base03};
         }
         #workspaces button.active {
-            color: ${scheme.base0E};
+            color: ${colors.withHashtag.base0E};
         }
         #workspaces button.urgent {
-            color: ${scheme.base09};
+            color: ${colors.withHashtag.base09};
         }
 
         #mpris.paused {
-            color: ${scheme.base03};
+            color: ${colors.withHashtag.base03};
         }
 
         #custom-notification {
-            color: ${scheme.base08};
+            color: ${colors.withHashtag.base08};
         }
         #pulseaudio.source {
-            color: ${scheme.base09};
+            color: ${colors.withHashtag.base09};
         }
         #pulseaudio.sink {
-            color: ${scheme.base0A};
+            color: ${colors.withHashtag.base0A};
         }
         #network {
-            color: ${scheme.base0B};
+            color: ${colors.withHashtag.base0B};
         }
         #bluetooth {
-            color: ${scheme.base0C};
+            color: ${colors.withHashtag.base0C};
         }
         #custom-calendar-icon,
         #clock.calendar {
-            color: ${scheme.base0D};
+            color: ${colors.withHashtag.base0D};
         }
         #custom-clock-icon,
         #clock {
-            color: ${scheme.base0E};
+            color: ${colors.withHashtag.base0E};
         }
         #backlight {
-            color: ${scheme.base0F};
+            color: ${colors.withHashtag.base0F};
         }
 
         #battery.warning {
-            color: ${scheme.base09};
+            color: ${colors.withHashtag.base09};
         }
         #battery.critical {
-            color: ${scheme.base08};
+            color: ${colors.withHashtag.base08};
         }
         #battery.charging,
         #battery.plugged {
-            color: ${scheme.base0B};
+            color: ${colors.withHashtag.base0B};
         }
 
         #systemd-failed-units.ok {
-            color: ${scheme.base0B}
+            color: ${colors.withHashtag.base0B}
         }
         #systemd-failed-units.degraded {
-            color: ${scheme.base08}
+            color: ${colors.withHashtag.base08}
         }
 
         #custom-weather,
diff --git a/system/home/wlogout.nix b/system/home/wlogout.nix
index 08d1987e..abca7930 100644
--- a/system/home/wlogout.nix
+++ b/system/home/wlogout.nix
@@ -24,8 +24,8 @@
     ];
     style =
       let
-        scheme = config.lib.stylix.scheme;
-        opacity = config.stylix.opacity.popups;
+        inherit (config.lib.stylix) colors;
+        inherit (config.stylix) opacity;
         icons = "${config.programs.wlogout.package}/share/wlogout/icons";
       in
       ''
@@ -35,15 +35,15 @@
         }
 
         window {
-          background-color: rgba(${scheme.base00-rgb-r}, ${scheme.base00-rgb-g}, ${scheme.base00-rgb-b}, ${toString opacity});
+          background-color: rgba(${colors.base00-rgb-r}, ${colors.base00-rgb-g}, ${colors.base00-rgb-b}, ${toString opacity.popups});
         }
 
         button {
           border-radius: 0;
-          border-color: ${scheme.withHashtag.base03};
-          text-decoration-color: ${scheme.withHashtag.base05};
-          color: ${scheme.withHashtag.base05};
-          background-color: ${scheme.withHashtag.base00};
+          border-color: ${colors.withHashtag.base03};
+          text-decoration-color: ${colors.withHashtag.base05};
+          color: ${colors.withHashtag.base05};
+          background-color: ${colors.withHashtag.base00};
           border-style: solid;
           border-width: 1px;
           background-repeat: no-repeat;
@@ -52,9 +52,9 @@
         }
 
         button:focus, button:active, button:hover {
-          text-decoration-color: ${scheme.withHashtag.base00};
-          color: ${scheme.withHashtag.base00};
-          background-color: ${scheme.withHashtag.base0E};
+          text-decoration-color: ${colors.withHashtag.base00};
+          color: ${colors.withHashtag.base00};
+          background-color: ${colors.withHashtag.magenta};
           outline-style: none;
         }