diff --git a/dots/.config/kitty/kitty.conf.nix b/dots/.config/kitty/kitty.conf.nix
index d4d0c36..c59f1df 100644
--- a/dots/.config/kitty/kitty.conf.nix
+++ b/dots/.config/kitty/kitty.conf.nix
@@ -92,8 +92,8 @@ in {
       color12 ${colors.blue}
 
       # magenta
-      color5  ${colors.pink}
-      color13 ${colors.pink}
+      color5  ${colors.mauve}
+      color13 ${colors.mauve}
 
       # cyan
       color6  ${colors.teal}
diff --git a/dots/.config/waybar/style.css.nix b/dots/.config/waybar/style.css.nix
index 275a21c..be75ea0 100644
--- a/dots/.config/waybar/style.css.nix
+++ b/dots/.config/waybar/style.css.nix
@@ -7,6 +7,7 @@
   cfg = config.horseman.dots.waybar;
   username = config.horseman.username;
   colors = config.horseman.catppuccin.colors;
+  accent = config.horseman.catppuccin.accent;
 in {
   options = {
     horseman.dots.waybar = {
@@ -25,7 +26,7 @@ in {
       }
 
       .modules-left, .modules-center, .modules-right {
-        border: 2px solid ${colors.lavender};
+        border: 2px solid ${colors.${accent}};
         border-radius: 10px;
         margin: 5px;
         background: ${colors.base};
@@ -39,7 +40,7 @@ in {
         color: ${colors.red};
       }
       #power * {
-        color: ${colors.lavender};
+        color: ${colors.${accent}};
         transition: 0.2s color ease;
         font-size: 26px;
       }
@@ -50,15 +51,19 @@ in {
       #workspaces .empty {
         color: ${colors.surface0};
       }
-      #workspaces * {
-        color: inherit;
-        padding: 0px 2px;
-        margin: 0px;
-      }
       #workspaces .active {
         color: ${colors.red};
         font-size: 18px;
       }
+      #workspaces * {
+        padding: 0px 2px;
+        margin: 0px;
+        border: 0px solid black;
+      }
+
+      #workspaces > * {
+        color: ${colors.${accent}};
+      }
 
 
       #clock {
diff --git a/dots/.config/wofi/style.css.nix b/dots/.config/wofi/style.css.nix
index 89a005f..b47e2dd 100644
--- a/dots/.config/wofi/style.css.nix
+++ b/dots/.config/wofi/style.css.nix
@@ -7,6 +7,7 @@
   cfg = config.horseman.dots.wofi;
   username = config.horseman.username;
   colors = config.horseman.catppuccin.colors;
+  accent = config.horseman.catppuccin.accent;
 in {
   options = {
     horseman.dots.wofi = {
@@ -25,7 +26,7 @@ in {
       window {
         margin: 0px;
         padding: 10px;
-        border: 3px solid ${colors.lavender};
+        border: 3px solid ${colors.${accent}};
         border-radius: 10px;
         background-color: ${builtins.replaceStrings ["rgb" ")"] ["rgba" ", 0.99)"] colors.base-rgb};
         /* animation: slideIn 0.5s ease-in-out both; */
@@ -82,7 +83,7 @@ in {
       #input {
         margin: 5px 20px;
         padding: 10px;
-        border: 2px solid ${colors.lavender};
+        border: 2px solid ${colors.${accent}};
         border-radius: 10px;
         color: ${colors.text};
         background-color: ${colors.base};
@@ -112,7 +113,7 @@ in {
 
       #entry arrow {
         border: none;
-        color: ${colors.lavender};
+        color: ${colors.${accent}};
       }
 
       /* Selected Entry */
@@ -122,7 +123,7 @@ in {
       }
 
       #entry:selected {
-        border: 1px solid ${colors.lavender};
+        border: 1px solid ${colors.${accent}};
         border-radius: 10px;
       }
 
@@ -131,7 +132,7 @@ in {
       }
 
       #entry:drop(active) {
-        background-color: ${colors.lavender}!important;
+        background-color: ${colors.${accent}}!important;
       }
     '';
   };
diff --git a/modules/catppuccin/default.nix b/modules/catppuccin/default.nix
index 7f0b3e9..05d2633 100644
--- a/modules/catppuccin/default.nix
+++ b/modules/catppuccin/default.nix
@@ -337,6 +337,39 @@ in {
         default = "mocha";
       };
 
+      accent = mkOption {
+        type = types.enum [
+          "rosewater"
+          "flamingo"
+          "pink"
+          "mauve"
+          "red"
+          "maroon"
+          "peach"
+          "yellow"
+          "green"
+          "teal"
+          "sky"
+          "sapphire"
+          "blue"
+          "lavender"
+          "text"
+          "subtext1"
+          "subtext0"
+          "overlay2"
+          "overlay1"
+          "overlay0"
+          "surface2"
+          "surface1"
+          "surface0"
+          "base"
+          "mantle"
+          "crust"
+        ];
+
+        default = "lavender";
+      };
+
       colors = mkOption {
         type = types.attrsOf types.anything;
         readOnly = true;
diff --git a/modules/wm/hyprland/default.nix b/modules/wm/hyprland/default.nix
index 4f4da46..536f736 100644
--- a/modules/wm/hyprland/default.nix
+++ b/modules/wm/hyprland/default.nix
@@ -9,6 +9,7 @@
 
   cfg = config.horseman.wm.hyprland;
   colors = config.horseman.catppuccin.colors;
+  accent = config.horseman.catppuccin.accent;
 in {
   imports = [
     ./options.nix
@@ -82,8 +83,8 @@ in {
         resizeOnBorder = true;
         allowTearing = false;
 
-        col.activeBorder = replaceStrings [" "] [""] colors.lavender-rgb;
-        col.inactiveBorder = replaceStrings [" " ")" "rgb"] ["" ",0.25)" "rgba"] colors.lavender-rgb; # Make transparent
+        col.activeBorder = replaceStrings [" "] [""] colors."${accent}-rgb";
+        col.inactiveBorder = replaceStrings [" " ")" "rgb"] ["" ",0.25)" "rgba"] colors."${accent}-rgb"; # Make transparent
 
         layout = "dwindle";
       };