diff --git a/flake.nix b/flake.nix
index 90d02cd..6b91667 100644
--- a/flake.nix
+++ b/flake.nix
@@ -27,23 +27,9 @@
           wrappers.flakeModules.wrappers
           ./modules/theme.nix
           ./modules/programs/emacs/emacs.nix
+          ./hosts.nix
         ];
-        flake.nixosConfigurations.nerv = inputs.nixpkgs.lib.nixosSystem {
-          specialArgs = { inherit inputs; };
-          modules = [
-            base16.nixosModule
-            { scheme = "${inputs.tt-schemes}/base16/oxocarbon-dark.yaml"; }
-            ./modules/hosts/nerv/configuration.nix
-            config.flake.wrappers.emacs.install
-            { wrappers.emacs.enable = true; }
-            home-manager.nixosModules.home-manager {
-              home-manager.useGlobalPkgs = true;
-              home-manager.useUserPackages = true;
-              home-manager.extraSpecialArgs = { inherit inputs; };
-              home-manager.users.lucy = ./modules/home.nix;
-            }
-          ];
-        };
+    
       }
     );
 }
diff --git a/hosts.nix b/hosts.nix
new file mode 100644
index 0000000..43bd10b
--- /dev/null
+++ b/hosts.nix
@@ -0,0 +1,23 @@
+{ inputs, config, ... }:
+let
+  themeName = "catppuccin-mocha";
+in
+{
+  flake.nixosConfigurations.nerv = inputs.nixpkgs.lib.nixosSystem {
+    specialArgs = { inherit inputs; };
+    modules = [
+      inputs.base16.nixosModules
+      { scheme = "${inputs.tt-schemes}/base16/${themeName}"; }
+      config.wrappers.emacs.install
+      ./configuration.nix
+      ./modules/theme.nix
+      ./modules/programs/emacs/emacs.nix
+      inputs.home-manager.nixosModules.home-manager
+      {
+        home-manager.useGlobalPkgs = true;
+        home-manager.useUserPackages = true;
+        home-manager.extraSpecialArgs = { inherit inputs; };
+      }
+    ];
+  };
+}
diff --git a/modules/home.nix b/modules/home.nix
index 3b8d960..e73ed4e 100644
--- a/modules/home.nix
+++ b/modules/home.nix
@@ -1,23 +1,18 @@
 {
-  inputs,
   pkgs,
   config,
   ...
 }:
 let
-  c = ((pkgs.callPackage inputs.base16.lib { }).mkSchemeAttrs config.theme.name).withHashtag;
+  c = config.scheme.withHashtag;
 in
 {
-  home.stateVersion = "26.05";
-  gtk = {
-    enable = true;
-    colorScheme = "dark";
-    cursorTheme = {
-      name = "macOS";
-      package = pkgs.apple-cursor;
-      size = 24;
-    };
-    gtk3.extraCss = ''
+  home-manager.users.lucy = {
+    home.stateVersion = "26.05";
+    gtk = {
+      enable = true;
+      colorScheme = "dark";
+      gtk3.extraCss = ''
         @define-color theme_bg_color ${c.base00};
         @define-color theme_fg_color ${c.base05};
         @define-color theme_base_color ${c.base00};
@@ -30,8 +25,32 @@ in
         @define-color warning_color ${c.base0A};
         @define-color error_color ${c.base08};
         @define-color success_color ${c.base0B};
-    '';
-
+      '';
+      gtk4.extraCss = ''
+        @define-color window_bg_color ${c.base00};
+        @define-color window_fg_color ${c.base05};
+        @define-color view_bg_color ${c.base00};
+        @define-color view_fg_color ${c.base05};
+        @define-color headerbar_bg_color ${c.base01};
+        @define-color headerbar_fg_color ${c.base05};
+        @define-color headerbar_border_color ${c.base02};
+        @define-color sidebar_bg_color ${c.base01};
+        @define-color sidebar_fg_color ${c.base05};
+        @define-color card_bg_color ${c.base01};
+        @define-color card_fg_color ${c.base05};
+        @define-color popover_bg_color ${c.base01};
+        @define-color popover_fg_color ${c.base05};
+        @define-color dialog_bg_color ${c.base01};
+        @define-color dialog_fg_color ${c.base05};
+        @define-color accent_bg_color ${c.base0D};
+        @define-color accent_fg_color ${c.base00};
+        @define-color accent_color ${c.base0D};
+        @define-color destructive_bg_color ${c.base08};
+        @define-color destructive_color ${c.base08};
+        @define-color warning_color ${c.base0A};
+        @define-color error_color ${c.base08};
+        @define-color success_color ${c.base0B};
+      '';
+    };
   };
-
 }
diff --git a/modules/hosts/nerv/#nerv.nix# b/modules/hosts/nerv/#nerv.nix#
new file mode 100644
index 0000000..150d2b9
--- /dev/null
+++ b/modules/hosts/nerv/#nerv.nix#
@@ -0,0 +1,9 @@
+{ inputs, ... }: {
+  flake.nixosConfigurations.nerv = inputs.nixpkgs.lib.nixosSystem {
+    modules = [
+      ./configuration.nix
+      
+    ];
+  };
+}
+  
\ No newline at end of file
diff --git a/modules/hosts/nerv/#theme.nix# b/modules/hosts/nerv/#theme.nix#
deleted file mode 100644
index 129ecf5..0000000
--- a/modules/hosts/nerv/#theme.nix#
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  inputs,
-  config,
-  lib,
-  ...
-}:
-let
-  schemeName = config.theme.name;
-in
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-
-let
-  scheme = (pkgs.callPackage inputs.base16.lib { }).mkSchemeAttrs schemeName;
-in
-{
-  
-
-}
diff --git a/modules/hosts/nerv/.#nerv.nix b/modules/hosts/nerv/.#nerv.nix
new file mode 120000
index 0000000..3242c7a
--- /dev/null
+++ b/modules/hosts/nerv/.#nerv.nix
@@ -0,0 +1 @@
+lucy@nerv.50314:1788169501
\ No newline at end of file
diff --git a/modules/hosts/nerv/.#theme.nix b/modules/hosts/nerv/.#theme.nix
deleted file mode 120000
index 42dbbad..0000000
--- a/modules/hosts/nerv/.#theme.nix
+++ /dev/null
@@ -1 +0,0 @@
-lucy@nerv.31959:1788169501
\ No newline at end of file
diff --git a/modules/hosts/nerv/theme.nix b/modules/hosts/nerv/theme.nix
index 33117a8..0186fc3 100644
--- a/modules/hosts/nerv/theme.nix
+++ b/modules/hosts/nerv/theme.nix
@@ -1,7 +1,22 @@
-{ inputs, config, lib, ... }: let
+{
+  inputs,
+  config,
+  lib,
+  ...
+}:
+let
   schemeName = config.theme.name;
 in
-  {config, lib, pkgs, ...}:
-
-  let scheme = (pkgs.callPackage inputs.base16.lib {}).mkSchemeAttrs schemeName; in
-  {}
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+let
+  scheme = (pkgs.callPackage inputs.base16.lib { }).mkSchemeAttrs schemeName;
+in
+{
+  options.scheme = lib.mkOption {type = lib.types.str; };
+  config.scheme = scheme;
+}