diff --git a/config/nvim/lua/aleidk/plugins/gitsigns.lua b/config/nvim/lua/aleidk/plugins/gitsigns.lua
index a28c96a..5b668ac 100644
--- a/config/nvim/lua/aleidk/plugins/gitsigns.lua
+++ b/config/nvim/lua/aleidk/plugins/gitsigns.lua
@@ -1,14 +1,35 @@
 -- Adds git releated signs to the gutter, as well as utilities for managing changes
 return {
 	"lewis6991/gitsigns.nvim",
+	event = { "BufReadPre", "BufNewFile" },
 	opts = {
 		-- See `:help gitsigns.txt`
 		signs = {
-			add = { text = "+" },
-			change = { text = "~" },
-			delete = { text = "_" },
-			topdelete = { text = "‾" },
-			changedelete = { text = "~" },
+			add = { text = "▎" },
+			change = { text = "▎" },
+			delete = { text = "" },
+			topdelete = { text = "" },
+			changedelete = { text = "▎" },
+			untracked = { text = "▎" },
 		},
+		on_attach = function(buffer)
+			local gs = package.loaded.gitsigns
+
+			local function map(mode, l, r, desc)
+				vim.keymap.set(mode, "<leader>g" .. l, r, { buffer = buffer, desc = desc })
+			end
+
+			-- stylua: ignore start
+			map("n", "j", gs.next_hunk, "Next Hunk")
+			map("n", "k", gs.prev_hunk, "Prev Hunk")
+			map({ "n", "v" }, "s", ":Gitsigns stage_hunk<CR>", "Stage Hunk")
+			map({ "n", "v" }, "r", ":Gitsigns reset_hunk<CR>", "Reset Hunk")
+			map("n", "u", gs.undo_stage_hunk, "Undo Stage Hunk")
+			map("n", "R", gs.reset_buffer, "Reset Buffer")
+			map("n", "p", gs.preview_hunk, "Preview Hunk")
+			map("n", "l", function() gs.blame_line({ full = true }) end, "Blame Line")
+			map("n", "d", gs.diffthis, "Diff This")
+			map("n", "D", function() gs.diffthis("~") end, "Diff This ~")
+		end,
 	},
 }
diff --git a/config/nvim/lua/aleidk/plugins/which-key.lua b/config/nvim/lua/aleidk/plugins/which-key.lua
index 664bf00..4707fad 100644
--- a/config/nvim/lua/aleidk/plugins/which-key.lua
+++ b/config/nvim/lua/aleidk/plugins/which-key.lua
@@ -5,17 +5,17 @@ return {
 		plugins = { spelling = true },
 		defaults = {
 			mode = { "n", "v" },
-			["g"] = { name = "+goto" },
-			["gz"] = { name = "+surround" },
-			["<leader>b"] = { name = "+buffer" },
-			["<leader>c"] = { name = "+comments" },
-			["<leader>f"] = { name = "+file/find" },
-			["<leader>g"] = { name = "+git" },
-			["<leader>q"] = { name = "+quit/session" },
-			["<leader>s"] = { name = "+search" },
-			["<leader>u"] = { name = "+ui" },
-			["<leader>w"] = { name = "+windows" },
-			["<leader>l"] = { name = "+diagnostics/quickfix" },
+			["g"] = { name = "+Goto" },
+			["gz"] = { name = "+Surround" },
+			["<leader>b"] = { name = "+Buffer" },
+			["<leader>c"] = { name = "+Comments" },
+			["<leader>f"] = { name = "+File/Find" },
+			["<leader>g"] = { name = "+Git" },
+			["<leader>q"] = { name = "+Quit/Session" },
+			["<leader>s"] = { name = "+Search" },
+			["<leader>u"] = { name = "+UI" },
+			["<leader>w"] = { name = "+Windows" },
+			["<leader>l"] = { name = "+Diagnostics/Quickfix" },
 		},
 	},
 	config = function(_, opts)