diff --git a/zshrc b/zshrc
index 6ff56c2..39e2e53 100644
--- a/zshrc
+++ b/zshrc
@@ -3,11 +3,15 @@ antigen use oh-my-zsh
 antigen bundle zsh-users/zsh-syntax-highlighting
 antigen bundle git
 antigen theme S1cK94/minimal minimal
-export ZSH_THEME="minimal"
+antigen apply
 
 autoload -U select-word-style
 select-word-style bash
 
+HISTSIZE=1000
+SAVEHIST=1000
+HISTFILE=~/.history
+
 bindkey -e
 
 alias vi=nvim
@@ -16,13 +20,13 @@ alias l="ls -la"
 alias ta="tmux attach -d"
 alias dustinswan="ssh dustinswan@dustinswan.com"
 alias kill_offlineimap="ps aux | grep offlineimap | awk '{ print $2 }' | xargs kill -9"
-alias e='emacsclient -a "" -t'
+alias e='emacsclient -a "" -t -nw'
+alias weather='curl http://wttr.in'
+
 export EDITOR=nvim
-export TERM="screen-256color"
 export MOSH_TITLE_NOPREFIX=1
 
 export BROWSER=open
-[[ -s luakit ]] && export BROWSER=luakit
 
 # IOCOM stuff
 alias dswan="ssh root@dswan.insors.net"
@@ -33,14 +37,9 @@ export P4EDITOR=vim
 alias er='rm -rf logs; unzip -o'
 
 # PATH
-export PATH=/usr/texbin:$PATH # Basictex
-export PATH=/usr/local/bin:/usr/local/sbin:$PATH # Homebrew
-export PATH=/Applications/Postgres.app/Contents/MacOS/bin:$PATH
-export PATH=$HOME/Library/Haskell/bin:$PATH
-export PATH=$HOME/.cabal/bin:$PATH
+export PATH=$HOME/.local/bin:$PATH # Stack
 export PATH=$HOME/dotfiles/bin:$PATH
-export PATH=/usr/local/share/npm/bin:$PATH
-export NODE_PATH=/usr/local/lib/node:/usr/local/share/npm/lib/node_modules
+export PATH=$HOME/.npm-packages/bin:$PATH
 export PYTHONPATH=$PYTHONPATH:/usr/local/lib/python2.7/site-packages
 
 # nix
@@ -49,12 +48,11 @@ if [ -e $HOME/.nix-profile/etc/profile.d/nix.sh ]; then . $HOME/.nix-profile/etc
 # Keychain
 eval `keychain --eval id_rsa`
 
-HISTSIZE=1000
-SAVEHIST=1000
-HISTFILE=~/.history
-
-### Added by the Heroku Toolbelt
+# Heroku Toolbelt
 export PATH="/usr/local/heroku/bin:$PATH"
 
 # FZF
 [ -f ~/.fzf.zsh ] && source ~/.fzf.zsh
+
+# iTerm2
+test -e "${HOME}/.iterm2_shell_integration.zsh" && source "${HOME}/.iterm2_shell_integration.zsh"