diff --git a/lazy-lock.json b/lazy-lock.json
index 106b66d..d8482be 100644
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -37,7 +37,6 @@
   "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" },
   "mason-lspconfig.nvim": { "branch": "main", "commit": "b9084b1f42f790d6230dc66dbcb6bcc35b148552" },
   "mason-null-ls.nvim": { "branch": "main", "commit": "558de4372d23bd432cc3594666c4d812cd071bbf" },
-  "mason-nvim-dap.nvim": { "branch": "main", "commit": "3614a39aae98ccd34124b072939d6283853b3dd2" },
   "mason.nvim": { "branch": "main", "commit": "9c9416817c9f4e6f333c749327a1ed5355cfab61" },
   "melange-nvim": { "branch": "master", "commit": "ca3444c8e5002ee5ab6f077660317f869c7b6a36" },
   "neodev.nvim": { "branch": "main", "commit": "e7ca4a2ea0da5e39a639c08c3edb352b9355f09e" },
@@ -49,20 +48,15 @@
   "nvim": { "branch": "main", "commit": "bc1f2151f23227ba02ac203c2c59ad693352a741" },
   "nvim-cmp": { "branch": "main", "commit": "538e37ba87284942c1d76ed38dd497e54e65b891" },
   "nvim-colorizer.lua": { "branch": "master", "commit": "85855b38011114929f4058efc97af1059ab3e41d" },
-  "nvim-dap": { "branch": "master", "commit": "9adbfdca13afbe646d09a8d7a86d5d031fb9c5a5" },
-  "nvim-dap-python": { "branch": "master", "commit": "091e4ae00a12085f9ed4200a3cd04af7179b8a23" },
-  "nvim-dap-ui": { "branch": "master", "commit": "d845ebd798ad1cf30aa4abd4c4eff795cdcfdd4f" },
-  "nvim-dap-virtual-text": { "branch": "master", "commit": "d4542ac257d3c7ee4131350db6179ae6340ce40b" },
   "nvim-lspconfig": { "branch": "master", "commit": "8917d2c830e04bf944a699b8c41f097621283828" },
   "nvim-surround": { "branch": "main", "commit": "0c02c52182a9c2a7fa7e122b4037f6408e98434a" },
-  "nvim-treesitter": { "branch": "master", "commit": "81660800352ecab6a2e95f4ca30d637df1f3765e" },
+  "nvim-treesitter": { "branch": "master", "commit": "1bee80469d3d1569de47a62dd59824d9f9af0866" },
   "nvim-treesitter-textobjects": { "branch": "master", "commit": "19a91a38b02c1c28c14e0ba468d20ae1423c39b2" },
   "nvim-ts-context-commentstring": { "branch": "main", "commit": "1277b4a1f451b0f18c0790e1a7f12e1e5fdebfee" },
   "nvim-ts-rainbow": { "branch": "master", "commit": "ef95c15a935f97c65a80e48e12fe72d49aacf9b9" },
   "nvim-web-devicons": { "branch": "master", "commit": "b427ac5f9dff494f839e81441fb3f04a58cbcfbc" },
   "oil.nvim": { "branch": "master", "commit": "bf753c3e3f8736939ad5597f92329dfe7b1df4f5" },
   "onedark.nvim": { "branch": "master", "commit": "14e5de43cf1ff761c280d1ff5b9980897f5b46c7" },
-  "playground": { "branch": "master", "commit": "ba48c6a62a280eefb7c85725b0915e021a1a0749" },
   "plenary.nvim": { "branch": "master", "commit": "663246936325062427597964d81d30eaa42ab1e4" },
   "popup.nvim": { "branch": "master", "commit": "b7404d35d5d3548a82149238289fa71f7f6de4ac" },
   "presence.nvim": { "branch": "main", "commit": "87c857a56b7703f976d3a5ef15967d80508df6e6" },
