diff --git a/.config/nvim/lua/lazyvim/config/keymaps.lua b/.config/nvim/lua/lazyvim/config/keymaps.lua
old mode 100644
new mode 100755
index ee1fb3b..8ee7bc9
--- a/.config/nvim/lua/lazyvim/config/keymaps.lua
+++ b/.config/nvim/lua/lazyvim/config/keymaps.lua
@@ -42,13 +42,23 @@ map("n", "<S-h>", ":bprevious<CR>", opts)
 map("n", "<C-u>", "<C-u>zz", opts)
 map("n", "<C-d>", "<C-d>zz", opts)
 
--- Easy exit insert mode
-map("i", "jk", "<ESC>", opts)
-
 -- Indenting
 map("v", "<", "<gv", opts)
 map("v", ">", ">gv", opts)
 
 -- move through quickfix list
-map("n", "<C-n>", ":cnext<cr>", opts)
-map("n", "<C-p>", ":cprev<cr>", opts)
+map("n", "<C-l>", ":cnext<cr>zz", { noremap = true, silent = true, desc = "Next quickfix" })
+map("n", "<C-h>", ":cprev<cr>zz", { noremap = true, silent = true, desc = "Prev quickfix" })
+map("n", "]q", ":cnext<cr>zz", { noremap = true, silent = true, desc = "Next quickfix" })
+map("n", "[q", ":cprev<cr>zz", { noremap = true, silent = true, desc = "Prev quickfix" })
+
+-- Thanks Prime
+vim.keymap.set("x", "<leader>p", [["_dP]])
+vim.keymap.set({ "n", "v" }, "<leader>y", [["+y]])
+vim.keymap.set("n", "<leader>Y", [["+Y]])
+vim.keymap.set({ "n", "v" }, "<leader>d", [["_d]])
+vim.keymap.set("i", "<C-c>", "<Esc>")
+vim.keymap.set("n", "Q", "<nop>")
+vim.keymap.set("n", "<leader>T", "<cmd>silent !tmux neww tmux-sessionizer<CR>")
+vim.keymap.set("n", "<leader>S", [[:%s/\<<C-r><C-w>\>/<C-r><C-w>/gI<Left><Left><Left>]])
+vim.keymap.set("n", "<leader>x", "<cmd>!chmod +x %<CR>", { silent = true })
diff --git a/.config/nvim/lua/lazyvim/plugins/comments.lua b/.config/nvim/lua/lazyvim/plugins/comments.lua
index ad2b18e..2e03471 100644
--- a/.config/nvim/lua/lazyvim/plugins/comments.lua
+++ b/.config/nvim/lua/lazyvim/plugins/comments.lua
@@ -9,7 +9,7 @@ return {
             { "]t",         function() require("todo-comments").jump_next() end, desc = "Next todo comment" },
             { "[t",         function() require("todo-comments").jump_prev() end, desc = "Previous todo comment" },
             { "<leader>tt", "<cmd>TodoTrouble<cr>",                              desc = "Todo Trouble" },
-            { "<leader>tT", "<cmd>TodoTrouble keywords=TODO,FIX,FIXME<cr>",      desc = "Todo Trouble" },
+            { "<leader>tT", "<cmd>TodoTrouble keywords=TODO,FIX,FIXME<cr>",      desc = "Todo, Fix and, FixMe Trouble " },
             { "<leader>tf", "<cmd>TodoTelescope<cr>",                            desc = "Todo Telescope" },
         },
     },
diff --git a/.config/nvim/lua/lazyvim/plugins/flash.lua b/.config/nvim/lua/lazyvim/plugins/flash.lua
index 6e4e567..d9894e3 100644
--- a/.config/nvim/lua/lazyvim/plugins/flash.lua
+++ b/.config/nvim/lua/lazyvim/plugins/flash.lua
@@ -5,10 +5,10 @@ return {
         opts = {},
         -- stylua: ignore
         keys = {
-            { "s", mode = { "n", "x", "o" }, function() require("flash").jump() end,              desc = "Flash" },
-            { "S", mode = { "n", "o", "x" }, function() require("flash").treesitter() end,        desc = "Flash Treesitter" },
-            { "r", mode = "o",               function() require("flash").remote() end,            desc = "Remote Flash" },
-            { "R", mode = { "o", "x" },      function() require("flash").treesitter_search() end, desc = "Treesitter Search" },
+            { "s", mode = { "n", "x", "o" }, function() require("flash").jump() end, desc = "Flash" },
+            -- { "S", mode = { "n", "o", "x" }, function() require("flash").treesitter() end, desc = "Flash Treesitter" },
+            -- { "r", mode = "o",               function() require("flash").remote() end,            desc = "Remote Flash" },
+            -- { "R", mode = { "o", "x" },      function() require("flash").treesitter_search() end, desc = "Treesitter Search" },
             -- no command mode keys using leader as space...
             -- { "<leader>oS", mode = { "c" }, function() require("flash").toggle() end, desc = "Toggle Flash Search" },
         },
diff --git a/.config/nvim/lua/lazyvim/plugins/noice.lua b/.config/nvim/lua/lazyvim/plugins/noice.lua
index 1dc1571..201831d 100644
--- a/.config/nvim/lua/lazyvim/plugins/noice.lua
+++ b/.config/nvim/lua/lazyvim/plugins/noice.lua
@@ -1,57 +1,57 @@
 return {
-	{
-		"folke/noice.nvim",
-		event = "VeryLazy",
-		opts = {
-			lsp = {
-				progress = {
-					enabled = true,
-				},
-				hover = {
-					enabled = true,
-				},
-				signature = {
-					enabled = true,
-				},
-				message = {
-					enabled = true,
-				},
-				override = {
-					["vim.lsp.util.convert_input_to_markdown_lines"] = true,
-					["vim.lsp.util.stylize_markdown"] = true,
-				},
-			},
-			cmdline = {
-				enabled = false,
-			},
-			messages = {
-				enabled = false,
-			},
-			popupmenu = {
-				enabled = true,
-			},
-			notify = {
-				enabled = false,
-			},
-			smart_move = {
-				enabled = true,
-			},
-			presets = {
-				bottom_search = false,
-				command_palette = false,
-				long_message_to_split = false,
-				inc_rename = false,
-				lsp_doc_border = false,
-			},
-		},
-		    -- stylua: ignore
-		    keys = {
-		      { "<S-Enter>", function() require("noice").redirect(vim.fn.getcmdline()) end, mode = "c", desc = "Redirect Cmdline" },
-		      { "<leader>Nl", function() require("noice").cmd("last") end, desc = "Noice Last Message" },
-		      { "<leader>Nh", function() require("noice").cmd("history") end, desc = "Noice History" },
-		      { "<leader>Na", function() require("noice").cmd("all") end, desc = "Noice All" },
-		      { "<c-f>", function() if not require("noice.lsp").scroll(4) then return "<c-f>" end end, silent = true, expr = true },
-		      { "<c-b>", function() if not require("noice.lsp").scroll(-4) then return "<c-b>" end end, silent = true, expr = true },
-		    },
-	},
+    {
+        "folke/noice.nvim",
+        event = "VeryLazy",
+        opts = {
+            lsp = {
+                progress = {
+                    enabled = true,
+                },
+                hover = {
+                    enabled = true,
+                },
+                signature = {
+                    enabled = true,
+                },
+                message = {
+                    enabled = true,
+                },
+                override = {
+                    ["vim.lsp.util.convert_input_to_markdown_lines"] = true,
+                    ["vim.lsp.util.stylize_markdown"] = true,
+                },
+            },
+            cmdline = {
+                enabled = false,
+            },
+            messages = {
+                enabled = false,
+            },
+            popupmenu = {
+                enabled = true,
+            },
+            notify = {
+                enabled = false,
+            },
+            smart_move = {
+                enabled = true,
+            },
+            presets = {
+                bottom_search = false,
+                command_palette = false,
+                long_message_to_split = false,
+                inc_rename = false,
+                lsp_doc_border = false,
+            },
+        },
+        -- stylua: ignore
+        keys = {
+            { "<S-Enter>",  function() require("noice").redirect(vim.fn.getcmdline()) end,                 mode = "c",                 desc = "Redirect Cmdline" },
+            { "<leader>Nl", function() require("noice").cmd("last") end,                                   desc = "Noice Last Message" },
+            { "<leader>Nh", function() require("noice").cmd("history") end,                                desc = "Noice History" },
+            { "<leader>Na", function() require("noice").cmd("all") end,                                    desc = "Noice All" },
+            { "<c-f>",      function() if not require("noice.lsp").scroll(4) then return "<c-f>" end end,  silent = true,              expr = true },
+            { "<c-b>",      function() if not require("noice.lsp").scroll(-4) then return "<c-b>" end end, silent = true,              expr = true },
+        },
+    },
 }
diff --git a/.config/nvim/lua/lazyvim/plugins/spectre.lua b/.config/nvim/lua/lazyvim/plugins/spectre.lua
index 25e61c8..f00a021 100644
--- a/.config/nvim/lua/lazyvim/plugins/spectre.lua
+++ b/.config/nvim/lua/lazyvim/plugins/spectre.lua
@@ -1,11 +1,11 @@
 return {
-	{
-		"windwp/nvim-spectre",
-        -- stylua: ignore
-        keys = {
-            { "<leader>rr", function() require("spectre").open() end, desc = "Replace in files" },
-            { "<leader>rw", function() require("spectre").open_visual({ select_word = true }) end, desc = "Relpace Word" },
-            { "<leader>rb", function() require("spectre").open_file_search() end, desc = "Relpace in Buffer" },
-        },
-	},
+    -- {
+    --     "windwp/nvim-spectre",
+    --     -- stylua: ignore
+    --     keys = {
+    --         { "<leader>rr", function() require("spectre").open() end,                              desc = "Replace in files" },
+    --         { "<leader>rw", function() require("spectre").open_visual({ select_word = true }) end, desc = "Relpace Word" },
+    --         { "<leader>rb", function() require("spectre").open_file_search() end,                  desc = "Relpace in Buffer" },
+    --     },
+    -- },
 }
diff --git a/.config/nvim/lua/lazyvim/plugins/telescope.lua b/.config/nvim/lua/lazyvim/plugins/telescope.lua
index f80e704..3d229c4 100644
--- a/.config/nvim/lua/lazyvim/plugins/telescope.lua
+++ b/.config/nvim/lua/lazyvim/plugins/telescope.lua
@@ -5,29 +5,29 @@ return {
         "nvim-telescope/telescope.nvim",
         event = "VeryLazy",
         keys = {
-            { "<leader>/",       util.telescope("live_grep"),                    desc = "Find in Files (Grep)" },
-            { "<leader><space>", util.telescope("find_files"),                   desc = "Find Files (root dir)" },
-            { "<leader>ff",      util.telescope("find_files"),                   desc = "Find Files (root dir)" },
-            { "<leader>fF",      util.telescope("find_files", { cwd = false }),  desc = "Find Files (cwd)" },
-            { "<leader>fr",      "<cmd>Telescope oldfiles<cr>",                  desc = "Recent" },
-            { "<leader>gc",      "<cmd>Telescope git_commits<CR>",               desc = "commits" },
-            { "<leader>gs",      "<cmd>Telescope git_status<CR>",                desc = "status" },
-            { "<leader>gb",      "<cmd>Telescope git_branches<CR>",              desc = "branches" },
-            { "<leader>ha",      "<cmd>Telescope autocommands<cr>",              desc = "Auto Commands" },
-            { "<leader>hc",      "<cmd>Telescope commands<cr>",                  desc = "Commands" },
-            { "<leader>hf",      "<cmd>Telescope filetypes<cr>",                 desc = "File Types" },
-            { "<leader>hh",      "<cmd>Telescope help_tags<cr>",                 desc = "Help Pages" },
-            { "<leader>hk",      "<cmd>Telescope keymaps<cr>",                   desc = "Key Maps" },
-            { "<leader>hm",      "<cmd>Telescope man_pages<cr>",                 desc = "Man Pages" },
-            { "<leader>ho",      "<cmd>Telescope vim_options<cr>",               desc = "Options" },
-            { "<leader>hs",      "<cmd>Telescope highlights<cr>",                desc = "Search Highlight Groups" },
+            { "<leader>/",       util.telescope("live_grep"),                    desc = "Telescope Find in Files (Grep)" },
+            { "<leader><space>", util.telescope("find_files"),                   desc = "Telescope Find Files (root dir)" },
+            { "<leader>ff",      util.telescope("find_files"),                   desc = "Telescope Find Files (root dir)" },
+            { "<leader>fF",      util.telescope("find_files", { cwd = false }),  desc = "Telescope Find Files (cwd)" },
+            { "<leader>fr",      "<cmd>Telescope oldfiles<cr>",                  desc = "Telescope Recent" },
+            { "<leader>gc",      "<cmd>Telescope git_commits<CR>",               desc = "Telescope commits" },
+            { "<leader>gs",      "<cmd>Telescope git_status<CR>",                desc = "Telescope status" },
+            { "<leader>gb",      "<cmd>Telescope git_branches<CR>",              desc = "Telescope branches" },
+            { "<leader>ha",      "<cmd>Telescope autocommands<cr>",              desc = "Telescope Auto Commands" },
+            { "<leader>hc",      "<cmd>Telescope commands<cr>",                  desc = "Telescope Commands" },
+            { "<leader>hf",      "<cmd>Telescope filetypes<cr>",                 desc = "Telescope File Types" },
+            { "<leader>hh",      "<cmd>Telescope help_tags<cr>",                 desc = "Telescope Help Pages" },
+            { "<leader>hk",      "<cmd>Telescope keymaps<cr>",                   desc = "Telescope Key Maps" },
+            { "<leader>hm",      "<cmd>Telescope man_pages<cr>",                 desc = "Telescope Man Pages" },
+            { "<leader>ho",      "<cmd>Telescope vim_options<cr>",               desc = "Telescope Options" },
+            { "<leader>hs",      "<cmd>Telescope highlights<cr>",                desc = "Telescope Search Highlight Groups" },
             { "<leader>ht",      "<cmd>Telescope builtin<cr>",                   desc = "Telescope" },
-            { "<leader>sb",      "<cmd>Telescope current_buffer_fuzzy_find<cr>", desc = "Buffer" },
-            { "<leader>sc",      "<cmd>Telescope command_history<cr>",           desc = "Command History" },
-            { "<leader>sG",      util.telescope("live_grep"),                    desc = "Grep (root dir)" },
-            { "<leader>sg",      util.telescope("live_grep", { cwd = false }),   desc = "Grep (cwd)" },
-            { "<leader>sm",      "<cmd>Telescope marks<cr>",                     desc = "Jump to Mark" },
-            { "<leader>so",      "<cmd>Telescope resume<cr>",                    desc = "Resume last search" },
+            { "<leader>sb",      "<cmd>Telescope current_buffer_fuzzy_find<cr>", desc = "Telescope Buffer" },
+            { "<leader>sc",      "<cmd>Telescope command_history<cr>",           desc = "Telescope Command History" },
+            { "<leader>sG",      util.telescope("live_grep"),                    desc = "Telescope Grep (root dir)" },
+            { "<leader>sg",      util.telescope("live_grep", { cwd = false }),   desc = "Telescope Grep (cwd)" },
+            { "<leader>sm",      "<cmd>Telescope marks<cr>",                     desc = "Telescope Jump to Mark" },
+            { "<leader>so",      "<cmd>Telescope resume<cr>",                    desc = "Telescope Resume last search" },
             {
                 "<leader>ss",
                 util.telescope("lsp_document_symbols", {
diff --git a/.config/nvim/lua/lazyvim/plugins/treesitter.lua b/.config/nvim/lua/lazyvim/plugins/treesitter.lua
index d079212..bac0eec 100644
--- a/.config/nvim/lua/lazyvim/plugins/treesitter.lua
+++ b/.config/nvim/lua/lazyvim/plugins/treesitter.lua
@@ -11,7 +11,47 @@ return {
                 enable = true,
                 additional_vim_regex_highlighting = false,
             },
-            autopairs = { enable = true },
+            incremental_selection = { enable = true },
+            textobjects = {
+                select = {
+                    enable = true,
+                    lookahead = true, -- Automatically jump forward to textobj, similar to targets.vim
+                    keymaps = {
+                        -- You can use the capture groups defined in textobjects.scm
+                        ['aa'] = '@parameter.outer',
+                        ['ia'] = '@parameter.inner',
+                        ['af'] = '@function.outer',
+                        ['if'] = '@function.inner',
+                        ['ac'] = '@class.outer',
+                        ['ic'] = '@class.inner',
+                        ['ii'] = '@conditional.inner',
+                        ['ai'] = '@conditional.outer',
+                        ['il'] = '@loop.inner',
+                        ['al'] = '@loop.outer',
+                        ['at'] = '@comment.outer',
+                    },
+                },
+                move = {
+                    enable = true,
+                    set_jumps = true, -- whether to set jumps in the jumplist
+                    goto_next_start = {
+                        [']f'] = '@function.outer',
+                        [']c'] = '@class.outer',
+                    },
+                    goto_next_end = {
+                        [']F'] = '@function.outer',
+                        [']C'] = '@class.outer',
+                    },
+                    goto_previous_start = {
+                        ['[f'] = '@function.outer',
+                        ['[c'] = '@class.outer',
+                    },
+                    goto_previous_end = {
+                        ['[F'] = '@function.outer',
+                        ['[C'] = '@class.outer',
+                    },
+                },
+            },
             indent = { enable = true },
             ensure_installed = {
                 "c_sharp",
diff --git a/.config/nvim/lua/lazyvim/plugins/whichkey.lua b/.config/nvim/lua/lazyvim/plugins/whichkey.lua
index ae4bf99..4346dad 100644
--- a/.config/nvim/lua/lazyvim/plugins/whichkey.lua
+++ b/.config/nvim/lua/lazyvim/plugins/whichkey.lua
@@ -106,6 +106,7 @@ return {
                     name = "+lsp",
                     l = { "<cmd>lopen<cr>", "Open Location List" },
                     q = { "<cmd>copen<cr>", "Open Quickfix List" },
+                    x = { "<cmd>cclose<cr>", "Close Quickfix List" },
                 },
 
                 C = {