diff --git a/modules/desktop/dunst.nix b/modules/desktop/dunst.nix
index 1231a8b..1c58c82 100644
--- a/modules/desktop/dunst.nix
+++ b/modules/desktop/dunst.nix
@@ -7,7 +7,6 @@
 
 let
   cfg = config.modules.desktop.dunst;
-  c = (import ./themes/_palette.nix).semantic;
 in
 {
   options.modules.desktop.dunst = {
@@ -39,7 +38,7 @@ in
             padding = 20;
             shrink = "no";
             transparency = 5;
-            font = "MesloLGS Nerd Font 12";
+            font = "monospace 14";
             idle_threshold = 120;
             indicate_hidden = "yes";
             markup = "full";
@@ -50,21 +49,21 @@ in
             sticky_history = "yes";
             sort = "yes";
             frame_width = 1;
-            frame_color = c.bgStrong;
+            frame_color = "#1d2021";
           };
           urgency_low = {
-            foreground = c.fg;
-            background = c.bgAlt;
+            foreground = "#ebdbb2";
+            background = "#3c3836";
             timeout = 8;
           };
           urgency_normal = {
-            foreground = c.fg;
-            background = c.bg;
+            foreground = "#ebdbb2";
+            background = "#32302f";
             timeout = 14;
           };
           urgency_critical = {
-            foreground = c.bg;
-            background = c.critical;
+            foreground = "#32302f";
+            background = "#cc241d";
             timeout = 0;
           };
         };
diff --git a/modules/desktop/themes/_palette.nix b/modules/desktop/themes/_palette.nix
deleted file mode 100644
index 6891d0c..0000000
--- a/modules/desktop/themes/_palette.nix
+++ /dev/null
@@ -1,54 +0,0 @@
-let
-  mkHex = value: "#${value}";
-  mkRgb = value: "rgb(${value})";
-
-  base = {
-    bg0Hard = "1d2021";
-    bg0 = "282828";
-    bg0Soft = "32302f";
-    bg1 = "3c3836";
-    bg2 = "504945";
-    bg3 = "665c54";
-
-    fg0 = "fbf1c7";
-    fg1 = "ebdbb2";
-    fg4 = "a89984";
-
-    red = "fb4934";
-    orange = "fe8019";
-    yellow = "fabd2f";
-    green = "b8bb26";
-    aqua = "8ec07c";
-    blue = "83a598";
-    purple = "d3869b";
-  };
-
-  hex = builtins.mapAttrs (_: mkHex) base;
-  rgb = builtins.mapAttrs (_: mkRgb) base;
-in
-{
-  inherit base hex rgb;
-
-  semantic = {
-    bg = hex.bg0;
-    bgAlt = hex.bg1;
-    bgHover = hex.bg3;
-    bgStrong = hex.bg0Hard;
-
-    fg = hex.fg1;
-    fgMuted = hex.fg4;
-
-    accent = hex.orange;
-    info = hex.blue;
-    success = hex.green;
-    warning = hex.yellow;
-    critical = hex.red;
-
-    borderActiveRgb = rgb.orange;
-    borderInactiveRgb = rgb.bg2;
-
-    lockInnerRgb = rgb.bg0Soft;
-    lockOuterRgb = rgb.orange;
-    lockTextRgb = rgb.fg1;
-  };
-}
diff --git a/modules/desktop/wm.nix b/modules/desktop/wm.nix
index 6719c92..fcc6735 100644
--- a/modules/desktop/wm.nix
+++ b/modules/desktop/wm.nix
@@ -9,7 +9,6 @@ let
   cfg = config.modules.desktop.wm;
   term = "${config.home-manager.users.${config.user.name}.programs.kitty.package}/bin/kitty";
   wallpaper = config.modules.desktop.wallpaper;
