diff --git a/.config/hypr/scripts/autostart b/.config/hypr/scripts/autostart
index e3f496d9..569e173a 100755
--- a/.config/hypr/scripts/autostart
+++ b/.config/hypr/scripts/autostart
@@ -41,8 +41,8 @@ dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
 systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP &
 
 # Launch tui monitors for cpu and gpu
-kitty --class btop-kitty btop &
-kitty --class nvtop-kitty nvtop &
+hyprctl dispatch exec "[workspace 24 silent] kitty btop" &
+hyprctl dispatch exec "[workspace 24 silent] kitty nvtop" &
 
 # Activity Watch
 # aw-server-rust &
diff --git a/.config/hypr/scripts/rofi/keybindings b/.config/hypr/scripts/rofi/keybindings
index 1f576d0b..a452cf0e 100755
--- a/.config/hypr/scripts/rofi/keybindings
+++ b/.config/hypr/scripts/rofi/keybindings
@@ -1,4 +1,5 @@
 #!/usr/bin/bash
 CONFIG=$(rofi -show file-browser-extended -theme ~/.config/rofi/style.rasi -file-browser-stdout -file-browser-dir "$HOME"/.config/keyb/bindings)
 
-kitty --class keyb-kitty keyb -k "$CONFIG"
+hyprctl dispatch exec "[float;center;size 35% 80%] kitty keyb -k '$CONFIG'"
+
diff --git a/.config/hypr/themes/luna/rules.conf b/.config/hypr/themes/luna/rules.conf
index 43bc0c34..e2c78a7f 100644
--- a/.config/hypr/themes/luna/rules.conf
+++ b/.config/hypr/themes/luna/rules.conf
@@ -1,63 +1,35 @@
-## Workspaces
-windowrulev2 = workspace 22 silent,class:^(discord)$
-windowrulev2 = workspace 21,silent,class:^(Spotify)$
-windowrulev2 = workspace 21,class:^(YouTube Music)$
-windowrulev2 = workspace 18,class:^(steam)$
-windowrulev2 = workspace 16,class:^(com.github.wwmm.easyeffects)$
-windowrulev2 = workspace 26,class:^(nm-connection-editor)$
-windowrulev2 = workspace 2,class:^(neovide)$
-windowrulev2 = tile,class:^(neovide)$
-windowrulev2 = workspace 9,class:^(virt-manager)$
+## Autostart
 windowrulev2 = workspace 23 silent,class:^(thunderbird)$
-windowrulev2 = workspace 18,class:^(com-atlauncher-App)$
-windowrulev2 = workspace 18,class:^(heroic)$
-windowrulev2 = workspace 8,class:^(cemu)$
-windowrulev2 = workspace 8,class:^(info.cemu.Cemu)$
-windowrulev2 = workspace 8,class:^(dolphin-emu)$
-windowrulev2 = workspace 24 silent,class:^(btop-kitty)$
-windowrulev2 = workspace 24 silent,class:^(nvtop-kitty)$
-windowrulev2 = workspace 10,class:^(libreoffice.*)$
-windowrulev2 = workspace 10,class:^(soffice)$
-windowrulev2 = workspace 17,class:^(com.obsproject.Studio)$
-windowrulev2 = workspace 6,class:^(vital.exe)$
-windowrulev2 = workspace 6,class:^(fl64.exe)$
-windowrulev2 = workspace 8,class:^(Ryujinx)$
-windowrulev2 = workspace 8,class:^(.*steam_app.*)$
-windowrulev2 = workspace 5,class:^(photoshop.exe)$
-windowrulev2 = workspace 5,class:^(pinta)$
+windowrulev2 = workspace 21,silent,class:^(Spotify)$
+windowrulev2 = workspace 22 silent,class:^(discord)$
 
-## Float
-windowrule = float, xfce-polkit
-windowrule = float, galculator
-windowrule = float, wleave
-windowrule = float, Geeqie
-windowrule = float, title:Open File
-windowrule = float, title:Open Folder
-windowrule = float, title:branchdialog
-windowrule = float, nwg-look
-windowrule = float, nm-connection-editor
-
-## Other
-windowrulev2 = animation windowsOut, 0, class:(wleave)
-windowrulev2 = float, class:^(file-roller)$
-windowrulev2 = size 60% 60%, class:^(file-roller)$
-windowrulev2 = center 1, class:^(file-roller)$
-windowrule = float, keyb-kitty
-windowrule = center 1, keyb-kitty
-windowrule = size 35% 80%, keyb-kitty
-windowrule = float, ^(yazi-geeqie)$
-windowrule = size 80% 80%,^(yazi-geeqie)$
-windowrule = center 1, ^(yazi-geeqie)$
-windowrulev2 = opacity 0.0 override 0.0 override,class:^(xwaylandvideobridge)$
-windowrulev2 = noanim,class:^(xwaylandvideobridge)$
-windowrulev2 = nofocus,class:^(xwaylandvideobridge)$
-windowrulev2 = noinitialfocus,class:^(xwaylandvideobridge)$
 
 ## Base Rules
