diff --git a/.config/nvim/lua/custom/telescope.lua b/.config/nvim/lua/custom/telescope.lua
index ffed466..b554a33 100644
--- a/.config/nvim/lua/custom/telescope.lua
+++ b/.config/nvim/lua/custom/telescope.lua
@@ -7,10 +7,10 @@ telescope.setup({
     },
     extensions = {
         fzf = {
-            fuzzy = true,                   -- false will only do exact matching
-            override_generic_sorter = true, -- override the generic sorter
-            override_file_sorter = true,    -- override the file sorter
-            case_mode = 'smart_case',       -- default "smart_case" or "ignore_case" or "respect_case"
+            fuzzy = true, -- false will only do exact matching
+            override_generic_sorter = true,
+            override_file_sorter = true,
+            case_mode = 'smart_case', -- default "smart_case" or "ignore_case" or "respect_case"
         },
         ['ui-select'] = {
             require('telescope.themes').get_dropdown({}),
@@ -35,8 +35,6 @@ vim.keymap.set('n', '<leader>fs', builtin.find_files, { desc = '[F]ile [S]ystem'
 vim.keymap.set('n', '<leader>fa', find_all, { desc = '[F]ind [A]ll files' })
 vim.keymap.set('n', '<leader>fh', builtin.help_tags, { desc = '[F]ind [H]elp' })
 vim.keymap.set('n', '<leader>fm', builtin.man_pages, { desc = '[F]ind [M]an Pages' })
--- vim.keymap.set('n', '<leader>fw', builtin.grep_string, { desc = '[F]ind current [W]ord' })
 vim.keymap.set('n', '<leader>lv', builtin.live_grep, { desc = '[L]ive [G]rep' })
 vim.keymap.set('n', '<leader>f.', builtin.oldfiles, { desc = '[F]ind Recent Files' })
 vim.keymap.set('n', '<leader>th', builtin.colorscheme, { desc = 'List [Th]eme' })
--- vim.keymap.set('n', '<leader>ob', builtin.buffers, { desc = '[O]pen [B]uffers' })
diff --git a/.config/nvim/plugin/keymaps.lua b/.config/nvim/plugin/keymaps.lua
index 6a95f9f..07a3a58 100644
--- a/.config/nvim/plugin/keymaps.lua
+++ b/.config/nvim/plugin/keymaps.lua
@@ -6,21 +6,27 @@ local function unbind(mode, keymap)
     set(mode, keymap, function() end)
 end
 
--- Misc
-set({ 'n', 'i' }, '<C-a>', '<Esc>ggVG', { desc = 'Visually Highlight [A]ll' })
-set('n', '<Esc>', '<cmd>nohlsearch<CR>', silent)
-set({ 'i', 'c' }, '<C-v>', function()
-    vim.fn.getreg('+')
-end)
-set('n', '<leader>z', function()
+local function toggle_zen()
     vim.cmd('Neotree close')
     vim.cmd('Trouble todo close')
     vim.cmd('UndotreeHide')
-end, { desc = '[Z]en Mode', silent = true })
+end
+
+
+local function paste()
+    vim.fn.getreg('+')
+end
+
+-- Misc
+set({ 'n', 'i' }, '<C-a>', '<Esc>ggVG', { desc = 'Visually Highlight [A]ll' })
+set('n', '<Esc>', '<cmd>nohlsearch<CR>', silent)
+set({ 'i', 'c' }, '<C-v>', paste) -- FIXME: seems to not work
+set('n', '<leader>z', toggle_zen, { desc = '[Z]en Mode', silent = true })
 unbind({ 'i', 'n', 'v' }, '<C-r>')
 
 set('n', 'U', '<cmd>redo<cr>')
 set('i', '<C-z>', '<cmd>undo<cr>')
+set('i', '<C-z>', '<cmd>undo<cr>')
 
 -- Window Navigation - NO NEED BECAUSE IT CONFLICTS WITH TMUX
 -- set('n', '<C-h>', '<C-w><C-h>', { desc = 'Move focus to the left window' })