diff --git a/bashrc b/bashrc
index 7248a3d..957c0a2 100644
--- a/bashrc
+++ b/bashrc
@@ -27,7 +27,7 @@ prompt_command()
         (*)       printf '\033]0;%s\007' "${HOSTNAME%%.*}";;
     esac
     ((UID)) && clr=8 || clr=1
-    PS1="[ \\v | $(colorize $clr \\u) \\h:$(colorize 8 \\W) ]\\n> "
+    PS1="[ bash-\\v $(colorize "$clr" \\u) \\h:$(colorize 8 "$(pwd)") ]\\n> "
 }
 PROMPT_COMMAND=prompt_command
 # }}}
@@ -42,6 +42,7 @@ alias rgrep='command grep --exclude-dir=\.git -R'
 alias ggrep='command git grep'
 alias tailf='command less -R +F'
 alias diff='command diff --color'
+alias whence='command -v'
 
 # ls
 alias ls='command ls --color=auto --group-directories-first '
@@ -99,5 +100,5 @@ s() {
 }
 
 # we want to see exit code on error (it also has to be the last entry here)
-trap 'printf "$(colorize 1 \>\>) $(colorize 8 exit) $(colorize 1 %s)\n" "$?" >&2' ERR
+trap 'returncode=$?; printf "$(colorize 1 \>\>) $(colorize 8 exit) $(colorize 1 %s)\n" "$returncode" >&2' ERR
 # }}}
diff --git a/i3_config b/i3_config
index f9b172f..0d8af58 100644
--- a/i3_config
+++ b/i3_config
@@ -164,6 +164,7 @@ for_window [class="pinentry"] floating enable
 for_window [class="plugin-container"] floating enable
 for_window [class="Qmmp"] floating enable
 for_window [class="Vncviewer"] floating enable
+for_window [class="X64"] floating enable
 for_window [class="(?i)firefox" instance="^(?!Navigator$)"] floating enable
 for_window [title="^Cacti - Realtime"] floating enable
 for_window [instance="sun-awt-X11-XFramePeer" title="(?i)kvm"] floating enable
@@ -174,7 +175,6 @@ for_window [class="EoCApp"] floating enable
 for_window [class="HitmanPro"] floating enable
 for_window [class="Mojosetup"] floating enable
 for_window [class="Pandora"] floating enable
-for_window [class="Steam"] floating enable
 for_window [class="Strife"] floating enable
 for_window [class="Symphony.bin.x86_64"] floating enable
 for_window [class="^Binding of Isaac"] floating enable