-$center-float = class:^(center-float)$
-windowrule = float, $center-float 
-windowrule = size 70% 70%, $center-float
-windowrule = center 1, $center-float
+$center-float = class:^(center-float)$|^(file-roller)$|^(.*easyeffects.*)$
+windowrulev2 = float,$center-float 
+windowrulev2 = size 70% 70%,$center-float
+windowrulev2 = center 1,$center-float
+
+
+## Float Rules
+windowrule = float, xfce-polkit|galculator|wleave|Geeqie|title:Open File|title:Open Folder|title:branchdialog|nwg-look|nm-connection-editor
+
+
+## Workspaces
+# Games
+windowrulev2 = workspace 8,class:^(.*steam_app.*)$
+windowrulev2 = workspace 18,class:^(steam)$|(.*atlauncher.*)$|(.*heroic.*)$
+windowrulev2 = workspace 8,class:^(Ryujinx)$|(.*cemu.*)$|(.*dolphin.*)$|(.*RetroArch.*)$|(xemu)$|(.*duckstation.*)$|(rpcs3)$
+
+# Tech
+windowrulev2 = workspace 26,class:^(nm-connection-editor)$
+windowrulev2 = workspace 9,class:^(virt-manager)$
+
+# Media
+windowrulev2 = workspace 17,class:^(.*obsproject.*)$
+windowrulev2 = workspace 6,class:^(.*vital.*)$|(.*fl64.*)$
+windowrulev2 = workspace 5,class:^(pinta)$
+
 
 # Scratchpads
 $scratchpad = class:^(scratchpad)$
@@ -70,3 +42,13 @@ $pavu = class:^(pavucontrol)$
 windowrulev2 = workspace special silent,$pavu
 windowrulev2 = float,$pavu
 windowrulev2 = size 30% 85%,$pavu
+
+
+## Specific App Rules
+$videobridge = class:^(xwaylandvideobridge)$
+windowrulev2 = opacity 0.0 override 0.0 override, $videobridge
+windowrulev2 = noanim, $videobridge
+windowrulev2 = nofocus, $videobridge
+windowrulev2 = noinitialfocus, $videobridge
+
+windowrulev2 = animation windowsOut, 0, class:(wleave)
diff --git a/.config/waybar/config.jsonc b/.config/waybar/config.jsonc
index 2a35e327..df2459cf 100644
--- a/.config/waybar/config.jsonc
+++ b/.config/waybar/config.jsonc
@@ -680,27 +680,27 @@
       "format-alt": "{:%A, %B %d, %Y}  "
     },
     "cpu": {
-      "on-click": "kitty --class btop-kitty btop",
+      "on-click": "kitty --class center-float btop",
       "format": "CPU: {usage}%",
       "tooltip": false,
       "interval": 2
     },
     "custom/gpu-usage": {
       "exec": "cat /sys/class/hwmon/hwmon1/device/gpu_busy_percent",
-      "on-click": "kitty --class nvtop-kitty nvtop",
+      "on-click": "kitty --class center-float nvtop",
       "format": "GPU: {}%",
       "return-type": "",
       "interval": 2
     },
     "memory": {
       "format": "{}%  ",
-      "on-click": "kitty --class btop-kitty btop",
+      "on-click": "kitty --class center-float btop",
       "tooltip": true,
       "interval": 2
     },
     "temperature": {
       "critical-threshold": 80,
-      "on-click": "kitty --class btop-kitty btop",
+      "on-click": "kitty --class center-float btop",
       "hwmon-path": "/sys/class/hwmon/hwmon2/temp1_input",
       "format-critical": "{icon} {temperatureC}°C",
       "format": "{icon} {temperatureC}°C",
@@ -714,7 +714,7 @@
     },
     "custom/gpu-temp": {
       "exec": "cat /sys/class/hwmon/hwmon1/temp1_input | cut -b 1-2",
-      "on-click": "kitty --class nvtop-kitty nvtop",
+      "on-click": "kitty --class center-float nvtop",
       "format": " {}°C",
       "return-type": "",
       "interval": 2
diff --git a/.config/yazi/yazi.toml b/.config/yazi/yazi.toml
index a73656a6..e92b84e4 100644
--- a/.config/yazi/yazi.toml
+++ b/.config/yazi/yazi.toml
@@ -21,7 +21,7 @@ archive = [{ exec = 'file-roller "$1"', desc = "Extract here" }]
 pdf = [{ exec = 'zathura "$1"', desc = "Open" }]
 text = [{ exec = '$EDITOR "$@"', block = true }]
 image = [
-  { exec = 'geeqie --class yazi-geeqie "$@"', desc = "Open" },
+  { exec = 'geeqie --class center-float "$@"', desc = "Open" },
   { exec = '''exiftool "$1"; echo "Press enter to exit"; read''', block = true, desc = "Show EXIF" },
 ]
 video = [