diff --git a/apps/waybar/default.nix b/apps/waybar/default.nix
index 927e578..00d9c00 100644
--- a/apps/waybar/default.nix
+++ b/apps/waybar/default.nix
@@ -33,7 +33,7 @@
 
     replace() {
       ${pkgs.hyprland}/bin/hyprctl dispatch closewindow "class:''${active_popup}"
-      sleep 1
+      sleep 0.3
       launch
     }
 
@@ -61,6 +61,8 @@ in {
     windowrulev2 = [
       # --- POPUP RULES (Wifi, BT, Audio) ---
       "float, class:^(org\.hakase\.popup\..*)$"
+      "size 900 600, class:^(org\.hakase\.popup\..*)$"
+      "center, class:^(org\.hakase\.popup\..*)$"
       "animation slide right, class:^(org\.hakase\.popup\..*)$"
       "dimaround, class:^(org\.hakase\.popup\..*)$"
     ];
@@ -134,12 +136,20 @@ in {
           show-special = true;
           special-visible-only = true;
           all-outputs = true;
-          ignore-workspaces = ["1" "2" "3" "4" "5" "6" "7" "8" "9" "10"];
+          ignore-workspaces = ["^[0-9]+$"];
           format = "{icon}";
           format-icons = {
             "special:youtube" = "󰗃";
             "special:music" = "󰎆";
             "special:steam" = "󰓓";
+            "special:custom" = "󱗼";
+            "special:preload" = "󱗼";
+            "youtube" = "󰗃";
+            "music" = "󰎆";
+            "steam" = "󰓓";
+            "custom" = "󱗼";
+            "preload" = "󱗼";
+            "default" = "󱗼";
           };
         };
 
@@ -153,7 +163,7 @@ in {
         "cpu" = {
           interval = 5;
           format = "󰍛";
-          on-click = "hakase-focus-wrapper btop";
+          on-click = "hakase-popup-launch btop 800 600";
           on-click-right = "xdg-terminal-exec";
         };