diff --git a/.config/firestarter/wm b/.config/firestarter/wm
index 1acd5723..08f5f79d 100755
--- a/.config/firestarter/wm
+++ b/.config/firestarter/wm
@@ -1,63 +1,7 @@
 #.fsdefaults
 [ -z "$DISPLAY" ]
 :
-command -v 2bwm
-2bwm
-command -v aewm
-aewm
-command -v awesome
-awesome
+command -v ksmserver && command -v bspwm
+ksmserver -w bspwm
 command -v bspwm
 bspwm
-command -v catwm
-catwm
-command -v cwm
-cwm
-command -v dwm
-dwm
-command -v evilwm
-evilwm
-command -v exwm
-exwm
-command -v fluxbox
-fluxbox
-command -v flwm
-flwm
-command -v fvwm
-fvwm
-command -v herbstluftwm
-herbstluftwm
-command -v i3
-i3
-command -v icewm
-icewm
-command -v jbwm
-jbwm
-command -v jwm
-jwm
-command -v lwm
-lwm
-command -v openbox
-openbox
-command -v pawm
-pawm
-command -v ratpoison
-ratpoison
-command -v twm
-twm
-command -v windowmaker
-windowmaker
-command -v wmii
-wmii
-command -v xmonad
-xmonad
-command -v xfwm4
-xfwm4
-command -v metacity
-metacity
-command -v mutter
-mutter
-command -v kwin
-kwin
-command -v tinywm
-tinywm
diff --git a/.config/firestarter/wm-old b/.config/firestarter/wm-old
new file mode 100644
index 00000000..1acd5723
--- /dev/null
+++ b/.config/firestarter/wm-old
@@ -0,0 +1,63 @@
+#.fsdefaults
+[ -z "$DISPLAY" ]
+:
+command -v 2bwm
+2bwm
+command -v aewm
+aewm
+command -v awesome
+awesome
+command -v bspwm
+bspwm
+command -v catwm
+catwm
+command -v cwm
+cwm
+command -v dwm
+dwm
+command -v evilwm
+evilwm
+command -v exwm
+exwm
+command -v fluxbox
+fluxbox
+command -v flwm
+flwm
+command -v fvwm
+fvwm
+command -v herbstluftwm
+herbstluftwm
+command -v i3
+i3
+command -v icewm
+icewm
+command -v jbwm
+jbwm
+command -v jwm
+jwm
+command -v lwm
+lwm
+command -v openbox
+openbox
+command -v pawm
+pawm
+command -v ratpoison
+ratpoison
+command -v twm
+twm
+command -v windowmaker
+windowmaker
+command -v wmii
+wmii
+command -v xmonad
+xmonad
+command -v xfwm4
+xfwm4
+command -v metacity
+metacity
+command -v mutter
+mutter
+command -v kwin
+kwin
+command -v tinywm
+tinywm
diff --git a/.config/sxhkd/sxhkdrc b/.config/sxhkd/sxhkdrc
index 6ffd2f67..3393de2e 100644
--- a/.config/sxhkd/sxhkdrc
+++ b/.config/sxhkd/sxhkdrc
@@ -12,7 +12,7 @@ alt + Tab
 alt + Escape
 	pkill -USR1 -x sxhkd
 ctrl + alt + l
-	i3lock -nfc 000000
+	loginctl lock-session
 
 ## APPLICATION TOGGLES
 alt + p
diff --git a/.firestarter b/.firestarter
index d7922537..2e2f6a64 160000
--- a/.firestarter
+++ b/.firestarter
@@ -1 +1 @@
-Subproject commit d792253772fef83dd1d7e8576e30c7d5aa8f4bf3
+Subproject commit 2e2f6a64b54450f14ca96608627ab77ff2d97544