diff --git a/os/+arch/.config/bspwm/bspwmrc b/os/+arch/.config/bspwm/bspwmrc
index 3b21b668..a8a045a7 100755
--- a/os/+arch/.config/bspwm/bspwmrc
+++ b/os/+arch/.config/bspwm/bspwmrc
@@ -74,19 +74,24 @@ fi
 # Rules
 #
 
+# Reset
 bspc rule -r '*'
-bspc rule -a URxvt:urxvt-scratch state=floating sticky=on center=on monitor=C
-bspc rule -a URxvt:urxvt-fuzzy state=floating sticky=on center=on monitor=C
-bspc rule -a Emacs split_ratio=0.25 border=off state=fullscreen
-bspc rule -a Emacs:org-capture border=off state=floating
-bspc rule -a Gimp desktop=^6
+
+# Floating fixes
+bspc rule -a Emacs:org-capture state=floating
 bspc rule -a mplayer2 state=floating
 bspc rule -a mpv state=floating center=on
 bspc rule -a Vlc state=floating monitor=C center=on
+bspc rule -a love state=floating center=on sticky=on
+bspc rule -a SimpleScreenRecorder state=floating center=on sticky=on
+
+# Special apps
+bspc rule -a URxvt:urxvt-scratch state=floating sticky=on center=on monitor=C
+bspc rule -a URxvt:urxvt-fuzzy state=floating sticky=on center=on monitor=C
+bspc rule -a Emacs split_ratio=0.25 border=off state=fullscreen
+bspc rule -a Gimp desktop=^6
 bspc rule -a feh state=fullscreen
 bspc rule -a Kupfer.py focus=on
 bspc rule -a Screenkey manage=off
-bspc rule -a love state=floating center=on sticky=on
-bspc rule -a SimpleScreenRecorder state=floating center=on sticky=on
 bspc rule -a Chromium monitor=L
 bspc rule -a Firefox monitor=L