diff --git a/.antigen b/.antigen
new file mode 160000
index 0000000..7860ce7
--- /dev/null
+++ b/.antigen
@@ -0,0 +1 @@
+Subproject commit 7860ce7aecdbed8fd8ff75472ac59c52c2ac9a7e
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..17ba4bd
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,6 @@
+[submodule ".tpm"]
+	path = .tpm
+	url = https://github.com/tmux-plugins/tpm
+[submodule ".antigen"]
+	path = .antigen
+	url = https://github.com/zsh-users/antigen.git
diff --git a/.tpm b/.tpm
new file mode 160000
index 0000000..aa09a56
--- /dev/null
+++ b/.tpm
@@ -0,0 +1 @@
+Subproject commit aa09a56f4bf24eb06fd06257b9b62645d37bf943
diff --git a/gitconfig b/git/gitconfig
similarity index 74%
rename from gitconfig
rename to git/gitconfig
index 160f2d6..d164d70 100644
--- a/gitconfig
+++ b/git/gitconfig
@@ -21,3 +21,7 @@
 
 [push]
   default = simple
+[filter "lfs"]
+	clean = git-lfs clean %f
+	smudge = git-lfs smudge %f
+	required = true
diff --git a/tmux/tmux-client-38556.log b/tmux/tmux-client-38556.log
new file mode 100644
index 0000000..663c677
--- /dev/null
+++ b/tmux/tmux-client-38556.log
@@ -0,0 +1,2 @@
+got 207 from server
+got 204 from server
diff --git a/tmux/tmux.conf b/tmux/tmux.conf
new file mode 100644
index 0000000..2d59356
--- /dev/null
+++ b/tmux/tmux.conf
@@ -0,0 +1,13 @@
+# List of plugins
+set -g @plugin 'tmux-plugins/tpm'
+set -g @plugin 'tmux-plugins/tmux-sensible'
+
+# Other examples:
+# set -g @plugin 'github_username/plugin_name'
+# set -g @plugin 'git@github.com/user/plugin'
+# set -g @plugin 'git@bitbucket.com/user/plugin'
+set -g @plugin 'seebi/tmux-colors-solarized'
+set -g @colors-solarized 'dark'
+
+# Initialize TMUX plugin manager (keep this line at the very bottom of tmux.conf)
+run '~/Code/joshtronic/dotfiles/.tpm/tpm'
diff --git a/vim/vimrc b/vim/vimrc
index 1162887..548c5af 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -23,7 +23,7 @@ set ignorecase
 set incsearch
 set laststatus=2
 set list
-set listchars=nbsp:¬,eol:↳,tab:└─,extends:»,precedes:«,trail:•
+set listchars=tab:└─,trail:•
 set magic
 set mat=2
 set nocindent
@@ -66,6 +66,7 @@ call vundle#rc()
 
 Bundle 'gmarik/vundle'
 Bundle 'AfterColors.vim'
+Bundle 'altercation/vim-colors-solarized'
 Bundle 'bling/vim-airline'
 Bundle 'bling/vim-bufferline'
 Bundle 'cakebaker/scss-syntax.vim'
@@ -80,7 +81,6 @@ Bundle 'hail2u/vim-css3-syntax'
 "Bundle 'majutsushi/tagbar'
 "Bundle 'MarcWeber/vim-addon-mw-utils'
 Bundle 'mustache/vim-mustache-handlebars'
-Bundle 'nanotech/jellybeans.vim'
 "Bundle 'nathanaelkane/vim-indent-guides'
 "Bundle 'nginx.vim'
 "Bundle 'othree/html5.vim'
@@ -91,7 +91,9 @@ Bundle 'scrooloose/syntastic'
 Bundle 'shawncplus/phpcomplete.vim'
 "Bundle 'SearchComplete'
 
-colorscheme jellybeans
+syntax enable
+set background=dark
+colorscheme solarized
 
 autocmd BufEnter * match ExtraWhitespace /\s\+$/
 autocmd InsertEnter * match ExtraWhitespace /\s\+\%#\@<!$/
@@ -122,7 +124,7 @@ match LineTooLong /\%121v.\+/
 let mapleader = ','
 let g:airline_powerline_fonts = 1
 let g:airline_section_c = '%t'
-let g:airline_theme_patch_func = 'AirlineThemePatch'
+" let g:airline_theme_patch_func = 'AirlineThemePatch'
 let g:airline#extensions#tabline#enabled = 1
 let g:airline#extensions#tabline#fnamemod = ':t'
 let g:airline#extensions#tabline#show_tab_nr = 0
@@ -181,9 +183,9 @@ function! s:VSetSearch()
 endfunction
 
 " Force airline's color scheme
-function! AirlineThemePatch(palette)
-  let a:palette.normal.airline_a = [ '#ffffff', '#268bd2', 255, 33 ]
-endfunction
+" function! AirlineThemePatch(palette)
+"   let a:palette.normal.airline_a = [ '#ffffff', '#268bd2', 255, 33 ]
+" endfunction
 
 if executable('ag')
   let g:ctrlp_user_command = 'ag --ignore-case --nogroup --hidden --follow
