diff --git a/bspwm/.config/bspwm/bspwmrc b/bspwm/.config/bspwm/bspwmrc
index 5626432..ea8305c 100755
--- a/bspwm/.config/bspwm/bspwmrc
+++ b/bspwm/.config/bspwm/bspwmrc
@@ -24,26 +24,25 @@ bspc config active_border_color "#545350"
 bspc config focused_border_color "#7E7F89"
 
 
-bspc rule -a viewnior floating=true
-bspc rule -a feh floating=true
-bspc rule -a mpv floating=true
-bspc rule -a urxvt floating=true
-bspc rule -a Thunar floating=true
-bspc rule -a QEMU floating=true
+bspc rule -a viewnior state=floating
+bspc rule -a feh state=floating
+bspc rule -a mpv state=floating
+bspc rule -a urxvt state=floating
+bspc rule -a Thunar state=floating
+bspc rule -a QEMU state=floating
 bspc rule -a Gimp focus=on
 
 #VBAM
-bspc rule -a InputOutput floating=true
+bspc rule -a InputOutput state=floating
 
 #Nitrogen
-bspc rule -a Nitrogen floating=true
+bspc rule -a Nitrogen state=floating
 
 # Onboard keyboard
 bspc rule -a onboard manage=off
 
 # Flash
-bspc rule -a plugin-container floating=true
-bspc rule -a plugin-container fullscreen=true
+bspc rule -a plugin-container state=fullscreen
 
 bspc desktop LVDS1:^9 -l monocle
 bspc rule -a "Psi-plus" desktop=LVDS1:^9
diff --git a/bspwm/.config/scripts/bspwm-session.sh b/bspwm/.config/scripts/bspwm-session.sh
index f88db49..0ef10cb 100755
--- a/bspwm/.config/scripts/bspwm-session.sh
+++ b/bspwm/.config/scripts/bspwm-session.sh
@@ -20,5 +20,5 @@ done
 
 sxhkd &
 
-exec bspwm
+exec bspwm -c $HOME/.config/bspwm/bspwmrc
 
diff --git a/bspwm/.config/sxhkd/sxhkdrc b/bspwm/.config/sxhkd/sxhkdrc
index 1593c3d..7e74f44 100644
--- a/bspwm/.config/sxhkd/sxhkdrc
+++ b/bspwm/.config/sxhkd/sxhkdrc
@@ -55,7 +55,7 @@ super + ctrl + {Left,Right,Up,Down}
 
 #Insert into latest preselection
 super + ctrl + i
-    bspc window -w last.manual
+    bspc window -w last.!automatic
 
 #Flip Desktop
 super + ctrl + {h,v}
@@ -89,19 +89,16 @@ super + q
 super + shift + r
     bspc desktop -R 90
 
-# Maximize
-super + m
-    bspc window -t fullscreen
+# Maximize and float
+super + {m,f}
+    state={fullscreen,floating}; \
+    bspc query -W -w "focused.$\{state\}" && state=tiled; \
+    bspc window -t "$state"
 
 # Direct access and move windows to desktop
 super + {_,shift +}{1-9}
     bspc {desktop -f,window -d} $(bspc query -M -m):^{1-9}
 
-# toggle floating
-super + f
-    bspc window -t floating
-
-
 # move windows
 super + button{1,3}
     bspc pointer -g {move,resize_corner}