diff --git a/modules/user/waybar.nix b/modules/user/waybar.nix
index 53758e9..73d4112 100644
--- a/modules/user/waybar.nix
+++ b/modules/user/waybar.nix
@@ -1,6 +1,6 @@
 { osConfig, config, pkgs, ... }: {
   home.packages = with pkgs; [
-    # font-awesome
+    font-awesome
     nerd-fonts.symbols-only
     playerctl
   ];
@@ -9,7 +9,6 @@
     enable = true;
 
     settings.mainBar = {
-      margin = "8px";
       spacing = 8;
 
       modules-left = [
@@ -54,6 +53,7 @@
       mpris = {
         format = "{dynamic}";
         dynamic-len = if osConfig.host.laptop then 32 else 64;
+        dynamic-order = [ "title" "artist" "album" ];
       };
 
       battery = {
@@ -130,151 +130,12 @@
       };
 
       temperature = {
-        # thermal-zone = 2;
         hwmon-path = "/sys/class/hwmon/hwmon5/temp1_input";
         critical-threshold = 80;
-        # format-critical = "{temperatureC}°C {icon}";
         format = "{temperatureC}°C {icon}";
         format-icons = ["" "" "" "" ""];
         tooltip = false;
       };
     };
-
-    style = let
-      colors = config.lib.stylix.colors.withHashtag;
-      radius = "12px";
-      scssFile = pkgs.writeText "waybar.scss" /* scss */ ''
-        window#waybar {
-          background: transparent;
-          color: ${colors.base05};
-          border-radius: ${radius};
-          font-weight: bold;
-          font-size: 1.1em;
-        }
-
-        #language,
-        #mpris,
-        #pulseaudio,
-        #network,
-        #battery,
-        #cpu,
-        #temperature,
-        #keyboard-state label.locked,
-        #custom-mem,
-        #clock {
-          background: ${colors.base00};
-          border-radius: ${radius};
-          padding: 8px;
-        }
-
-        #workspaces,
-        #tray {
-          background: ${colors.base00};
-          border-radius: ${radius};
-        }
-
-        #workspaces button {
-          color: ${colors.base05};
-          padding: 4px;
-          border-radius: ${radius};
-          border: 1pt solid transparent;
-
-          &:hover { background: ${colors.base01}; }
-
-          &.active {
-            background: ${colors.base0B};
-            color: ${colors.base00};
-
-            &:hover {
-              border-color: ${colors.base0B};
-              background: ${colors.base01};
-              color: ${colors.base0B};
-            }
-          }
-        }
-
-        #mpris {
-          &:hover { background: ${colors.base01}; }
-          &.paused { opacity: .5; }
-        }
-
-        #tray {
-          widget {
-            border: 1pt solid transparent;
-            border-radius: ${radius};
-            &:hover { background: ${colors.base01}; }
-            & > image { padding: 8px; }
-          }
-
-          & > .passive { border-color: ${colors.base02}; }
-          & > .needs-attention { border-color: ${colors.base09}; }
-        }
-
-        #pulseaudio {
-          &:hover { background: ${colors.base01}; }
-          &.muted {
-            background: ${colors.base08};
-            color: ${colors.base00};
-
-            &:hover {
-              color: ${colors.base08};
-              background: ${colors.base01};
-            }
-          }
-        }
-
-        #network {
-          &:hover { background: ${colors.base01}; }
-          &.disconnected {
-            color: ${colors.base00};
-            background: ${colors.base08};
-          }
-        }
-
-        #system .drawer-child > * {
-          margin-right: 4px
-        }
-
-        #keyboard-state label.locked {
-          background-color: ${colors.base00};
-          color: ${colors.base08};
-        }
-
-        #battery {
-          &.plugged { color: ${colors.base0D}; }
-          &.charging { color: ${colors.base0B}; }
-          &:not(.charging) {
-            &.warning {
-              color: ${colors.base00};
-              background-color: ${colors.base09};
-            }
-            &.critical {
-              background-color: ${colors.base08};
-              color: ${colors.base00};
-              animation-name: blink;
-              animation-duration: 0.5s;
-              animation-timing-function: linear;
-              animation-iteration-count: infinite;
-              animation-direction: alternate;
-            }
-          }
-          &.full {
-            color: ${colors.base00};
-            background: ${colors.base0B};
-          }
-        }
-
-      	@keyframes blink {
-          to {
-            background-color: ${colors.base00};
-            color: ${colors.base08};
-          }
-        }
-      '';
-
-      cssFile = pkgs.runCommand "waybar.css" {
-        nativeBuildInputs = [ pkgs.dart-sass ];
-      } "sass ${scssFile} $out";
-    in builtins.readFile cssFile;
   };
 }
