diff --git a/config/Distro-AstroNvim b/config/Distro-AstroNvim
index f10b473..dad0bec 160000
--- a/config/Distro-AstroNvim
+++ b/config/Distro-AstroNvim
@@ -1 +1 @@
-Subproject commit f10b4730176b567e15911b3c1a7c5a31c82c8b8e
+Subproject commit dad0bec1fef2833561d04ea446a544fbfde92539
diff --git a/config/nvim/lua/aleidk/plugins/key-help.lua b/config/nvim/lua/aleidk/plugins/key-help.lua
new file mode 100644
index 0000000..3d62d45
--- /dev/null
+++ b/config/nvim/lua/aleidk/plugins/key-help.lua
@@ -0,0 +1,64 @@
+return {
+	"echasnovski/mini.nvim",
+	version = "*",
+	event = "VeryLazy",
+	config = function()
+		local miniclue = require("mini.clue")
+		miniclue.setup({
+			triggers = {
+				-- Leader triggers
+				{ mode = "n", keys = "<Leader>" },
+				{ mode = "x", keys = "<Leader>" },
+
+				-- Built-in completion
+				{ mode = "i", keys = "<C-x>" },
+
+				-- `g` key
+				{ mode = "n", keys = "g" },
+				{ mode = "x", keys = "g" },
+
+				-- Marks
+				{ mode = "n", keys = "'" },
+				{ mode = "n", keys = "`" },
+				{ mode = "x", keys = "'" },
+				{ mode = "x", keys = "`" },
+
+				-- Registers
+				{ mode = "n", keys = '"' },
+				{ mode = "x", keys = '"' },
+				{ mode = "i", keys = "<C-r>" },
+				{ mode = "c", keys = "<C-r>" },
+
+				-- Window commands
+				{ mode = "n", keys = "<C-w>" },
+
+				-- `z` key
+				{ mode = "n", keys = "z" },
+				{ mode = "x", keys = "z" },
+			},
+
+			clues = {
+				-- Enhance this by adding descriptions for <Leader> mapping groups
+				miniclue.gen_clues.builtin_completion(),
+				miniclue.gen_clues.g(),
+				miniclue.gen_clues.marks(),
+				miniclue.gen_clues.registers(),
+				miniclue.gen_clues.windows(),
+				miniclue.gen_clues.z(),
+			},
+
+			-- Clue window settings
+			window = {
+				-- Floating window config
+				config = {},
+
+				-- Delay before showing clue window
+				delay = 200,
+
+				-- Keys to scroll inside the clue window
+				scroll_down = "<C-d>",
+				scroll_up = "<C-u>",
+			},
+		})
+	end,
+}
diff --git a/config/nvim/lua/aleidk/plugins/which-key.lua b/config/nvim/lua/aleidk/plugins/which-key.lua
deleted file mode 100644
index 4707fad..0000000
--- a/config/nvim/lua/aleidk/plugins/which-key.lua
+++ /dev/null
@@ -1,26 +0,0 @@
-return {
-	"folke/which-key.nvim",
-	event = "VeryLazy",
-	opts = {
-		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" },
-		},
-	},
-	config = function(_, opts)
-		local wk = require("which-key")
-		wk.setup(opts)
-		wk.register(opts.defaults)
-	end,
-}