diff --git a/nvim/init.vim b/nvim/init.vim
index 7c8ce8d..22d0b2f 100644
--- a/nvim/init.vim
+++ b/nvim/init.vim
@@ -9,7 +9,6 @@ Plug 'ervandew/supertab'
 " of words.
 Plug 'easymotion/vim-easymotion'
 " Fuzzy file search
-Plug 'ctrlpvim/ctrlp.vim'
 "Plug '~/.fzf'
 Plug 'junegunn/fzf.vim'
 " Remove extraneous whitespace when edit mode is exited
@@ -31,8 +30,11 @@ Plug 'tmux-plugins/vim-tmux-focus-events'
 " For LaTeX support
 Plug 'lervag/vimtex'
 " For git support
-Plug 'jreybert/vimagit'
+Plug 'tpope/vim-fugitive'
+Plug 'junegunn/gv.vim'
 Plug 'rhysd/git-messenger.vim'
+Plug 'sodapopcan/vim-twiggy'
+Plug 'christoomey/vim-conflicted'
 " For tmux yank
 Plug 'vim-utils/vim-husk'
 " gtags
@@ -55,6 +57,7 @@ Plug 'rust-lang/rust.vim'
 Plug 'tpope/vim-surround'
 Plug 'editorconfig/editorconfig-vim'
 Plug 'tpope/vim-eunuch'
+Plug 'jeetsukumaran/vim-buffergator'
 
 " Initialize plugin system
 call plug#end()
@@ -72,8 +75,6 @@ set updatetime=500
 set mouse-=a
 " Don't let autocomplete affect usual typing habits
 set completeopt=menuone,preview,noinsert
-" Let vim-gitgutter do its thing on large files
-let g:gitgutter_max_signs=10000
 
 " Set up leaders
 let mapleader="\<SPACE>"
@@ -132,28 +133,16 @@ nmap <Leader>s :%s//g<Left><Left>
 "nnoremap ; :    " Use ; for commands.
 "nnoremap Q @q   " Use Q to execute default register.
 
-" Open file menu
-nnoremap <Leader>o :CtrlP<CR>
-" Open buffer menu
-nnoremap <Leader>b :CtrlPBuffer<CR>
-" Open most recently used files
-nnoremap <Leader>f :CtrlPMRUFiles<CR>
 " Open NerdTree
 nnoremap <Leader>n :NERDTree<CR>
-
 " Open fuzzy file search
-nnoremap <Leader>t :Files<CR>
+nnoremap <Leader>f :Files<CR>
 " Use ripgrep to search for content in files
 nnoremap <Leader>/ :Rg<CR>
 
 " For git messenger
 nnoremap <Leader>gm :GitMessenger<CR>
 
-" For CMus control
-nnoremap <Leader>x :CmusPlay<CR>
-nnoremap <Leader>c :CmusPause<CR>
-nnoremap <Leader>v :CmusStop<CR>
-
 " Manage splits
 set splitbelow
 set splitright
@@ -276,3 +265,5 @@ let g:airline_right_alt_sep = '|'
 " Prevent loading of ctags
 let g:loaded_gentags#ctags = 1
 
+" Let vim-gitgutter do its thing on large files
+let g:gitgutter_max_signs=10000