diff --git a/nvim/plugin-config.vim b/nvim/plugin-config.vim
index 16a2aac..39ecaf3 100644
--- a/nvim/plugin-config.vim
+++ b/nvim/plugin-config.vim
@@ -11,6 +11,7 @@ source ~/.config/nvim/plugin-config/colorizer.lua
 source ~/.config/nvim/plugin-config/diagnosticls-configs.lua
 source ~/.config/nvim/plugin-config/export-to-vscode.lua
 source ~/.config/nvim/plugin-config/fugitive.vim
+source ~/.config/nvim/plugin-config/fzf.lua
 source ~/.config/nvim/plugin-config/gitsigns.lua
 source ~/.config/nvim/plugin-config/goyo.vim
 source ~/.config/nvim/plugin-config/harpoon.lua
diff --git a/nvim/plugin-config/fzf.lua b/nvim/plugin-config/fzf.lua
new file mode 100644
index 0000000..b882c13
--- /dev/null
+++ b/nvim/plugin-config/fzf.lua
@@ -0,0 +1,25 @@
+-- fzf.nvim
+-- https://github.com/nvim-telescope/telescope.nvim/
+
+--- Mappings
+local opts = { noremap = true, silent = true }
+
+vim.api.nvim_set_keymap('n', '<C-p>',       [[<Cmd>Files<CR>]],     opts)
+vim.api.nvim_set_keymap('n', '<Leader>b',   [[<Cmd>Buffers<CR>]],   opts)
+vim.api.nvim_set_keymap('n', '<Leader>gs',  [[<Cmd>GFiles?<CR>]],   opts)
+vim.api.nvim_set_keymap('n', '<Leader>fc',  [[<Cmd>Commits<CR>]],   opts)
+vim.api.nvim_set_keymap('n', '<Leader>fbc', [[<Cmd>BCommits<CR>]],  opts)
+vim.api.nvim_set_keymap('n', '<Leader>ht',  [[<Cmd>Helptags<CR>]],  opts)
+vim.api.nvim_set_keymap('n', '<Leader>r',   [[<Cmd>Rg<CR>]],        opts)
+vim.api.nvim_set_keymap('n', '<Leader>rf',  [[<Cmd>Rg!<CR>]],       opts)
+vim.api.nvim_set_keymap('n', '<Leader>t',   [[<Cmd>Tags<CR>]],      opts)
+vim.api.nvim_set_keymap('n', '<Leader>m',   [[<Cmd>Marks<CR>]],     opts)
+vim.api.nvim_set_keymap('n', '<Leader>km',  [[<Cmd>Maps<CR>]],      opts)
+vim.api.nvim_set_keymap('n', '<Leader>fl',  [[<Cmd>Lines<CR>]],     opts)
+vim.api.nvim_set_keymap('n', '<Leader>fbl', [[<Cmd>BLines<CR>]],    opts)
+vim.api.nvim_set_keymap('n', '<Leader>w',   [[<Cmd>Windows<CR>]],   opts)
+vim.api.nvim_set_keymap('n', '<Leader>mru', [[<Cmd>History<CR>]],   opts)
+vim.api.nvim_set_keymap('n', '<Leader>ch',  [[<Cmd>History:<CR>]],  opts)
+vim.api.nvim_set_keymap('n', '<Leader>sh',  [[<Cmd>History/<CR>]],  opts)
+vim.api.nvim_set_keymap('n', '<Leader>fs',  [[<Cmd>Snippets<CR>]],  opts)
+vim.api.nvim_set_keymap('n', '<Leader>ff',  [[<Cmd>Filetypes<CR>]], opts)
diff --git a/nvim/plugin-config/telescope.lua b/nvim/plugin-config/telescope.lua
index 4e05dad..0af7aff 100644
--- a/nvim/plugin-config/telescope.lua
+++ b/nvim/plugin-config/telescope.lua
@@ -64,23 +64,23 @@ require('telescope').load_extension('node_modules')
 --- Mappings
 local opts = { noremap = true, silent = true }
 
-vim.api.nvim_set_keymap('n', '<C-p>',         [[<Cmd>Telescope find_files<CR>]],                                                                   opts)
-vim.api.nvim_set_keymap('n', '<Leader>b',     [[<Cmd>Telescope buffers<CR>]],                                                                      opts)
 vim.api.nvim_set_keymap('n', '<Leader>bh',    [[<Cmd>Telescope bookmarks<CR>]],                                                                    opts)
 vim.api.nvim_set_keymap('n', '<Leader>cheat', [[<Cmd>:Cheatsheet<CR>]],                                                                            opts)
-vim.api.nvim_set_keymap('n', '<Leader>fb',    [[<Cmd>Telescope buffers<CR>]],                                                                      opts)
-vim.api.nvim_set_keymap('n', '<Leader>fc',    [[<Cmd>Telescope git_status<CR>]],                                                                   opts)
 vim.api.nvim_set_keymap('n', '<Leader>fcb',   [[<Cmd>Telescope git_branches<CR>]],                                                                 opts)
