diff --git a/.gitmodules b/.gitmodules
index d7ba4ad..aad11c0 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -5,11 +5,3 @@
 [submodule "antigen"]
 	path = zsh/antigen
 	url = https://github.com/zsh-users/antigen.git
-
-[submodule "bundle/Vundle.vim"]
-	path = vim/bundle/Vundle.vim
-	url = https://github.com/VundleVim/Vundle.vim.git
-
-[submodule "nvim/bundle/Vundle.vim"]
-	path = nvim/bundle/Vundle.vim
-	url = https://github.com/VundleVim/Vundle.vim.git
diff --git a/nvim/bundle/Vundle.vim b/nvim/bundle/Vundle.vim
deleted file mode 160000
index b255382..0000000
--- a/nvim/bundle/Vundle.vim
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit b255382d6242d7ea3877bf059d2934125e0c4d95
diff --git a/nvim/init.vim b/nvim/init.vim
index 0859a2e..8de130e 100644
--- a/nvim/init.vim
+++ b/nvim/init.vim
@@ -2,71 +2,72 @@ set nocompatible
 filetype off
 
 " Plugins
-set rtp+=~/.config/nvim/bundle/Vundle.vim
-call vundle#begin("~/.config/nvim/bundle")
-
-Plugin 'VundleVim/Vundle.vim'
-
+let data_dir = has('nvim') ? stdpath('data') . '/site' : '~/.vim'
+if empty(glob(data_dir . '/autoload/plug.vim'))
+  silent execute '!curl -fLo '.data_dir.'/autoload/plug.vim --create-dirs  https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim'
+  autocmd VimEnter * PlugInstall --sync | source $MYVIMRC
+endif
+call plug#begin()
 " Powerline replacement
-Plugin 'vim-airline/vim-airline'
-Plugin 'vim-airline/vim-airline-themes'
+Plug 'vim-airline/vim-airline'
+Plug 'vim-airline/vim-airline-themes'
 
 " Tags
-Plugin 'xolox/vim-misc'
+Plug 'xolox/vim-misc'
 "Plugin 'ludovicchabant/vim-gutentags'
-Plugin 'majutsushi/tagbar'
+Plug 'majutsushi/tagbar'
 
 " Templates
-Plugin 'aperezdc/vim-template'
+Plug 'aperezdc/vim-template'
 
 " Selection expand
-Plugin 'terryma/vim-expand-region'
-Plugin 'kana/vim-textobj-user'
-Plugin 'kana/vim-textobj-line'
-Plugin 'kana/vim-submode'
+Plug 'terryma/vim-expand-region'
+Plug 'kana/vim-textobj-user'
+Plug 'kana/vim-textobj-line'
+Plug 'kana/vim-submode'
 
 " Better Pasting
-Plugin 'ConradIrwin/vim-bracketed-paste'
+Plug 'ConradIrwin/vim-bracketed-paste'
 
 " Tmux navigation
-Plugin 'christoomey/vim-tmux-navigator'
+Plug 'christoomey/vim-tmux-navigator'
 
 " YouCompleteMe
-Plugin 'Valloric/YouCompleteMe'
-Plugin 'rdnetto/YCM-Generator'
+Plug 'Valloric/YouCompleteMe'
+Plug 'rdnetto/YCM-Generator'
 
 " Git
-Plugin 'tpope/vim-fugitive'
+Plug 'tpope/vim-fugitive'
 
 " Comments
-Plugin 'scrooloose/nerdcommenter'
+Plug 'scrooloose/nerdcommenter'
 
 " Surround
-Plugin 'tpope/vim-surround'
+Plug 'tpope/vim-surround'
 
 " Snippets
 " Track the engine.
-Plugin 'SirVer/ultisnips'
+Plug 'SirVer/ultisnips'
 " Snippets are separated from the engine. Add this if you want them:
-Plugin 'honza/vim-snippets'
-Plugin 'ervandew/supertab'
+Plug 'honza/vim-snippets'
+Plug 'ervandew/supertab'
 
 "Buftabeline
-"Plugin 'ap/vim-buftabline'
+"Plug 'ap/vim-buftabline'
 
 " Highlight matching xml tags
-Plugin 'Valloric/MatchTagAlways'
+Plug 'Valloric/MatchTagAlways'
 
 "Javascript
-Plugin 'pangloss/vim-javascript'
+Plug 'pangloss/vim-javascript'
 
 " Tex
-Plugin 'lervag/vimtex'
+Plug 'lervag/vimtex'
 
 "Go
-Plugin 'fatih/vim-go'
+Plug 'fatih/vim-go'
 
-call vundle#end()
+call plug#end()
 filetype plugin indent on
 set cinkeys-=0#
 
@@ -191,7 +192,7 @@ nmap <C-]> <C-w><C-]><C-w>T
 let g:ycm_collect_identifiers_from_tags_files = 1 " Read from tag files
 let g:ycm_global_ycm_extra_conf = '~/.config/nvim/.ycm_extra_conf.py' " Standard conf
 let g:ycm_enable_diagnostic_signs = 0 " Do not show semantic error bar
-let g:ycm_server_python_interpreter = 'python'
+let g:ycm_server_python_interpreter = 'python3'
 let g:ycm_key_list_select_completion   = ['<C-j>', '<C-n>', '<Down>']
 let g:ycm_key_list_previous_completion = ['<C-k>', '<C-p>', '<Up>']