diff --git a/tmux.conf b/tmux.conf
index 7370442..9578f4e 100644
--- a/tmux.conf
+++ b/tmux.conf
@@ -18,7 +18,6 @@ bind y command-prompt break-pane
 bind -n M-w next-window
 bind -n M-q previous-window
 bind -n M-` last-window
-set -g terminal-overrides 'rxvt-unicode*:sitm@,ritm@'
 set -g prefix C-g
 set -g update-environment "DISPLAY SSH_ASKPASS SSH_AGENT_PID SSH_CONNECTION WINDOWID XAUTHORITY"
 set -g mode-keys "vi"
diff --git a/zshrc b/zshrc
index da63fa5..3202bfc 100644
--- a/zshrc
+++ b/zshrc
@@ -18,8 +18,11 @@ export MYSQL_PS1='mysql [\d]> '
 export SSH_AUTH_SOCK="$HOME/.ssh/ssh_auth_sock"
 export LS_COLORS='no=00:fi=00:di=34:ow=34;40:ln=35:pi=30;44:so=35;47:do=35;44:bd=33;44:cd=37;44:or=05;37;41:mi=05;37;41:ex=01;31:*.cmd=01;31:*.exe=01;31:*.com=01;31:*.bat=01;31:*.reg=01;31:*.app=01;31:*.txt=32:*.org=32:*.md=32:*.mkd=32:*.h=32:*.c=32:*.C=32:*.cc=32:*.cpp=32:*.cxx=32:*.objc=32:*.sh=32:*.csh=32:*.zsh=32:*.el=32:*.vim=32:*.java=32:*.pl=32:*.pm=32:*.py=32:*.rb=32:*.hs=32:*.php=32:*.htm=32:*.html=32:*.shtml=32:*.erb=32:*.haml=32:*.xml=32:*.rdf=32:*.css=32:*.sass=32:*.scss=32:*.less=32:*.js=32:*.coffee=32:*.man=32:*.0=32:*.1=32:*.2=32:*.3=32:*.4=32:*.5=32:*.6=32:*.7=32:*.8=32:*.9=32:*.l=32:*.n=32:*.p=32:*.pod=32:*.tex=32:*.bmp=33:*.cgm=33:*.dl=33:*.dvi=33:*.emf=33:*.eps=33:*.gif=33:*.jpeg=33:*.jpg=33:*.JPG=33:*.mng=33:*.pbm=33:*.pcx=33:*.pdf=33:*.pgm=33:*.png=33:*.ppm=33:*.pps=33:*.ppsx=33:*.ps=33:*.svg=33:*.svgz=33:*.tga=33:*.tif=33:*.tiff=33:*.xbm=33:*.xcf=33:*.xpm=33:*.xwd=33:*.xwd=33:*.yuv=33:*.aac=33:*.au=33:*.flac=33:*.mid=33:*.midi=33:*.mka=33:*.mp3=33:*.mpa=33:*.mpeg=33:*.mpg=33:*.ogg=33:*.ra=33:*.wav=33:*.anx=33:*.asf=33:*.avi=33:*.axv=33:*.flc=33:*.fli=33:*.flv=33:*.gl=33:*.m2v=33:*.m4v=33:*.mkv=33:*.mov=33:*.mp4=33:*.mp4v=33:*.mpeg=33:*.mpg=33:*.nuv=33:*.ogm=33:*.ogv=33:*.ogx=33:*.qt=33:*.rm=33:*.rmvb=33:*.swf=33:*.vob=33:*.wmv=33:*.doc=31:*.docx=31:*.rtf=31:*.dot=31:*.dotx=31:*.xls=31:*.xlsx=31:*.ppt=31:*.pptx=31:*.fla=31:*.psd=31:*.7z=1;35:*.apk=1;35:*.arj=1;35:*.bin=1;35:*.bz=1;35:*.bz2=1;35:*.cab=1;35:*.deb=1;35:*.dmg=1;35:*.gem=1;35:*.gz=1;35:*.iso=1;35:*.jar=1;35:*.msi=1;35:*.rar=1;35:*.rpm=1;35:*.tar=1;35:*.tbz=1;35:*.tbz2=1;35:*.tgz=1;35:*.tx=1;35:*.war=1;35:*.xpi=1;35:*.xz=1;35:*.z=1;35:*.Z=1;35:*.zip=1;35:*.ANSI-30-black=30:*.ANSI-01;30-brblack=01;30:*.ANSI-31-red=31:*.ANSI-01;31-brred=01;31:*.ANSI-32-green=32:*.ANSI-01;32-brgreen=01;32:*.ANSI-33-yellow=33:*.ANSI-01;33-bryellow=01;33:*.ANSI-34-blue=34:*.ANSI-01;34-brblue=01;34:*.ANSI-35-magenta=35:*.ANSI-01;35-brmagenta=01;35:*.ANSI-36-cyan=36:*.ANSI-01;36-brcyan=01;36:*.ANSI-37-white=37:*.ANSI-01;37-brwhite=01;37:*.log=01;32:*~=01;32:*#=01;32:*.bak=01;33:*.BAK=01;33:*.old=01;33:*.OLD=01;33:*.org_archive=01;33:*.off=01;33:*.OFF=01;33:*.dist=01;33:*.DIST=01;33:*.orig=01;33:*.ORIG=01;33:*.swp=01;33:*.swo=01;33:*,v=01;33:*.gpg=34:*.gpg=34:*.pgp=34:*.asc=34:*.3des=34:*.aes=34:*.enc=34:'
 
+autoload -Uz compinit edit-command-line
+zle -N edit-command-line
+
 # completion
-autoload -Uz compinit && compinit
+compinit
 zstyle ':completion:*' completer _list _complete _ignored
 zstyle ':completion:*' insert-unambiguous true
 zstyle ':completion:*' file-sort name
@@ -39,30 +42,33 @@ zstyle ':completion:*:default' list-colors ${(s.:.)LS_COLORS}
 # {{{ key bindings
 bindkey -e
 # urxvt
-bindkey '^[[7~'   beginning-of-line                   # home
-bindkey '^[[8~'   end-of-line                         # end
-bindkey '^[Oc'    forward-word                        # ctrl + right
-bindkey '^[Od'    backward-word                       # ctrl + left
-bindkey '^[[3^'   delete-word                         # ctrl + del
+bindkey '^[[7~'   beginning-of-line    # home
+bindkey '^[[8~'   end-of-line          # end
+bindkey '^[Oc'    forward-word         # ctrl + right
+bindkey '^[Od'    backward-word        # ctrl + left
+bindkey '^[[3^'   delete-word          # ctrl + del
 # screen
-bindkey '^[[1~'   beginning-of-line                   # home
-bindkey '^[[4~'   end-of-line                         # end
+bindkey '^[[1~'   beginning-of-line    # home
+bindkey '^[[4~'   end-of-line          # end
 # xterm
-bindkey '^[[H'    beginning-of-line                   # home
-bindkey '^[[F'    end-of-line                         # end
+bindkey '^[[H'    beginning-of-line    # home
+bindkey '^[[F'    end-of-line          # end
 # st
-bindkey '^[[P'    delete-char                         # del
-bindkey '^[[M'    delete-word                         # ctrl + del
+bindkey '^[[P'    delete-char          # del
+bindkey '^[[M'    delete-word          # ctrl + del
 # most of them (but not urxvt)
-bindkey '^[[1;5C' forward-word                        # ctrl + right
-bindkey '^[[1;5D' backward-word                       # ctrl + left
-bindkey '^[[3;5~' delete-word                         # ctrl + del
+bindkey '^[[1;5C' forward-word         # ctrl + right
+bindkey '^[[1;5D' backward-word        # ctrl + left
+bindkey '^[[3;5~' delete-word          # ctrl + del
 # all of them
-bindkey '^[[5~'   backward-word                       # page up
-bindkey '^[[6~'   forward-word                        # page down
-bindkey '^[[3~'   delete-char                         # del
-bindkey '^[m'     copy-prev-shell-word                # alt + m
-bindkey -s '^j'   '^atime ^m'                         # ctrl + j
+bindkey '^[[5~'   backward-word        # page up
+bindkey '^[[6~'   forward-word         # page down
+bindkey '^[[3~'   delete-char          # del
+bindkey '^[m'     copy-prev-shell-word # alt + m
+bindkey -s '^j'   '^atime ^m'          # ctrl + j
+
+# command line editing
+bindkey '^x^e'    edit-command-line
 # }}}
 # {{{ prompt
 prompt_ln1='[ %(!.%F{red}.%F{black})%n%f %m:%F{black}%d%f ]'