-  c = (import ./themes/_palette.nix).semantic;
 in
 {
   options.modules.desktop.wm = {
@@ -63,8 +62,8 @@ in
               gaps_in = 7;
               gaps_out = 14;
               border_size = 2;
-              "col.active_border" = c.borderActiveRgb;
-              "col.inactive_border" = c.borderInactiveRgb;
+              "col.active_border" = "rgb(B28121)";
+              "col.inactive_border" = "rgb(504945)";
               no_focus_fallback = false;
               resize_on_border = false;
               hover_icon_on_border = false;
@@ -288,31 +287,19 @@ in
 
               cpu = {
                 interval = 1;
-                states = {
-                  warning = 60;
-                  critical = 85;
-                };
-                format = "<span size=\"120%\" rise=\"0\">󰍛</span> {usage}%";
+                format = "  {usage}%";
                 tooltip = false;
               };
 
               memory = {
                 interval = 1;
-                states = {
-                  warning = 70;
-                  critical = 90;
-                };
-                format = "<span size=\"120%\" rise=\"-80\">󰘚</span> {percentage}%";
+                format = " {percentage}%";
                 tooltip = false;
               };
 
               disk = {
                 interval = 60;
-                states = {
-                  warning = 75;
-                  critical = 90;
-                };
-                format = "<span size=\"120%\" rise=\"0\">󰋊</span> {free}";
+                format = "  {free}";
                 tooltip = false;
               };
 
@@ -322,25 +309,6 @@ in
                 tooltip = false;
               };
 
-              battery = {
-                states = {
-                  warning = 30;
-                  critical = 15;
-                };
-                format = "<span size=\"120%\" rise=\"0\">{icon}</span> {capacity}%";
-                format-charging = "<span size=\"120%\" rise=\"0\">󱐋</span> {capacity}%";
-                format-plugged = "<span size=\"120%\" rise=\"0\"></span> {capacity}%";
-                format-full = "<span size=\"120%\" rise=\"0\"></span>";
-                format-icons = [
-                  ""
-                  ""
-                  ""
-                  ""
-                  ""
-                ];
-                tooltip-format = "{timeTo}";
-              };
-
             };
           };
           style = ''
@@ -352,41 +320,41 @@ in
             }
 
             tooltip {
-              background: ${c.bg};
+              background: #282828;
               border: 0px solid;
               border-radius: 0px;
             }
 
             window#waybar {
-              background: ${c.bg};
-              color: ${c.fg};
+              background: #282828;
+              color: #ebdbb2;
             }
 
             #workspaces button {
               padding: 0 0.6em;
-              color: ${c.fgMuted};
+              color: #a89984;
               border-radius: 0px;
             }
 
             #workspaces button.active {
-              color: ${c.fg};
-              background: ${c.bgHover};
+              color: #ebdbb2;
+              background: #665c54;
             }
 
             #workspaces button.urgent {
-              color: ${c.bgStrong};
-              background: ${c.critical};
+              color: #1d2021;
+              background: #fb4934;
             }
 
             #workspaces button:hover {
-              background: ${c.bgHover};
+              background: #665c54;
             }
 
             #network,
             #workspaces,
             #bluetooth,
             #tray {
-              color: ${c.fg};
+              color: #ebdbb2;
               padding: 0 5px;
               margin: 0 5px;
             }
@@ -394,37 +362,10 @@ in
             #cpu,
             #memory,
             #disk,
-            #battery,
             #clock {
               padding: 0 5px;
               margin: 0 5px;
-              color: ${c.info};
-            }
-
-            #battery.charging,
-            #battery.plugged,
-            #battery.full {
-              color: ${c.success};
-            }
-
-            #battery.warning:not(.charging) {
-              color: ${c.warning};
-            }
-
-            #cpu.warning,
-            #memory.warning,
-            #disk.warning {
-              color: ${c.warning};
-            }
-
-            #battery.critical:not(.charging) {
-              color: ${c.critical};
-            }
-
-            #cpu.critical,
-            #memory.critical,
-            #disk.critical {
-              color: ${c.critical};
+              color: #83a598;
             }
           '';
           package = pkgs.waybar.override { wireplumberSupport = false; };
@@ -488,9 +429,9 @@ in
                 dots_center = true;
                 fade_on_empty = false;
                 outline_thickness = 3;
-                inner_color = c.lockInnerRgb;
-                outer_color = c.lockOuterRgb;
-                font_color = c.lockTextRgb;
+                inner_color = "rgb(50, 48, 47)";
+                outer_color = "rgb(231, 138, 78)";
+                font_color = "rgb(212, 190, 152)";
                 placeholder_text = "Password...";
               }
             ];
@@ -499,7 +440,7 @@ in
               {
                 monitor = "";
                 text = "$TIME";
-                color = c.lockTextRgb;
+                color = "rgb(212, 190, 152)";
                 font_size = 42;
                 font_family = "MesloLGS Nerd Font Propo";
                 position = "0, 160";
@@ -509,7 +450,7 @@ in
               {
                 monitor = "";
                 text = "cmd[update:1000] date +%d/%m/%Y";
-                color = c.lockTextRgb;
+                color = "rgb(212, 190, 152)";
                 font_size = 18;
                 font_family = "MesloLGS Nerd Font Propo";
                 position = "0, 120";