diff --git a/config/ai/avante.nix b/config/ai/avante.nix
index 5d7f1ba..a75b34d 100644
--- a/config/ai/avante.nix
+++ b/config/ai/avante.nix
@@ -6,14 +6,6 @@
   ];
   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
new file mode 100644
index 0000000..fe5cf05
--- /dev/null
+++ b/config/bufferline.nix
@@ -0,0 +1,5 @@
+{
+  plugins.bufferline = {
+    enable = true;
+  };
+}
diff --git a/config/default.nix b/config/default.nix
index 8e5d989..0afec8f 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,15 +16,13 @@
     ./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/filemanager.nix b/config/neo-tree.nix
similarity index 66%
rename from config/filemanager.nix
rename to config/neo-tree.nix
index 4d485ec..cd3132c 100644
--- a/config/filemanager.nix
+++ b/config/neo-tree.nix
@@ -27,12 +27,6 @@
     '';
     window.mappings."<space>" = "";
   };
-
-  plugins.yazi = {
-    enable = true;
-  };
-  dependencies.yazi.enable = true;
-
   keymaps = [
     {
       mode = [ "n" ];
@@ -46,29 +40,5 @@
         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 10b9294..a604fdb 100644
--- a/config/rainbow-delimiters.nix
+++ b/config/rainbow-delimiters.nix
@@ -1,23 +1,23 @@
-{ helpers, ... }:
 {
   plugins.rainbow-delimiters = {
     enable = true;
     highlight = [
-      "RainbowDelimiterRed"
-      "RainbowDelimiterYellow"
-      "RainbowDelimiterBlue"
-      "RainbowDelimiterOrange"
-      "RainbowDelimiterGreen"
-      "RainbowDelimiterViolet"
-      "RainbowDelimiterCyan"
+      "RainbowRed"
+      "RainbowYellow"
+      "RainbowBlue"
+      "RainbowOrange"
+      "RainbowGreen" 
+      "RainbowViolet"
+      "RainbowCyan"
     ];
-    strategy = {
-      # Use global strategy by default
-      default = "global";
-    };
-    query = {
-      default = "rainbow-delimiters";
-      lua = "rainbow-blocks";
-    };
+  };
+  highlight = {
+    RainbowRed = { fg = "#E06C75"; };
+    RainbowYellow = { fg = "#E5C07B"; };
+    RainbowBlue = { fg = "#61AFEF"; };
+    RainbowOrange = { fg = "#D19A66"; };
+    RainbowGreen = { fg = "#98C379"; };
+    RainbowViolet = { fg = "#C678DD"; };
+    RainbowCyan = { fg = "#56B6C2"; };
   };
 }
diff --git a/config/treesitter.nix b/config/treesitter.nix
index d29e34e..d15124b 100644
--- a/config/treesitter.nix
+++ b/config/treesitter.nix
@@ -1,10 +1,5 @@
 {
   plugins.treesitter = {
     enable = true;
-    autoLoad = true;
-    nixvimInjections = true;
-    settings = {
-      highlight.enable = true;
-    };
   };
 }
diff --git a/config/ui.nix b/config/ui.nix
deleted file mode 100644
index ec1dfad..0000000
--- a/config/ui.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ helpers, ... }:
-{
-  colorschemes.catppuccin = {
-    enable = true;
-    settings = {
-      flavour = "mocha";
-    };
-  };
-  plugins.bufferline = {
-    enable = true;
-  };
-}