diff --git a/.vimrc b/.vimrc
index e30fd2a..c97beb1 100644
--- a/.vimrc
+++ b/.vimrc
@@ -1,19 +1,30 @@
 set nocompatible
 filetype off
 set rtp+=~/.vim/bundle/Vundle.vim
-call vundle#begin()
+set rtp+=~/.config/nvim/bundle/Vundle.vim
+call vundle#begin('~/.config/nvim/bundle')
 Plugin 'VundleVim/Vundle.vim'
-Plugin 'tomasr/molokai'
+Plugin 'chriskempson/base16-vim'
 Plugin 'godlygeek/tabular'
 Plugin 'plasticboy/vim-markdown'
 Plugin 'itchyny/lightline.vim'
+Plugin 'tpope/vim-fugitive'
+Plugin 'tpope/vim-surround'
+Plugin 'scrooloose/nerdtree'
+Plugin 'scrooloose/nerdcommenter'
+Plugin 'ctrlpvim/ctrlp.vim'
+Plugin 'othree/html5.vim'
+Plugin 'tpope/vim-haml'
+Plugin 'junegunn/fzf'
 call vundle#end()
 
 syntax enable
 set background=dark
-colorscheme apprentice
+set termguicolors
+colorscheme base16-default-dark
 hi Search cterm=NONE ctermfg=white ctermbg=red
 hi clear SpecialKey
+filetype plugin indent on
 
 "Disable vi-compatible backspace behavior
 set backspace=indent,eol,start
@@ -98,6 +109,7 @@ inoremap <buffer><Insert> <nop>
 inoremap <buffer><End> <nop>
 
 nnoremap ; :
+nnoremap <Leader>b :buffers<CR>:buffer<Space>
 
 "Toggle line numbering
 nmap <Leader>n :setlocal number!<CR>
@@ -108,6 +120,7 @@ map <C-J> :bnext<CR>
 map <C-K> :bprev<CR>
 map <C-L> :tabn<CR>
 map <C-H> :tabp<CR>
+map <C-O> :NERDTreeToggle<CR>
 
 "Delete single characters without updating the default register
 noremap x "_x
@@ -127,7 +140,6 @@ set nofoldenable
 
 set grepprg=grep\ -nH\ $*
 
-filetype plugin indent on
 
 let g:powerline_pycmd = "py3"
 let loaded_matchparen = 1
diff --git a/.zshrc b/.zshrc
index 0894d14..ff83b68 100644
--- a/.zshrc
+++ b/.zshrc
@@ -32,6 +32,7 @@ function chpwd() {
 
 alias git='noglob git'
 alias ga='git add'
+alias gaa='git add .'
 alias gb='git branch'
 alias gc='git commit'
 alias gch='git checkout'