diff --git a/clients/quadraticpc/fht-compositor/default.nix b/clients/quadraticpc/fht-compositor/default.nix
index 9cdc685..f37067d 100644
--- a/clients/quadraticpc/fht-compositor/default.nix
+++ b/clients/quadraticpc/fht-compositor/default.nix
@@ -45,10 +45,9 @@ in
 
   # The default theme, minus its hardcoded @define-color palette, so the GTK theme's colors show through
   environment.etc."xdg/walker/themes/system/style.css".source =
-    pkgs.runCommand "walker-system-style.css" { }
-      ''
-        sed '/^@define-color/d' ${pkgs.walker.src}/resources/themes/default/style.css > $out
-      '';
+    pkgs.runCommand "walker-system-style.css" { } ''
+      sed '/^@define-color/d' ${pkgs.walker.src}/resources/themes/default/style.css > $out
+    '';
 
   environment.etc.${filename}.source = (pkgs.formats.toml { }).generate "config.toml" {
     autostart = [ session-programs ];
@@ -138,14 +137,6 @@ in
       }
     ];
 
-    # # Blur behind gaypanel's semi-transparent background
-    # layer-rules = [
-    #   {
-    #     match-namespace = [ "^panel$" ];
-    #     blur.disable = false;
-    #   }
-    # ];
-
     outputs = {
       HDMI-A-1.position.x = 0;
       DP-3.position.x = 1920;
diff --git a/wrappers/desktop/gaypanel/default.nix b/wrappers/desktop/gaypanel/default.nix
index e3176e0..e8b3e7c 100644
--- a/wrappers/desktop/gaypanel/default.nix
+++ b/wrappers/desktop/gaypanel/default.nix
@@ -6,6 +6,7 @@
 let
   bar = pkgs.writeText "top.blp" ''
     using Gtk 4.0;
+    using Adw 1;
 
     $GayPanel panel {
       anchor-direction: top;
@@ -33,33 +34,18 @@ let
         }
 
         [end]
-        Box {
-          spacing: 4;
-
-          // Hides itself when nothing is playing
-          $MprisWidget {
-            styles [
-              "pill",
-              "flat",
-            ]
-          }
-
-          $SystemControlsWidget {
-            styles [
-              "pill",
-              "flat",
-            ]
-          }
+        $SystemControlsWidget {
+          styles [
+            "pill",
+            "flat",
+          ]
         }
       }
     }
   '';
 
+  # GNOME-style workspace dots, with the active one stretched into a pill
   style = pkgs.writeText "style.css" ''
-    window.panel {
-      background: alpha(var(--window-bg-color), 0.5);
-    }
-
     .workspaces button {
       min-width: 8px;
       min-height: 8px;
@@ -71,6 +57,7 @@ let
 
     .workspaces button.selected {
       min-width: 32px;
+      padding: 0;
       background: var(--window-fg-color);
     }
 
@@ -81,9 +68,13 @@ let
 in
 {
   wrappers.gaypanel = {
-    basePackage = inputs.gaypanel.packages.${pkgs.stdenv.hostPlatform.system}.default.overrideAttrs {
-      patches = [ ./no-sound-panic.patch ];
-    };
+    basePackage =
+      inputs.gaypanel.packages.${pkgs.stdenv.hostPlatform.system}.default.overrideAttrs
+        (old: {
+          patches = (old.patches or [ ]) ++ [
+            ./no-sound-panic.patch
+          ];
+        });
 
     prependFlags = [
       "--config"