diff --git a/home-manager/modules/ezpcusr.nix b/home-manager/modules/ezpcusr.nix
index ae99d84..caa18ea 100644
--- a/home-manager/modules/ezpcusr.nix
+++ b/home-manager/modules/ezpcusr.nix
@@ -76,9 +76,8 @@ in {
       };
     };
 
-    services.avizo.enable = true;
     programs.hyprlock.enable = true;
-    services.swaync.enable = true;
+    # services.swaync.enable = true;
 
     wayland.windowManager.hyprland = {
       enable = true;
@@ -102,8 +101,16 @@ in {
         };
         layerrule = [
           "ignorealpha 0.1, ashell-main-layer"
-          "blur,ashell-main-layer"
-          "blur,avizo"
+          "blur, ashell-main-layer"
+
+          "blur, bar-.*"
+          "ignorealpha 0.1, bar-.*"
+          "blur, .*menu"
+          "ignorealpha 0.1, .*menu"
+          "blur, notifications-window"
+          "ignorealpha 0.1, notifications-window"
+          "blur, indicator"
+          "ignorealpha 0.1, indicator"
         ];
         ecosystem = {
           no_update_news = true;
@@ -156,19 +163,19 @@ in {
 
             "$mod, c, exec, ${config.services.cliphist.package}/bin/cliphist list | rofi -dmenu | cliphist decode | wl-copy"
 
-            "$mod, minus, exec, volumectl -u down"
-            "$mod, equal, exec, volumectl -u up"
+            "$mod, minus, exec, pamixer --decrease=5"
+            "$mod, equal, exec, pamixer --increase=5 --unmute"
 
-            ", XF86AudioLowerVolume, exec, volumectl -u down"
-            ", XF86AudioRaiseVolume, exec, volumectl -u up"
+            ", XF86AudioLowerVolume, exec, pamixer --decrease=5"
+            ", XF86AudioRaiseVolume, exec, pamixer --increase=5 --unmute"
 
-            ", XF86AudioMute, exec, volumectl toggle-mute"
-            ", XF86AudioMicMute, exec, volumectl -m toggle-mute"
+            ", XF86AudioMute, exec, pamixer --toggle-mute"
+            ", XF86AudioMicMute, exec, pamixer --toggle-mute --default-source"
 
-            ", XF86MonBrightnessDown, exec, lightctl down"
-            ", XF86MonBrightnessUp, exec, lightctl up"
-            "$mod, semicolon, exec, lightctl down"
-            "$mod, apostrophe, exec, lightctl up"
+            ", XF86MonBrightnessDown, exec, light -U 10"
+            ", XF86MonBrightnessUp, exec, light -A 10"
+            "$mod, semicolon, exec, light -U 10"
+            "$mod, apostrophe, exec, light -A 10"
 
             # Previous/next but change the shuffle/random state before action (and change back afterwards)
             "$mod&SHIFT, bracketright, exec, ${pkgs.playerctl}/bin/playerctl shuffle Toggle && ${pkgs.playerctl}/bin/playerctl next && ${pkgs.playerctl}/bin/playerctl shuffle Toggle"
@@ -242,8 +249,62 @@ in {
       };
     };
 
-    programs.ashell = {
+    programs.hyprpanel = {
       enable = true;
+      settings = {
+        bar.layouts = {
+          "*" = {
+            left = [
+              "dashboard"
+              "workspaces"
+              "windowtitle"
+            ];
+            middle = [ "media" ];
+            right = [
+              "systray"
+              "bluetooth"
+              "network"
+              "battery"
+              "volume"
+              "clock"
+              "notifications"
+            ];
+          };
+        };
+
+        bar = {
+          launcher.autoDetectIcon = true;
+          workspaces.show_numbered = true;
+        };
+
+        menus.clock = {
+          time = {
+            military = false;
+            hideSeconds = false;
+          };
+          # weather.unit = "metric";
+        };
+
+        menus.dashboard = {
+          directories.enabled = false;
+          shortcuts.enabled = false;
+          stats.enable_gpu = false;
+        };
+
+        theme = {
+          font.weight = 100;
+          osd.opacity = 60;
+          notification.opacity = 60;
+          bar = {
+            transparent = true;
+            buttons.background_opacity = 60;
+          };
+        };
+      };
+    };
+
+    programs.ashell = {
+      enable = false;
       systemd.enable = true;
       settings = {
         clock.format = "%a %d %b %r";
@@ -331,11 +392,10 @@ in {
       wtype
       ydotool
       keyutils
-
-      # CLI tools
       maim
       slop
       xorg.xhost
+      pamixer
     ];
 
     programs.rofi = {