diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim
index 3f7de30..7ca5a53 100644
--- a/.config/nvim/init.vim
+++ b/.config/nvim/init.vim
@@ -13,9 +13,13 @@ Plug 'yuezk/vim-js'
 Plug 'neoclide/coc.nvim', {'branch': 'release'}
 
 Plug 'vim-airline/vim-airline'
-Plug 'ctrlpvim/ctrlp.vim'
 Plug 'ryanoasis/vim-devicons'
 
+" File finder and live grep
+Plug 'nvim-telescope/telescope.nvim', {'branch': '0.1.x'}
+Plug 'nvim-lua/plenary.nvim'
+Plug 'nvim-treesitter/nvim-treesitter', {'do': ':TSUpdate'}
+
 " Grep utility for whole project
 Plug 'jremmen/vim-ripgrep'
 " Git integration
@@ -89,12 +93,6 @@ endif
 
 source ~/.config/nvim/coc.vim
 
-let g:ctrlp_custom_ignore = 'node_modules\|DS_Store'
-let g:ctrlp_prompt_mappings = {
-      \ 'AcceptSelection("h")': ['<c-s>', '<c-b>'],
-      \ 'ToggleType(1)': ['<c-up'],
-      \ 'ToggleType(-1)': ['<c-down'],
-      \ }
 let mapleader = " "
 
 nnoremap <leader>h :wincmd h<CR>
@@ -102,7 +100,6 @@ nnoremap <leader>j :wincmd j<CR>
 nnoremap <leader>k :wincmd k<CR>
 nnoremap <leader>l :wincmd l<CR>
 nnoremap <leader>u :UndotreeToggle<CR>
-nnoremap <leader>ps :Rg<SPACE>
 
 nnoremap <leader>1 1gt
 nnoremap <leader>2 2gt
@@ -115,6 +112,9 @@ nnoremap <leader>8 8gt
 nnoremap <leader>9 9gt
 nnoremap <leader>0 10gt
 
+nnoremap <C-p> <cmd>Telescope find_files<cr>
+nnoremap <C-f> <cmd>Telescope live_grep<cr>
+
 " Add folding shortcuts and settings
 set foldmethod=indent
 set foldnestmax=10