diff --git a/flake.nix b/flake.nix
index 563e20e..377b59f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -111,6 +111,12 @@
           inherit inputs outputs;
         };
       };
+      builder = lib.nixosSystem {
+        modules = [./hosts/builder];
+        specialArgs = {
+          inherit inputs outputs;
+        };
+      };
     };
 
     # Standalone HM
diff --git a/homes/julian/pianonix.nix b/homes/julian/pianonix.nix
index 66a303e..de5ca75 100644
--- a/homes/julian/pianonix.nix
+++ b/homes/julian/pianonix.nix
@@ -7,8 +7,7 @@
     ./features/neovim
     ./features/wezterm
     ./features/yazi
-    ./features/nix-helper
-    ./features/desktop
+    ./features/gtk
   ];
 
   hostName = "pianonix";
diff --git a/hosts/builder/default.nix b/hosts/builder/default.nix
index 01393a6..96c0287 100644
--- a/hosts/builder/default.nix
+++ b/hosts/builder/default.nix
@@ -1,47 +1,15 @@
 # sudo nixos-rebuild switch --flake .#builder --target-host root@192.168.3.118
 # or
 # deploy .#builder
-{
-  config,
-  pkgs,
-  ...
-}: {
+{config, ...}: {
   imports = [
     ./hardware-configuration.nix
 
     ../common/global
   ];
 
-  # hardware.graphics = {
-  #   enable = true;
-  #   extraPackages = with pkgs; [
-  #     rocmPackages.clr.icd
-  #     linuxPackages.amdgpu-pro
-  #   ];
-  # };
-
-  # boot.kernelParams = [
-  #   "radeon.si_support=0"
-  #   "radeon.cik_support=1"
-  #   "amdgpu.si_support=0"
-  #   "amdgpu.cik_support=1"
-  # ];
-  # boot.extraModulePackages = with config.boot.kernelPackages; [ amdgpu-pro ];
-  # boot.blacklistedKernelModules = [ "radeon" ];
-
-  boot.loader.grub.enable = true;
-  boot.loader.grub.device = "/dev/sda";
-
-  # Emulated systems used as alternative to cross-compiling
-  boot.binfmt.emulatedSystems = ["aarch64-linux"];
-
   networking.hostName = "builder";
-
-  modules = {
-    keymap.enable = true;
-    locales.enable = true;
-    sops.enable = true;
-  };
+  system.stateVersion = "23.11";
 
   users.users.nix = {
     isNormalUser = true;
@@ -87,17 +55,6 @@
     max-free = ${toString (100 * 1024 * 1024 * 1024)}
   '';
 
-  environment.systemPackages = with pkgs; [
-    vim
-    htop
-    mc
-
-    # # AMD GPU tools
-    # pciutils
-    # nvtopPackages.amd
-    # linuxPackages.amdgpu-pro
-  ];
-
   nix.nrBuildUsers = 64;
 
   # prevent memory to get filled
@@ -240,7 +197,7 @@
 
   sops.secrets."gitea_token" = {
     owner = config.users.users.nix.name;
-    sopsFile = ../../../secrets/secrets-builder.yaml;
+    sopsFile = ./secrets.yaml;
   };
 
   # =========== Binary Cache ==========
@@ -250,7 +207,7 @@
   };
 
   # =========== Binary Cache with attic ==========
-  sops.secrets."attic_token".sopsFile = ../../../secrets/secrets-builder.yaml;
+  sops.secrets."attic_token".sopsFile = ./secrets.yaml;
 
   services.atticd = {
     enable = true;
@@ -284,8 +241,4 @@
       };
     };
   };
-
-  # ======================== DO NOT CHANGE THIS ========================
-  system.stateVersion = "23.11";
-  # ======================== DO NOT CHANGE THIS ========================
 }
diff --git a/hosts/builder/hardware-configuration.nix b/hosts/builder/hardware-configuration.nix
index 5047a5d..2761945 100644
--- a/hosts/builder/hardware-configuration.nix
+++ b/hosts/builder/hardware-configuration.nix
@@ -1,15 +1,4 @@
-# Do not modify this file!  It was generated by ‘nixos-generate-config’
-# and may be overwritten by future invocations.  Please make changes
-# to /etc/nixos/configuration.nix instead.
-{
-  config,
-  lib,
-  pkgs,
-  modulesPath,
-  ...
-}: {
-  imports = [(modulesPath + "/profiles/qemu-guest.nix")];
-
+{lib, ...}: {
   boot.initrd.availableKernelModules = [
     "ata_piix"
     "uhci_hcd"
@@ -35,4 +24,27 @@
   # networking.interfaces.ens18.useDHCP = lib.mkDefault true;
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+
+  # hardware.graphics = {
+  #   enable = true;
+  #   extraPackages = with pkgs; [
+  #     rocmPackages.clr.icd
+  #     linuxPackages.amdgpu-pro
+  #   ];
+  # };
+
+  # boot.kernelParams = [
+  #   "radeon.si_support=0"
+  #   "radeon.cik_support=1"
+  #   "amdgpu.si_support=0"
+  #   "amdgpu.cik_support=1"
+  # ];
+  # boot.extraModulePackages = with config.boot.kernelPackages; [ amdgpu-pro ];
+  # boot.blacklistedKernelModules = [ "radeon" ];
+
+  boot.loader.grub.enable = true;
+  boot.loader.grub.device = "/dev/sda";
+
+  # Emulated systems used as alternative to cross-compiling
+  boot.binfmt.emulatedSystems = ["aarch64-linux"];
 }
diff --git a/hosts/pianonix/default.nix b/hosts/pianonix/default.nix
index be99252..b650cea 100644
--- a/hosts/pianonix/default.nix
+++ b/hosts/pianonix/default.nix
@@ -16,19 +16,11 @@
     ../common/global
     ../common/users/julian
 
-    # ../common/optional/openssh.nix
-    # ../common/optional/greetd.nix
     ../common/optional/pipewire.nix
     ../common/optional/remote-builder.nix
-    # ../common/optional/boot-efi.nix
     ../common/optional/pcmanfm.nix
-    # ../common/optional/i3.nix
-    # ../common/optional/gdm.nix
     ../common/optional/redshift.nix
-    # ../common/optional/virtualbox.nix
-    ../common/optional/xdg-portal.nix
-    ../common/optional/polkit.nix # TODO: maybe not needed!
-    ../common/optional/keyring.nix # TODO: maybe not needed!
+    ../common/optional/authentication.nix
   ];
 
   # disko.devices.disk.main.device = "/dev/mmcblk1";
@@ -39,6 +31,7 @@
   #   "@SSID@".psk = "@PSK@";
   # };
   networking.hostName = "pianonix";
+  system.stateVersion = "22.11";
 
   sops.secrets."vnc-passwd" = {
     owner = config.users.users.julian.name;
@@ -135,15 +128,7 @@
     };
   };
 
-  # Packages needed as root
-  environment.systemPackages = with pkgs; [
-    vim
-    htop
-    mc
-  ];
-
   networking.firewall.enable = true;
-
   networking.firewall.allowedTCPPorts = [
     5900 # for vnc
   ];
@@ -170,8 +155,4 @@
   # boot.loader.raspberryPi.firmwareConfig = ''
   #   dtparam=audio=on
   # '';
-
-  # ======================== DO NOT CHANGE THIS ========================
-  system.stateVersion = "22.11";
-  # ======================== DO NOT CHANGE THIS ========================
 }