diff --git a/.config/nvim/coc-settings.json b/.config/nvim/coc-settings.json
index 4b34873d..9351c655 100644
--- a/.config/nvim/coc-settings.json
+++ b/.config/nvim/coc-settings.json
@@ -10,8 +10,9 @@
   ],
   "eslint.autoFixOnSave": true,
   "diagnostic.checkCurrentLine": true,
+  "codeLens.enabled": true,
   "solargraph.autoformat": true,
   "solargraph.formatting": true,
   "solargraph.hover": true,
-  "solargraph.diagnostics": true,
+  "solargraph.diagnostics": true
 }
diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim
index 709f7cfa..ef5481a8 100644
--- a/.config/nvim/init.vim
+++ b/.config/nvim/init.vim
@@ -30,9 +30,23 @@ nnoremap k gk
 noremap <leader><leader> :GFiles<CR>
 noremap <leader>pf :Files<CR>
 nnoremap <leader>C        :Colors<CR>
-nnoremap <leader><CR>     :Buffers<CR>
+nnoremap <leader>B        :Buffers<CR>
 nnoremap <leader>fl       :Lines<CR>
-nnoremap <leader>m        :History<CR>
+noremap <leader>m        :History<CR>
+noremap <leader>/        :Rg<space>
+
+" Use fuzzy completion relative filepaths across directory
+imap <expr> <c-x><c-f> fzf#vim#complete#path('git ls-files $(git rev-parse --show-toplevel)')
+
+" Better command history with q:
+command! CmdHist call fzf#vim#command_history({'right': '40'})
+nnoremap q: :CmdHist<CR>
+
+" Better search history
+command! QHist call fzf#vim#search_history({'right': '40'})
+nnoremap q/ :QHist<CR>
+
+command! -bang -nargs=* Ack call fzf#vim#ag(<q-args>, {'down': '40%', 'options': --no-color'})
 
 inoremap <F1> <ESC>
 nnoremap <F1> <ESC>
@@ -51,10 +65,12 @@ Plug 'vim-airline/vim-airline'
 Plug 'vim-airline/vim-airline-themes'
 Plug 'junegunn/fzf', { 'do': { -> fzf#install() } }
 Plug 'junegunn/fzf.vim'
+Plug 'stsewd/fzf-checkout.vim'
 Plug 'leafgarland/typescript-vim'
 Plug 'airblade/vim-gitgutter'
 Plug 'neoclide/coc.nvim', {'branch': 'release'}
 Plug 'github/copilot.vim'
+Plug 'tpope/vim-rhubarb'
 
 " Initialize plugin system
 call plug#end()
@@ -93,6 +109,7 @@ let g:completion_matching_strategy_list = ['exact', 'substring', 'fuzzy']
 nmap <leader>gs :G<CR>
 nmap <leader>gh :diffget //3<CR>
 nmap <leader>gu :diffget //2<CR>
+nnoremap <leader>gc :GCheckout<CR>
 
 " Copy to system clipboard
 vnoremap <leader>y "*y
diff --git a/.config/nvim/plugin/coc.vim b/.config/nvim/plugin/coc.vim
index 3d1a5c94..0a72ef83 100644
--- a/.config/nvim/plugin/coc.vim
+++ b/.config/nvim/plugin/coc.vim
@@ -22,6 +22,7 @@ endif
 inoremap <silent><expr> <cr> pumvisible() ? coc#_select_confirm()
                               \: "\<C-g>u\<CR>\<c-r>=coc#on_enter()\<CR>"
 
+inoremap <expr> <cr> pumvisible() ? "\<C-y>" : "\<C-g>u\<CR>"
 " Use `[g` and `]g` to navigate diagnostics
 " Use `:CocDiagnostics` to get all diagnostics of current buffer in location list.
 nmap <silent> [g <Plug>(coc-diagnostic-prev)
@@ -110,3 +111,4 @@ let g:coc_global_extensions = [
       \'coc-json', 
       \'coc-git'
       \]
+
diff --git a/.local/bin/tmux-sessionizer b/.local/bin/tmux-sessionizer
index 461772d3..39193ed3 100755
--- a/.local/bin/tmux-sessionizer
+++ b/.local/bin/tmux-sessionizer
@@ -3,7 +3,7 @@
 if [[ $# -eq 1 ]]; then
     selected=$1
 else
-    selected=$(find ~/ ~/Development -mindepth 1 -maxdepth 1 -type d | fzf)
+    selected=$(find ~/.config ~/Development ~/Development/keeps-next ~/Development/keeps-frontend -mindepth 1 -maxdepth 1 -type d | fzf)
 fi
 
 if [[ -z $selected ]]; then