diff --git a/bspwm/.config/bspwm/commands.sh b/bspwm/.config/bspwm/commands.sh
index e06d670..4d383b9 100644
--- a/bspwm/.config/bspwm/commands.sh
+++ b/bspwm/.config/bspwm/commands.sh
@@ -36,7 +36,7 @@ if [ "$SCHEME" = light ]; then
     FOCUS_BORDER=#068c70
     EMACS_THEME=lupan-light
 else
-    ROOT_BG=#343a1a
+    ROOT_BG=#404040
     BAR_BG=#1a343a
     BAR_FG=#f2f6e1
     BAR_ACTIVE=#3585ce
@@ -46,6 +46,7 @@ else
     FOCUS_BORDER=#3585ce
     EMACS_THEME=lupan-dark
 fi
+DMENU_ARGS="-nb ${BAR_BG} -nf ${BAR_FG} -sb ${BAR_ACTIVE} -sf ${BAR_FG} -fn $FONT"
 
 switch_colors() {
     xrdb -merge <<EOF
@@ -71,6 +72,9 @@ case "$CMD" in
 	switch_colors
 	;;
     dmenu|dmenu_run)
-	exec "$CMD" -nb "${BAR_BG}" -nf "${BAR_FG}" -sb "${BAR_ACTIVE}" -sf "${BAR_FG}" -fn "$FONT" "$@"
+	exec "$CMD" ${DMENU_ARGS} "$@"
 	;;
+    dmenu_window)
+	bspc node -f $(xtitle -f '%u  %s\n' $(bspc query -N -n .window) \
+			   | dmenu ${DMENU_ARGS} "$@" -l 20 -i | cut -f 1 -d ' ')
 esac
diff --git a/bspwm/.config/sxhkd/sxhkdrc b/bspwm/.config/sxhkd/sxhkdrc
index b7b5e80..55f82a5 100644
--- a/bspwm/.config/sxhkd/sxhkdrc
+++ b/bspwm/.config/sxhkd/sxhkdrc
@@ -20,9 +20,6 @@ super + e
 super + r ; {e,f,t}
 	{emacsclient -n -c,firefox,thunderbird}
 
-super + shift + @space
-	bspc node -f $(xtitle -f '%u  %s\n' $(bspc query -N -n .window) | sh ~/.config/bspwm/commands.sh dmenu -l 20 -i | cut -f 1 -d ' ')
-
 super + semicolon ; shift + {h,l,s}
 	{systemctl hibernate,slock,systemctl suspend}
 
@@ -108,6 +105,10 @@ super + {o,i}
 super + {_,shift + }{1-9,0}
 	bspc {desktop -f,node -d} '^{1-9,10}'
 
+# focus window by title
+super + shift + @space
+	sh ~/.config/bspwm/commands.sh dmenu_window
+
 #
 # preselect
 #