diff --git a/common/.config/nvim/lua/config/keymaps.lua b/common/.config/nvim/lua/config/keymaps.lua
index dda7d9c..933b94a 100644
--- a/common/.config/nvim/lua/config/keymaps.lua
+++ b/common/.config/nvim/lua/config/keymaps.lua
@@ -81,7 +81,7 @@ local diagnostic_goto = function(next, severity)
         go({ severity = severity })
     end
 end
-vim.keymap.set("n", "<leader>cd", vim.diagnostic.open_float, { desc = "Line Diagnostics" })
+vim.keymap.set("n", "<leader>dc", vim.diagnostic.open_float, { desc = "Line Diagnostics" })
 vim.keymap.set("n", "]d", diagnostic_goto(true), { desc = "Next Diagnostic" })
 vim.keymap.set("n", "[d", diagnostic_goto(false), { desc = "Prev Diagnostic" })
 vim.keymap.set("n", "]e", diagnostic_goto(true, "ERROR"), { desc = "Next Error" })
diff --git a/common/.config/nvim/lua/plugins/coding-git.lua b/common/.config/nvim/lua/plugins/coding-git.lua
index 7fe8768..3776912 100644
--- a/common/.config/nvim/lua/plugins/coding-git.lua
+++ b/common/.config/nvim/lua/plugins/coding-git.lua
@@ -27,32 +27,32 @@ return {
                 end
 
                 -- Navigation
-                map({ "n", "v" }, "]h", function()
+                map({ "n", "v" }, "]g", function()
                     if vim.wo.diff then
-                        return "]h"
+                        return "]g"
                     end
                     vim.schedule(function()
                         gs.next_hunk()
                     end)
                     return "<Ignore>"
-                end, { expr = true, desc = "Jump to next git hunk" })
+                end, { expr = true, desc = "Next Git hunk" })
 
-                map({ "n", "v" }, "[h", function()
+                map({ "n", "v" }, "[g", function()
                     if vim.wo.diff then
-                        return "[h"
+                        return "[g"
                     end
                     vim.schedule(function()
                         gs.prev_hunk()
                     end)
                     return "<Ignore>"
-                end, { expr = true, desc = "Jump to previous git hunk" })
+                end, { expr = true, desc = "Previous Git hunk" })
 
                 -- Staging
                 -- Actions
+                map("n", "<leader>gr", gs.reset_hunk, { desc = "Git: reset hunk" })
                 map("n", "<leader>gsh", gs.stage_hunk, { desc = "Git: Stage Hunk" })
                 map("n", "<leader>gsu", gs.undo_stage_hunk, { desc = "Git: Undo Stage Hunk" })
                 map("n", "<leader>gsb", gs.stage_buffer, { desc = "Git: Stage Current File" })
-                map("n", "<leader>gr", gs.reset_hunk, { desc = "Git: reset hunk" })
 
                 -- visual mode
                 map("v", "<leader>gsH", function()