diff --git a/sub/bash/shopt b/sub/bash/shopt
index 5b1d069..1d95db3 100644
--- a/sub/bash/shopt
+++ b/sub/bash/shopt
@@ -8,3 +8,5 @@ shopt -s checkwinsize               ## Update col/lines after commands
 shopt -s cdspell                    ## Fixes minor spelling errors in cd paths
 shopt -s no_empty_cmd_completion    ## Stops empty line tab comp
 shopt -s dirspell 2>/dev/null       ## Tab comp can fix dir name typos
+
+bind '"\e."':yank-last-arg
diff --git a/sub/zsh/options b/sub/zsh/options
index 6a470aa..f2f3f70 100644
--- a/sub/zsh/options
+++ b/sub/zsh/options
@@ -14,7 +14,8 @@ WORDCHARS=${WORDCHARS//\/} # Don't consider certain characters part of the word
 PROMPT_EOL_MARK=""
 
 # configure key keybindings
-bindkey -e                                        # emacs key bindings
+bindkey -v
+bindkey -M viins 'jk' vi-cmd-mode
 bindkey ' ' magic-space                           # do history expansion on space
 bindkey '^[[3;5~' kill-word                       # ctrl + Supr
 bindkey '^[[3~' delete-char                       # delete
@@ -27,5 +28,4 @@ bindkey '^[[F' end-of-line                        # end
 bindkey '^[[Z' undo                               # shift + tab undo last action
 bindkey '^K' up-line-or-history
 bindkey '^J' down-line-or-history
-bindkey '^E' vi-forward-word
-bindkey '^B' vi-backward-word
+bindkey -M viins '\e.' insert-last-word