diff --git a/homeManagerModules/apps/waybar/default.nix b/homeManagerModules/apps/waybar/default.nix
index ba4445da..391fb736 100644
--- a/homeManagerModules/apps/waybar/default.nix
+++ b/homeManagerModules/apps/waybar/default.nix
@@ -16,150 +16,138 @@
 
     xdg.configFile."waybar/style.css".source = ./waybar.css;
 
-    programs.waybar.enable = true;
-    programs.waybar.settings = {
-      mainBar = {
-        height = 36;
-        layer = "top";
-        output = ["*"];
-        position = "top";
-        modules-left = lib.mkDefault [];
-        modules-center = ["clock"];
-        modules-right = [
-          "tray"
-          "bluetooth"
-          "pulseaudio"
-          # "group/power"
-          "power-profiles-daemon"
-          "battery"
-          "custom/logout"
-        ];
-        "hyprland/workspaces" = {
-          "all-outputs" = true;
-          "format" = "{icon} {name}";
-          "format-icons" = {
-            "default" = "󰝥";
-            "active" = "󰪥";
+    programs.waybar = {
+      enable = true;
+      settings = {
+        mainBar = {
+          height = 36;
+          layer = "top";
+          output = ["*"];
+          position = "top";
+          modules-left = lib.mkDefault [];
+          modules-center = ["clock"];
+          modules-right = [
+            "tray"
+            "bluetooth"
+            "pulseaudio"
+            "power-profiles-daemon"
+            "battery"
+            "custom/logout"
+          ];
+          "hyprland/workspaces" = {
+            "all-outputs" = true;
+            "format" = "{icon} {name}";
+            "format-icons" = {
+              "default" = "󰝥";
+              "active" = "󰪥";
+            };
+            "sort-by" = "id";
           };
-          "sort-by" = "id";
-        };
-        "hyprland/submap" = {
-          "on-click" = "${pkgs.hyprland}/bin/hyprctl dispatch submap reset";
-        };
-        "hyprland/window" = {
-          "format" = "";
-          "max-length" = 100;
-          "separate-outputs" = true;
-          "icon" = true;
-        };
-        "sway/workspaces" = {
-          "all-outputs" = true;
-          "format" = "{icon} {name}";
-          "format-icons" = {
-            "default" = "󰝥";
-            "focused" = "󰪥";
+          "hyprland/submap" = {
+            "on-click" = "${pkgs.hyprland}/bin/hyprctl dispatch submap reset";
           };
-          "sort-by" = "id";
-        };
-        "sway/mode" = {
-          "on-click" = "${pkgs.sway}/bin/swaymsg mode default";
-        };
-        "sway/window" = {
-          "max-length" = 100;
-        };
-        "river/window" = {
-          "max-length" = 100;
-        };
-        "river/tags" = {
-          "num-tags" = 4;
-        };
-        "clock" = {
-          # "tooltip-format" = "{:%Y-%m-%d | %H:%M}";
-          "interval" = 60;
-          "format" = "{:%I:%M%p}";
-        };
-        # "group/power" = {
-        #   "orientation" = "inherit";
-        #   "drawer" = {
-        #     "transition-duration" = 500;
-        #     "children-class" = "not-power";
-        #     "transition-left-to-right" = false;
-        #   };
-        #   "modules" = [
-        #     "battery"
-        #     "power-profiles-daemon"
-        #     "inhibitor"
-        #   ];
-        # };
-        "battery" = {
-          "states" = {"critical" = 20;};
-          "format" = "{icon}";
-          "format-icons" = ["󰁺" "󰁻" "󰁼" "󰁽" "󰁾" "󰁿" "󰂀" "󰂁" "󰂂" "󰁹"];
-          "tooltip-format" = ''
-            {capacity}%: {timeTo}.
-            Using {power} watts.'';
-        };
-        "inhibitor" = {
-          "what" = "sleep";
-          "format" = "{icon}";
-          "format-icons" = {
-            "activated" = "";
-            "deactivated" = "";
+          "hyprland/window" = {
+            "format" = "";
+            "max-length" = 100;
+            "separate-outputs" = true;
+            "icon" = true;
           };
-        };
-        "bluetooth" = {
-          "format" = "󰂯";
-          "format-disabled" = ""; # an empty format will hide the module
-          "format-connected" = "󰂯　{num_connections} connected";
-          "tooltip-format" = "{controller_alias}	{controller_address}";
-          "tooltip-format-connected" = ''
-            {controller_alias}	{controller_address}
+          "sway/workspaces" = {
+            "all-outputs" = true;
+            "format" = "{icon} {name}";
+            "format-icons" = {
+              "default" = "󰝥";
+              "focused" = "󰪥";
+            };
+            "sort-by" = "id";
+          };
+          "sway/mode" = {
+            "on-click" = "${config.wayland.windowManager.sway.package}/bin/swaymsg mode default";
+          };
+          "sway/window" = {
+            "max-length" = 100;
+          };
+          "river/window" = {
+            "max-length" = 100;
+          };
+          "river/tags" = {
+            "num-tags" = 4;
+          };
+          "clock" = {
+            # "tooltip-format" = "{:%Y-%m-%d | %H:%M}";
+            "interval" = 60;
+            "format" = "{:%I:%M%p}";
+          };
+          "battery" = {
+            "states" = {"critical" = 20;};
+            "format" = "{icon}";
+            "format-icons" = ["󰁺" "󰁻" "󰁼" "󰁽" "󰁾" "󰁿" "󰂀" "󰂁" "󰂂" "󰁹"];
+            "tooltip-format" = ''
+              {capacity}%: {timeTo}.
+              Using {power} watts.'';
+          };
+          "inhibitor" = {
+            "what" = "sleep";
+            "format" = "{icon}";
+            "format-icons" = {
+              "activated" = "";
+              "deactivated" = "";
+            };
+          };
+          "bluetooth" = {
+            "format" = "󰂯";
+            "format-disabled" = ""; # an empty format will hide the module
+            "format-connected" = "󰂯　{num_connections} connected";
+            "tooltip-format" = "{controller_alias}	{controller_address}";
+            "tooltip-format-connected" = ''
+              {controller_alias}	{controller_address}
 
-            {device_enumerate}'';
-          "tooltip-format-enumerate-connected" = "{device_alias}	{device_address}";
-          "on-click" = "${pkgs.blueberry}/bin/blueberry";
-        };
-        "pulseaudio" = {
-          "format" = "{icon}";
-          "format-bluetooth" = "{volume}% {icon}󰂯";
-          "format-muted" = "";
-          "format-icons" = {
-            "headphones" = "󰋋";
-            "handsfree" = "󰋎";
-            "headset" = "󰋎";
-            "default" = [ "" "" "" ];
+              {device_enumerate}'';
+            "tooltip-format-enumerate-connected" = "{device_alias}	{device_address}";
+            "on-click" = "${pkgs.blueberry}/bin/blueberry";
           };
-          "scroll-step" = 5;
-          "ignored-sinks" = ["Easy Effects Sink"];
-          "on-click" = "${pkgs.pavucontrol}/bin/pavucontrol -t 3";
-        };
-        "network" = {
-          "format-wifi" = "{icon}";
-          "format-ethernet" = "󰈀";
-          "format-disconnected" = "⚠";
-          "format-icons" = ["󰤟" "󰤢" "󰤥" "󰤨" ];
-          "tooltip-format" = "{ifname} via {gwaddr} 󰊗";
-          "tooltip-format-wifi" = "{essid} ({signalStrength}%) {icon}";
-          "tooltip-format-ethernet" = "{ifname} ";
-          "tooltip-format-disconnected" = "Disconnected";
-          "on-click" = "${pkgs.alacritty}/bin/alacritty --class nmtui -e ${pkgs.networkmanager}/bin/nmtui";
-        };
-        "tray" = {"spacing" = 15;};
-        "custom/logout" = {
-          "on-click" = "${pkgs.wlogout}/bin/wlogout";
-          "format" = "󰗽";
-        };
-        "power-profiles-daemon" = {
-          "format" = "{icon}";
-          "tooltip-format" = ''
-            Profile: {profile}
-            Driver: {driver}'';
-          "tooltip" = true;
-          "format-icons" = {
-            "default" = "󱐌";
-            "performance" = "󱐌";
-            "balanced" = "󰗑";
-            "power-saver" = "󰌪";
+          "pulseaudio" = {
+            "format" = "{icon}";
+            "format-bluetooth" = "{volume}% {icon}󰂯";
+            "format-muted" = "";
+            "format-icons" = {
+              "headphones" = "󰋋";
+              "handsfree" = "󰋎";
+              "headset" = "󰋎";
+              "default" = ["" "" ""];
+            };
+            "scroll-step" = 5;
+            "ignored-sinks" = ["Easy Effects Sink"];
+            "on-click" = "${pkgs.pavucontrol}/bin/pavucontrol -t 3";
+          };
+          "network" = {
+            "format-wifi" = "{icon}";
+            "format-ethernet" = "󰈀";
+            "format-disconnected" = "⚠";
+            "format-icons" = ["󰤟" "󰤢" "󰤥" "󰤨"];
+            "tooltip-format" = "{ifname} via {gwaddr} 󰊗";
+            "tooltip-format-wifi" = "{essid} ({signalStrength}%) {icon}";
+            "tooltip-format-ethernet" = "{ifname} ";
+            "tooltip-format-disconnected" = "Disconnected";
+            "on-click" = "${pkgs.alacritty}/bin/alacritty --class nmtui -e ${pkgs.networkmanager}/bin/nmtui";
+          };
+          "tray" = {"spacing" = 15;};
+          "custom/logout" = {
+            "on-click" = "${pkgs.wlogout}/bin/wlogout";
+            "format" = "󰗽";
+          };
+          "power-profiles-daemon" = {
+            "format" = "{icon}";
+            "tooltip-format" = ''
+              Profile: {profile}
+              Driver: {driver}'';
+            "tooltip" = true;
+            "format-icons" = {
+              "default" = "󱐌";
+              "performance" = "󱐌";
+              "balanced" = "󰗑";
+              "power-saver" = "󰌪";
+            };
           };
         };
       };
diff --git a/homeManagerModules/desktop/sway/default.nix b/homeManagerModules/desktop/sway/default.nix
index 9e701dff..748c45c9 100644
--- a/homeManagerModules/desktop/sway/default.nix
+++ b/homeManagerModules/desktop/sway/default.nix
@@ -48,12 +48,16 @@
 
     services.cliphist.enable = lib.mkDefault true;
 
-    programs.waybar.settings = {
-      mainBar = {
-        modules-left = ["sway/workspaces" "sway/mode"];
+    programs.waybar = {
+      settings = {
+        mainBar = {
+          modules-left = ["sway/workspaces" "sway/mode"];
+        };
       };
     };
 
+    xdg.configFile."waybar/sway-style.css".source = ./waybar.css;
+
     wayland.windowManager.sway.enable = true;
     wayland.windowManager.sway.package = pkgs.swayfx;
     wayland.windowManager.sway.wrapperFeatures.gtk = true;
@@ -67,7 +71,7 @@
       terminal = pkgs.alacritty + "/bin/alacritty";
 
       # Sway desktop utilities
-      bar = pkgs.waybar + "/bin/waybar";
+      bar = pkgs.waybar + "/bin/waybar -s ${config.xdg.configHome}/waybar/sway-style.css";
       launcher = pkgs.fuzzel + "/bin/fuzzel";
       notifyd = pkgs.mako + "/bin/mako";
       wallpaperd = pkgs.swaybg + "/bin/swaybg -i ~/.local/share/backgrounds/jr-korpa-9XngoIpxcEo-unsplash.jpg";
diff --git a/homeManagerModules/desktop/sway/waybar.css b/homeManagerModules/desktop/sway/waybar.css
new file mode 100644
index 00000000..40abd8ff
--- /dev/null
+++ b/homeManagerModules/desktop/sway/waybar.css
@@ -0,0 +1,7 @@
+@import url("style.css");
+
+/* Style overrides for sway */
+
+window#waybar {
+    background: rgba (35, 38, 52, 1.0);
+}
\ No newline at end of file