diff --git a/home-manager/common/software/cli/nixvim-base.nix b/home-manager/common/software/cli/nixvim-base.nix
index d32acda5..84164649 100644
--- a/home-manager/common/software/cli/nixvim-base.nix
+++ b/home-manager/common/software/cli/nixvim-base.nix
@@ -55,18 +55,23 @@
             (nmap "<leader>gc" ":Git commit -a<CR>" // desc "[C]ommit" )
             (nmap "<leader>gp" ":Git push<CR>" // desc "[P]ush")
             # Window Management
-            (nmap "<leader>w" "<C-w>"    // desc "Move to left window")
-            # (nmap "<leader>wl" "<GO_TO_RIGHT_WINDOW>"   // desc "Move to right window")
-            # (nmap "<leader>wj" "<GO_TO_LOWER_WINDOW>"   // desc "Move to lower window")
-            # (nmap "<leader>wk" "<GO_TO_UPPER_WINDOW>"   // desc "Move to upper window")
-            # (nmap "<leader>wc" "<CLOSE_CURRENT_WINDOW>" // desc "[C]lose active window")
-            # (nmap "<leader>wn" "<OPEN_NEW_WINDOW>"      // desc "Open [n]ew window")
-        ];
+            (nmap "<leader>wh"  ":wincmd h" // desc "Move left")
+            (nmap "<leader>wl"  ":wincmd l" // desc "Move right")
+            (nmap "<leader>wj"  ":wincmd j" // desc "Move down")
+            (nmap "<leader>wk"  ":wincmd k" // desc "Move up")
+            (nmap "<leader>wp"  ":wincmd p" // desc "Move to [p]revious")
+            (nmap "<leader>wp"  ":wincmd n" // desc "Move to [n]ext")
+            (nmap "<leader>wc"  ":wincmd c" // desc "[C]lose active window")
+            (nmap "<leader>ww"  ":wincmd w" // desc "Switch [w]indows")
+            (nmap "<leader>wnh" ":wincmd n" // desc "[N]ew [H]orizontal window")
+            (nmap "<leader>wnv" ":wincmd v" // desc "[N]ew [V]ertical window")
+            # Buffer Management
+            (nmap "<leader>bn" ":bnext" // desc "Next buffer")
+            (nmap "<leader>bp" "bNext" // desc "Previous buffer")
 
         options = {
             number = true;
             shiftwidth = 2;
-            # Indent wrapped text.
             breakindent = true;
             colorcolumn = "100";
             showmode = false;
@@ -122,9 +127,9 @@
                         action = "live_grep";
                         desc = "Search by live grep";
                     };
-                    "<leader>b" = {
+                    "<leader>bl" = {
                         action = "buffers";
-                        desc = "Search open [B]uffers by file name";
+                        desc = "[L]list open [B]uffers";
                     };
                     "<leader>h" = {
                         action = "help_tags";
@@ -142,6 +147,10 @@
                         action = "oldfiles";
                         desc = "Search [R]ecently opened files by name";
                     };
+                    "<leader>cs" = {
+                        action = "colorscheme";
+                        desc = "Change [C]olor[s]cheme";
+                    };
                 };
             };