diff --git a/.config/hypr/rules.conf b/.config/hypr/rules.conf
index 8a62ce6..1ef188d 100644
--- a/.config/hypr/rules.conf
+++ b/.config/hypr/rules.conf
@@ -1,24 +1,12 @@
 # https://wiki.hyprland.org/Configuring/Window-Rules
 # https://wiki.hyprland.org/Configuring/Workspace-Rules
 
+# Prevent windows from force-maximizing
 windowrulev2 = suppressevent maximize, class:.*
-windowrulev2 = nofocus,class:^$,title:^$,xwayland:1,floating:1,fullscreen:0,pinned:0
 
 # Fix some dragging issues with XWayland
 windowrulev2 = nofocus,class:^$,title:^$,xwayland:1,floating:1,fullscreen:0,pinned:0
 
-# Fix odd behaviors in IntelliJ IDEs
-windowrulev2 = center,class:^(jetbrains-.*)$,title:^(splash)$,floating:1
-windowrulev2 = nofocus,class:^(jetbrains-.*)$,title:^(splash)$,floating:1
-windowrulev2 = noborder,class:^(jetbrains-.*)$,title:^(splash)$,floating:1
-windowrulev2 = center,class:^(jetbrains-.*)$,title:^( )$,floating:1
-windowrulev2 = stayfocused,class:^(jetbrains-.*)$,title:^( )$,floating:1
-windowrulev2 = noborder,class:^(jetbrains-.*)$,title:^( )$,floating:1
-windowrulev2 = nofocus,class:^(jetbrains-.*)$,title:^(win.*)$,floating:1
-
-# Center vscode prompts
-windowrulev2 = center,xwayland:1,floating:1,fullscreen:0,pinned:0,initialClass:Electron
-
 # Steam friends list
 windowrulev2 = float,initialClass:steam,initialTitle:Friends List
 
@@ -34,3 +22,18 @@ windowrule = rounding 0, floating:0, onworkspace:f[1]
 windowrulev2 = idleinhibit fullscreen, class:^(*)$
 windowrulev2 = idleinhibit fullscreen, title:^(*)$
 windowrulev2 = idleinhibit fullscreen, fullscreen:1
+
+
+# -- IntelliJ IDEs --
+#! Fix splash screen showing in weird places and prevent annoying focus takeovers
+windowrulev2 = center,class:^(jetbrains-.*)$,title:^(splash)$,floating:1
+windowrulev2 = nofocus,class:^(jetbrains-.*)$,title:^(splash)$,floating:1
+windowrulev2 = noborder,class:^(jetbrains-.*)$,title:^(splash)$,floating:1
+
+#! Center popups/find windows
+windowrulev2 = center,class:^(jetbrains-.*)$,title:^( )$,floating:1
+windowrulev2 = stayfocused,class:^(jetbrains-.*)$,title:^( )$,floating:1
+windowrulev2 = noborder,class:^(jetbrains-.*)$,title:^( )$,floating:1
+#! Disable window flicker when autocomplete or tooltips appear
+windowrulev2 = nofocus,class:^(jetbrains-.*)$,title:^(win.*)$,floating:1
+# -- END IntelliJ IDEs --