diff --git a/nvim/mappings.vim b/nvim/mappings.vim
index 1fdd9e8..7b45f55 100644
--- a/nvim/mappings.vim
+++ b/nvim/mappings.vim
@@ -21,10 +21,15 @@ nnoremap <leader>h :set rnu!<CR>
 " nerdtree
 map <leader>e :NERDTreeToggle<CR>
 
-" fzf
-nmap <C-y> :Buffers<CR>
-nmap <Leader>f :GFiles<CR>
-nmap <Leader>l :Lines<CR>
+" Telescope
+nnoremap <C-y> <cmd>Telescope buffers<CR>
+nnoremap <leader>f <cmd>Telescope find_files<CR>
+nnoremap <leader>l <cmd>Telescope live_grep<CR>
+nnoremap <silent> gD  <cmd>Telescope lsp_implementations<CR>
+nnoremap <silent> gH  <cmd>Telescope lsp_code_actions<CR>
+nnoremap <silent> gd  <cmd>Telescope lsp_definitions<CR>
+nnoremap <silent> gr  <cmd>Telescope lsp_references<CR>
+nnoremap <silent> gy  <cmd>Telescope treesitter<CR>
 
 " vim fugitive
 nnoremap <leader>gg :G<cr>
diff --git a/nvim/pluginoptions.vim b/nvim/pluginoptions.vim
index 121a64b..4d35268 100644
--- a/nvim/pluginoptions.vim
+++ b/nvim/pluginoptions.vim
@@ -43,10 +43,6 @@ augroup VimDiff
 	autocmd VimEnter,FilterWritePre * if &diff | GitGutterDisable | endif
 augroup END
 
-" FZF SETUP
-" =========================
-let g:fzf_buffers_jump = 1
-
 " VIMWIKI SETUP
 " =========================
 let g:vimwiki_list = [{'path': '~/.notes/',
@@ -143,13 +139,13 @@ let g:user_emmet_leader_key='<C-i>'
 let g:languagetool_cmd='/usr/bin/languagetool'
 
 " TREESITTER
-" lua <<EOF
-" require'nvim-treesitter.configs'.setup {
-"   highlight = {
-"     enable = true,
-"   },
-"   indent = {
-"     enable = true
-"   },
-" }
-" EOF
+lua <<EOF
+require'nvim-treesitter.configs'.setup {
+  highlight = {
+    enable = true,
+  },
+  indent = {
+    enable = true
+  },
+}
+EOF
diff --git a/nvim/plugins.vim b/nvim/plugins.vim
index c147378..b63d6fb 100644
--- a/nvim/plugins.vim
+++ b/nvim/plugins.vim
@@ -31,8 +31,8 @@ Plug 'preservim/nerdtree'
 Plug 'ryanoasis/vim-devicons'
 
 " fzf plugin
-Plug 'junegunn/fzf', { 'do': { -> fzf#install() } }
-Plug 'junegunn/fzf.vim'
+Plug 'nvim-lua/plenary.nvim'
+Plug 'nvim-telescope/telescope.nvim'
 
 " vimwiki
 Plug 'vimwiki/vimwiki'
@@ -69,12 +69,7 @@ Plug 'nvim-lua/completion-nvim'
 Plug 'sbdchd/neoformat'
 
 " treesitter
-" Plug 'nvim-treesitter/nvim-treesitter', {'do': ':TSUpdate'}
-" Plug 'nvim-treesitter/playground'
-
-" disable latex before loading
-let g:polyglot_disabled = ["latex"]
-Plug 'sheerun/vim-polyglot'
+Plug 'nvim-treesitter/nvim-treesitter', {'do': ':TSUpdate'}
 
 " latex
 Plug 'lervag/vimtex'