diff --git a/hosts/pinwheel/modules/bemenu/default.nix b/hosts/pinwheel/modules/bemenu/default.nix
index 5f60e04..b5f69bc 100644
--- a/hosts/pinwheel/modules/bemenu/default.nix
+++ b/hosts/pinwheel/modules/bemenu/default.nix
@@ -2,25 +2,19 @@
 let
   hyprlandEnabled = config.mod.hyprland.enable;
 
-  bmr =
-    let
-      foreground = "#f9c22b";
-      foreground-dim = "#a57b06";
-      background = "#262626";
-    in
-      pkgs.writeShellScript "bmr" ''
-      ${pkgs.bemenu}/bin/bemenu-run \
-        --fn 'DejaVuSansM Nerd Font Mono 16' \
-        --hp 10 \
-        --line-height 38 \
-        --cw 12 \
-        --ch 25 \
-        --fixed-height \
-        --ff "${foreground}" --fb "${background}" \
-        --hf "${foreground}" --hb "${background}" \
-        --af "${foreground-dim}" --ab "${background}" \
-        --nf "${foreground-dim}" --nb "${background}" \
-        --prompt ""
+  bmr = pkgs.writeShellScript "bmr" ''
+    ${pkgs.bemenu}/bin/bemenu-run \
+      --fn 'DejaVuSansM Nerd Font Mono 16' \
+      --hp 10 \
+      --line-height 38 \
+      --cw 12 \
+      --ch 25 \
+      --fixed-height \
+      --ff "#${config.lib.colors.foreground}" --fb "#${config.lib.colors.background}" \
+      --hf "#${config.lib.colors.foreground}" --hb "#${config.lib.colors.background}" \
+      --af "#${config.lib.colors.foreground-dim}" --ab "#${config.lib.colors.background}" \
+      --nf "#${config.lib.colors.foreground-dim}" --nb "#${config.lib.colors.background}" \
+      --prompt ""
   '';
 in
 {
diff --git a/hosts/pinwheel/modules/colors/default.nix b/hosts/pinwheel/modules/colors/default.nix
new file mode 100644
index 0000000..208f34c
--- /dev/null
+++ b/hosts/pinwheel/modules/colors/default.nix
@@ -0,0 +1,12 @@
+{
+  lib = {
+    colors = {
+      foreground = "f9c22b";
+      foreground-dim = "a57b06";
+      background = "262626";
+
+      gray = "3a3a3a";
+      warning = "ff6969";
+    };
+  };
+}
diff --git a/hosts/pinwheel/modules/dunst/default.nix b/hosts/pinwheel/modules/dunst/default.nix
index ed76307..1f6e949 100644
--- a/hosts/pinwheel/modules/dunst/default.nix
+++ b/hosts/pinwheel/modules/dunst/default.nix
@@ -1,5 +1,4 @@
-
-{ pkgs, ... }:
+{ pkgs, config, ... }:
 {
   home-manager.users.alex = {
     services.dunst = {
@@ -13,7 +12,7 @@
           offset = "10x50";
           origin = "top-right";
           transparency = 10;
-          frame_color = "#a57b06";
+          frame_color = "#${config.lib.colors.foreground-dim}";
           font = "DejaVuSansM Nerd Font Mono 14";
         };
 
@@ -24,8 +23,8 @@
         };
 
         urgency_normal = {
-          background = "#262626";
-          foreground = "#f9c22b";
+          background = "#${config.lib.colors.background}";
+          foreground = "#${config.lib.colors.foreground}";
           timeout = 10;
         };
 
diff --git a/hosts/pinwheel/modules/hyprland/default.nix b/hosts/pinwheel/modules/hyprland/default.nix
index e7019ea..a3179b5 100644
--- a/hosts/pinwheel/modules/hyprland/default.nix
+++ b/hosts/pinwheel/modules/hyprland/default.nix
@@ -61,10 +61,13 @@ in
           };
 
           general = {
+            layout = "dwindle";
+
             gaps_in = 0;  # gaps between windows
             gaps_out = 0; # gaps between windows and monitor edges
 
-            layout = "dwindle";
+            "col.active_border" = "rgba(${config.lib.colors.foreground}ff)";
+            "col.inactive_border" = "rgba(${config.lib.colors.background}ff)";
           };
 
           dwindle = {
diff --git a/hosts/pinwheel/modules/tmux/default.nix b/hosts/pinwheel/modules/tmux/default.nix
index e31781f..b798902 100644
--- a/hosts/pinwheel/modules/tmux/default.nix
+++ b/hosts/pinwheel/modules/tmux/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, config, ... }:
 {
   home-manager.users.alex = {
     programs.tmux = {
@@ -24,19 +24,18 @@
         set-option -g allow-rename off
 
         # Status line colors
-        set -g status-fg '#f9c22b'
-        set -g status-bg '#303030'
+        set -g status-fg '#${config.lib.colors.foreground}'
+        set -g status-bg '#${config.lib.colors.background}'
 
         # Remove date/time etc. on the right side
         set -g status-right ""
 
         # Status window colors
-        set -g window-status-current-style bg='#3a3a3a',fg='#f9c22b'
-        set -g window-status-current-style bg='#3a3a3a',fg='#f9c22b'
-        set -g window-status-style bg='#303030',fg='#767676'
+        set -g window-status-current-style bg='#${config.lib.colors.background}',fg='#${config.lib.colors.foreground}'
+        set -g window-status-style bg='#${config.lib.colors.background}',fg='#${config.lib.colors.foreground-dim}'
 
-        set -g pane-border-style fg='#3a3a3a'
-        set -g pane-active-border-style fg='#f9c22b'
+        set -g pane-border-style fg='#${config.lib.colors.gray}'
+        set -g pane-active-border-style fg='#${config.lib.colors.foreground}'
 
         bind r source-file ~/.config/tmux/tmux.conf \; display "Config reloaded"
 
diff --git a/hosts/pinwheel/modules/waybar/default.nix b/hosts/pinwheel/modules/waybar/default.nix
index 1c0446e..c38e432 100644
--- a/hosts/pinwheel/modules/waybar/default.nix
+++ b/hosts/pinwheel/modules/waybar/default.nix
@@ -216,21 +216,15 @@ in
         };
       };
 
-      style = let
-        foreground = "#f9c22b";
-        foreground-dim = "#a57b06";
-        background = "#262626";
-        warning = "#FF6969";
-      in
-        ''
+      style = ''
         * {
           font-family: 'DejaVuSansM Nerd Font Mono';
           font-size: 22px;
         }
 
         #workspaces button {
-          color: ${foreground-dim};
-          background-color: ${background};
+          color: #${config.lib.colors.foreground-dim};
+          background-color: #${config.lib.colors.background};
           border: none;
         }
 
@@ -243,25 +237,25 @@ in
         }
 
         #workspaces button.active {
-          color: ${foreground};
-          background-color: ${background};
+          color: #${config.lib.colors.foreground};
+          background-color: #${config.lib.colors.background};
           }
 
         window#waybar {
-          color: ${foreground};
-          background-color: ${background};
+          color: #${config.lib.colors.foreground};
+          background-color: #${config.lib.colors.background};
         }
 
         #wireplumber.muted {
-          color: ${warning};
+          color: #${config.lib.colors.warning};
         }
 
         #custom-mullvad.disconnected {
-          color: ${warning};
+          color: #${config.lib.colors.warning};
         }
 
         #custom-work-vpn-status {
-          color: ${warning};
+          color: #${config.lib.colors.warning};
         }
 
         #clock {