diff --git a/config/keymaps/buffers.nix b/config/keymaps/buffers.nix
index c835db8..f8c1079 100644
--- a/config/keymaps/buffers.nix
+++ b/config/keymaps/buffers.nix
@@ -2,6 +2,7 @@
 # https://github.com/AstroNvim/AstroNvim/blob/v4.7.7/lua/astronvim/plugins/_astrocore_mappings.lua#L56-L89
 [
   {
+    mode = "n";
     key = "<leader>c";
     options.desc = "Close buffer";
 
@@ -12,6 +13,7 @@
     '';
   }
   {
+    mode = "n";
     key = "<leader>C";
     options.desc = "Force close buffer";
 
@@ -22,6 +24,7 @@
     '';
   }
   {
+    mode = "n";
     key = "]b";
     options.desc = "Next buffer in tabline";
 
@@ -32,6 +35,7 @@
     '';
   }
   {
+    mode = "n";
     key = "[b";
     options.desc = "Previous buffer in tabline";
 
@@ -42,6 +46,7 @@
     '';
   }
   {
+    mode = "n";
     key = ">b";
     options.desc = "Move buffer tab right";
 
@@ -52,6 +57,7 @@
     '';
   }
   {
+    mode = "n";
     key = "<b";
     options.desc = "Move buffer tab left";
 
@@ -62,6 +68,7 @@
     '';
   }
   {
+    mode = "n";
     key = "<leader>bc";
     options.desc = "Close all buffers except current";
 
@@ -72,6 +79,7 @@
     '';
   }
   {
+    mode = "n";
     key = "<leader>bC";
     options.desc = "Close all buffers";
 
@@ -82,6 +90,7 @@
     '';
   }
   {
+    mode = "n";
     key = "<leader>bl";
     options.desc = "Close all buffers to the left";
 
@@ -92,6 +101,7 @@
     '';
   }
   {
+    mode = "n";
     key = "<leader>bp";
     options.desc = "Previous buffer";
 
@@ -102,6 +112,7 @@
     '';
   }
   {
+    mode = "n";
     key = "<leader>br";
     options.desc = "Close all buffers to the right";
 
@@ -112,6 +123,7 @@
     '';
   }
   {
+    mode = "n";
     key = "<Leader>bse";
     options.desc = "By extension";
 
@@ -122,6 +134,7 @@
     '';
   }
   {
+    mode = "n";
     key = "<Leader>bsr";
     options.desc = "By relative path";
 
@@ -132,6 +145,7 @@
     '';
   }
   {
+    mode = "n";
     key = "<Leader>bsp";
     options.desc = "By full path";
 
@@ -142,6 +156,7 @@
     '';
   }
   {
+    mode = "n";
     key = "<Leader>bsi";
     options.desc = "By buffer number";
 
@@ -152,6 +167,7 @@
     '';
   }
   {
+    mode = "n";
     key = "<Leader>bsm";
     options.desc = "By modification";
 
diff --git a/config/keymaps/diagnostics.nix b/config/keymaps/diagnostics.nix
index a340ace..310414b 100644
--- a/config/keymaps/diagnostics.nix
+++ b/config/keymaps/diagnostics.nix
@@ -2,6 +2,7 @@
 # https://github.com/AstroNvim/AstroNvim/blob/v4.7.7/lua/astronvim/plugins/_astrocore_mappings.lua#L92-L100
 [
   {
+    mode = "n";
     key = "<Leader>ld";
     options.desc = "Hover diagnostics";
 
@@ -12,6 +13,7 @@
     '';
   }
   {
+    mode = "n";
     key = "[d";
     options.desc = "Previous diagnostic";
 
@@ -22,6 +24,7 @@
     '';
   }
   {
+    mode = "n";
     key = "]d";
     options.desc = "Next diagnostic";
 
@@ -32,6 +35,7 @@
     '';
   }
   {
+    mode = "n";
     key = "gl";
     options.desc = "Hover diagnostics";
 
diff --git a/config/keymaps/splits.nix b/config/keymaps/splits.nix
index cb473da..887af90 100644
--- a/config/keymaps/splits.nix
+++ b/config/keymaps/splits.nix
@@ -2,41 +2,49 @@
 # https://github.com/AstroNvim/AstroNvim/blob/v4.7.7/lua/astronvim/plugins/_astrocore_mappings.lua#L107-L114
 [
   {
+    mode = "n";
     key = "<C-H>";
     action = "<C-w>h";
     options.desc = "Move to left split";
   }
   {
+    mode = "n";
     key = "<C-J>";
     action = "<C-w>j";
     options.desc = "Move to below split";
   }
   {
+    mode = "n";
     key = "<C-K>";
     action = "<C-w>k";
     options.desc = "Move to above split";
   }
   {
+    mode = "n";
     key = "<C-L>";
     action = "<C-w>l";
     options.desc = "Move to right split";
   }
   {
+    mode = "n";
     key = "<C-Up>";
     action = "<Cmd>resize -2<CR>";
     options.desc = "Resize split up";
   }
   {
+    mode = "n";
     key = "<C-Down>";
     action = "<Cmd>resize +2<CR>";
     options.desc = "Resize split down";
   }
   {
+    mode = "n";
     key = "<C-Left>";
     action = "<Cmd>vertical resize -2<CR>";
     options.desc = "Resize split left";
   }
   {
+    mode = "n";
     key = "<C-Right>";
     action = "<Cmd>vertical resize +2<CR>";
     options.desc = "Resize split right";
diff --git a/config/keymaps/standard.nix b/config/keymaps/standard.nix
index 257776c..57630d9 100644
--- a/config/keymaps/standard.nix
+++ b/config/keymaps/standard.nix
@@ -8,8 +8,8 @@ in
   # Standard operations
   # https://github.com/AstroNvim/AstroNvim/blob/v4.7.7/lua/astronvim/plugins/_astrocore_mappings.lua#L27-L44
   {
-    key = "j";
     mode = [ "n" "x" ];
+    key = "j";
     action = "v:count == 0 ? 'gj' : 'j'";
 
     options = {
@@ -19,8 +19,8 @@ in
     };
   }
   {
-    key = "k";
     mode = [ "n" "x" ];
+    key = "k";
     action = "v:count == 0 ? 'gk' : 'k'";
 
     options = {
@@ -30,51 +30,60 @@ in
     };
   }
   {
+    mode = "n";
     key = "<leader>w";
     action = "<cmd>w<cr>";
     options.desc = "Save";
   }
   {
+    mode = "n";
     key = "<leader>q";
     action = "<cmd>confirm q<cr>";
     options.desc = "Quit window";
   }
   {
+    mode = "n";
     key = "<leader>Q";
     action = "<cmd>confirm qall<cr>";
     options.desc = "Exit neovim";
   }
   {
+    mode = "n";
     key = "<leader>n";
     action = "<cmd>enew<cr>";
     options.desc = "New file";
   }
   {
     inherit (forceWrite) action options;
+    mode = "n";
     key = "<c-s>";
   }
   {
     inherit (forceWrite) options;
-    key = "<c-s>";
     mode = [ "i" "x" ];
+    key = "<c-s>";
     action = "<esc>" + forceWrite.action;
   }
   {
+    mode = "n";
     key = "<c-q>";
     action = "<cmd>q!<cr>";
     options.desc = "Force quit";
   }
   {
+    mode = "n";
     key = "|";
     action = "<cmd>vsplit<cr>";
     options.desc = "Vertical split";
   }
   {
+    mode = "n";
     key = "\\";
     action = "<cmd>split<cr>";
     options.desc = "Horizontal split";
   }
   {
+    mode = "n";
     key = "gx";
     action.__raw = "require('astrocore').system_open";
     options.desc = "Open the file under cursor with system app";
@@ -83,14 +92,14 @@ in
   # Stay in indent mode
   # https://github.com/AstroNvim/AstroNvim/blob/v4.7.7/lua/astronvim/plugins/_astrocore_mappings.lua#L117-L118
   {
+    mode = "v";
     key = "<S-Tab>";
-    mode = [ "v" ];
     action = "<gv";
     options.desc = "Unindent line";
   }
   {
+    mode = "v";
     key = "<Tab>";
-    mode = [ "v" ];
     action = ">gv";
     options.desc = "Indent line";
   }
diff --git a/config/keymaps/tabs.nix b/config/keymaps/tabs.nix
index dbdf672..6d9809b 100644
--- a/config/keymaps/tabs.nix
+++ b/config/keymaps/tabs.nix
@@ -2,6 +2,7 @@
 # https://github.com/AstroNvim/AstroNvim/blob/v4.7.7/lua/astronvim/plugins/_astrocore_mappings.lua#L103-L104
 [
   {
+    mode = "n";
     key = "]t";
     options.desc = "Next tab";
 
@@ -12,6 +13,7 @@
     '';
   }
   {
+    mode = "n";
     key = "[t";
     options.desc = "Previous tab";
 
diff --git a/config/keymaps/terminal.nix b/config/keymaps/terminal.nix
index 8492900..e5ea0d9 100644
--- a/config/keymaps/terminal.nix
+++ b/config/keymaps/terminal.nix
@@ -2,26 +2,26 @@
 # https://github.com/AstroNvim/AstroNvim/blob/v4.7.7/lua/astronvim/plugins/_astrocore_mappings.lua#L121-L124
 [
   {
+    mode = "t";
     key = "<C-H>";
-    mode = [ "t" ];
     action = "<Cmd>wincmd h<CR>";
     options.desc = "Terminal left window navigation";
   }
   {
+    mode = "t";
     key = "<C-J>";
-    mode = [ "t" ];
     action = "<Cmd>wincmd j<CR>";
     options.desc = "Terminal down window navigation";
   }
   {
+    mode = "t";
     key = "<C-K>";
-    mode = [ "t" ];
     action = "<Cmd>wincmd k<CR>";
     options.desc = "Terminal up window navigation";
   }
   {
+    mode = "t";
     key = "<C-L>";
-    mode = [ "t" ];
     action = "<Cmd>wincmd l<CR>";
     options.desc = "Terminal right window navigation";
   }
diff --git a/config/keymaps/toggles.nix b/config/keymaps/toggles.nix
index 9600c54..6e01990 100644
--- a/config/keymaps/toggles.nix
+++ b/config/keymaps/toggles.nix
@@ -2,6 +2,7 @@
 # https://github.com/AstroNvim/AstroNvim/blob/v4.7.7/lua/astronvim/plugins/_astrocore_mappings.lua#L128-L145
 [
   {
+    mode = "n";
     key = "<Leader>uA";
     options.desc = "Toggle rooter autochdir";
 
@@ -12,6 +13,7 @@
     '';
   }
   {
+    mode = "n";
     key = "<Leader>ub";
     options.desc = "Toggle background";
 
@@ -22,6 +24,7 @@
     '';
   }
   {
+    mode = "n";
     key = "<Leader>ud";
     options.desc = "Toggle diagnostics";
 
@@ -32,6 +35,7 @@
     '';
   }
   {
+    mode = "n";
     key = "<Leader>ug";
     options.desc = "Toggle signcolumn";
 
@@ -42,6 +46,7 @@
     '';
   }
   {
+    mode = "n";
     key = "<Leader>u>";
     options.desc = "Toggle foldcolumn";
 
@@ -52,6 +57,7 @@
     '';
   }
   {
+    mode = "n";
     key = "<Leader>ui";
     options.desc = "Change indent setting";
 
@@ -62,6 +68,7 @@
     '';
   }
   {
+    mode = "n";
     key = "<Leader>ul";
     options.desc = "Toggle statusline";
 
@@ -72,6 +79,7 @@
     '';
   }
   {
+    mode = "n";
     key = "<Leader>un";
     options.desc = "Change line numbering";
 
@@ -82,6 +90,7 @@
     '';
   }
   {
+    mode = "n";
     key = "<Leader>uN";
     options.desc = "Toggle Notifications";
 
@@ -92,6 +101,7 @@
     '';
   }
   {
+    mode = "n";
     key = "<Leader>up";
     options.desc = "Toggle paste mode";
 
@@ -102,6 +112,7 @@
     '';
   }
   {
+    mode = "n";
     key = "<Leader>us";
     options.desc = "Toggle spellcheck";
 
@@ -112,6 +123,7 @@
     '';
   }
   {
+    mode = "n";
     key = "<Leader>uS";
     options.desc = "Toggle conceal";
 
@@ -122,6 +134,7 @@
     '';
   }
   {
+    mode = "n";
     key = "<Leader>ut";
     options.desc = "Toggle tabline";
 
@@ -132,6 +145,7 @@
     '';
   }
   {
+    mode = "n";
     key = "<Leader>uu";
     options.desc = "Toggle URL highlight";
 
@@ -142,6 +156,7 @@
     '';
   }
   {
+    mode = "n";
     key = "<Leader>uw";
     options.desc = "Toggle wrap";
 
@@ -152,6 +167,7 @@
     '';
   }
   {
+    mode = "n";
     key = "<Leader>uy";
     options.desc = "Toggle syntax highlight";
 
diff --git a/plugins/alpha.nix b/plugins/alpha.nix
index 07306a7..04d9a04 100644
--- a/plugins/alpha.nix
+++ b/plugins/alpha.nix
@@ -172,6 +172,7 @@ in
 
     keymaps = [
       {
+        mode = "n";
         key = "<leader>h";
         options.desc = "Home screen";
 
diff --git a/plugins/autopairs.nix b/plugins/autopairs.nix
index 223a08f..e935b42 100644
--- a/plugins/autopairs.nix
+++ b/plugins/autopairs.nix
@@ -33,6 +33,7 @@
 
   rootOpts.keymaps = [
     {
+      mode = "n";
       key = "<leader>ua";
       action.__raw = "function() require('astrocore.toggles').autopairs() end";
       options.desc = "Toggle autopairs";
diff --git a/plugins/gitsigns.nix b/plugins/gitsigns.nix
index 2c2fcf8..42e63d7 100644
--- a/plugins/gitsigns.nix
+++ b/plugins/gitsigns.nix
@@ -33,51 +33,61 @@
     # https://github.com/AstroNvim/AstroNvim/blob/v4.7.7/lua/astronvim/plugins/gitsigns.lua#L9-L21
     keymaps = [
       {
+        mode = "n";
         key = "]g";
         action.__raw = "function() require('gitsigns').next_hunk() end";
         options.desc = "Next Git hunk";
       }
       {
+        mode = "n";
         key = "[g";
         action.__raw = "function() require('gitsigns').prev_hunk() end";
         options.desc = "Previous Git hunk";
       }
       {
+        mode = "n";
         key = "<leader>gl";
         action.__raw = "function() require('gitsigns').blame_line { full = true } end";
         options.desc = "View full Git blame";
       }
       {
+        mode = "n";
         key = "<Leader>gp";
         action.__raw = "function() require('gitsigns').preview_hunk_inline() end";
         options.desc = "Preview Git hunk";
       }
       {
+        mode = "n";
         key = "<Leader>gh";
         action.__raw = "function() require('gitsigns').reset_hunk() end";
         options.desc = "Reset Git hunk";
       }
       {
+        mode = "n";
         key = "<Leader>gr";
         action.__raw = "function() require('gitsigns').reset_buffer() end";
         options.desc = "Reset Git buffer";
       }
       {
+        mode = "n";
         key = "<Leader>gs";
         action.__raw = "function() require('gitsigns').stage_hunk() end";
         options.desc = "Stage Git hunk";
       }
       {
+        mode = "n";
         key = "<Leader>gS";
         action.__raw = "function() require('gitsigns').stage_buffer() end";
         options.desc = "Stage Git buffer";
       }
       {
+        mode = "n";
         key = "<Leader>gu";
         action.__raw = "function() require('gitsigns').undo_stage_hunk() end";
         options.desc = "Unstage Git hunk";
       }
       {
+        mode = "n";
         key = "<Leader>gd";
         action.__raw = "function() require('gitsigns').diffthis() end";
         options.desc = "View Git diff";
diff --git a/plugins/heirline.nix b/plugins/heirline.nix
index ee82d6e..3b57cdd 100644
--- a/plugins/heirline.nix
+++ b/plugins/heirline.nix
@@ -160,6 +160,7 @@
 
     keymaps = [
       {
+        mode = "n";
         key = "<leader>bb";
         options.desc = "Select buffer from tabline";
 
@@ -170,6 +171,7 @@
         '';
       }
       {
+        mode = "n";
         key = "<leader>bd";
         options.desc = "Close buffer from tabline";
 
@@ -182,6 +184,7 @@
         '';
       }
       {
+        mode = "n";
         key = "<leader>b\\";
         options.desc = "Horizontal split buffer from tabline";
 
@@ -195,6 +198,7 @@
         '';
       }
       {
+        mode = "n";
         key = "<leader>b|";
         options.desc = "Vertical split buffer from tabline";
 
diff --git a/plugins/neo-tree.nix b/plugins/neo-tree.nix
index faa5c09..70353d9 100644
--- a/plugins/neo-tree.nix
+++ b/plugins/neo-tree.nix
@@ -245,11 +245,13 @@
 
     keymaps = [
       {
+        mode = "n";
         key = "<leader>e";
         action = "<cmd>Neotree toggle<cr>";
         options.desc = "Toggle explorer";
       }
       {
+        mode = "n";
         key = "<leader>o";
         options.desc = "Toggle explorer focus";
 
diff --git a/plugins/nvim-highlight-colors.nix b/plugins/nvim-highlight-colors.nix
index 492b2d0..0646d11 100644
--- a/plugins/nvim-highlight-colors.nix
+++ b/plugins/nvim-highlight-colors.nix
@@ -18,6 +18,7 @@
 
   rootOpts.keymaps = [
     {
+      mode = "n";
       key = "<leader>uz";
       action = "<cmd>HighlightColors Toggle<cr>";
       options.desc = "Toggle color highlight";