diff --git a/vimrc b/init.vim
similarity index 97%
rename from vimrc
rename to init.vim
index 31fdfff..857cfcc 100644
--- a/vimrc
+++ b/init.vim
@@ -16,7 +16,9 @@ if v:progname =~? "evim"
 endif
 
 " Get the defaults that most users want.
-source $VIMRUNTIME/defaults.vim
+if !has('nvim')
+  source $VIMRUNTIME/defaults.vim
+endif
 
 if has("vms")
   set nobackup		" do not keep a backup file, use versions instead
@@ -105,4 +107,4 @@ let mapleader = "\<Space>"
 nnoremap <Leader>? :echon " n :Lex \n l? lsp help (if implemented in buffer)\n w? vimWiki help"<CR>
 nnoremap <Leader>n :Sexplore<CR>
 " Load Plugins
-so ~/.vim/plugins.vim
+so plugins.vim
diff --git a/plugins.vim b/plugins.vim
index ad4b57d..077edb3 100644
--- a/plugins.vim
+++ b/plugins.vim
@@ -1,53 +1,34 @@
 set nocompatible              " be iMproved, required
 filetype off                  " required
 
-" set the runtime path to include Vundle and initialize
-set rtp+=~/.vim/bundle/Vundle.vim
-call vundle#begin()
-" alternatively, pass a path where Vundle should install plugins
-"call vundle#begin('~/some/path/here')
-
-" let Vundle manage Vundle, required
-Plugin 'VundleVim/Vundle.vim'
+call plug#begin()
 
 " Pretty
-Plugin 'itchyny/lightline.vim'
-Plugin 'morhetz/gruvbox'
-Plugin 'ShowTrailingWhitespace'
-"Plugin 'Yggdroot/indentLine'
+Plug 'itchyny/lightline.vim'
+Plug 'morhetz/gruvbox'
+Plug 'vim-scripts/ShowTrailingWhitespace'
+"Plug 'Yggdroot/indentLine'
 
 " Functional
-Plugin 'tpope/vim-fugitive'
-Plugin 'jiangmiao/auto-pairs'
-Plugin 'tpope/vim-surround'
-"Plugin 'dhruvasagar/vim-dotoo'
-Plugin 'vimwiki/vimwiki'
-"Plugin 'tools-life/taskwiki'
-Plugin 'sheerun/vim-polyglot'
-Plugin 'junegunn/fzf', { 'do': { -> fzf#install() } }
-Plugin 'junegunn/fzf.vim'
+Plug 'tpope/vim-fugitive'
+Plug 'jiangmiao/auto-pairs'
+Plug 'tpope/vim-surround'
+"Plug 'dhruvasagar/vim-dotoo'
+Plug 'vimwiki/vimwiki'
+"Plug 'tools-life/taskwiki'
+Plug 'sheerun/vim-polyglot'
+Plug 'junegunn/fzf', { 'do': { -> fzf#install() } }
+Plug 'junegunn/fzf.vim'
 " Language C++/glsl
-"Plugin 'ycm-core/YouCompleteMe'
-Plugin 'prabirshrestha/vim-lsp'
-Plugin 'mattn/vim-lsp-settings'
-Plugin 'prabirshrestha/asyncomplete.vim'
-Plugin 'tikhomirov/vim-glsl'
-Plugin 'mattn/calendar-vim'
+"Plug 'ycm-core/YouCompleteMe'
+Plug 'prabirshrestha/vim-lsp'
+Plug 'mattn/vim-lsp-settings'
+Plug 'prabirshrestha/asyncomplete.vim'
+Plug 'tikhomirov/vim-glsl'
+Plug 'mattn/calendar-vim'
+
+call plug#end()
 
-" All of your Plugins must be added before the following line
-call vundle#end()            " required
-filetype plugin indent on    " required
-" To ignore plugin indent changes, instead use:
-"filetype plugin on
-"
-" Brief help
-" :PluginList       - lists configured plugins
-" :PluginInstall    - installs plugins; append `!` to update or just :PluginUpdate
-" :PluginSearch foo - searches for foo; append `!` to refresh local cache
-" :PluginClean      - confirms removal of unused plugins; append `!` to auto-approve removal
-"
-" see :h vundle for more details or wiki for FAQ
-" Put your non-Plugin stuff after this line
 
 "Always show lightline
 set laststatus=2
@@ -65,6 +46,7 @@ else
 endif
 "let g:gruvbox_improved_strings=1
 let g:gruvbox_improved_warnings=1
+let g:gruvbox_italic=1
 colorscheme gruvbox
 
 " Plugin leader mappings