diff --git a/home-manager/common/software/cli/nixvim/base.nix b/home-manager/common/software/cli/nixvim/base.nix
index f3137392..d451f4c2 100644
--- a/home-manager/common/software/cli/nixvim/base.nix
+++ b/home-manager/common/software/cli/nixvim/base.nix
@@ -124,9 +124,9 @@
             offsets = [
               {
                 # filetype = "NvimTree";
-                filetype = "NeoTree";
+                filetype = "neo-tree";
                 text = "File Explorer";
-                highlight = "EcovimNeoTreeTitle";
+                highlight = "Directory";
                 # highlight = "EcovimNvimTreeTitle";
                 text_align = "center";
                 separator = true;
@@ -142,6 +142,8 @@
         enableGitStatus = true; 
         enableModifiedMarkers = true; 
         enableRefreshOnWrite = true;
+        hideRootNode = true;
+        popupBorderStyle = "rounded";
         sourceSelector = {
           winbar = true;
         };
@@ -151,6 +153,16 @@
           "git_status"
           "document_symbols"
         ];
+        filesystem = {
+          followCurrentFile = {
+            enabled = true; 
+            leaveDirsOpen = true;
+          };
+          filteredItems = {
+            hideDotfiles = false;
+            hideGitignored = true;
+          };
+        };
       };
       nvim-tree = {
         enable = false;
diff --git a/home-manager/common/software/cli/nixvim/keymaps.nix b/home-manager/common/software/cli/nixvim/keymaps.nix
index 2169be29..0a77f8fc 100644
--- a/home-manager/common/software/cli/nixvim/keymaps.nix
+++ b/home-manager/common/software/cli/nixvim/keymaps.nix
@@ -31,13 +31,13 @@
 
       # Normal Mode
       # NVimTree
-      (nmap "<leader>n" "<Nop>"                 // desc "[N]vimTree")
-      (nmap "<leader>nf" ":NvimTreeFocus<CR>"   // desc "[F]ocus NvimTree")
-      (nmap "<leader>nt" ":NvimTreeToggle<CR>"  // desc "[T]oggle NvimTree")
-      (nmap "<leader>ns" ":NvimTreeFindFile<CR>"// desc "[S]earch NvimTree")
-      (nmap "<leader>nc" ":NvimTreeClose<CR>"   // desc "[C]lose NvimTree")
-      (nmap "<leader>nr" ":NvimTreeRefresh<CR>" // desc "[R]efresh NvimTree")
-      (nmap "<leader>nT" ":NoiceTelescope<CR>"  // desc "Noice [T]elescope")
+      (nmap "<leader>nf" ":Neotree focus<CR>"      // desc "[F]ocus NeoTree")
+      (nmap "<leader>nt" ":Neotree toggle<CR>"     // desc "[T]oggle NeoTree")
+      (nmap "<leader>nc" ":Neotree close<CR>"      // desc "[C]lose NeoTree")
+      (nmap "<leader>ns" ":Neotree filesystem<CR>" // desc "[S]earch NeoTree")
+      (nmap "<leader>ng" ":Neotree git_status<CR>" // desc "[G]it Status")
+      (nmap "<leader>nb" ":Neotree buffers<CR>"    // desc "[B]uffer List")
+      (nmap "<leader>nT" ":NoiceTelescope<CR>"     // desc "Noice [T]elescope")
       # ToggleTerm
       (nmap "<leader>Tt" ":ToggleTerm<CR>"      // desc "[T]oggle Terminal")
       (nmap "<leader>Ts" ":TermSelect<CR>"      // desc "[S]elect a terminal")