diff --git a/README.md b/README.md
index 5ca0dc3..4e3f8fc 100644
--- a/README.md
+++ b/README.md
@@ -15,6 +15,11 @@ The directory structure is as follows:
 3. *installation_instructions* - This file contains a series of command you copy and paste during install of Arch
 4. *nix/* - This contains all the stuff needed to get up and running with my nix configuration
 
+## Patched Fonts
+
+There are a series of patched inconsolata fonts designed for work with the plugins I have for
+icons in nerd tree. These are not Windows compatible.
+
 ## Emacs Specific Things
 
 Before programming C, install `global` and `libclang` in your distro. After doing that, run `M-x irony-install-server` to install the server in the emacs directory.
diff --git a/dotfiles/config/nvim/init.vim b/dotfiles/config/nvim/init.vim
index cec2c65..8a44ff3 100644
--- a/dotfiles/config/nvim/init.vim
+++ b/dotfiles/config/nvim/init.vim
@@ -8,11 +8,8 @@ endif
 
 call plug#begin('~/.config/nvim/plugged')
 
-" Solarized theme
-Plug 'altercation/vim-colors-solarized'
-
-" Zenburn theme
-Plug 'vim-scripts/zenburn'
+" Material theme
+Plug 'hzchirs/vim-material'
 
 " Syntastic
 Plug 'scrooloose/syntastic'
@@ -35,6 +32,7 @@ Plug 'mileszs/ack.vim'
 " Improved vim status bar
 Plug 'bling/vim-airline'
 Plug 'vim-airline/vim-airline-themes'
+let g:airline_theme='material'
 
 " Indent guides
 Plug 'Yggdroot/indentLine'
@@ -57,7 +55,6 @@ Plug 'wavded/vim-stylus'
 Plug 'raichoo/haskell-vim'
 Plug 'OCamlPro/ocp-indent'
 Plug 'slim-template/vim-slim'
-Plug 'fatih/vim-go'
 Plug 'isRuslan/vim-es6'
 
 " SBT integration for vim
@@ -82,6 +79,9 @@ if !has("win32") || !has("win16")
   " For nerdtree indicators of what has changed
   Plug 'Xuyuanp/nerdtree-git-plugin'
 
+  " For some modern file icons
+  Plug 'ryanoasis/vim-devicons'
+
   " Make Vim play nice with tmux
   " Use <c-h> <c-j> <c-k> <c-l>
   " to move between window panes in tmux or vim
@@ -114,6 +114,16 @@ Plug 'https://github.com/vim-scripts/dbext.vim'
 " end plugin list
 call plug#end()
 
+" Configure vim for true color display otherwise vim-material won't display
+" correctly.
+if (has('nvim'))
+  let $NVIM_TUI_ENABLE_TRUE_COLOR = 1
+endif
+
+if (has('termguicolors'))
+  set termguicolors
+endif
+
 " Standard variables
 set expandtab                  " tabs to spaces
 set tabstop=2                  " spaces entered when tab key is pressed
@@ -220,9 +230,6 @@ endif
 let g:syntastic_javascript_checkers = ['eslint']
 let g:syntastic_javascript_jsxhint_exec = 'eslint'
 
-" Color customizations
-colorscheme zenburn
-
 " Python-mode settings
 
 " disable pymode folding
@@ -259,3 +266,8 @@ let g:indentLine_enabled=0
 
 " Leader + i will toggle line indent guides
 map <silent> <Leader>i :IndentLinesToggle<CR>
+
+" Color scheme setting is done absolutely last to make sure everything is
+" available to vim
+set background=dark
+colorscheme vim-material
diff --git a/dotfiles/emacs.d/init.el b/dotfiles/emacs.d/init.el
index 37018f7..650661e 100644
--- a/dotfiles/emacs.d/init.el
+++ b/dotfiles/emacs.d/init.el
@@ -457,7 +457,7 @@
 
 (set-frame-parameter nil 'background-mode 'dark)
 (set-terminal-parameter nil 'background-mode 'dark)
-(load-theme 'zenburn t)
+(load-theme 'material t)
 
 ;; 10 pt font
 (set-frame-font "inconsolata")
diff --git a/dotfiles/emacs.d/package.el b/dotfiles/emacs.d/package.el
index d600eec..b12da7a 100644
--- a/dotfiles/emacs.d/package.el
+++ b/dotfiles/emacs.d/package.el
@@ -41,6 +41,7 @@
                       wrap-region
                       expand-region
                       wrap-region
+                      material-theme
                       ;;;;;
 
                       ;; Project Interaction/Search/Syntax
diff --git a/dotfiles/zshrc b/dotfiles/zshrc
index 298e3d3..de1a6eb 100644
--- a/dotfiles/zshrc
+++ b/dotfiles/zshrc
@@ -29,7 +29,7 @@ export GOPATH=$HOME/go/
 export PATH=$PATH:"$GOPATH/bin"
 
 alias emacs='emacs -nw'
-alias vim='emacs'         # LOL
+alias vim='nvim'
 alias irssi='TERM=screen-256color irssi'
 alias scheme='rlwrap mit-scheme'
 alias startpg='pg_ctl -D /usr/local/var/postgres -l /usr/local/var/postgres/server.log start'
diff --git a/patched-inconsolata/Inconsolata Bold Nerd Font Complete Mono.ttf b/patched-inconsolata/Inconsolata Bold Nerd Font Complete Mono.ttf
new file mode 100644
index 0000000..f5445c5
Binary files /dev/null and b/patched-inconsolata/Inconsolata Bold Nerd Font Complete Mono.ttf differ
diff --git a/patched-inconsolata/Inconsolata Bold Nerd Font Complete.ttf b/patched-inconsolata/Inconsolata Bold Nerd Font Complete.ttf
new file mode 100644
index 0000000..ea63be0
Binary files /dev/null and b/patched-inconsolata/Inconsolata Bold Nerd Font Complete.ttf differ
diff --git a/patched-inconsolata/Inconsolata Nerd Font Complete.otf b/patched-inconsolata/Inconsolata Nerd Font Complete.otf
new file mode 100644
index 0000000..720a700
Binary files /dev/null and b/patched-inconsolata/Inconsolata Nerd Font Complete.otf differ
diff --git a/patched-inconsolata/Inconsolata Regular Nerd Font Complete Mono.ttf b/patched-inconsolata/Inconsolata Regular Nerd Font Complete Mono.ttf
new file mode 100644
index 0000000..bd8495c
Binary files /dev/null and b/patched-inconsolata/Inconsolata Regular Nerd Font Complete Mono.ttf differ
diff --git a/patched-inconsolata/Inconsolata Regular Nerd Font Complete.ttf b/patched-inconsolata/Inconsolata Regular Nerd Font Complete.ttf
new file mode 100644
index 0000000..98d3db6
Binary files /dev/null and b/patched-inconsolata/Inconsolata Regular Nerd Font Complete.ttf differ