diff --git a/.vim/vimrc b/.vim/vimrc
index c38edad..975a851 100644
--- a/.vim/vimrc
+++ b/.vim/vimrc
@@ -12,106 +12,97 @@ endif
 " }}}
 
 " Plugins {{{
-
-filetype plugin off
-filetype off                  " required
-" set the runtime path to include Vundle and initialize
-set runtimepath+=~/.vim/bundle/Vundle.vim
-call vundle#begin()
-
-" let Vundle manage Vundle, required
-Plugin 'VundleVim/Vundle.vim'
+"
+call plug#begin('~/.vim/bundle')
 
 " Completion engines {{{
-"Plugin 'Valloric/YouCompleteMe'
-"Plugin 'zxqfl/tabnine-vim'
-"Plugin 'lifepillar/vim-mucomplete'
-"Plugin 'Shougo/neocomplete.vim'
-"Plugin 'lyuts/vim-rtags'
-"Plugin 'JBakamovic/cxxd-vim'
-Plugin 'neoclide/coc.nvim'
-Plugin 'jackguo380/vim-lsp-cxx-highlight'
+"Plug 'Valloric/YouCompleteMe'
+"Plug 'zxqfl/tabnine-vim'
+"Plug 'lifepillar/vim-mucomplete'
+"Plug 'Shougo/neocomplete.vim'
+"Plug 'lyuts/vim-rtags'
+"Plug 'JBakamovic/cxxd-vim'
+Plug 'neoclide/coc.nvim'
+Plug 'jackguo380/vim-lsp-cxx-highlight'
 " }}}
 
 " Mappings {{{
-"Plugin 'milkypostman/vim-togglelist' " Map of quickfix toggles
+"Plug 'milkypostman/vim-togglelist' " Map of quickfix toggles
 " }}}
 
 " Code development helpers {{{
-"Plugin 'rhysd/vim-clang-format'
-Plugin 'tpope/vim-commentary' " Toggle C style comments with gc
-"Plugin 'KabbAmine/zeavim.vim' " gz to open zeal
-Plugin 'mbbill/undotree'
-"Plugin 'kkoomen/vim-doge'
-Plugin 'SirVer/ultisnips'
-Plugin 'honza/vim-snippets'
-Plugin 'wellle/context.vim'
-Plugin 'svermeulen/vim-yoink'
-Plugin 'will133/vim-dirdiff'
-"Plugin 'n0v1c3/vira'
+"Plug 'rhysd/vim-clang-format'
+Plug 'tpope/vim-commentary' " Toggle C style comments with gc
+"Plug 'KabbAmine/zeavim.vim' " gz to open zeal
+Plug 'mbbill/undotree'
+"Plug 'kkoomen/vim-doge'
+Plug 'SirVer/ultisnips'
+Plug 'honza/vim-snippets'
+Plug 'wellle/context.vim'
+Plug 'svermeulen/vim-yoink'
+Plug 'will133/vim-dirdiff'
+"Plug 'n0v1c3/vira'
 " }}}
 
 " Files switch, jump and grep-like tools {{{
-"Plugin 'ericcurtin/CurtineIncSw.vim' "Toggle .c .h files
-Plugin 'preservim/nerdtree'
-Plugin 'Xuyuanp/nerdtree-git-plugin'
-"Plugin 'mileszs/ack.vim' " Ack integration
-Plugin 'junegunn/fzf.vim'
-"Plugin 'fholgado/minibufexpl.vim'
-Plugin 'justinmk/vim-sneak' " easy movement
-Plugin 'ludovicchabant/vim-gutentags' "Auto generate tags
-Plugin 'liuchengxu/vista.vim'
-Plugin 'wellle/targets.vim'
-Plugin 'inside/vim-search-pulse'
+"Plug 'ericcurtin/CurtineIncSw.vim' "Toggle .c .h files
+Plug 'preservim/nerdtree'
+Plug 'Xuyuanp/nerdtree-git-plugin'
+"Plug 'mileszs/ack.vim' " Ack integration
+Plug 'junegunn/fzf.vim'
+"Plug 'fholgado/minibufexpl.vim'
+Plug 'justinmk/vim-sneak' " easy movement
+Plug 'ludovicchabant/vim-gutentags' "Auto generate tags
+Plug 'liuchengxu/vista.vim'
+Plug 'wellle/targets.vim'
+Plug 'inside/vim-search-pulse'
 " }}}
 
 " Git integration {{{
