diff --git a/runcoms/zpreztorc b/runcoms/zpreztorc
index 765681983c..0896ee32bd 100644
--- a/runcoms/zpreztorc
+++ b/runcoms/zpreztorc
@@ -15,6 +15,12 @@
 # Color output (auto set to 'no' on dumb terminals).
 zstyle ':prezto:*:*' color 'yes'
 
+# Add additional directories to load prezto modules from
+# zstyle ':prezto:load' pmodule-dirs $HOME/.zprezto-contrib
+
+# Allow module overrides when pmodule-dirs causes module name collisions
+# zstyle ':prezto:load' pmodule-allow-overrides 'yes'
+
 # Set the Zsh modules to load (man zshmodules).
 # zstyle ':prezto:load' zmodule 'attr' 'stat'
 
@@ -46,6 +52,14 @@ zstyle ':prezto:load' pmodule \
 # Set the query found color.
 # zstyle ':prezto:module:autosuggestions:color' found ''
 
+#
+# Completions
+#
+
+# Set the entries to ignore in static */etc/hosts* for host completion.
+# zstyle ':prezto:module:completion:*:hosts' etc-host-ignores \
+#   '0.0.0.0' '127.0.0.1'
+
 #
 # Editor
 #
@@ -87,7 +101,7 @@ zstyle ':prezto:module:editor' key-bindings 'vi'
 # zstyle ':prezto:module:history-substring-search' globbing-flags ''
 
 #
-# OS X
+# macOS
 #
 
 # Set the keyword used by `mand` to open man pages in Dash.app
@@ -112,7 +126,7 @@ zstyle ':prezto:module:prompt' theme 'powerline'
 # Set the working directory prompt display length.
 # By default, it is set to 'short'. Set it to 'long' (without '~' expansion)
 # for longer or 'full' (with '~' expansion) for even longer prompt display.
-# zstyle ':prezto:module:prompt' pwd-length 'short'
+zstyle ':prezto:module:prompt' pwd-length 'long'
 
 # Set the prompt to display the return code along with an indicator for non-zero
 # return codes. This is not supported by all prompts.
@@ -123,14 +137,17 @@ zstyle ':prezto:module:prompt' theme 'powerline'
 #
 
 # Auto switch the Python virtualenv on directory change.
-# zstyle ':prezto:module:python:virtualenv' auto-switch 'yes'
+zstyle ':prezto:module:python:pyenv' auto-switch 'yes'
+
+# Automatically initialize virtualenvwrapper if pre-requisites are met.
+zstyle ':prezto:module:python:virtualenv' initialize 'yes'
 
 #
 # Ruby
 #
 
 # Auto switch the Ruby version on directory change.
-# zstyle ':prezto:module:ruby:chruby' auto-switch 'yes'
+zstyle ':prezto:module:ruby:rbenv' auto-switch 'yes'
 
 #
 # Screen
@@ -147,7 +164,7 @@ zstyle ':prezto:module:prompt' theme 'powerline'
 #
 
 # Set the SSH identities to load into the agent.
-zstyle ':prezto:module:ssh:load' identities 'id_rsa' 'jlrngi-iac_id_rsa'
+zstyle ':prezto:module:ssh:load' identities 'id_rsa' 'id_rsa.pem' 'jlrngi-iac_id_rsa' 'id_ed25519'
 
 #
 # Syntax Highlighting
diff --git a/runcoms/zshrc b/runcoms/zshrc
index bde68298f8..8afb2ad827 100644
--- a/runcoms/zshrc
+++ b/runcoms/zshrc
@@ -19,16 +19,19 @@ export NVM_DIR="$HOME/.nvm"
 [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"  # This loads nvm
 
 # powerline for zsh
-if [[ -r /usr/local/lib/python2.7/site-packages/powerline/bindings/zsh/powerline.zsh ]]; then
-  source /usr/local/lib/python2.7/site-packages/powerline/bindings/zsh/powerline.zsh
+if [[ -r /usr/local/lib/python3.6/site-packages/powerline/bindings/zsh/powerline.zsh ]]; then
+  source /usr/local/lib/python3.6/site-packages/powerline/bindings/zsh/powerline.zsh
 fi
 
+export PATH="${HOME}/bin:${PATH}"
+
 # go
 export GOENV_ROOT="$HOME/.goenv"
 export PATH="$GOENV_ROOT/bin:$PATH"
 eval "$(goenv init -)"
-export PATH="$GOROOT/bin:$PATH"
-export PATH="$PATH:$GOPATH/bin"
+export PATH="$GOROOT/bin:${RBENV_ROOT}/bin:$PATH"
+export PATH="${PYENV_ROOT}/bin:$PATH:$GOPATH/bin"
+eval "$(pyenv init -)"
 
 # direnv
 eval "$(direnv hook zsh)"