diff --git a/modules/home/waybar/default.nix b/modules/home/waybar/default.nix
index 1d7579d..9b8b240 100644
--- a/modules/home/waybar/default.nix
+++ b/modules/home/waybar/default.nix
@@ -1,34 +1,5 @@
 { ... }: 
-let 
-  custom = {
-    font = "JetBrainsMono Nerd Font";
-    fontsize = "15";
-    primary_accent = "cba6f7";
-    secondary_accent= "89b4fa";
-    tertiary_accent = "f5f5f5";
-    background = "11111B";
-    opacity = "0.98";
-    palette = rec {
-      primary_accent_hex = "cba6f7";
-      secondary_accent_hex = "89b4fa";
-      tertiary_accent_hex = "f5f5f5";
-      primary_background_hex = "11111B";
-      secondary_background_hex = "1b1b2b";
-      tertiary_background_hex = "25253a";
-
-      primary_accent_rgba = "rgba(203,166,247,${opacity})";
-      secondary_accent_rgba = "rgba(137,180,250,${opacity})";
-      tertiary_accent_rgba = "rgba(245,245,245,${opacity})";
-      primary_background_rgba = "rgba(17,17,27,${opacity})";
-      secondary_background_rgba = "rgba(27,27,43,${opacity})";
-      tertiary_background_rgba = "rgba(37,37,58,${opacity})";
-
-      opacity = "1";
-    };
-  };
-in
 {
-  _module.args = { inherit custom; };
   imports =  [ (import ./waybar.nix)   ]
           ++ [ (import ./settings.nix) ]
           ++ [ (import ./style.nix)    ];
diff --git a/modules/home/waybar/settings.nix b/modules/home/waybar/settings.nix
index 62aa53b..15d4037 100644
--- a/modules/home/waybar/settings.nix
+++ b/modules/home/waybar/settings.nix
@@ -2,7 +2,7 @@
 {
   programs.waybar.settings.mainBar = {
     position= "bottom";
-    layer= "bottom";
+    layer= "top";
     height= 5;
     margin-top= 0;
     margin-bottom= 0;
@@ -10,9 +10,10 @@
     margin-right= 0;
     modules-left= [
         "custom/launcher" 
+        "hyprland/workspaces"
     ];
     modules-center= [
-        "hyprland/workspaces"
+        "clock"
     ];
     modules-right= [
         "tray" 
@@ -21,7 +22,6 @@
         "disk"
         "pulseaudio" 
         "network"
-        "clock" 
     ];
     clock= {
         format = " {:%H:%M}";
diff --git a/modules/home/waybar/style.nix b/modules/home/waybar/style.nix
index 2eb79cf..eb0d95d 100644
--- a/modules/home/waybar/style.nix
+++ b/modules/home/waybar/style.nix
@@ -1,7 +1,17 @@
-{ custom, ... }:
+{ ... }:
+let custom = {
+    font = "JetBrainsMono Nerd Font";
+    font_size = "15px";
+    font_weight = "bold";
+    text_color = "#cdd6f4";
+    secondary_accent= "89b4fa";
+    tertiary_accent = "f5f5f5";
+    background = "11111B";
+    opacity = "0.98";
+};
+in 
 {
   programs.waybar.style = ''
-    * { all: initial; }
 
     * {
         border: none;
@@ -10,47 +20,23 @@
         margin: 0;
         min-height: 0px;
         font-family: ${custom.font};
-        font-weight: bold;
-        font-size: 15px;
+        font-weight: ${custom.font_weight};
+        font-size: ${custom.font_size};
+        color: ${custom.text_color};
         opacity: ${custom.opacity};
     }
 
     window#waybar {
-        background: rgba(24, 24, 37, 0.5);
+        background: none;
     }
 
     #workspaces {
-        color: #${custom.primary_accent}
     }
     #workspaces button {
-        padding: 0px 5px;
-        margin: 0px 3px;
-        border-radius: 15px;
-        color: #${custom.background};
-        background: #${custom.secondary_accent};
-        transition: all 0.2s ease-in-out;
     }
-
     #workspaces button.active {
-        background-color: #${custom.primary_accent};
-        color: #${custom.background};
-        border-radius: 15px;
-        min-width: 35px;
-        background-size: 200% 200%;
-        transition: all 0.2s ease-in-out;
     }
-
     #workspaces button:hover {
-        background-color: #b4befe;
-        color: #${custom.background};
-        border-radius: 15px;
-        min-width: 35px;
-        background-size: 200% 200%;
-    }
-
-    #tray, #pulseaudio, #network, #cpu, #memory, #disk, #clock, custom-launcher {
-        color: #${custom.tertiary_accent};
-        font-weight: bold;
     }
 
     #cpu {
@@ -90,9 +76,5 @@
         margin-left: 10px;
         font-size: 22px;
     }
-
-    #window{
-        background: #${custom.palette.tertiary_background_hex};
-    }
   '';
 }