-Plugin 'mhinz/vim-signify' " Mark edited lines - faster gitgutter
-"Plugin 'rhysd/git-messenger.vim' " show git history
-Plugin 'tpope/vim-fugitive' " Git integration
+Plug 'mhinz/vim-signify' " Mark edited lines - faster gitgutter
+"Plug 'rhysd/git-messenger.vim' " show git history
+Plug 'tpope/vim-fugitive' " Git integration
 " }}}
 
 " Syntax for random filetypes {{{
-"Plugin 'gabrielelana/vim-markdown'
-Plugin 'kergoth/vim-bitbake' " Bitbake templates and syntax
-"Plugin 'vim-scripts/DoxygenToolkit.vim' " Doxygen support
-Plugin 'pboettch/vim-cmake-syntax'
-Plugin 'aklt/plantuml-syntax'
-Plugin 'vim-pandoc/vim-pandoc-syntax'
+"Plug 'gabrielelana/vim-markdown'
+Plug 'kergoth/vim-bitbake' " Bitbake templates and syntax
+"Plug 'vim-scripts/DoxygenToolkit.vim' " Doxygen support
+Plug 'pboettch/vim-cmake-syntax'
+Plug 'aklt/plantuml-syntax'
+Plug 'vim-pandoc/vim-pandoc-syntax'
 " }}}
 
 " Colorschemes {{{
-"Plugin 'flazz/vim-colorschemes' " lots of colorschemes
-"Plugin 'jeaye/color_coded'
-"Plugin 'thiagoalessio/rainbow_levels.vim'
-"Plugin 'fielding/vice'
-"Plugin 'whatyouhide/vim-gotham'
-"Plugin 'chuling/ci_dark'
-"Plugin 'adrian5/oceanic-next-vim'
+"Plug 'flazz/vim-colorschemes' " lots of colorschemes
+"Plug 'jeaye/color_coded'
+"Plug 'thiagoalessio/rainbow_levels.vim'
+"Plug 'fielding/vice'
+"Plug 'whatyouhide/vim-gotham'
+"Plug 'chuling/ci_dark'
+"Plug 'adrian5/oceanic-next-vim'
 "Black and white:
-"Plugin 'ewilazarus/preto'
-Plugin 'andreasvc/vim-256noir.git'
+"Plug 'ewilazarus/preto'
+Plug 'andreasvc/vim-256noir.git'
 " }}}
 
 " Other plugins (external tools, etc) {{{
-Plugin 'junegunn/goyo.vim'
-Plugin 'jez/vim-superman' "vman application
-Plugin 'vimwiki/vimwiki'
-"Plugin 'metakirby5/codi.vim' " live coding
-Plugin 'vim-airline/vim-airline'
-Plugin 'vim-airline/vim-airline-themes'
-Plugin 'mhinz/vim-startify'
-Plugin 'vim-pandoc/vim-pandoc'
+Plug 'junegunn/goyo.vim'
+Plug 'jez/vim-superman' "vman application
+Plug 'vimwiki/vimwiki'
+"Plug 'metakirby5/codi.vim' " live coding
+Plug 'vim-airline/vim-airline'
+Plug 'vim-airline/vim-airline-themes'
+Plug 'mhinz/vim-startify'
+Plug 'vim-pandoc/vim-pandoc'
 " }}}
 
-call vundle#end()            " required
+call plug#end()            " required
 
 " Packages {{{
 "packadd termdebug
 " }}}
 
-filetype plugin indent on
-
 " }}}
 
 " TAB settings {{{