diff --git a/nvim/lua/telescope.lua b/nvim/lua/telescope.lua
index dd1895f..3cdcaad 100644
--- a/nvim/lua/telescope.lua
+++ b/nvim/lua/telescope.lua
@@ -8,19 +8,39 @@ local builtin = require('telescope.builtin')
 
 -- Keys
 vim.keymap.set('n',
-  '<leader>ff',
+  '<leader>f',
   builtin.find_files,
   { desc = 'Telescope find files' }
 )
 vim.keymap.set('n',
-  '<leader>fg',
+  '<leader>/',
   builtin.live_grep, { desc = 'Telescope live grep' }
 )
 vim.keymap.set('n',
-  '<leader><leader>',
+  '<leader><tab>',
   builtin.buffers, { desc = 'Telescope buffers' }
 )
 vim.keymap.set('n',
-  '<leader>fh',
-  builtin.help_tags, { desc = 'Telescope help tags' }
+  '<leader><S-tab>',
+  builtin.oldfiles, { desc = 'Telescope previously opened files' }
+)
+vim.keymap.set('n',
+  '<leader>p',
+  builtin.command_history, { desc = 'Telescope recent commands palette' }
+)
+vim.keymap.set('n',
+  '<leader>gf',
+  builtin.quickfix, { desc = 'Telescope quickfix' }
+)
+vim.keymap.set('n',
+  '<leader>gd',
+  builtin.lsp_references, { desc = 'Telescope LSP references' }
+)
+vim.keymap.set('n',
+  '<leader>g?',
+  builtin.quickfix, { desc = 'Telescope LSP diagnostics' }
+)
+vim.keymap.set('n',
+  '<leader>"',
+  builtin.registers, { desc = 'Telescope registers' }
 )
diff --git a/nvim/lua/undo.lua b/nvim/lua/undo.lua
new file mode 100644
index 0000000..fe81d80
--- /dev/null
+++ b/nvim/lua/undo.lua
@@ -0,0 +1,13 @@
+vim.o.undofile = true
+vim.o.undodir = "~/.config/nvim/undo"
+
+vim.pack.add({
+  'https://github.com/jiaoshijie/undotree'
+})
+
+-- Keys
+vim.keymap.set('n',
+  '<leader>u',
+  require('undotree').toggle,
+  { desc = 'Undo tree' }
+)
diff --git a/nvim/lua/~/.config/nvim/undo/%home%gaiety%dotfiles%nvim%lua%telescope.lua b/nvim/lua/~/.config/nvim/undo/%home%gaiety%dotfiles%nvim%lua%telescope.lua
new file mode 100644
index 0000000..1fe2267
Binary files /dev/null and b/nvim/lua/~/.config/nvim/undo/%home%gaiety%dotfiles%nvim%lua%telescope.lua differ
diff --git a/nvim/lua/~/.config/nvim/undo/%home%gaiety%dotfiles%nvim%lua%undo.lua b/nvim/lua/~/.config/nvim/undo/%home%gaiety%dotfiles%nvim%lua%undo.lua
new file mode 100644
index 0000000..58637bc
Binary files /dev/null and b/nvim/lua/~/.config/nvim/undo/%home%gaiety%dotfiles%nvim%lua%undo.lua differ