diff --git a/.vimrc b/.vimrc
index a0812d7..89a7826 100644
--- a/.vimrc
+++ b/.vimrc
@@ -1,6 +1,6 @@
 set nocompatible
 filetype off
-
+set encoding=utf8
 
 set rtp+=~/.vim/bundle/vundle/
 call vundle#rc()
@@ -9,6 +9,8 @@ call vundle#rc()
 "Auto reload .vimrc
 autocmd! bufwritepost .vimrc source %
 
+autocmd FileType nerdtree setlocal nolist
+
 "De-insaneify copy & paste
 set pastetoggle=<F2>
 set clipboard=unnamed
@@ -31,6 +33,8 @@ inoremap {<CR>  {<CR>}<Esc>O
 inoremap {{     {
 inoremap {}     {}
 
+"remove whitespace
+nnoremap <silent> <F5> :let _s=@/ <Bar> :%s/\s\+$//e <Bar> :let @/=_s <Bar> :nohl <Bar> :unlet _s <CR>
 
 "Sane window management
 map <c-h> <c-w>h
@@ -38,9 +42,9 @@ map <c-j> <c-w>j
 map <c-k> <c-w>k
 map <c-l> <c-w>l
 
-:nnoremap <Tab> :bnext<CR>
-:nnoremap <S-Tab> :bprevious<CR>
-:noremap <F3> :Autoformat<CR><CR>
+nnoremap <Tab> :bnext<CR>
+nnoremap <S-Tab> :bprevious<CR>
+noremap <F3> :Autoformat<CR><CR>
 
 "CTRL-N to open Nerd Tree
 map <C-n> :NERDTreeToggle<CR>
@@ -59,38 +63,50 @@ set smartcase
 Plugin 'Chiel92/vim-autoformat'
 Plugin 'gmarik/vundle'
 Plugin 'scrooloose/nerdtree'
+Plugin 'tiagofumo/vim-nerdtree-syntax-highlight'
 Plugin 'scrooloose/syntastic'
 Plugin 'leafgarland/typescript-vim'
 Plugin 'SirVer/ultisnips'
 Plugin 'evanmiller/nginx-vim-syntax'
+Plugin 'chr4/nginx.vim'
 " My Plugins here:
 "
 " original repos on github
-Plugin 'tpope/vim-fugitive'
+Plugin 'tpope/vim-dispatch'
+Plugin 'Xuyuanp/nerdtree-git-plugin'
 " Plugin 'fholgado/minibufexpl.vim'
 Plugin 'Valloric/YouCompleteMe'
 Plugin 'marijnh/tern_for_vim'
-Plugin 'https://github.com/kien/ctrlp.vim'
-Plugin 'https://github.com/klen/python-mode.git'
-Plugin 'https://github.com/godlygeek/tabular.git'
+Plugin 'ctrlpvim/ctrlp.vim'
+Plugin 'klen/python-mode'
 Plugin 'taglist.vim'
 Plugin 'mattn/emmet-vim'
-Plugin 'tpope/vim-dispatch'
 
+Plugin 'Yggdroot/indentline'
 Plugin 'vim-airline/vim-airline'
 Plugin 'vim-airline/vim-airline-themes'
 Plugin 'ntpeters/vim-better-whitespace'
 Plugin 'ap/vim-buftabline'
-Plugin 'airblade/vim-gitgutter'
 Plugin 'elzr/vim-json'
 Plugin 'OmniSharp/omnisharp-vim'
 Plugin 'OrangeT/vim-csharp'
 Plugin 'morhetz/gruvbox'
 
+Plugin 'ryanoasis/vim-devicons'
+
+" step 2: font configuration
+" " These are the basic settings to get the font to work (required):
+set guifont=Droid\ Sans\ Mono\ for\ Powerline\ Nerd\ Font\ Complete\ 12
+set encoding=utf-8
+" " required if using https://github.com/bling/vim-airline
+let g:airline_powerline_fonts=1
+
+
 let g:JSHintHighlightErrorLine = 0
 let g:miniBufExplForceSyntaxEnable = 1
 
 let g:airline#extensions#tabline#enabled = 1
+let g:airline_powerline_fonts = 1
 
 " These are the tweaks I apply to YCM's config, you don't need them but they
 " might help.