diff --git a/apps/hyprland/hypr/binds.nix b/apps/hyprland/hypr/binds.nix
index 3038ea7..300445c 100644
--- a/apps/hyprland/hypr/binds.nix
+++ b/apps/hyprland/hypr/binds.nix
@@ -44,8 +44,6 @@
         # apps
         # "SUPER, SPACE, Open App Launcher, exec, nc -U $XDG_RUNTIME_DIR/walker/walker.sock"
 
-        "SUPER CTRL, I, Switch Wallpaper, exec, hakase-wallpaper-switch"
-
         # TODO:
         # add text clipping from pictures
         # add screen recording
diff --git a/apps/hyprland/hypr/rules.nix b/apps/hyprland/hypr/rules.nix
index ce3c663..b02cc05 100644
--- a/apps/hyprland/hypr/rules.nix
+++ b/apps/hyprland/hypr/rules.nix
@@ -4,23 +4,6 @@
     ];
 
     windowrulev2 = [
-      # --- POPUP RULES (Wifi, BT, Audio) ---
-      "float, class:^(org\.hakase\.popup\..*)$"
-      "animation slide right, class:^(org\.hakase\.popup\..*)$"
-      "dimaround, class:^(org\.hakase\.popup\..*)$"
-      # --- WALLPAPER PICKER ---
-      "float, class:^(org\.hakase\.switch-wallpaper)$"
-      "float, initialTitle:^(Wallpaper Selector)$"
-      "center, class:^(org\.hakase\.switch-wallpaper)$"
-      "center, initialTitle:^(Wallpaper Selector)$"
-      "size 60% 60%, class:^(org\.hakase\.switch-wallpaper)$"
-      "size 60% 60%, initialTitle:^(Wallpaper Selector)$"
-      "dimaround, class:^(org\.hakase\.switch-wallpaper)$"
-      "dimaround, initialTitle:^(Wallpaper Selector)$"
-
-      # --- CAVA RULES ---
-      "workspace special:music silent, title:^(cava)$"
-      "workspace special:music silent, initialTitle:^(cava)$"
     ];
   };
 }
diff --git a/apps/hyprpaper/default.nix b/apps/hyprpaper/default.nix
index 9d25622..c1eb9ba 100644
--- a/apps/hyprpaper/default.nix
+++ b/apps/hyprpaper/default.nix
@@ -59,6 +59,22 @@ in {
     exec-once = [
       "uwsm app -- hyprpaper"
     ];
+
+    bindd = [
+      "SUPER CTRL, I, Switch Wallpaper, exec, hakase-wallpaper-switch"
+    ];
+
+    windowrulev2 = [
+      # --- WALLPAPER PICKER ---
+      "float, class:^(org\.hakase\.switch-wallpaper)$"
+      "float, initialTitle:^(Wallpaper Selector)$"
+      "center, class:^(org\.hakase\.switch-wallpaper)$"
+      "center, initialTitle:^(Wallpaper Selector)$"
+      "size 60% 60%, class:^(org\.hakase\.switch-wallpaper)$"
+      "size 60% 60%, initialTitle:^(Wallpaper Selector)$"
+      "dimaround, class:^(org\.hakase\.switch-wallpaper)$"
+      "dimaround, initialTitle:^(Wallpaper Selector)$"
+    ];
   };
 
   services.hyprpaper = {
diff --git a/apps/waybar/default.nix b/apps/waybar/default.nix
index 19e9831..776d0d1 100644
--- a/apps/waybar/default.nix
+++ b/apps/waybar/default.nix
@@ -57,6 +57,13 @@ in {
     exec-once = [
       "uwsm app -- waybar"
     ];
+
+    windowrulev2 = [
+      # --- POPUP RULES (Wifi, BT, Audio) ---
+      "float, class:^(org\.hakase\.popup\..*)$"
+      "animation slide right, class:^(org\.hakase\.popup\..*)$"
+      "dimaround, class:^(org\.hakase\.popup\..*)$"
+    ];
   };
   imports = [
     ./style.nix