diff --git a/.zshrc b/.zshrc
index 8b085b2..7d57b0b 100644
--- a/.zshrc
+++ b/.zshrc
@@ -1,8 +1,18 @@
-# Fig pre block. Keep at the top of this file.
-[[ -f "$HOME/.fig/shell/zshrc.pre.zsh" ]] && builtin source "$HOME/.fig/shell/zshrc.pre.zsh"
+# CodeWhisperer pre block. Keep at the top of this file.
+[[ -f "${HOME}/Library/Application Support/codewhisperer/shell/zshrc.pre.zsh" ]] && builtin source "${HOME}/Library/Application Support/codewhisperer/shell/zshrc.pre.zsh"
+export PATH=/opt/homebrew/bin:$PATH
 export PATH=$HOME/bin:/usr/local/bin:$PATH
 export PATH=$HOME/.deno/bin:$PATH
 export GOPATH=$HOME/.go
+export HOMEBREW_AUTO_UPDATE_SECS=86400
+
+# pnpm
+export PNPM_HOME="/Users/mando/Library/pnpm"
+case ":$PATH:" in
+  *":$PNPM_HOME:"*) ;;
+  *) export PATH="$PNPM_HOME:$PATH" ;;
+esac
+# pnpm end
 
 # Path to your oh-my-zsh installation.
 export ZSH="$HOME/.oh-my-zsh"
@@ -12,6 +22,7 @@ ZSH_THEME="mrtazz" # set by `omz`
 plugins=(git)
 
 source $ZSH/oh-my-zsh.sh
+source ~/.iterm2_shell_integration.zsh
 
 alias fp='ps aux -ww | ag $1'
 alias ctags="`brew --prefix`/bin/ctags"
@@ -19,27 +30,12 @@ alias gi='git log --all --oneline --color --decorate'
 alias gg='git log --pretty=format:"%h %ad | %s%d [%an]" --graph --date=short --decorate'
 alias glo='git log --oneline --no-merges master..'
 
-if [ $USE_NODE ]; then
-  export NVM_DIR="$HOME/.nvm"
-  [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"  # This loads nvm
-  [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"  # This loads nvm bash_completion
-
-  export PATH="$HOME/.nodeenv/bin:$PATH"
-  eval "$(nodenv init -)"
-fi
-
-if [ $USE_RUBY ]; then  
-  if [[ -s $HOME/.rvm/scripts/rvm ]]; then
-    source $HOME/.rvm/scripts/rvm;
-  fi
-
-  export PATH="$HOME/.rbenv/bin:$PATH"
-  eval "$(rbenv init -)"
 
-  # Add RVM to PATH for scripting. Make sure this is the last PATH variable change.
-  export PATH="$PATH:$HOME/.rvm/bin"
-fi
+export NVM_DIR="$HOME/.nvm"
+[ -s "/opt/homebrew/opt/nvm/nvm.sh" ] && \. "/opt/homebrew/opt/nvm/nvm.sh"  # This loads nvm
+[ -s "/opt/homebrew/opt/nvm/etc/bash_completion.d/nvm" ] && \. "/opt/homebrew/opt/nvm/etc/bash_completion.d/nvm"  # This loads nvm bash_completion
 
+eval "$(rbenv init - zsh)"
 
 alias ls=lsd
 alias la="ls -lah"
@@ -56,6 +52,7 @@ alias gsd="gds"
 alias wip="git add .; git commit -m 'wip'; git push origin head"
 
 alias subl="/Applications/Sublime\ Text.app/Contents/SharedSupport/bin/subl"
+alias webstorm='open -na "WebStorm.app" --args "$@"'
 
 # Copies the first file of a Git Merge Conflict
 alias gmc="gs | grep UU | head -n 1 | cut -c 4- | pbcopy; pbpaste"
@@ -97,6 +94,9 @@ gu() {
   git checkout $current_branch
   git merge $parent
 }
+alias gup="gu pre-production"
+alias gum="gu master"
+alias gbc="git branch --merged master --no-color | grep -v 'master\|pre-production' | xargs git branch -d"
 
 pkg_v() {
   echo $(cat package.json \
@@ -112,5 +112,19 @@ alias ip="dig +short myip.opendns.com @resolver1.opendns.com"
 # To download video call `yt VIDEO_ID`
 alias yt="time yt-dlp --download-archive ../downloaded.txt --merge-output-format mp4 -f \"bestvideo+bestaudio[ext=m4a]/best\" --embed-thumbnail --add-metadata --compat-options embed-thumbnail-atomicparsley -x --audio-format m4a"
 
-# Fig post block. Keep at the bottom of this file.
-[[ -f "$HOME/.fig/shell/zshrc.post.zsh" ]] && builtin source "$HOME/.fig/shell/zshrc.post.zsh"
+test -e "${HOME}/.iterm2_shell_integration.zsh" && source "${HOME}/.iterm2_shell_integration.zsh" || true
+
+# Add RVM to PATH for scripting. Make sure this is the last PATH variable change.
+export PATH="$PATH:$HOME/.rvm/bin"
+
+export WASMTIME_HOME="$HOME/.wasmtime"
+
+export PATH="$WASMTIME_HOME/bin:$PATH"
+
+source <(pkgx --shellcode)  #docs.pkgx.sh/shellcode
+
+
+[[ -f "$HOME/fig-export/dotfiles/dotfile.zsh" ]] && builtin source "$HOME/fig-export/dotfiles/dotfile.zsh"
+
+# CodeWhisperer post block. Keep at the bottom of this file.
+[[ -f "${HOME}/Library/Application Support/codewhisperer/shell/zshrc.post.zsh" ]] && builtin source "${HOME}/Library/Application Support/codewhisperer/shell/zshrc.post.zsh"