diff --git a/users/modules/programs/nixvim.nix b/users/modules/programs/nixvim.nix
index 830e9ad..fa1bf03 100644
--- a/users/modules/programs/nixvim.nix
+++ b/users/modules/programs/nixvim.nix
@@ -1,9 +1,10 @@
 { inputs, ... }: {
   imports = [ 
     inputs.nixvim.homeManagerModules.nixvim 
-    ./nixvim-plugins/nvim-tree.nix # filetree
-    ./nixvim-plugins/noice.nix # custom CMDLINE
-    ./nixvim-plugins/lualine.nix # custom statusline
+    ./nixvim/colorscheme-catppuccin.nix
+    ./nixvim/nvim-tree.nix # filetree
+    ./nixvim/noice.nix # custom CMDLINE
+    ./nixvim/lualine.nix # custom statusline
   ];
   programs.nixvim = {
     enable = true;
@@ -22,8 +23,5 @@
 
     clipboard.providers.wl-copy.enable = true;
 
-    colorschemes = {
-      catppuccin.enable = true;
-    };
   };
 }
diff --git a/users/modules/programs/nixvim/colorscheme-catppuccin.nix b/users/modules/programs/nixvim/colorscheme-catppuccin.nix
new file mode 100644
index 0000000..411a122
--- /dev/null
+++ b/users/modules/programs/nixvim/colorscheme-catppuccin.nix
@@ -0,0 +1,8 @@
+{
+  programs.nixvim.colorschemes.catppuccin = {
+    enable = true;
+    settings = {
+      flavour = "mocha";
+    };
+  };
+}
diff --git a/users/modules/programs/nixvim-plugins/lualine.nix b/users/modules/programs/nixvim/lualine.nix
similarity index 100%
rename from users/modules/programs/nixvim-plugins/lualine.nix
rename to users/modules/programs/nixvim/lualine.nix
diff --git a/users/modules/programs/nixvim-plugins/noice.nix b/users/modules/programs/nixvim/noice.nix
similarity index 100%
rename from users/modules/programs/nixvim-plugins/noice.nix
rename to users/modules/programs/nixvim/noice.nix
diff --git a/users/modules/programs/nixvim-plugins/nvim-tree.nix b/users/modules/programs/nixvim/nvim-tree.nix
similarity index 100%
rename from users/modules/programs/nixvim-plugins/nvim-tree.nix
rename to users/modules/programs/nixvim/nvim-tree.nix