diff --git a/lua/plugins/copilot.lua b/lua/plugins/copilot.lua
index badd582..e2809b9 100644
--- a/lua/plugins/copilot.lua
+++ b/lua/plugins/copilot.lua
@@ -1,6 +1,15 @@
 return {
 	"zbirenbaum/copilot.lua",
 	event = "InsertEnter",
+	keys = {
+		{
+			"<leader>lc",
+			function()
+				vim.cmd("CopilotToggle")
+			end,
+			desc = "Toggle [C]opilot",
+		},
+	},
 	opts = {
 		panel = {
 			enabled = true,
diff --git a/lua/plugins/dap.lua b/lua/plugins/dap.lua
index 3879094..b24e3e0 100644
--- a/lua/plugins/dap.lua
+++ b/lua/plugins/dap.lua
@@ -1,6 +1,6 @@
 return {
 	"jayp0521/mason-nvim-dap.nvim",
-	-- cond = false,
+	cond = false,
 	opts = {
 		ensure_installed = {
 			"python",
diff --git a/lua/plugins/diffview.lua b/lua/plugins/diffview.lua
deleted file mode 100644
index 72f3109..0000000
--- a/lua/plugins/diffview.lua
+++ /dev/null
@@ -1 +0,0 @@
-return { "sindrets/diffview.nvim" }
diff --git a/lua/plugins/lspconfig.lua b/lua/plugins/lspconfig.lua
index ecbe3fa..3962095 100644
--- a/lua/plugins/lspconfig.lua
+++ b/lua/plugins/lspconfig.lua
@@ -1,8 +1,8 @@
 return {
-	"williamboman/mason-lspconfig.nvim",
+	"neovim/nvim-lspconfig",
 	dependencies = {
 		"williamboman/mason.nvim",
-		"neovim/nvim-lspconfig",
+		"williamboman/mason-lspconfig.nvim",
 		"hrsh7th/cmp-nvim-lsp",
 		"folke/neodev.nvim",
 		"nvim-telescope/telescope.nvim",
@@ -35,22 +35,6 @@ return {
 			vim.diagnostic.setloclist,
 			desc = "[S]etloclist",
 		},
-		{
-			"<leader>lj",
-			function()
-				vim.diagnostic.goto_next()
-				vim.cmd("norm zz")
-			end,
-			desc = "Next Diagnostic",
-		},
-		{
-			"<leader>lk",
-			function()
-				vim.diagnostic.goto_prev()
-				vim.cmd("norm zz")
-			end,
-			desc = "Prev Diagnostic",
-		},
 		{
 			"<leader>lr",
 			vim.lsp.buf.rename,
@@ -93,13 +77,6 @@ return {
 			require("telescope.builtin").quickfix,
 			desc = "Telescope [Q]uickfix",
 		},
-		{
-			"<leader>lc",
-			function()
-				vim.cmd("CopilotToggle")
-			end,
-			desc = "Toggle [C]opilot",
-		},
 	},
 	config = function()
 		require("mason").setup()
diff --git a/lua/plugins/oil.lua b/lua/plugins/oil.lua
index 669ff47..1eb92b3 100644
--- a/lua/plugins/oil.lua
+++ b/lua/plugins/oil.lua
@@ -55,12 +55,13 @@ return {
 		-- See :help oil-actions for a list of all available actions
 		keymaps = {
 			["g?"] = "actions.show_help",
-			["<CR>"] = "actions.select",
-			["<leader>v"] = "actions.select_vsplit",
-			["<leader>h"] = "actions.select_split",
-			["<leader>t"] = "actions.select_tab",
-			["<leader>p"] = "actions.preview",
+			["<cr>"] = "actions.select",
+			["v"] = "actions.select_vsplit",
+			["s"] = "actions.select_split",
+			["t"] = "actions.select_tab",
+			["p"] = "actions.preview",
 			["<C-c>"] = "actions.close",
+			["q"] = "actions.close",
 			["<C-r>"] = "actions.refresh",
 			["Y"] = "actions.copy_entry_path",
 			["-"] = "actions.parent",
diff --git a/lua/plugins/surround.lua b/lua/plugins/surround.lua
index 23a24a8..10800f3 100644
--- a/lua/plugins/surround.lua
+++ b/lua/plugins/surround.lua
@@ -1,5 +1,6 @@
 return {
 	"kylechui/nvim-surround",
+	version = "*", -- Use for stability; omit to use `main` branch for the latest features
 	event = "VeryLazy",
-	opts = true,
+	opts = {},
 }
diff --git a/lua/plugins/telescope.lua b/lua/plugins/telescope.lua
index 650d33d..04ef910 100644
--- a/lua/plugins/telescope.lua
+++ b/lua/plugins/telescope.lua
@@ -21,7 +21,9 @@ return {
 	keys = {
 		{
 			"<C-p>",
-			require("telescope.builtin").git_files,
+			function()
+				require("telescope.builtin").git_files(require("telescope.themes").get_dropdown({ previewer = false }))
+			end,
 			desc = "Telescope git_files",
 		},
 		{
diff --git a/lua/plugins/trouble.lua b/lua/plugins/trouble.lua
index 1cbeeb6..1619f35 100644
--- a/lua/plugins/trouble.lua
+++ b/lua/plugins/trouble.lua
@@ -24,18 +24,18 @@ return {
 			desc = "[D]ocument Diagnostics",
 		},
 		{
-			"<leader>tn",
+			"[d",
 			function()
 				require("trouble").next({ skip_groups = true, jump = true })
 			end,
-			desc = "Next",
+			desc = "Trouble Next",
 		},
 		{
-			"<leader>tp",
+			"]d",
 			function()
 				require("trouble").previous({ skip_groups = true, jump = true })
 			end,
-			desc = "Previous",
+			desc = "Trouble Prev",
 		},
 	},
 	opts = {
diff --git a/lua/plugins/which_key.lua b/lua/plugins/which_key.lua
index e1ab2ee..43b41a5 100644
--- a/lua/plugins/which_key.lua
+++ b/lua/plugins/which_key.lua
@@ -4,9 +4,13 @@ return {
 		vim.o.timeout = true
 		vim.o.timeoutlen = 300
 	end,
-	opts = true,
 	config = function()
 		local wk = require("which-key")
+		wk.setup({
+			window = {
+				border = "single",
+			},
+		})
 
 		local opts = {
 			mode = "n", -- NORMAL mode