diff --git a/lazygit/.config/lazygit/config.yml b/lazygit/.config/lazygit/config.yml
index 03fa864..733e16d 100644
--- a/lazygit/.config/lazygit/config.yml
+++ b/lazygit/.config/lazygit/config.yml
@@ -7,3 +7,7 @@ os:
 
 gui:
   nerdFontsVersion: "3"
+
+  theme:
+    selectedLineBgColor:
+      - reverse
diff --git a/nvim/.config/nvim/lua/config/options.lua b/nvim/.config/nvim/lua/config/options.lua
index 806a2bf..dfdcdbc 100644
--- a/nvim/.config/nvim/lua/config/options.lua
+++ b/nvim/.config/nvim/lua/config/options.lua
@@ -11,3 +11,5 @@ vim.opt.title = true
 vim.opt.timeout = false
 
 vim.o.undofile = true
+
+vim.cmd([[autocmd TermOpen * startinsert]]);
diff --git a/nvim/.config/nvim/lua/config/remap.lua b/nvim/.config/nvim/lua/config/remap.lua
index 3db4f1a..78895ac 100644
--- a/nvim/.config/nvim/lua/config/remap.lua
+++ b/nvim/.config/nvim/lua/config/remap.lua
@@ -5,8 +5,15 @@ set("n", "<M-k>", "<C-w>k")
 set("n", "<M-j>", "<C-w>j")
 set("n", "<M-l>", "<C-w>l")
 
+set({ "n", 'v' }, "<leader>p", [["+p]])
+set({ "n", 'v' }, "<leader>P", [["+P]])
+set({ "n", 'v' }, "<leader>y", [["+y]])
+set({ "n", 'v' }, "<leader>Y", [["+Y]])
+
 set("n", "<Esc>", "<cmd>nohlsearch<cr>")
 set("n", "<leader>K", "<cmd>cp<cr>")
 set("n", "<leader>J", "<cmd>cn<cr>")
 set("n", "<leader>x", "<cmd>copen<cr>")
 set("n", "<leader>X", "<cmd>cclose<cr>")
+
+set("n", "<leader>ga", "<cmd>tabnew | terminal lazygit<cr>")
diff --git a/nvim/.config/nvim/lua/plugins/snacks.lua b/nvim/.config/nvim/lua/plugins/snacks.lua
index 1ea88a8..702d4f7 100644
--- a/nvim/.config/nvim/lua/plugins/snacks.lua
+++ b/nvim/.config/nvim/lua/plugins/snacks.lua
@@ -15,10 +15,6 @@ set("n", "<leader>ea", function()
 	Snacks.explorer()
 end, { desc = "File Explorer" })
 
-set("n", "<leader>ga", function()
-	Snacks.lazygit()
-end, { desc = "Lazygit" })
-
 set("n", "<leader>gh", function()
 	Snacks.picker.git_diff()
 end, { desc = "Git Diff (Hunks)" })
diff --git a/nvim/.config/nvim/lua/plugins/treesitter.lua b/nvim/.config/nvim/lua/plugins/treesitter.lua
index ff49a3d..0b998d3 100644
--- a/nvim/.config/nvim/lua/plugins/treesitter.lua
+++ b/nvim/.config/nvim/lua/plugins/treesitter.lua
@@ -71,10 +71,10 @@ if ok then
 			swap = {
 				enable = true,
 				swap_next = {
-					["<leader>p"] = "@parameter.inner",
+					["<leader>cp"] = "@parameter.inner",
 				},
 				swap_previous = {
-					["<leader>P"] = "@parameter.inner",
+					["<leader>cP"] = "@parameter.inner",
 				},
 			},
 		},