diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json
index 3861056e..1ab4ca8e 100644
--- a/.config/nvim/lazy-lock.json
+++ b/.config/nvim/lazy-lock.json
@@ -139,7 +139,6 @@
   "trouble.nvim": { "branch": "main", "commit": "f1168feada93c0154ede4d1fe9183bf69bac54ea" },
   "tsc.nvim": { "branch": "main", "commit": "26d3c9010f3ef78fbecdfc69d901ab8ed89cff6c" },
   "twilight.nvim": { "branch": "main", "commit": "8b7b50c0cb2dc781b2f4262a5ddd57571556d1e4" },
-  "undotree": { "branch": "master", "commit": "36ff7abb6b60980338344982ad4cdf03f7961ecd" },
   "urlview.nvim": { "branch": "main", "commit": "7d622e11adbc2cac5bba62345ade9b6672d564a4" },
   "venv-selector.nvim": { "branch": "main", "commit": "d5f6602d2d3f4089116a7eb04475b6a295f72419" },
   "vim-be-good": { "branch": "master", "commit": "c290810728a4f75e334b07dc0f3a4cdea908d351" },
diff --git a/.config/nvim/lua/plugins/extras/coding/undotree.lua b/.config/nvim/lua/plugins/extras/coding/undotree.lua
index 0b982905..4cbad6a2 100644
--- a/.config/nvim/lua/plugins/extras/coding/undotree.lua
+++ b/.config/nvim/lua/plugins/extras/coding/undotree.lua
@@ -1,10 +1,6 @@
-local util = require("lazyvim.util")
+local Util = require("lazyvim.util")
 
 return {
-  {
-    "mbbill/undotree",
-    event = "BufReadPost",
-  },
   {
     "debugloop/telescope-undo.nvim",
     opts = {},
@@ -13,5 +9,8 @@ return {
         require("telescope").load_extension("undo")
       end)
     end,
+    keys = {
+      { "<leader>su", "<cmd>Telescope undo<cr>", desc = "Undos" },
+    },
   },
 }
diff --git a/.config/nvim/lua/plugins/extras/editor/git.lua b/.config/nvim/lua/plugins/extras/editor/git.lua
index 1da2090d..aa39ce37 100644
--- a/.config/nvim/lua/plugins/extras/editor/git.lua
+++ b/.config/nvim/lua/plugins/extras/editor/git.lua
@@ -52,6 +52,7 @@ return {
     opts = {
       defaults = {
         ["<leader>gc"] = { name = "+conflicts" },
+        ["<leader>gw"] = { name = "+worktrees" },
       },
     },
   },
diff --git a/.config/nvim/lua/plugins/extras/lang/web.lua b/.config/nvim/lua/plugins/extras/lang/web.lua
index c37f9bbd..db0bdc6d 100644
--- a/.config/nvim/lua/plugins/extras/lang/web.lua
+++ b/.config/nvim/lua/plugins/extras/lang/web.lua
@@ -1,3 +1,5 @@
+local Util = require("lazyvim.util")
+
 return {
   {
     "aurum77/live-server.nvim",
@@ -15,4 +17,15 @@ return {
     event = "BufReadPost",
     config = true,
   },
+  {
+    "piersolenski/telescope-import.nvim",
+    config = function(_, opts)
+      Util.on_load("telescope.nvim", function()
+        require("telescope").load_extension("import")
+      end)
+    end,
+    keys = {
+      { "<leader>si", "<cmd>Telescope import<CR>", desc = "Imports" },
+    },
+  },
 }
diff --git a/.config/nvim/lua/plugins/floaterm.lua b/.config/nvim/lua/plugins/floaterm.lua
index c7fee5ba..7f844ada 100644
--- a/.config/nvim/lua/plugins/floaterm.lua
+++ b/.config/nvim/lua/plugins/floaterm.lua
@@ -1,3 +1,5 @@
+local Util = require("lazyvim.util")
+
 return {
   {
     "voldikss/vim-floaterm",
@@ -34,6 +36,14 @@ return {
   { "<leader>ftV", "<cmd>FloatermNew --name=vsplitbuffer --opener=edit --titleposition=center --width=0.35 --wintype=vsplit --cwd=<buffer><cr>", desc = "Vsplit (cwd)" },
     },
   },
+  {
+    "dawsers/telescope-floaterm.nvim",
+    config = function()
+      Util.on_load("telescope.nvim", function()
+        require("telescope").load_extension("floaterm")
+      end)
+    end,
+  },
   {
     "folke/which-key.nvim",
     opts = {
diff --git a/.config/nvim/lua/plugins/telescope.lua b/.config/nvim/lua/plugins/telescope.lua
index 227ea02b..3630dfb1 100644
--- a/.config/nvim/lua/plugins/telescope.lua
+++ b/.config/nvim/lua/plugins/telescope.lua
@@ -22,23 +22,6 @@ return {
           end)
         end,
       },
-      {
-        "dawsers/telescope-floaterm.nvim",
-        config = function()
-          Util.on_load("telescope.nvim", function()
-            require("telescope").load_extension("floaterm")
-          end)
-        end,
-      },
-      {
-        "debugloop/telescope-undo.nvim",
-        opts = {},
-        config = function(_, opts)
-          Util.on_load("telescope.nvim", function()
-            require("telescope").load_extension("undo")
-          end)
-        end,
-      },
       {
         "prochri/telescope-all-recent.nvim",
         dependencies = {
@@ -79,14 +62,6 @@ return {
           end)
         end,
       },
-      {
-        "piersolenski/telescope-import.nvim",
-        config = function(_, opts)
-          Util.on_load("telescope.nvim", function()
-            require("telescope").load_extension("import")
-          end)
-        end,
-      },
       {
         "jvgrootveld/telescope-zoxide",
         config = function()
@@ -130,14 +105,11 @@ return {
         "<cmd>Telescope dap variables<CR>",
         desc = "Variables",
       },
-      { "<leader>si", "<cmd>Telescope import<CR>", desc = "Imports" },
       { "<leader>sz", "<cmd>Telescope zoxide list<CR>", desc = "Zoxide" },
       { "<leader>sp", "<cmd>Telescope lazy<CR>", desc = "Plugins (Lazy)" },
       { "<leader>sl", "<cmd>Telescope luasnip<CR>", desc = "Luasnip (Snippets)" },
       { "<leader>sN", "<cmd>Nerdy<cr>", desc = "Nerd Fonts" },
       { "<leader>gC", "<cmd>Telescope git_commits<CR>", desc = "Commits" },
-
-      { "<leader>cu", "<cmd>Telescope undo<cr>", desc = "Undotree" },
       {
         "<leader>ssa",
         Util.telescope("lsp_document_symbols", {
@@ -456,14 +428,13 @@ return {
       defaults = {
         ["<leader>sS"] = { name = "+Goto Symbols (Workspace)" },
         ["<leader>ss"] = { name = "+Goto Symbols" },
-        ["<leader>gw"] = { name = "+worktrees" },
       },
     },
   },
   {
     "axieax/urlview.nvim",
     cmd = { "UrlView" },
-    keys = { { "<leader>su", "<cmd>UrlView<cr>", desc = "Search Urls" } },
+    keys = { { "<leader>sU", "<cmd>UrlView<cr>", desc = "Search Urls" } },
     opts = {
       default_picker = "telescope",
     },