diff --git a/dotfiles/.config/displaym/bspwm_sxhkdrc b/dotfiles/.config/displaym/bspwm_sxhkdrc
deleted file mode 100644
index 7a90078..0000000
--- a/dotfiles/.config/displaym/bspwm_sxhkdrc
+++ /dev/null
@@ -1,24 +0,0 @@
-# thanks weedsmokingjew
-
-mod1 + {_,shift + }F4
-	bspc node -{c,k}
-mod1 + {_,shift + }q
-	bspc node -{c,k}
-
-mod1 + {_,shift + }{1-4}
-	bspc {desktop -f,node -d} '^{1-4}'
-
-mod1 + shift + e
-	[ "Yes." = $(printf "No.\nYes." | dmenu -p "You pressed the exit shortcut. Do you really want to exit? This will end your X session.") ] && bspc quit
-
-mod1 + f
-	bspc node -t '~fullscreen'
-	
-mod1 + {h,j,k,l}
-	bspc node -f {west,south,north,east}
-
-mod1 + shift + {h,j,k,l}
-	bspc node -s {west,south,north,east}
-
-mod1 + shift + r
-	bspc wm -r && pkill -USR1 -x sxhkd
diff --git a/dotfiles/.config/displaym/sxhkdrc b/dotfiles/.config/displaym/sxhkdrc
deleted file mode 100755
index ae4d2c7..0000000
--- a/dotfiles/.config/displaym/sxhkdrc
+++ /dev/null
@@ -1,50 +0,0 @@
-XF86AudioMute
-	volume m
-XF86Audio{Lower,Raise}Volume
-	volume r {-5,5}
-XF86Launch1
-	$TERMINAL
-
-XF86TaskPane
-	rotate LVDS1
-
-control + shift + Escape
-	$TERMINAL -e htop
-Print
-	scrot
-
-mod1 + {9,0}
-	volume r {-5,5}
-# cred 4 https://github.com/patrickbolle/dotfiles/
-mod1 + equal
-	light -A 5
-mod1 + shift + equal
-	light -A 1
-mod1 + minus
-	light -U 5
-mod1 + shift + minus
-	light -U 1
-
-mod1 + shift + r
-	pkill -USR1 sxhkd
-
-mod1 + t
-	dmenu="dmenu -fn unscii -l 1 -nb #000 -nf #FFDBDB -sb #000 -sf #FFDBDB" autotranslate
-
-mod1 + shift + i
-	pkill dmenubar
-
-mod1 + d
-	dmenu_run -fn unscii -nb '#000' -nf '#FFDBDB' -p '$' -sb '#FFDBDB' -sf '#000'
-
-mod1 + Return
-	$TERMINAL
-
-mod1 + v
-	$TERMINAL -e aiomixer
-
-mod1 + b
-	$BROWSER
-
-mod1 + m
-	volume m
diff --git a/dotfiles/.config/sxhkd/sxhkdrc b/dotfiles/.config/sxhkd/sxhkdrc
new file mode 100755
index 0000000..69823e6
--- /dev/null
+++ b/dotfiles/.config/sxhkd/sxhkdrc
@@ -0,0 +1,64 @@
+# thanks patrickbolle, weedsmokingjew
+XF86AudioMicMute
+	pactl set-source-mute @DEFAULT_SOURCE@ toggle
+XF86AudioMute
+	volume m
+XF86Audio{Lower,Raise}Volume
+	volume r {-5,5}
+XF86Audio{Play,Pause,Next,Prev}
+	playerctl {play,pause,next,previous}
+XF86Launch1
+	$TERMINAL
+
+control + shift + Escape
+	$TERMINAL -e htop
+Print
+	scrot
+
+mod1 + {_,shift +}F4
+	bspc node -{c,k}
+mod1 + {_,shift +}q
+	bspc node -{c,k}
+
+mod1 + {_,shift +}{1-4}
+	bspc {desktop -f,node -d} '^{1-4}'
+
+mod1 + equal
+	light -A 5
+mod1 + shift + equal
+	light -A 1
+mod1 + minus
+	light -U 5
+mod1 + shift + minus
+	light -U 1
+
+mod1 + shift + e
+	if [ "Yes." = $(printf "No.\nYes." | dmenu -fn unscii -nb '#000' -nf '#FFDBDB' -p '$' -sb '#FFDBDB' -sf '#000' -p "You pressed the exit shortcut. Do you really want to exit? This will end your X session.") ]; \
+		then bspc quit || pkill X; fi
+
+mod1 + shift + r
+	bspc wm -r; pkill -USR1 -x sxhkd
+
+mod1 + d
+	dmenu_run -fn unscii -nb '#000' -nf '#FFDBDB' -p '$' -sb '#FFDBDB' -sf '#000'
+
+mod1 + f
+	bspc node -t '~fullscreen'
+
+mod1 + {h,j,k,l}
+	bspc node -f {west,south,north,east}
+
+mod1 + shift + {h,j,k,l}
+	bspc node -s {west,south,north,east}
+
+mod1 + Return
+	$TERMINAL
+
+mod1 + v
+	$TERMINAL -e aiomixer
+
+mod1 + b
+	$BROWSER
+
+mod1 + m
+	volume m
diff --git a/dotfiles/.config/sxhkd/sxhkdrc-base b/dotfiles/.config/sxhkd/sxhkdrc-base
deleted file mode 100755
index c1c3bdd..0000000
--- a/dotfiles/.config/sxhkd/sxhkdrc-base
+++ /dev/null
@@ -1,52 +0,0 @@
-XF86AudioMicMute
-	pactl set-source-mute @DEFAULT_SOURCE@ toggle
-XF86AudioMute
-	pactl -- set-sink-mute @DEFAULT_SINK@ toggle
-XF86Audio{Lower,Raise}Volume
-	pactl set-sink-volume @DEFAULT_SINK@ {"-5%","+5%"}
-XF86Audio{Play,Pause,Next,Prev}
-	playerctl {play,pause,next,previous}
-XF86Launch1
-	$TERMINAL
-
-control + shift + Escape
-	$TERMINAL -e htop
-Print
-	scrot
-
-# cred 4 https://github.com/patrickbolle/dotfiles/
-mod1 + equal
-	light -A 5
-mod1 + shift + equal
-	light -A 1
-mod1 + minus
-	light -U 5
-mod1 + shift + minus
-	light -U 1
-
-mod1 + shift + r
-	pkill -USR1 sxhkd
-
-mod1 + i
-	ps aux | grep dmenubar | grep -v grep && pkill dmenubar; \
-	data | /home/trinity/src/dmenubar/dmenubar -b
-
-mod1 + shift + i
-	pkill dmenubar
-
-mod1 + d
-	dmenu_run
-
-mod1 + Return
-	$TERMINAL
-
-mod1 + v
-	$TERMINAL -e pulsemixer
-
-mod1 + b
-	$BROWSER
-
-mod1 + m
-	pactl -- set-sink-mute @DEFAULT_SINK@ toggle
-mod1 + shift + m
-	pactl set-source-mute @DEFAULT_SOURCE@ toggle