diff --git a/homedir/.config/bspwm/sxhkdrc b/homedir/.config/bspwm/sxhkdrc
index fa9ac22..6116dbc 100644
--- a/homedir/.config/bspwm/sxhkdrc
+++ b/homedir/.config/bspwm/sxhkdrc
@@ -26,12 +26,6 @@ super + {1-9,h}
 super + shift + {1-9,h}
 	bspc node -d {1-9,h}
 
-super + m
-	bspc monitor -f next
-
-super + shift + m
-	bspc node -m next
-
 super + t
 	bspc desktop -l next
 
@@ -65,8 +59,8 @@ super + bracketright
 super + f
 	bspc rule -a \* -o state=floating
 
-super + XF86AudioLowerVolume
+super + comma
 	amixer -c 0 set PCM 2dB-
 
-super + XF86AudioRaiseVolume
+super + period
 	amixer -c 0 set PCM 2dB+
diff --git a/homedir/.config/watchman/init.d/lockd b/homedir/.config/watchman/init.d/lockd
index 9b20659..408cb6c 100755
--- a/homedir/.config/watchman/init.d/lockd
+++ b/homedir/.config/watchman/init.d/lockd
@@ -1,5 +1,9 @@
-#!/usr/bin/env watchman
+#!/usr/bin/env ssm
 
 service_respawn='true'
 service_command="$HOME/bin/lockd"
-service_args=( -- i3lock-extra -s -o ~/pics/lock.png -g -p )
+service_args=( i3lock-extra -s -o ~/pics/lock.png -g -p )
+
+lock() {
+	kill -USR1 "$service_pid"
+}
diff --git a/homedir/.config/watchman/init.d/mpd b/homedir/.config/watchman/init.d/mpd
index 0f5605e..1b32986 100755
--- a/homedir/.config/watchman/init.d/mpd
+++ b/homedir/.config/watchman/init.d/mpd
@@ -1,7 +1,7 @@
 #!/usr/bin/env ssm
 
 service_tmpfiles=( "/run/user/$UID/mpd:dir" )
-service_respawn=1
+# service_respawn=false
 service_command='/usr/bin/mpd'
 service_args=( --no-daemon -v )
 
diff --git a/homedir/.config/watchman/init.d/socks b/homedir/.config/watchman/init.d/socks
index cd8e227..c2f7bef 100755
--- a/homedir/.config/watchman/init.d/socks
+++ b/homedir/.config/watchman/init.d/socks
@@ -1,5 +1,8 @@
-#!/usr/bin/watchman
+#!/usr/bin/bash
 
-service_respaen=true
+[[ $PROXY_USER ]] || PROXY_USER='proxy'
+[[ $PROXY_HOST ]] || PROXY_HOST='malganis.priv'
+
+service_respawn=true
 service_command='/usr/bin/ssh'
-service_args=( -i ~/.ssh/proxy/id_ecdsa -ND 8080 proxy@malganis.priv )
+service_args=( -i ~/.ssh/proxy/id_ecdsa -ND 8080 "$PROXY_USER@$PROXY_HOST" )
diff --git a/homedir/.config/zsh.d/modules/config b/homedir/.config/zsh.d/modules/config
index 3fcb459..55741a6 100644
--- a/homedir/.config/zsh.d/modules/config
+++ b/homedir/.config/zsh.d/modules/config
@@ -21,8 +21,6 @@ compinit
 _comp_options+=( globdots )
 
 # History
-setopt HIST_IGNORE_DUPS
-
 HISTFILE=~/.zsh_history
 SAVEHIST=9001
 HISTSIZE=9001
@@ -40,15 +38,17 @@ export LC_ALL='en_US.UTF-8'
 dotfiles_dir="$HOME/git/dotfiles"
 
 # PATH
-set_misc_path "$HOME/ruby/bin" "$HOME/games/bin" "$HOME/.config/alternatives" "$HOME/.local/bin" "$HOME/bin" "$HOME/.gem/ruby/2.3.0/bin/"
+set_misc_path \
+	"$HOME/games/bin" \
+	"$HOME/.config/alternatives" \
+	"$HOME/.local/bin" \
+	"$HOME/bin" \
+	"$HOME/.gem/ruby/2.3.0/bin/" \
+	"$HOME/.nails/bin"
 
 # GPG
 GPG_TTY=$(tty)
 export GPG_TTY
 
 # EDITOR
-EDITOR=vim
-export EDITOR
-
-# jspass completion
-compdef _pass jspass
+export EDITOR=vim
diff --git a/homedir/.config/zsh.d/modules/keys b/homedir/.config/zsh.d/modules/keys
index f6619aa..69fc16d 100644
--- a/homedir/.config/zsh.d/modules/keys
+++ b/homedir/.config/zsh.d/modules/keys
@@ -13,7 +13,6 @@ bindings=(
 	Home     'beginning-of-line'
 	End      'end-of-line'
 	Delete   'delete-char'
-	^R     'history-incremental-search-backward'
 )
 
 for b in ${(k)bindings}; do
diff --git a/homedir/.config/zsh.d/modules/local b/homedir/.config/zsh.d/modules/local
index 786bda2..d9f4eb4 100644
--- a/homedir/.config/zsh.d/modules/local
+++ b/homedir/.config/zsh.d/modules/local
@@ -6,3 +6,5 @@ SSH_AUTH_SOCK="/tmp/${USER}-ssh-auth.sock"
 export SSH_AUTH_SOCK
 
 function x { exec xinit -- -nolisten tcp vt9; }
+
+compdef _pass jspass
diff --git a/homedir/.vimperatorrc.local b/homedir/.vimperatorrc.local
index 26617b9..27611c9 100644
--- a/homedir/.vimperatorrc.local
+++ b/homedir/.vimperatorrc.local
@@ -1,6 +1,6 @@
 :set gui=nonavigation
 :set autocomplete=false
-:map O :tabopen 
+:map O :tabopen! 
 :map P :set apptab<CR>
 :map D :tabclose!<CR>
 
diff --git a/homedir/.vimrc b/homedir/.vimrc
index 2d22751..c114319 100644
--- a/homedir/.vimrc
+++ b/homedir/.vimrc
@@ -23,7 +23,7 @@ set number
 set relativenumber
 
 syntax enable
-set background=dark
+"set background=dark
 
 "colorscheme apprentice
 
diff --git a/mozilla/chrome/userChrome.css b/mozilla/chrome/userChrome.css
index e87978d..e1c6fad 100644
--- a/mozilla/chrome/userChrome.css
+++ b/mozilla/chrome/userChrome.css
@@ -1,5 +1,5 @@
 .tabbrowser-tab {
-	font: 14px xos4 terminus, Monospace !important;
+	font: 14px terminus, Monospace !important;
 	color: #bebebe !important;
 	border: none !important;
 	background: #29303A !important;