diff --git a/nvim/init.vim b/nvim/init.vim
index c194e27..0dbfb3b 100644
--- a/nvim/init.vim
+++ b/nvim/init.vim
@@ -9,7 +9,7 @@ Plug 'ervandew/supertab'
 " of words.
 Plug 'easymotion/vim-easymotion'
 " Fuzzy search
-Plug 'liuchengxu/vim-clap'
+Plug 'Yggdroot/LeaderF', { 'do': './install.sh' }
 " Remove extraneous whitespace when edit mode is exited
 Plug 'thirtythreeforty/lessspace.vim'
 " Status bar mods
@@ -194,18 +194,17 @@ nnoremap Q <Nop>
 nnoremap <Leader>pg :PlugUpgrade<CR>
 nnoremap <Leader>pd :PlugUpdate<CR>
 nnoremap <Leader>pc :PlugClean<CR>
-" For Clap
-nnoremap <Leader>vf  :Clap files<CR>
-nnoremap <Leader>vg  :Clap gfiles<CR>
-nnoremap <Leader>vb  :Clap buffers<CR>
-nnoremap <Leader>vL  :Clap lines<CR>
-nnoremap <Leader>vl  :Clap blines<CR>
-nnoremap <Leader>vc  :Clap bcommits<CR>
-nnoremap <Leader>va  :Clap commits<CR>
-nnoremap <Leader>vh  :Clap history<CR>
-nnoremap <Leader>vm  :Clap command<CR>
-nnoremap <Leader>/   :Clap grep<CR>
-nnoremap <Leader>d   :Clap grep ++query=<cword><CR>
+" For Fuzzy
+nnoremap <Leader>vf  :LeaderfFile<CR>
+nnoremap <Leader>vb  :LeaderfBuffer<CR>
+nnoremap <Leader>vL  :LeaderfLineAll<CR>
+nnoremap <Leader>vl  :LeaderfLine<CR>
+nnoremap <Leader>vh  :LeaderfHistorySearch<CR>
+nnoremap <Leader>vc  :LeaderfHistoryCmd<CR>
+nnoremap <Leader>vt  :LeaderfTag<CR>
+nnoremap <Leader>vw  :LeaderfTagCword<CR>
+nnoremap <Leader>vm  :LeaderfMru<CR>
+nnoremap <Leader>d   :exe ':Leaderf! rg -e ' . expand("<cword>")<CR>
 " Quick buffer switching
 nnoremap <Leader>b :ls<CR>:b<Space>
 " Undo tree
@@ -463,6 +462,10 @@ let g:slime_no_mappings = 1
 let g:slime_python_ipython = 1
 let g:slime_dont_ask_default = 1
 let g:slime_preserve_curpos = 0
+" For LeaderF
+let g:Lf_WindowPosition = 'popup'
+let g:Lf_PreviewInPopup = 1
+let g:Lf_CommandMap = {'<C-K>': ['<Up>'], '<C-J>': ['<Down>']}
 
 augroup Terminal
   au!