diff --git a/.vimrc b/.vimrc
index 006aed5..7a43d88 100644
--- a/.vimrc
+++ b/.vimrc
@@ -15,13 +15,13 @@ call vundle#begin()
 Plugin 'VundleVim/Vundle.vim'
 
 " Completion engines:
-Plugin 'Valloric/YouCompleteMe'
+"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 'neoclide/coc.nvim'
 
 " Mappings
 "Plugin 'milkypostman/vim-togglelist' " Map of quickfix toggles
@@ -31,7 +31,8 @@ Plugin 'Valloric/YouCompleteMe'
 "Plugin 'quark-zju/vim-cpp-auto-include'
 Plugin 'tpope/vim-commentary' " Toggle C style comments with gc
 "Plugin 'mnpk/vim-jira-complete'
-Plugin 'KabbAmine/zeavim.vim' " gz to open zeal
+"Plugin 'KabbAmine/zeavim.vim' " gz to open zeal
+Plugin 'mbbill/undotree'
 
 " Files switch, jump and grep-like tools
 "Plugin 'ericcurtin/CurtineIncSw.vim' "Toggle .c .h files
@@ -45,24 +46,27 @@ Plugin 'ctrlpvim/ctrlp.vim'
 Plugin 'justinmk/vim-sneak' " easy movement
 "Plugin 'easymotion/vim-easymotion'
 Plugin 'ludovicchabant/vim-gutentags' "Auto generate tags
-Plugin 'andymass/vim-matchup' " Improve if-else matches
+"Plugin 'andymass/vim-matchup' " Improve if-else matches
 Plugin 'vim-scripts/taglist.vim'
 
 " Git integration
 "Plugin 'airblade/vim-gitgutter' " Mark edited lines
 Plugin 'mhinz/vim-signify' " Mark edited lines - faster gitgutter
-Plugin 'rhysd/git-messenger.vim' " show git history
+"Plugin 'rhysd/git-messenger.vim' " show git history
 "Plugin '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'
 
 " Colorschemes
 Plugin 'flazz/vim-colorschemes' " lots of colorschemes
+"Plugin 'octol/vim-cpp-enhanced-highlight'
 "Plugin 'vim-scripts/CycleColor'
 "Plugin 'jeaye/color_coded'
+"Plugin 'thiagoalessio/rainbow_levels.vim'
 
 " Other plugins (external tools, etc)
 "Plugin 'Shougo/vimproc.vim'
@@ -72,6 +76,7 @@ Plugin 'vimwiki/vimwiki'
 "Plugin 'metakirby5/codi.vim' " live coding
 "Plugin 'pelodelfuego/vim-swoop' " editing in parallel
 "Plugin 'vim-airline/vim-airline'
+Plugin 'mhinz/vim-startify'
 
 call vundle#end()            " required
 
@@ -256,8 +261,19 @@ if has("autocmd")
 	autocmd WinEnter * set cursorline
 
 	"autocmd FileType tex set textwidth=79
+    "autocmd FileType c,cpp,hpp,h :RainbowLevelsOn
 endif
 
+"hi! link RainbowLevel0 Constant
+"hi! link RainbowLevel1 Type
+"hi! link RainbowLevel2 Function
+"hi! link RainbowLevel3 String
+"hi! link RainbowLevel4 PreProc
+"hi! link RainbowLevel5 Statement
+"hi! link RainbowLevel6 Identifier
+"hi! link RainbowLevel7 Normal
+"hi! link RainbowLevel8 Comment
+"
 if has("cscope")
 	"use both cscope and ctags
 	"set cscopetag
@@ -457,6 +473,7 @@ nnoremap <F6> :call FindAlternate()<CR>
 
 packadd termdebug
 
+let g:startify_custom_header = ''
 
 "set shortmess+=c
 "inoremap <silent><expr> <c-space> coc#refresh()