diff --git a/.vimrc_template b/.vimrc_template
index 5a73fe2..0401da3 100644
--- a/.vimrc_template
+++ b/.vimrc_template
@@ -12,33 +12,44 @@ call vundle#begin()
 "set rtp+=$HOME/vimfiles/bundle/Vundle.vim/
 "call vundle#begin($HOME/vimfiles/bundle/)
 
+"Plugin Manager
 Plugin 'VundleVim/Vundle.vim'
-"Plugin 'Valloric/YouCompleteMe'
-Plugin 'tmhedberg/SimpylFold'
+
+"Autocomplete (choose one)
+" Plugin 'Valloric/YouCompleteMe'
+" Plugin 'ajh17/VimCompletesMe'
+
+"Stuff useful everywhere
 Plugin 'scrooloose/syntastic'
-Plugin 'vim-scripts/indentpython.vim'
 Plugin 'scrooloose/nerdtree'
 Plugin 'tpope/vim-fugitive'
 Plugin 'tpope/vim-eunuch'
 Plugin 'majutsushi/tagbar'
+
+"Python
 Plugin 'vim-python/python-syntax'
-" Plugin 'mattn/emmet-vim'
-" Plugin 'lepture/vim-jinja'
+Plugin 'vim-scripts/indentpython.vim'
+Plugin 'tmhedberg/SimpylFold'
+
+"Latex
+" Plugin 'LaTeX-Box-Team/LaTeX-Box'
+
+"Weird other langs
+" Plugin 'neovimhaskell/haskell-vim'
+" Plugin 'cespare/vim-toml'
+" Plugin 'rust-lang/rust.vim'
+" Plugin 'tikhomirov/vim-glsl'
 
 call vundle#end()
 "}}}
 
-"Path variables for Plugins
-"{{{
-"let g:tagbar_ctags_bin = '/usr/local/bin/ctags'
-"let g:ycm_global_ycm_extra_conf = '~/.ycm_global_extra_config.py'
-"let g:ycm_python_binary_path = '/usr/local/bin/python'
-"let g:syntastic_python_python_exec = '/usr/local/bin/python'
-"}}}
-
 "Local settings
 "{{{
-" set guifont=Consolas:h12
 set guifont=JetBrains\ Mono\ 12
-colorscheme snowhite
+
+if !empty($DISPLAY)
+    colorscheme snowhite
+else
+    colorscheme pitchblack
+endif
 "}}}