-vim.api.nvim_set_keymap('n', '<Leader>ff',    [[<Cmd>lua require('telescope.builtin').find_files({ hidden = true })<CR>]],                         opts)
-vim.api.nvim_set_keymap('n', '<Leader>fht',   [[<Cmd>Telescope help_tags<CR>]],                                                                    opts)
 vim.api.nvim_set_keymap('n', '<Leader>fnm',   [[<Cmd>Telescope node_modules list<CR>]],                                                            opts)
-vim.api.nvim_set_keymap('n', '<Leader>fr',    [[<Cmd>Telescope resume<CR>]],                                                                       opts)
-vim.api.nvim_set_keymap('n', '<Leader>frg',   [[<Cmd>Telescope live_grep<CR>]],                                                                    opts)
-vim.api.nvim_set_keymap('n', '<Leader>fs',    [[<Cmd>lua require('telescope.builtin').file_browser({ cwd = vim.fn.expand('%:p:h') })<CR>]],        opts)
-vim.api.nvim_set_keymap('n', '<Leader>ft',    [[<Cmd>Telescope tags<CR>]],                                                                         opts)
-vim.api.nvim_set_keymap('n', '<Leader>m',     [[<Cmd>Telescope marks<CR>]],                                                                        opts)
-vim.api.nvim_set_keymap('n', '<Leader>km',    [[<Cmd>Telescope keymaps<CR>]],                                                                      opts)
-vim.api.nvim_set_keymap('n', '<Leader>mru',   [[<Cmd>Telescope frecency<CR>]],                                                                     opts)
-vim.api.nvim_set_keymap('n', '<Leader>ps',    [[<Cmd>lua require('telescope.builtin').grep_string({ search = vim.fn.input('Grep for > ') })<CR>]], opts)
-vim.api.nvim_set_keymap('n', '<Leader>r',     [[<Cmd>Telescope live_grep<CR>]],                                                                    opts)
-vim.api.nvim_set_keymap('n', '<Leader>t',     [[<Cmd>Telescope tags<CR>]],                                                                         opts)
+-- vim.api.nvim_set_keymap('n', '<Leader>fr',    [[<Cmd>Telescope resume<CR>]],                                                                       opts)
+-- vim.api.nvim_set_keymap('n', '<C-p>',         [[<Cmd>Telescope find_files<CR>]],                                                                   opts)
+-- vim.api.nvim_set_keymap('n', '<Leader>b',     [[<Cmd>Telescope buffers<CR>]],                                                                      opts)
+-- vim.api.nvim_set_keymap('n', '<Leader>fb',    [[<Cmd>Telescope buffers<CR>]],                                                                      opts)
+-- vim.api.nvim_set_keymap('n', '<Leader>fc',    [[<Cmd>Telescope git_status<CR>]],                                                                   opts)
+-- vim.api.nvim_set_keymap('n', '<Leader>ff',    [[<Cmd>lua require('telescope.builtin').find_files({ hidden = true })<CR>]],                         opts)
+-- vim.api.nvim_set_keymap('n', '<Leader>fht',   [[<Cmd>Telescope help_tags<CR>]],                                                                    opts)
+-- vim.api.nvim_set_keymap('n', '<Leader>frg',   [[<Cmd>Telescope live_grep<CR>]],                                                                    opts)
+-- vim.api.nvim_set_keymap('n', '<Leader>fs',    [[<Cmd>lua require('telescope.builtin').file_browser({ cwd = vim.fn.expand('%:p:h') })<CR>]],        opts)
+-- vim.api.nvim_set_keymap('n', '<Leader>ft',    [[<Cmd>Telescope tags<CR>]],                                                                         opts)
+-- vim.api.nvim_set_keymap('n', '<Leader>km',    [[<Cmd>Telescope keymaps<CR>]],                                                                      opts)
+-- vim.api.nvim_set_keymap('n', '<Leader>m',     [[<Cmd>Telescope marks<CR>]],                                                                        opts)
+-- vim.api.nvim_set_keymap('n', '<Leader>mru',   [[<Cmd>Telescope frecency<CR>]],                                                                     opts)
+-- vim.api.nvim_set_keymap('n', '<Leader>ps',    [[<Cmd>lua require('telescope.builtin').grep_string({ search = vim.fn.input('Grep for > ') })<CR>]], opts)
+-- vim.api.nvim_set_keymap('n', '<Leader>r',     [[<Cmd>Telescope live_grep<CR>]],                                                                    opts)
+-- vim.api.nvim_set_keymap('n', '<Leader>t',     [[<Cmd>Telescope tags<CR>]],                                                                         opts)
diff --git a/nvim/plugins.vim b/nvim/plugins.vim
index b43be3d..8d3addc 100644
--- a/nvim/plugins.vim
+++ b/nvim/plugins.vim
@@ -38,6 +38,7 @@ Plug 'gbrlsnchs/telescope-lsp-handlers.nvim'
 Plug 'github/copilot.vim' " No API key jet :(
 Plug 'godlygeek/tabular'
 Plug 'junegunn/fzf', { 'dir': '~/.fzf', 'do': './install --all' }
+Plug 'junegunn/fzf.vim'
 Plug 'kyazdani42/nvim-tree.lua'
 Plug 'lewis6991/gitsigns.nvim'
 Plug 'mg979/vim-visual-multi'