diff --git a/flake.nix b/flake.nix
index 6e232a5..aa3bfda 100644
--- a/flake.nix
+++ b/flake.nix
@@ -31,30 +31,19 @@
       nixosConfigurations.nerv = nixpkgs.lib.nixosSystem {
         specialArgs = { inherit inputs; };
         modules = [
-
           # set the theme
-          ./theme.nix
-          ({ pkgs, ... }: {
-            config.theming.theme = "gruvbox-dark-hard";
-            config.theming.font = "Iosevka";
-            config.theming.fontPackage = pkgs.iosevka;
-          })
-          base16.nixosModule
-          ({ config, ... }: { scheme = "${config.theming.theme}"; })
-
-          # import nixos & hm configuration
+          ./modules/themeing
           ./modules/hosts/nerv/configuration.nix
           home-manager.nixosModules.home-manager
           {
-            home-manager.extraSpecialArgs = { inherit inputs; };
             home-manager.useGlobalPkgs = true;
             home-manager.useUserPackages = true;
-            home-manager.users.lucy = ./modules/hosts/nerv/home.nix;
+            home-manager.extraSpecialArgs = { inherit inputs; };
             imports = [
               ./modules/themeing
               ./modules/programs
-        
             ];
+            home-manager.users.lucy = ./modules/hosts/nerv/home.nix;
           }
         ];
       };
diff --git a/modules/themeing/default.nix b/modules/themeing/default.nix
index 9d01887..fce7560 100644
--- a/modules/themeing/default.nix
+++ b/modules/themeing/default.nix
@@ -1,4 +1,12 @@
-{ lib, inputs, ...}: {
+{
+  lib,
+  inputs,
+  pkgs,
+  config,
+  ...
+}:
+{
+  imports = [ inputs.base16.nixosModule ];
   options.theming.theme = lib.mkOption {
     type = lib.types.str;
     apply = name: "${inputs.tt-schemes}/base16/${name}.yaml";
@@ -9,4 +17,9 @@
   options.theming.fontPackage = lib.mkOption {
     type = lib.types.package;
   };
+
+  config.theming.theme = "catppuccin-mocha";
+  config.theming.font = "Iosevka";
+  config.theming.fontPackage = pkgs.iosevka;
+  config.scheme = config.theming.theme;
 }