diff --git a/zsh/zsh-theme b/zsh/joshtronic.zsh-theme
similarity index 75%
rename from zsh/zsh-theme
rename to zsh/joshtronic.zsh-theme
index d710050..26ed6c3 100644
--- a/zsh/zsh-theme
+++ b/zsh/joshtronic.zsh-theme
@@ -1,15 +1,11 @@
-function username()
-{
-  if [[ `whoami` != 'josh' ]];
-  then
+function username() {
+  if [[ `whoami` != 'josh' ]]; then
     echo %{$FG[248]%}%n
   fi
 }
 
-function server()
-{
-  if [[ `hostname` != *.home ]];
-  then
+function server() {
+  if [[ `hostname` != *.home ]]; then
     echo "%{$FG[244]%}@%{$fg[magenta]%}%m "
   fi
 }
diff --git a/zsh/zshrc b/zsh/zshrc
index cfaf057..a3377be 100644
--- a/zsh/zshrc
+++ b/zsh/zshrc
@@ -1,44 +1,66 @@
+DOTFILES_BASE=$HOME/Code/joshtronic/dotfiles
+
 export TERM="xterm-256color"
+export KEYTIMEOUT=1
 
-ZSH=$HOME/.oh-my-zsh
+bindkey -v
 
-ZSH_THEME="joshtronic"
-
-COMPLETION_WAITING_DOTS="true"
-
-plugins=(brew common-aliases composer git-extras git gitfast gitignore jsontools meteor node npm nvm osx redis-cli rsync systemadmin vundle web-search xcode z zsh_reload)
-
-source $ZSH/oh-my-zsh.sh
+# ZSH=$HOME/.oh-my-zsh
+# 
+# ZSH_THEME="joshtronic"
+# 
+# COMPLETION_WAITING_DOTS="true"
+# 
+# plugins=(brew common-aliases composer git-extras git gitfast gitignore jsontools meteor node npm nvm osx redis-cli rsync systemadmin vundle web-search xcode z zsh_reload)
+# 
+# source $ZSH/oh-my-zsh.sh
 
 # PHP_FULL_VERSION=`php --version | head -n 1 | awk '{print $2}'`
 # PHP_MAJOR_MINOR=`echo $PHP_FULL_VERSION | awk -F '.' '{print $1$2}'`
 # PHP_BASE_PATH=/usr/local/Cellar/php$PHP_MAJOR_MINOR/$PHP_FULL_VERSION
-#
+# 
 # export PATH=/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin:$PHP_BASE_PATH/lib/php:~/Source/dotfiles/scripts:~/Source/dotfiles/git/scripts:$PHP_BASE_PATH/bin:/opt/X11/bin:$PHP_BASE_PATH/lib/php/File
 
-alias    gaa="git add --all"
-alias   gcob="git checkout -B"
-alias    gdb="git delete-branch"
-alias     gf="git fetch"
-alias    gmm="git merge master"
-alias   gmup="git fetch upstream; git merge origin/upstream"
-alias    gmv="git mv"
-#alias     gp="git rev-parse --abbrev-ref HEAD | xargs git push origin"
-#alias    gpu="git rev-parse --abbrev-ref HEAD | xargs git pull origin"
-alias    gra="git remote add"
-alias    grm="git rm"
-alias     gs="git status"
-alias jekyll="jekyll serve --watch"
-alias    mtr="sudo mtr"
-alias   uuid="node -e \"var uuid = require('node-uuid'); console.log(uuid.v4())\""
-alias    unq="xattr -r -d com.apple.quarantine *"
-alias      v="vim"
-alias     vd="vimdiff"
+source $DOTFILES_BASE/.antigen/antigen.zsh
+
+antigen-use oh-my-zsh
+antigen-bundle git
+
+if [[ $OSTYPE == "darwin*" ]]; then
+  antigen-bundle osx
+fi
+
+antigen-bundle zsh-users/zsh-completions
+# antigen-bundle zsh-users/zsh-history-substring-search
+antigen-bundle zsh-users/zsh-syntax-highlighting
+
+antigen-theme $DOTFILES_BASE/zsh joshtronic
+antigen-apply
+
+
+# alias    gaa="git add --all"
+# alias   gcob="git checkout -B"
+# alias    gdb="git delete-branch"
+# alias     gf="git fetch"
+# alias    gmm="git merge master"
+# alias   gmup="git fetch upstream; git merge origin/upstream"
+# alias    gmv="git mv"
+# #alias     gp="git rev-parse --abbrev-ref HEAD | xargs git push origin"
+# #alias    gpu="git rev-parse --abbrev-ref HEAD | xargs git pull origin"
+# alias    gra="git remote add"
+# alias    grm="git rm"
+# alias     gs="git status"
+# alias gh-pages="bundle exec jekyll serve"
+# alias    mtr="sudo mtr"
+# alias   uuid="node -e \"var uuid = require('node-uuid'); console.log(uuid.v4())\""
+# alias    unq="xattr -r -d com.apple.quarantine *"
+# alias      v="vim"
+# alias     vd="vimdiff"
 
 export CLICOLOR=1
-export LSCOLORS=Exfxcxdxbxegedabagacad
+#export LSCOLORS=Exfxcxdxbxegedabagacad
 
-export GREP_OPTIONS="--color=auto --exclude-dir=.git --exclude-dir=artwork --exclude-dir=node_modules"
+export GREP_OPTIONS="--color=auto --exclude-dir=.git --exclude-dir=artwork --exclude-dir=node_modules --exclude-dir=.sass-cache"
 
 export EDITOR=vim
 
@@ -48,6 +70,6 @@ done
 
 export PATH=/usr/local/bin:/usr/local/sbin:./node_modules/bower/bin:./node_modules/grunt-cli/bin:$PATH
 
-source $(brew --prefix nvm)/nvm.sh
+# source $(brew --prefix nvm)/nvm.sh
 
 export NODE_ENV=development