diff --git a/lua/config/keymaps.lua b/lua/config/keymaps.lua
index 23f2022..3f00cd3 100644
--- a/lua/config/keymaps.lua
+++ b/lua/config/keymaps.lua
@@ -4,10 +4,12 @@ vim.keymap.set('i','÷','()<Esc>i', {noremap=true, silent=true})
 
 vim.keymap.set('n','<space><tab>',':b#<CR>', {noremap=true, silent=true})
 vim.keymap.set('n', '<leader>cd', ':cd %:p:h<CR>', {noremap=true, silent=true})
-vim.keymap.set('n', '<leader>ff', ':Files<CR>', { noremap = true, silent = true })
-vim.keymap.set('n', '<leader>fg', ':GFiles<CR>', { noremap = true, silent = true })
-vim.keymap.set('n', '<leader>bb', ':Buffers<CR>', { noremap = true, silent = true })
-vim.keymap.set('n', '<leader>fh', ':Helptags<CR>', { noremap = true, silent = true })
+
+vim.api.nvim_set_keymap('n', '<leader>ff', '<cmd>Telescope find_files<cr>', {noremap = true, silent = true})
+vim.api.nvim_set_keymap('n', '<leader>fg', '<cmd>Telescope live_grep<cr>', {noremap = true, silent = true})
+vim.api.nvim_set_keymap('n', '<leader>fb', '<cmd>Telescope buffers<cr>', {noremap = true, silent = true})
+vim.api.nvim_set_keymap('n', '<leader>fh', '<cmd>Telescope help_tags<cr>', {noremap = true, silent = true})
+
 vim.keymap.set('n', '-', '/', { noremap = true, silent = true })
 vim.keymap.set('n', '<F1>', function() vim.cmd('e ~/.config/nvim/init.vim') end, { noremap = true, silent = true })
 vim.keymap.set('n','<F4>',':set hlsearch!<CR>',{ noremap = true, silent = true })
diff --git a/lua/config/plugins/fzf.lua b/lua/config/plugins/fzf.lua
deleted file mode 100644
index 146506d..0000000
--- a/lua/config/plugins/fzf.lua
+++ /dev/null
@@ -1,10 +0,0 @@
-return {
-  {
-    'junegunn/fzf',
-    run = function() vim.fn['fzf#install']() end
-  },
-  {
-    'junegunn/fzf.vim',
-    cmd = { 'Files','GFiles','Buffers','Helptags', 'Ag', 'Rg' }, -- Load when invoking FZF commands
-  }
-}
diff --git a/lua/config/plugins/telescope.lua b/lua/config/plugins/telescope.lua
new file mode 100644
index 0000000..07c56a6
--- /dev/null
+++ b/lua/config/plugins/telescope.lua
@@ -0,0 +1,19 @@
+return {
+    'nvim-telescope/telescope.nvim', tag = '0.1.8',
+-- or                              , branch = '0.1.x',
+      dependencies = { 'nvim-lua/plenary.nvim' },
+
+      config = function()
+      require('telescope').setup{
+        defaults = {
+          mappings = {
+            i = {
+              ["<esc>"] = require('telescope.actions').close
+            }
+          }
+        }
+      }
+    end,
+    cmd = 'Telescope'
+
+    }