diff --git a/config/ai/avante.nix b/config/ai/avante.nix
index a75b34d..5d7f1ba 100644
--- a/config/ai/avante.nix
+++ b/config/ai/avante.nix
@@ -6,6 +6,14 @@
   ];
   plugins.avante = {
     enable = true;
+    lazyLoad = {
+      enable = true;
+      settings = {
+        keys = [
+          "<leader>a"
+        ];
+      };
+    };
     settings = {
       provider = "deepseek";
       vendors = {
diff --git a/config/bufferline.nix b/config/bufferline.nix
deleted file mode 100644
index fe5cf05..0000000
--- a/config/bufferline.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  plugins.bufferline = {
-    enable = true;
-  };
-}
diff --git a/config/default.nix b/config/default.nix
index 0afec8f..8e5d989 100644
--- a/config/default.nix
+++ b/config/default.nix
@@ -1,10 +1,10 @@
 {
   # Import all your configuration modules here
   imports = [
+    ./rainbow-delimiters.nix
     ./ai/avante.nix
     ./buffer/bufdelete.nix
     ./blink.nix
-    ./bufferline.nix
     ./comment.nix
     ./core.nix
     ./direnv.nix
@@ -16,13 +16,15 @@
     ./lazygit.nix
     ./lsp
     ./lualine.nix
-    ./neo-tree.nix
     # ./project.nix
-    ./rainbow-delimiters.nix
     ./telescope.nix
     ./toggleterm.nix
     ./treesitter.nix
     ./which-key.nix
+
+    ./filemanager.nix
+    ./ui.nix
   ];
   plugins.web-devicons.enable = true;
+  plugins.lz-n.enable = true;
 }
diff --git a/config/neo-tree.nix b/config/filemanager.nix
similarity index 66%
rename from config/neo-tree.nix
rename to config/filemanager.nix
index cd3132c..4d485ec 100644
--- a/config/neo-tree.nix
+++ b/config/filemanager.nix
@@ -27,6 +27,12 @@
     '';
     window.mappings."<space>" = "";
   };
+
+  plugins.yazi = {
+    enable = true;
+  };
+  dependencies.yazi.enable = true;
+
   keymaps = [
     {
       mode = [ "n" ];
@@ -40,5 +46,29 @@
         desc = "Toggle Neo-Tree";
       };
     }
+    {
+      mode = [ "n" ];
+      key = "<leader>cw";
+      action = "<cmd>Yazi cwd<cr>";
+      options = {
+        desc = "Open the file manager in nvim's working directory";
+      };
+    }
+    {
+      mode = [ "n" ];
+      key = "<c-up>";
+      action = "<cmd>Yazi toggle<cr>";
+      options = {
+        desc = "Resume the last yazi session";
+      };
+    }
+    {
+      mode = [ "n" ];
+      key = "<leader>y";
+      action = "<cmd>Yazi<cr>";
+      options = {
+        desc = "Open yazi at the current file";
+      };
+    }
   ];
 }
diff --git a/config/rainbow-delimiters.nix b/config/rainbow-delimiters.nix
index a604fdb..10b9294 100644
--- a/config/rainbow-delimiters.nix
+++ b/config/rainbow-delimiters.nix
@@ -1,23 +1,23 @@
+{ helpers, ... }:
 {
   plugins.rainbow-delimiters = {
     enable = true;
     highlight = [
-      "RainbowRed"
-      "RainbowYellow"
-      "RainbowBlue"
-      "RainbowOrange"
-      "RainbowGreen" 
-      "RainbowViolet"
-      "RainbowCyan"
+      "RainbowDelimiterRed"
+      "RainbowDelimiterYellow"
+      "RainbowDelimiterBlue"
+      "RainbowDelimiterOrange"
+      "RainbowDelimiterGreen"
+      "RainbowDelimiterViolet"
+      "RainbowDelimiterCyan"
     ];
-  };
-  highlight = {
-    RainbowRed = { fg = "#E06C75"; };
-    RainbowYellow = { fg = "#E5C07B"; };
-    RainbowBlue = { fg = "#61AFEF"; };
-    RainbowOrange = { fg = "#D19A66"; };
-    RainbowGreen = { fg = "#98C379"; };
-    RainbowViolet = { fg = "#C678DD"; };
-    RainbowCyan = { fg = "#56B6C2"; };
+    strategy = {
+      # Use global strategy by default
+      default = "global";
+    };
+    query = {
+      default = "rainbow-delimiters";
+      lua = "rainbow-blocks";
+    };
   };
 }
diff --git a/config/treesitter.nix b/config/treesitter.nix
index d15124b..d29e34e 100644
--- a/config/treesitter.nix
+++ b/config/treesitter.nix
@@ -1,5 +1,10 @@
 {
   plugins.treesitter = {
     enable = true;
+    autoLoad = true;
+    nixvimInjections = true;
+    settings = {
+      highlight.enable = true;
+    };
   };
 }
diff --git a/config/ui.nix b/config/ui.nix
new file mode 100644
index 0000000..ec1dfad
--- /dev/null
+++ b/config/ui.nix
@@ -0,0 +1,12 @@
+{ helpers, ... }:
+{
+  colorschemes.catppuccin = {
+    enable = true;
+    settings = {
+      flavour = "mocha";
+    };
+  };
+  plugins.bufferline = {
+    enable = true;
+  };
+}