diff --git a/nvim/init.vim b/nvim/init.vim
index f31b363..da7ae81 100644
--- a/nvim/init.vim
+++ b/nvim/init.vim
@@ -88,7 +88,6 @@ Plug 'tpope/vim-surround'
 Plug 'tpope/vim-repeat'
 Plug 'tpope/vim-eunuch'
 Plug 'tpope/vim-sleuth'
-Plug 'tpope/vim-unimpaired'
 Plug 'tpope/vim-vinegar'
 Plug 'editorconfig/editorconfig-vim'
 Plug 'igankevich/mesonic'
@@ -239,6 +238,11 @@ nnoremap sv  <Esc>:vsp<CR>
 nnoremap <Leader>x  <Esc>:x<CR>
 nnoremap <Leader>q  <Esc>:q<CR>
 nnoremap <Leader>Q  <Esc>:qa<CR>
+" Navigate buffers
+nnoremap [b :bprevious<CR>
+nnoremap ]b :bnext<CR>
+nnoremap [B :bfirst<CR>
+nnoremap ]B :blast<CR>
 " Terminal
 nnoremap <Leader>te :vsp<CR> :terminal<CR>
 nnoremap <Leader>tc :SlimeConfig<CR>
@@ -264,8 +268,8 @@ nnoremap <Leader>gf :exe ':Ggrep ' . expand('<cword>')<CR>
 nnoremap <Leader>gF :Ggrep<SPACE>
 nnoremap <Leader>gg :GGrep<SPACE>
 " For gitgutter
-nnoremap un :GitGutterNextHunk<CR>
-nnoremap up :GitGutterPrevHunk<CR>
+nnoremap ]h :GitGutterNextHunk<CR>
+nnoremap [h :GitGutterPrevHunk<CR>
 nnoremap us :GitGutterStageHunk<CR>
 nnoremap ud :GitGutterUndoHunk<CR>
 nnoremap ur :GitGutterPreviewHunk<CR>
@@ -284,10 +288,18 @@ nnoremap <Leader>ws  :ToggleWorkspace<CR>
 " Quickfix & Location list mappings
 nnoremap qo :copen<CR>
 nnoremap qc :cclose<CR>
+nnoremap [q :cprevious<CR>
+nnoremap ]q :cnext<CR>
+nnoremap [Q :cfirst<CR>
+nnoremap ]Q :clast<CR>
 nnoremap qs :vimgrep<SPACE>
 nnoremap qt :call ToggleQuickfixList()<CR>
 nnoremap Lo :lopen<CR>
 nnoremap Lc :lclose<CR>
+nnoremap [l :lprevious<CR>
+nnoremap ]l :lnext<CR>
+nnoremap [L :lfirst<CR>
+nnoremap ]L :llast<CR>
 nnoremap Ls :lvimgrep<SPACE>
 nnoremap Lt :call ToggleLocationList()<CR>