\ No newline at end of file
diff --git a/user/sweetbread/home.nix b/user/sweetbread/home.nix
index 46e5388..7dfd17f 100644
--- a/user/sweetbread/home.nix
+++ b/user/sweetbread/home.nix
@@ -1,6 +1,7 @@
 { pkgs, ... }: {
   imports = [
     ../../modules/user/packages/tex.nix
+    ./modules/waybar.nix
   ];
   programs.hyprlock.enable = true;
   home.packages = with pkgs; [
diff --git a/user/sweetbread/modules/waybar.nix b/user/sweetbread/modules/waybar.nix
new file mode 100644
index 0000000..89667ee
--- /dev/null
+++ b/user/sweetbread/modules/waybar.nix
@@ -0,0 +1,144 @@
+{ config, pkgs, ... }: {
+  programs.waybar.style = let
+    colors = config.lib.stylix.colors.withHashtag;
+    radius = "6px";
+    scssFile = pkgs.writeText "waybar.scss" /*scss*/ ''
+      window#waybar {
+        background: transparent;
+        color: ${colors.base05};
+        border-radius: ${radius};
+        font-weight: bold;
+        font-size: 1.1em;
+
+        & > * { padding: 8px; }
+      }
+
+      #language,
+      #mpris,
+      #pulseaudio,
+      #network,
+      #battery,
+      #cpu,
+      #temperature,
+      #keyboard-state label.locked,
+      #custom-mem,
+      #clock {
+        background: ${colors.base00};
+        border-radius: ${radius};
+        padding: 8px;
+      }
+
+      #workspaces,
+      #tray {
+        background: ${colors.base00};
+        border-radius: ${radius};
+      }
+
+      #workspaces button {
+        color: ${colors.base05};
+        padding: 4px;
+        border-radius: ${radius};
+        border: 1pt solid transparent;
+
+        &:hover { background: ${colors.base01}; }
+
+        &.active {
+          background: ${colors.base0B};
+          color: ${colors.base00};
+
+          &:hover {
+            border-color: ${colors.base0B};
+            background: ${colors.base01};
+            color: ${colors.base0B};
+          }
+        }
+      }
+
+      #mpris {
+        &:hover { background: ${colors.base01}; }
+        &.paused { opacity: .5; }
+      }
+
+      #tray {
+        widget {
+          border: 1pt solid transparent;
+          border-radius: ${radius};
+          &:hover { background: ${colors.base01}; }
+          & > image { padding: 8px; }
+        }
+
+        & > .passive { border-color: ${colors.base02}; }
+        & > .needs-attention { border-color: ${colors.base09}; }
+      }
+
+      #pulseaudio {
+        &:hover { background: ${colors.base01}; }
+        &.muted {
+          background: ${colors.base08};
+          color: ${colors.base00};
+
+          &:hover {
+            color: ${colors.base08};
+            background: ${colors.base01};
+          }
+        }
+      }
+
+      #network {
+        &:hover { background: ${colors.base01}; }
+        &.disconnected {
+          color: ${colors.base00};
+          background: ${colors.base08};
+        }
+      }
+
+      #system .drawer-child > * {
+        margin-right: 4px
+      }
+
+      #keyboard-state label.locked {
+        background-color: ${colors.base00};
+        color: ${colors.base08};
+      }
+
+      #battery {
+        &.plugged { color: ${colors.base0D}; }
+        &.charging { color: ${colors.base0B}; }
+        &:not(.charging) {
+          &.warning {
+            color: ${colors.base00};
+            background-color: ${colors.base09};
+          }
+          &.critical {
+            background-color: ${colors.base08};
+            color: ${colors.base00};
+            animation-name: blink;
+            animation-duration: 0.5s;
+            animation-timing-function: linear;
+            animation-iteration-count: infinite;
+            animation-direction: alternate;
+          }
+        }
+        &.full {
+          color: ${colors.base00};
+          background: ${colors.base0B};
+        }
+      }
+
+    	@keyframes blink {
+        to {
+          background-color: ${colors.base00};
+          color: ${colors.base08};
+        }
+      }
+    '';
+
+    cssFile = pkgs.runCommand "waybar.css" {
+      nativeBuildInputs = [ pkgs.dart-sass ];
+    } "sass ${scssFile} $out";
+  in builtins.readFile cssFile;
+
+  wayland.windowManager.hyprland.settings.layerrule = [
+    "blur, waybar"
+  ];
+}
\ No newline at end of file