diff --git a/nvim/lua/plugins/git.lua b/nvim/lua/plugins/git.lua
index dad1630..b292382 100644
--- a/nvim/lua/plugins/git.lua
+++ b/nvim/lua/plugins/git.lua
@@ -34,14 +34,16 @@ return {
 
 				map('n', ']h', function() gs.nav_hunk('next') end, "Next Hunk")
 				map('n', '[h', function() gs.nav_hunk('prev') end, "Prev Hunk")
-				map({ "n", "v" }, "<leader>ha", ":Gitsigns stage_hunk<CR>", "Add Hunk")
-				map({ "n", "v" }, "<leader>hr", ":Gitsigns reset_hunk<CR>", "Reset Hunk")
-				map("n", "<leader>hu", gs.undo_stage_hunk, "Unstage Hunk")
+
+				map({ "n", "v" }, "<leader>ha", gs.stage_hunk, "Add Hunk")
+				map({ "n", "v" }, "<leader>hr", gs.reset_hunk, "Reset Hunk")
+				map("n", "<leader>hp", gs.preview_hunk, "Preview Hunk")
+
 				map("n", "<leader>ga", gs.stage_buffer, "Add buffer")
 				map("n", "<leader>gR", gs.reset_buffer, "Reset Buffer")
-				map("n", "<leader>hp", gs.preview_hunk, "Preview Hunk")
-				map({ "o", "x" }, "ih", ":<C-U>Gitsigns select_hunk<CR>", "Git Select Hunk")
-				map({ "o", "x" }, "ah", ":<C-U>Gitsigns select_hunk<CR>", "Git Select Hunk")
+
+				map({ "o", "x" }, "ih", gs.select_hunk, "Git Select Hunk")
+				map({ "o", "x" }, "ah", gs.select_hunk, "Git Select Hunk")
 			end,
 		},
 		after = function(plug)
diff --git a/nvim/lua/plugins/mini.lua b/nvim/lua/plugins/mini.lua
index 723644b..2a2f924 100644
--- a/nvim/lua/plugins/mini.lua
+++ b/nvim/lua/plugins/mini.lua
@@ -18,8 +18,8 @@ return {
 		},
 		keys = {
 			{ "gx" },
-			{ "cr",         desc = "Replace with register" },
-			{ "<leader>cr", '"+cr',                        remap = true, desc = "Replace with system clipboard" },
+			{ "cr", desc = "Replace with register" },
+			{ "<leader>cr", '"+cr', remap = true, desc = "Replace with system clipboard" },
 		},
 		after = function(plug)
 			require("mini.operators").setup(plug.opts)
diff --git a/nvim/lua/plugins/motions.lua b/nvim/lua/plugins/motions.lua
index d60dee6..3a6dc5c 100644
--- a/nvim/lua/plugins/motions.lua
+++ b/nvim/lua/plugins/motions.lua
@@ -11,10 +11,10 @@ return {
 		"vim-wordmotion",
 		keys = {
 			-- This overrides the default ge & gw but i never used them.
-			{ "gw",  "<plug>WordMotion_w",  desc = "Next small world",                mode = { "n", "x", "o" } },
-			{ "ge",  "<plug>WordMotion_e",  desc = "Next end of small world",         mode = { "n", "x", "o" } },
-			{ "gb",  "<plug>WordMotion_b",  desc = "Previous small world",            mode = { "n", "x", "o" } },
-			{ "igw", "<plug>WordMotion_iw", desc = "inner small word",                mode = { "x", "o" } },
+			{ "gw", "<plug>WordMotion_w", desc = "Next small world", mode = { "n", "x", "o" } },
+			{ "ge", "<plug>WordMotion_e", desc = "Next end of small world", mode = { "n", "x", "o" } },
+			{ "gb", "<plug>WordMotion_b", desc = "Previous small world", mode = { "n", "x", "o" } },
+			{ "igw", "<plug>WordMotion_iw", desc = "inner small word", mode = { "x", "o" } },
 			{ "agw", "<plug>WordMotion_aw", desc = "a small word (with white-space)", mode = { "x", "o" } },
 		},
 		before = function()
@@ -36,9 +36,9 @@ return {
 		"leap.nvim",
 		keys = {
 			{ "s", "<Plug>(leap-forward-till)", mode = { "n", "x", }, desc = "Leap forward to" },
-			{ "S", "<Plug>(leap-backward)",     mode = { "n", "x", }, desc = "Leap backward to" },
-			{ "z", "<Plug>(leap-forward-till)", mode = "o",           desc = "Leap forward to" },
-			{ "Z", "<Plug>(leap-backward)",     mode = "o",           desc = "Leap backward to" },
+			{ "S", "<Plug>(leap-backward)", mode = { "n", "x", }, desc = "Leap backward to" },
+			{ "z", "<Plug>(leap-forward-till)", mode = "o", desc = "Leap forward to" },
+			{ "Z", "<Plug>(leap-backward)", mode = "o", desc = "Leap backward to" },
 		},
 	},