diff --git a/lua/coldboot/plugins/lsp.lua b/lua/coldboot/plugins/lsp.lua
index 4a79b66..eaa9feb 100644
--- a/lua/coldboot/plugins/lsp.lua
+++ b/lua/coldboot/plugins/lsp.lua
@@ -39,14 +39,16 @@ return {
             vim.keymap.set('n', keys, func, { buffer = bufnr, desc = desc })
           end
 
+          local fzf_lua = require 'fzf-lua'
+
           nmap('<leader>rn', vim.lsp.buf.rename, '[R]e[n]ame')
           nmap('<leader>ca', vim.lsp.buf.code_action, '[C]ode [A]ction')
           nmap('gd', vim.lsp.buf.definition, '[G]oto [D]efinition')
-          nmap('gr', require('telescope.builtin').lsp_references, '[G]oto [R]eferences')
-          nmap('gI', require('telescope.builtin').lsp_implementations, '[G]oto [I]mplementation')
+          nmap('gr', fzf_lua.lsp_references, '[G]oto [R]eferences')
+          nmap('gI', fzf_lua.lsp_implementations, '[G]oto [I]mplementation')
           nmap('<leader>D', vim.lsp.buf.type_definition, 'Type [D]efinition')
-          nmap('<leader>ds', require('telescope.builtin').lsp_document_symbols, '[D]ocument [S]ymbols')
-          nmap('<leader>ws', require('telescope.builtin').lsp_dynamic_workspace_symbols, '[W]orkspace [S]ymbols')
+          nmap('<leader>ds', fzf_lua.lsp_document_symbols, '[D]ocument [S]ymbols')
+          nmap('<leader>ws', fzf_lua.lsp_live_workspace_symbols, '[W]orkspace [S]ymbols')
           nmap('K', vim.lsp.buf.hover, 'Hover Documentation')
           nmap('<C-k>', vim.lsp.buf.signature_help, 'Signature Documentation')
           nmap('gD', vim.lsp.buf.declaration, '[G]oto [D]eclaration')
@@ -62,14 +64,16 @@ return {
           vim.keymap.set('n', keys, func, { buffer = bufnr, desc = desc })
         end
 
+        local fzf_lua = require 'fzf-lua'
+
         nmap('<leader>rn', vim.lsp.buf.rename, '[R]e[n]ame')
         nmap('<leader>ca', vim.lsp.buf.code_action, '[C]ode [A]ction')
         nmap('gd', vim.lsp.buf.definition, '[G]oto [D]efinition')
-        nmap('gr', require('telescope.builtin').lsp_references, '[G]oto [R]eferences')
-        nmap('gI', require('telescope.builtin').lsp_implementations, '[G]oto [I]mplementation')
+        nmap('gr', fzf_lua.lsp_references, '[G]oto [R]eferences')
+        nmap('gI', fzf_lua.lsp_implementations, '[G]oto [I]mplementation')
         nmap('<leader>D', vim.lsp.buf.type_definition, 'Type [D]efinition')
-        nmap('<leader>ds', require('telescope.builtin').lsp_document_symbols, '[D]ocument [S]ymbols')
-        nmap('<leader>ws', require('telescope.builtin').lsp_dynamic_workspace_symbols, '[W]orkspace [S]ymbols')
+        nmap('<leader>ds', fzf_lua.lsp_document_symbols, '[D]ocument [S]ymbols')
+        nmap('<leader>ws', fzf_lua.lsp_live_workspace_symbols, '[W]orkspace [S]ymbols')
         nmap('K', vim.lsp.buf.hover, 'Hover Documentation')
         nmap('<C-k>', vim.lsp.buf.signature_help, 'Signature Documentation')
         nmap('gD', vim.lsp.buf.declaration, '[G]oto [D]eclaration')
diff --git a/lua/coldboot/plugins/telescope.lua b/lua/coldboot/plugins/telescope.lua
index c8b3944..f2b1adc 100644
--- a/lua/coldboot/plugins/telescope.lua
+++ b/lua/coldboot/plugins/telescope.lua
@@ -1,53 +1,93 @@
 return {
   {
-    'nvim-telescope/telescope.nvim',
-    branch = '0.1.x',
-    cmd = 'Telescope',
+    'ibhagwan/fzf-lua',
+    cmd = 'FzfLua',
     keys = {
-      { '<leader>?', '<cmd>Telescope oldfiles<cr>', desc = '[?] Find recently opened files' },
-      { '<leader><space>', '<cmd>Telescope buffers<cr>', desc = '[ ] Find existing buffers' },
+      {
+        '<leader>?',
+        function()
+          require('fzf-lua').oldfiles()
+        end,
+        desc = '[?] Find recently opened files',
+      },
+      {
+        '<leader><space>',
+        function()
+          require('fzf-lua').buffers()
+        end,
+        desc = '[ ] Find existing buffers',
+      },
       {
         '<leader>/',
         function()
-          require('telescope.builtin').current_buffer_fuzzy_find(require('telescope.themes').get_dropdown {
-            winblend = 10,
-            previewer = false,
-          })
+          require('fzf-lua').blines()
         end,
         desc = '[/] Fuzzily search in current buffer',
       },
-      { '<leader>gf', '<cmd>Telescope git_files<cr>', desc = 'Search [G]it [F]iles' },
-      { '<leader>sf', '<cmd>Telescope find_files<cr>', desc = '[S]earch [F]iles' },
-      { '<leader>sh', '<cmd>Telescope help_tags<cr>', desc = '[S]earch [H]elp' },
-      { '<leader>sw', '<cmd>Telescope grep_string<cr>', desc = '[S]earch current [W]ord' },
-      { '<leader>sg', '<cmd>Telescope live_grep<cr>', desc = '[S]earch by [G]rep' },
-      { '<leader>sd', '<cmd>Telescope diagnostics<cr>', desc = '[S]earch [D]iagnostics' },
-      { '<leader>sr', '<cmd>Telescope resume<cr>', desc = '[S]earch [R]esume' },
-    },
-    dependencies = {
-      'nvim-lua/plenary.nvim',
       {
-        'nvim-telescope/telescope-fzf-native.nvim',
-        build = 'make',
-        cond = function()
-          return vim.fn.executable 'make' == 1
+        '<leader>gf',
+        function()
+          require('fzf-lua').git_files()
+        end,
+        desc = 'Search [G]it [F]iles',
+      },
+      {
+        '<leader>sf',
+        function()
+          require('fzf-lua').files()
+        end,
+        desc = '[S]earch [F]iles',
+      },
+      {
+        '<leader>sh',
+        function()
+          require('fzf-lua').help_tags()
+        end,
+        desc = '[S]earch [H]elp',
+      },
+      {
+        '<leader>sw',
+        function()
+          require('fzf-lua').grep_cword()
+        end,
+        desc = '[S]earch current [W]ord',
+      },
+      {
+        '<leader>sg',
+        function()
+          require('fzf-lua').live_grep()
+        end,
+        desc = '[S]earch by [G]rep',
+      },
+      {
+        '<leader>sd',
+        function()
+          require('fzf-lua').diagnostics_workspace()
+        end,
+        desc = '[S]earch [D]iagnostics',
+      },
+      {
+        '<leader>sr',
+        function()
+          require('fzf-lua').resume()
         end,
+        desc = '[S]earch [R]esume',
       },
     },
+    dependencies = {
+      'nvim-tree/nvim-web-devicons',
+    },
     config = function()
-      require('telescope').setup {
-        defaults = {
-          mappings = {
-            i = {
-              ['<C-u>'] = false,
-              ['<C-d>'] = false,
-            },
-          },
+      local fzf = require 'fzf-lua'
+
+      fzf.setup {
+        files = {
+          fd_opts = [[--color=never --type f --hidden --follow --exclude .git]],
+        },
+        grep = {
+          rg_opts = [[--column --line-number --no-heading --color=never --smart-case --hidden --glob !.git/]],
         },
       }
-
-      -- Enable telescope fzf native, if installed
-      pcall(require('telescope').load_extension, 'fzf')
     end,
   },
 }