diff --git a/.config/base16-shell b/.config/base16-shell
new file mode 160000
index 0000000..c33aade
--- /dev/null
+++ b/.config/base16-shell
@@ -0,0 +1 @@
+Subproject commit c33aade439719ed7448fb1948ff8888e9b143f86
diff --git a/.gitmodules b/.gitmodules
index 152a3a6..c2be2b8 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "vim/vim.symlink/bundle/vundle"]
 	path = vim/vim.symlink/bundle/vundle
 	url = git@github.com:gmarik/vundle.git
+[submodule ".config/base16-shell"]
+	path = .config/base16-shell
+	url = git@github.com:chriskempson/base16-shell.git
diff --git a/vim/vim.symlink/plugins.vim b/vim/vim.symlink/plugins.vim
index 3da0867..f73d6ac 100644
--- a/vim/vim.symlink/plugins.vim
+++ b/vim/vim.symlink/plugins.vim
@@ -46,12 +46,14 @@ Plugin 'tpope/vim-sleuth' " detect indent style (tabs vs. spaces)
 " Plugin 'flazz/vim-colorschemes'
 " Plugin 'nanotech/jellybeans.vim'
 " Plugin 'w0ng/vim-hybrid'
-" Plugin 'chriskempson/base16-vim'
+Plugin 'chriskempson/base16-vim'
 Plugin 'nicknisi/vim-colors-pencil'
 
 " languages
 Plugin 'othree/html5.vim'
-Plugin 'pangloss/vim-javascript'
+" Plugin 'pangloss/vim-javascript'
+Plugin 'jason0x43/vim-js-syntax'
+Plugin 'jason0x43/vim-js-indent'
 " Plugin 'jelera/vim-javascript-syntax'
 Plugin 'tpope/vim-markdown'
 Plugin 'wavded/vim-stylus'
diff --git a/vim/vimrc.symlink b/vim/vimrc.symlink
index d36cba5..5d726bd 100644
--- a/vim/vimrc.symlink
+++ b/vim/vimrc.symlink
@@ -119,9 +119,10 @@ set tm=500
 syntax on
 
 set encoding=utf8
+let base16colorspace=256  " Access colors present in 256 colorspace"
 set t_Co=256 " Explicitly tell vim that the terminal supports 256 colors"
 set background=dark
-colorscheme pencil
+colorscheme base16-eighties
 
 " set number " show line numbers
 set relativenumber " show relative line numbers
@@ -396,6 +397,9 @@ nmap <leader>mq :MarkedQuit<cr>
 " toggle syntastic
 nmap <leader>s :SyntasticToggleMode<cr>
 
+" allow es5 mode when looking at TypeScript
+let g:syntastic_typescript_tsc_args = '--module amd --target ES5'
+
 " CtrlP ignore patterns
 let g:ctrlp_custom_ignore = {
             \ 'dir': '\.git$\|node_modules$\|\.hg$\|\.svn$',
@@ -405,11 +409,12 @@ let g:ctrlp_custom_ignore = {
 " search the nearest ancestor that contains .git, .hg, .svn
 let g:ctrlp_working_path_mode = 2
 
+
 " airline options
 " let g:airline_left_sep=''
 " let g:airline_right_sep=''
 let g:airline_powerline_fonts=1
-let g:airline_theme='badwolf'
+let g:airline_theme='base16'
 
 " don't hide quotes in json files
 let g:vim_json_syntax_conceal = 0
diff --git a/zsh/zshrc.symlink b/zsh/zshrc.symlink
index db51bec..71cc9d2 100644
--- a/zsh/zshrc.symlink
+++ b/zsh/zshrc.symlink
@@ -42,7 +42,7 @@ fi
 
 if [[ -d ~/.rvm ]]; then
     PATH=$HOME/.rvm/bin:$PATH # Add RVM to PATH for scripting
-	source ~/.rvm/scripts/rvm
+    source ~/.rvm/scripts/rvm
 fi
 
 # alias git to hub
@@ -52,3 +52,10 @@ eval "$(hub alias -s)"
 source $(brew --prefix nvm)/nvm.sh
 
 source `brew --prefix`/etc/profile.d/z.sh
+
+
+# Base16 Shell
+export THEME="base16-harmonic16"
+export BACKGROUND="dark"
+BASE16_SHELL="$DOTFILES/.config/base16-shell/$THEME.$BACKGROUND.sh"
+[[ -s $BASE16_SHELL ]] && source $BASE16_SHELL