diff --git a/common/.config/nvim/lua/config/keymaps.lua b/common/.config/nvim/lua/config/keymaps.lua
index 2a5af15..84f0a35 100644
--- a/common/.config/nvim/lua/config/keymaps.lua
+++ b/common/.config/nvim/lua/config/keymaps.lua
@@ -34,8 +34,8 @@ vim.keymap.set("i", ";", ";<C-g>u", { desc = "Auto add undo breakpoints on ';'"
 vim.keymap.set("i", "\r", "\r<C-g>u", { desc = "Auto add undo breakpoints on new lines" })
 
 -- Save file
-vim.keymap.set({ "i", "x", "n", "s" }, "<C-s>", "<cmd>w<cr><esc>", { desc = "Save file" })
-vim.keymap.set({ "i", "x", "n", "s" }, "<C-q>", "<cmd>wqa<cr><esc>", { desc = "Save all files and Quit Neovim" })
+vim.keymap.set({ "i", "x", "n", "s" }, "<C-s>", "<cmd>wa<cr><esc>", { desc = "Save all files" })
+vim.keymap.set({ "i", "x", "n", "s" }, "<C-q>", "<cmd>q<cr><esc>", { desc = "Quit Neovim without saving" })
 
 -- Close Current Buffer
 vim.keymap.set({ "n", "v" }, "<leader>bx", function()
diff --git a/common/.config/nvim/lua/core/lsp.lua b/common/.config/nvim/lua/core/lsp.lua
index 859c5a9..c1c2e4c 100644
--- a/common/.config/nvim/lua/core/lsp.lua
+++ b/common/.config/nvim/lua/core/lsp.lua
@@ -74,8 +74,8 @@ vim.api.nvim_create_autocmd("LspAttach", {
 
         -- Telescope
         map("gI", require("telescope.builtin").lsp_implementations, "[G]oto [I]mplementation")
-        map("<leader>cs", require("telescope.builtin").lsp_document_symbols, "Search Document Symbols")
-        map("<leader>cS", require("telescope.builtin").lsp_workspace_symbols, "Search Workspace Symbols")
+        map("<leader>s", require("telescope.builtin").lsp_document_symbols, "Search Document Symbols")
+        map("<leader>S", require("telescope.builtin").lsp_workspace_symbols, "Search Workspace Symbols")
         map("<leader>ct", require("telescope.builtin").lsp_type_definitions, "Goto Type Definition")
 
         Snacks.toggle({
diff --git a/common/.config/nvim/lua/plugins/code-generic.lua b/common/.config/nvim/lua/plugins/code-generic.lua
index 1ead328..a7d5a8f 100644
--- a/common/.config/nvim/lua/plugins/code-generic.lua
+++ b/common/.config/nvim/lua/plugins/code-generic.lua
@@ -269,10 +269,13 @@ return {
 
                         move = {
                             -- Jump to next and previous text objects
+                            -- ]a -> next argument
+                            -- ]T -> next test
                             enable = true,
                             goto_next_start = {
                                 ["]f"] = { query = "@function.outer", desc = "Goto next inner function start" },
                                 ["]o"] = { query = "@loop.*", desc = "Goto next loop start" },
+                                ["]a"] = { query = "@parameter.inner", desc = "Goto next parameter" },
                             },
                             goto_next_end = {
                                 ["]F"] = { query = "@function.outer", desc = "Goto next outer function end" },
@@ -282,6 +285,7 @@ return {
                             goto_previous_start = {
                                 ["[f"] = { query = "@function.outer", desc = "Goto goto previous inner function start" },
                                 ["[o"] = { query = "@loop.*", desc = "Goto previous loop start" },
+                                ["[a"] = { query = "@parameter.inner", desc = "Goto previous parameter" },
                             },
                             goto_previous_end = {
                                 ["[F"] = { query = "@function.outer", desc = "Goto goto previous outer function start" },
diff --git a/common/.config/nvim/lua/plugins/git.lua b/common/.config/nvim/lua/plugins/git.lua
index 5832acc..0bca451 100644
--- a/common/.config/nvim/lua/plugins/git.lua
+++ b/common/.config/nvim/lua/plugins/git.lua
@@ -53,11 +53,11 @@ return {
                 -- Text object
                 map({ "o", "x" }, "ih", ":<C-U>Gitsigns select_hunk<CR>", { desc = "Git: Visual select hunk" })
 
-                map({ "n", "v" }, "]h", function()
+                map({ "n", "v" }, "]g", function()
                     gs.next_hunk()
                 end, { desc = "Next Git hunk" })
 
-                map({ "n", "v" }, "[h", function()
+                map({ "n", "v" }, "[g", function()
                     gs.prev_hunk()
                 end, { desc = "Previous Git hunk" })
 
@@ -73,10 +73,6 @@ return {
                 map("n", "<leader>gp", gs.preview_hunk, { desc = "Git: Preview hunk" })
                 map("n", "<leader>gs", gs.stage_hunk, { desc = "Git: Toggle Stage-Hunk" })
 
-                map("n", "<leader>gK", function()
-                    gs.blame_line({ full = true })
-                end, { desc = "Git: Hover blame-line" })
-
                 map("n", "<leader>gB", gs.toggle_current_line_blame, { desc = "Git: Toggle virtual blame-line" })
             end,
         },
diff --git a/common/.vim/key_maps.vim b/common/.vim/key_maps.vim
index 6e62b42..e367e48 100644
--- a/common/.vim/key_maps.vim
+++ b/common/.vim/key_maps.vim
@@ -90,9 +90,10 @@ nnoremap <expr> N  'nN'[v:searchforward]
 xnoremap <expr> N  'nN'[v:searchforward]
 onoremap <expr> N  'nN'[v:searchforward]
 
-" <ctrl-q> to save everything and quit Neovim
-nnoremap <C-q> :wqa<CR>
-vnoremap <C-q> :wqa<CR>
+" <ctrl-q> Quit Vim (without saving)
+" <ctrl-s> Save all buffers
+nnoremap <C-q> :q<CR>
+vnoremap <C-q> :q<CR>
 nnoremap <C-s> :wa<CR>
 vnoremap <C-s> :wa<CR>