diff --git a/plugged.vim b/plugged.vim
index 424aa86..aaf50cc 100644
--- a/plugged.vim
+++ b/plugged.vim
@@ -21,7 +21,7 @@ Plug 'rking/ag.vim'           " the silver searcher
 
 " UI extensions
 Plug 'ciaranm/securemodelines'          " safe modelines in files
-Plug 'kien/ctrlp.vim'                   " fuzzy file+buffer search
+Plug 'junegunn/fzf.vim'
 Plug 'vim-airline/vim-airline'
 Plug 'vim-airline/vim-airline-themes'
 Plug 'scrooloose/nerdtree'              , { 'on': 'NERDTreeToggle' }
diff --git a/vimrc b/vimrc
index a1b0e01..bec379f 100644
--- a/vimrc
+++ b/vimrc
@@ -116,9 +116,10 @@ inoremap <F5> <C-O>:set number!<CR>
 inoremap <F6> <C-O>:set list!<CR>
 
 map <leader>t :NERDTreeToggle<CR>
-map <leader>b :CtrlPBuffer<CR>
-map <leader>r :CtrlPTag<CR>
-map <leader>p :CtrlP<CR>
+map <leader>b :Buffers<CR>
+map <leader>r :Tags<CR>
+map <leader>p :Files<CR>
+map <C-p> :Files<CR>
 
 " Unimpaired remap for non-US keyboard
 nmap ( [