diff --git a/home/file/yazi/module/Keymap.nix b/home/file/yazi/module/Keymap.nix
index f98daff..7d4f06d 100644
--- a/home/file/yazi/module/Keymap.nix
+++ b/home/file/yazi/module/Keymap.nix
@@ -8,6 +8,7 @@
 			prepend_keymap = [
 				{ on = "<Enter>";   desc = "Spawn shell here";  run = ''shell "SHELL_NAME=yazi $SHELL" --block --confirm''; }
 				{ on = "<Tab>";     desc = "New tab";           run = "tab_create --current"; }
+				{ on = "?";         desc = "Show help";         run = "help"; }
 				{ on = "D";         desc = "Force delete";      run = "remove --permanently --force"; }
 				{ on = "E";         desc = "Move to next tab";  run = "tab_swap 1 --relative"; }
 				{ on = "O";         desc = "Open default";      run = "open"; }
diff --git a/home/file/yazi/module/Theme.nix b/home/file/yazi/module/Theme.nix
index 5fb3f87..f0d46b0 100644
--- a/home/file/yazi/module/Theme.nix
+++ b/home/file/yazi/module/Theme.nix
@@ -50,10 +50,15 @@ in {
 			tab_active      = mkCounter color.selection;
 		};
 		select = {
-			border = borderLight;
+			active   = select;
+			border   = borderLight;
+			inactive = text;
 		};
 		input = {
-			border = borderLight;
+			border   = borderLight; # ISSUE: Currently broken, stays blue.
+			selected = select;
+			title    = text;
+			value    = text;
 		};
 		completion = {
 			active   = hover;
@@ -61,7 +66,9 @@ in {
 			inactive = text;
 		};
 		tasks = {
-			border = borderLight;
+			border  = borderLight;
+			hovered = hover;
+			title   = text;
 		};
 		which = {
 			cand = text;
@@ -72,6 +79,13 @@ in {
 			separator       = " - ";
 			separator_style = text;
 		};
+		help = {
+			desc    = text;
+			footer  = text;
+			hovered = hover;
+			on      = text;
+			run     = text;
+		};
 		confirm = {
 			border = borderLight;
 			title  = borderLight;