diff --git a/.config/hypr/themes/luna/rules.conf b/.config/hypr/themes/luna/rules.conf
index 8f6c910c..dd75b83f 100644
--- a/.config/hypr/themes/luna/rules.conf
+++ b/.config/hypr/themes/luna/rules.conf
@@ -1,9 +1,3 @@
-## Autostart
-windowrulev2 = workspace 23 silent,class:^(.*thunderbird.*)$
-windowrulev2 = workspace 21,silent,class:^(.*Spotify.*)$
-windowrulev2 = workspace 22 silent,class:^(.*discord.*)$
-
-
 ## Base Rules
 $center-float = class:^(center-float)$|^(.*file-roller.*)$|^(Geeqie)$|^(.*celluloid.*)$
 windowrulev2 = float,$center-float 
@@ -20,7 +14,7 @@ windowrulev2 = center 1,$center-float-mini
 windowrule = float, xfce-polkit|wleave|title:Open File|title:Open Folder|title:branchdialog|nwg-look|nm-connection-editor
 
 
-## Workspaces
+## Workspace Rules
 # System
 windowrulev2 = workspace 9,class:^(.*virt-manager.*)$|(.*PikaBackup.*)$
 windowrulev2 = workspace 19,class:^(.*GParted.*)$|(.*clamtk.*)$|(.*gnome.Logs.*)$
@@ -31,6 +25,9 @@ windowrulev2 = workspace 18,class:^(steam)$|(.*atlauncher.*)$|(.*heroic.*)$
 windowrulev2 = workspace 8,class:^(.*Ryujinx.*)$|(.*cemu.*)$|(.*dolphin.*)$|(.*RetroArch.*)$|(.*xemu.*)$|(.*duckstation.*)$|(.*rpcs3.*)$
 
 # Media
+windowrulev2 = workspace 23 silent,class:^(.*thunderbird.*)$
+windowrulev2 = workspace 21,silent,class:^(.*Spotify.*)$
+windowrulev2 = workspace 22 silent,class:^(.*discord.*)$
 windowrulev2 = workspace 17,class:^(.*obsproject.*)$
 windowrulev2 = workspace 16,class:^(.*easyeffects.*)$|^(.*qpwgraph.*)$
 windowrulev2 = workspace 6,class:^(.*vital.*)$|(.*fl64.*)$
@@ -40,7 +37,8 @@ windowrulev2 = workspace 5,class:^(.*pinta.*)$|(.*krita.*)$|(.*blender.*)$|(.*Up
 windowrulev2 = workspace 10,class:^(.*obsidian.*)$
 windowrulev2 = workspace 2,class:^(.*Code.*)$
 
-# Scratchpads
+
+## Scratchpads
 $scratchpad = class:^(scratchpad)$
 windowrulev2 = float,$scratchpad
 windowrulev2 = size 70% 70%,$scratchpad
@@ -76,3 +74,5 @@ windowrulev2 = center 1, $zathura
 $scrcpy = class:^(.*scrcpy.*)$
 windowrulev2 = center 1,$scrcpy
 windowrulev2 = float,$scrcpy
+
+windowrulev2 = noinitialfocus, class:(.*Spotify.*)