diff --git a/flake.nix b/flake.nix
index 7a66712..90d02cd 100644
--- a/flake.nix
+++ b/flake.nix
@@ -26,9 +26,24 @@
         imports = [
           wrappers.flakeModules.wrappers
           ./modules/theme.nix
-          ./hosts.nix
+          ./modules/programs/emacs/emacs.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
deleted file mode 100644
index 02474eb..0000000
--- a/hosts.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ inputs, config, ... }:
-let
-  themeName = "catppuccin-mocha";
-in
-{
-  flake.nixosConfigurations.nerv = inputs.nixpkgs.lib.nixosSystem {
-    specialArgs = { inherit inputs; };
-    modules = [
-      inputs.base16.nixosModule
-      { scheme = "${inputs.tt-schemes}/base16/${themeName}.yaml"; }
-      ./modules/hosts/nerv/configuration.nix
-      ./modules/home.nix
-      inputs.home-manager.nixosModules.home-manager
-      {
-        home-manager.useGlobalPkgs = true;
-        home-manager.useUserPackages = true;
-        home-manager.extraSpecialArgs = { inherit inputs; };
-      }
-      {
-        imports = [
-          (inputs.wrappers.lib.getInstallModule {
-            name = "emacs";
-            value = inputs.wrappers.lib.wrapperModules.emacs;
-          })
-          ./modules/programs/emacs/emacs.nix
-        ];
-
-      }
-    ];
-  };
-}
diff --git a/modules/home.nix b/modules/home.nix
index e73ed4e..3b8d960 100644
--- a/modules/home.nix
+++ b/modules/home.nix
@@ -1,18 +1,23 @@
 {
+  inputs,
   pkgs,
   config,
   ...
 }:
 let
-  c = config.scheme.withHashtag;
+  c = ((pkgs.callPackage inputs.base16.lib { }).mkSchemeAttrs config.theme.name).withHashtag;
 in
 {
-  home-manager.users.lucy = {
-    home.stateVersion = "26.05";
-    gtk = {
-      enable = true;
-      colorScheme = "dark";
-      gtk3.extraCss = ''
+  home.stateVersion = "26.05";
+  gtk = {
+    enable = true;
+    colorScheme = "dark";
+    cursorTheme = {
+      name = "macOS";
+      package = pkgs.apple-cursor;
+      size = 24;
+    };
+    gtk3.extraCss = ''
         @define-color theme_bg_color ${c.base00};
         @define-color theme_fg_color ${c.base05};
         @define-color theme_base_color ${c.base00};
@@ -25,32 +30,8 @@ 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#
deleted file mode 100644
index 150d2b9..0000000
--- a/modules/hosts/nerv/#nerv.nix#
+++ /dev/null
@@ -1,9 +0,0 @@
-{ 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#
new file mode 100644
index 0000000..129ecf5
--- /dev/null
+++ b/modules/hosts/nerv/#theme.nix#
@@ -0,0 +1,23 @@
+{
+  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
deleted file mode 120000
index 3242c7a..0000000
--- a/modules/hosts/nerv/.#nerv.nix
+++ /dev/null
@@ -1 +0,0 @@
-lucy@nerv.50314:1788169501
\ No newline at end of file
diff --git a/modules/hosts/nerv/.#theme.nix b/modules/hosts/nerv/.#theme.nix
new file mode 120000
index 0000000..42dbbad
--- /dev/null
+++ b/modules/hosts/nerv/.#theme.nix
@@ -0,0 +1 @@
+lucy@nerv.31959:1788169501
\ No newline at end of file
diff --git a/modules/hosts/nerv/configuration.nix b/modules/hosts/nerv/configuration.nix
index d4df98f..258f6fa 100644
--- a/modules/hosts/nerv/configuration.nix
+++ b/modules/hosts/nerv/configuration.nix
@@ -1,14 +1,10 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
+{ config, lib, pkgs, ... }:
 
 {
-  imports = [
-    ./hardware-configuration.nix
-  ];
+  imports =
+    [ 
+      ./hardware-configuration.nix
+    ];
 
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
@@ -23,42 +19,43 @@
   hardware.graphics.enable = true;
   services.xserver.videoDrivers = [ "nvidia" ];
   hardware.nvidia = {
-    modesetting.enable = true;
-    powerManagement.enable = false;
-    open = true;
-    nvidiaSettings = true;
-    package = config.boot.kernelPackages.nvidiaPackages.stable;
-  };
+  		  modesetting.enable = true;
+		  powerManagement.enable = false;
+		  open = true;
+		  nvidiaSettings = true;
+		  package = config.boot.kernelPackages.nvidiaPackages.stable;
+};
 
   # Set your time zone.
   time.timeZone = "Europe/Berlin";
 
-  i18n.defaultLocale = "en_US.UTF-8";
-  services.desktopManager.gnome.enable = true;
-  services.displayManager.gdm.enable = true;
-  services.xserver.xkb.layout = "us";
-  services.pipewire = {
-    enable = true;
-    pulse.enable = true;
+   i18n.defaultLocale = "en_US.UTF-8";
+   services.desktopManager.gnome.enable = true;
+   services.displayManager.gdm.enable = true;
+   services.xserver.xkb.layout = "us";
+   services.pipewire = {
+     enable = true;
+     pulse.enable = true;
   };
   nixpkgs.config.allowUnfree = true;
 
-  # Define a user account. Don't forget to set a password with ‘passwd’.
-  users.users.lucy = {
-    isNormalUser = true;
-    extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user.
-    packages = with pkgs; [
-      vesktop
-      google-chrome
-    ];
-  };
+   # Define a user account. Don't forget to set a password with ‘passwd’.
+   users.users.lucy = {
+     isNormalUser = true;
+     extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user.
+     packages = with pkgs; [
+       vesktop
+	     google-chrome
+     ];
+   };
 
-  environment.systemPackages = with pkgs; [
-    fastfetch
-    wget
-    git
-    clang
-  ];
+   environment.systemPackages = with pkgs; [
+     fastfetch
+     wget
+     git
+     clang
+   ];
   system.stateVersion = "26.05"; # Did you read the comment?
 
 }
+
diff --git a/modules/hosts/nerv/theme.nix b/modules/hosts/nerv/theme.nix
new file mode 100644
index 0000000..33117a8
--- /dev/null
+++ b/modules/hosts/nerv/theme.nix
@@ -0,0 +1,7 @@
+{ 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/programs/emacs/emacs.nix b/modules/programs/emacs/emacs.nix
index 8d6e2b1..81d8c6b 100644
--- a/modules/programs/emacs/emacs.nix
+++ b/modules/programs/emacs/emacs.nix
@@ -5,10 +5,10 @@
   ...
 }:
 let
-  schemeName = config.scheme;
+  schemeName = config.theme.name;
 in
 {
-  wrappers.emacs =
+  flake.wrappers.emacs =
     {
       pkgs,
       wlib,
@@ -17,8 +17,7 @@ in
     let
       scheme = (pkgs.callPackage inputs.base16.lib { }).mkSchemeAttrs schemeName;
     in
-      {
-        enable = true;
+    {
       imports = [
         wlib.wrapperModules.emacs
       ];