diff --git a/.gitignore b/.gitignore
index e6a886e..981d435 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 .netrwhist
 bundle/*
 view
+plugged
diff --git a/.gitmodules b/.gitmodules
index 75554b2..6810d75 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
-[submodule "bundle/Vundle.vim"]
-	path = bundle/Vundle.vim
-	url = https://github.com/VundleVim/Vundle.vim.git
+[submodule "vim-plug"]
+	path = vim-plug
+	url = https://github.com/junegunn/vim-plug.git
diff --git a/autoload/plug.vim b/autoload/plug.vim
new file mode 120000
index 0000000..6c4bafe
--- /dev/null
+++ b/autoload/plug.vim
@@ -0,0 +1 @@
+../vim-plug/plug.vim
\ No newline at end of file
diff --git a/bundle/.keep b/bundle/.keep
deleted file mode 100644
index e69de29..0000000
diff --git a/bundle/Vundle.vim b/bundle/Vundle.vim
deleted file mode 160000
index 4984767..0000000
--- a/bundle/Vundle.vim
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 4984767509e3d05ca051e253c8a8b37de784be45
diff --git a/vim-plug b/vim-plug
new file mode 160000
index 0000000..96375cb
--- /dev/null
+++ b/vim-plug
@@ -0,0 +1 @@
+Subproject commit 96375cb7d30b7caf2a9417799ff509b59b43a627
diff --git a/vimrc b/vimrc
index e6ea64e..02ba346 100644
--- a/vimrc
+++ b/vimrc
@@ -1,35 +1,40 @@
 set nocompatible              " be iMproved, required
 filetype off                  " required
 
-set rtp+=~/.vim/bundle/Vundle.vim/
-call vundle#rc()
-
-" vundle - It states it is required?!?
-Plugin 'VundleVim/Vundle.vim'
+call plug#begin('~/.vim/plugged')
 
 " Other plugins
-Plugin 'nathanaelkane/vim-indent-guides'
-Plugin 'airblade/vim-gitgutter'
-Plugin 'tpope/vim-fugitive'
-Plugin 'scrooloose/nerdtree'
-Plugin 'Shougo/neocomplete.vim'
-Plugin 'godlygeek/tabular'
-Plugin 'Chiel92/vim-autoformat'
-Plugin 'vim-airline/vim-airline'
-Plugin 'reedes/vim-pencil'
+Plug 'nathanaelkane/vim-indent-guides'
+Plug 'airblade/vim-gitgutter'
+Plug 'tpope/vim-fugitive'
+Plug 'scrooloose/nerdtree'
+Plug 'godlygeek/tabular'
+Plug 'Chiel92/vim-autoformat'
+Plug 'vim-airline/vim-airline'
+Plug 'reedes/vim-pencil'
+
+if has('nvim')
+  Plug 'Shougo/deoplete.nvim', { 'do': ':UpdateRemotePlugins' }
+else
+  Plug 'Shougo/deoplete.nvim'
+  Plug 'roxma/nvim-yarp'
+  Plug 'roxma/vim-hug-neovim-rpc'
+endif
 
 " Languages
-Plugin 'jakar/vim-json'
-Plugin 'kchmck/vim-coffee-script'
-Plugin 'groenewege/vim-less'
-Plugin 'mutewinter/nginx.vim'
-Plugin 'fatih/vim-go'
-Plugin 'honza/dockerfile.vim'
-Plugin 'nsf/gocode', {'rtp': 'vim/'}
-Plugin 'Matt-Deacalion/vim-systemd-syntax'
-Plugin 'cespare/vim-toml'
-Plugin 'fatih/vim-hclfmt'
-Plugin 'b4b4r07/vim-hcl'
+Plug 'jakar/vim-json'
+Plug 'kchmck/vim-coffee-script'
+Plug 'groenewege/vim-less'
+Plug 'mutewinter/nginx.vim'
+Plug 'fatih/vim-go'
+Plug 'honza/dockerfile.vim'
+Plug 'nsf/gocode', {'rtp': 'vim/'}
+Plug 'Matt-Deacalion/vim-systemd-syntax'
+Plug 'cespare/vim-toml'
+Plug 'fatih/vim-hclfmt'
+Plug 'b4b4r07/vim-hcl'
+
+call plug#end()
 
 " important settings
 "
@@ -980,12 +985,10 @@ map <C-n> :NERDTreeToggle<CR>
 autocmd bufenter * if (winnr("$") == 1 && exists("b:NERDTreeType") && b:NERDTreeType == "primary") | q | endif
 
 "
-" NeoComplete configuration
+" deoplete configuration
 "
-
-let g:acp_enableAtStartup = 0 " Disable AutoComplPop.
-let g:neocomplete#enable_at_startup = 1 " Use neocomplete.
-let g:neocomplete#enable_smart_case = 1 " Use smartcase.
+"
+let g:deoplete#enable_at_startup = 1
 
 " Enable omni completion.
 autocmd FileType css setlocal omnifunc=csscomplete#CompleteCSS