diff --git a/Droidnix/flake.nix b/Droidnix/flake.nix
index beaa07cb3..5835a87fe 100644
--- a/Droidnix/flake.nix
+++ b/Droidnix/flake.nix
@@ -15,6 +15,7 @@
       url = "github:catppuccin/nix";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+
     zen-browser = {
       url = "github:youwen5/zen-browser-flake";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -22,62 +23,63 @@
     hyprland.url = "github:hyprwm/Hyprland";
   };
 
-outputs =
-  inputs@{
-    self,
-    nixpkgs,
-    home-manager,
-    emacs-overlay,
-    catppuccin,
-    zen-browser,
-    hyprland,
-    ...
-  }:
-  let
-    lib = nixpkgs.lib;
-    system = "x86_64-linux";
-    user = import ./generated/out_of_tree/users/henrov.nix;
-    machines = [
-      "traveldroid"
-      "maindroid"
-    ];
-    flakeRoot = ./.; # Define flakeRoot here
-  in
-  {
-    nixosConfigurations = lib.genAttrs machines (
-      machine:
-      lib.nixosSystem {
-        inherit system;
-        modules = [
-          # Import machine-specific configurations
-          ./generated/out_of_tree/machines/traveldroid/top.nix
-          # Catppuccin theme module
-          inputs.catppuccin.nixosModules.catppuccin
-          # Anchoring all the other nixes
-          ./generated/top.nix
-          # Home Manager module
-          inputs.home-manager.nixosModules.home-manager
-          {
-            home-manager.useGlobalPkgs = true;
-            home-manager.useUserPackages = true;
-            home-manager.extraSpecialArgs = { inherit user inputs flakeRoot; };
-          }
-        ];
-        specialArgs = { inherit user inputs flakeRoot; };
-      }
-    );
+  outputs =
+    inputs@{
+      self,
+      nixpkgs,
+      home-manager,
+      emacs-overlay,
+      catppuccin,
+      zen-browser,
+      hyprland,
+      ...
+    }:
+    let
+      lib = nixpkgs.lib;
+      system = "x86_64-linux";
+      user = import ./generated/out_of_tree/users/henrov.nix;
+      machines = [
+        "traveldroid"
+        "maindroid"
+      ];
+      flakeRoot = ./.; # Define flakeRoot here
+    in
+    {
+      nixosConfigurations = lib.genAttrs machines (
+        machine:
+        lib.nixosSystem {
+          inherit system;
+          modules = [
+            # Import machine-specific configurations
+            ./generated/out_of_tree/machines/traveldroid/top.nix
+            # Catppuccin theme module
+            inputs.catppuccin.nixosModules.default
 
-    homeConfigurations = lib.genAttrs (map (machine: "${user.username}@${machine}") machines) (
-      userMachine:
-      home-manager.lib.homeManagerConfiguration {
-        inherit system;
-        configuration = import ./user.nix { inherit inputs user flakeRoot; };
-        extraSpecialArgs = { inherit user inputs flakeRoot; };
-      }
-    );
+            # Anchoring all the other nixes
+            ./generated/top.nix
+            # Home Manager module
+            inputs.home-manager.nixosModules.home-manager
+            {
+              home-manager.useGlobalPkgs = true;
+              home-manager.useUserPackages = true;
+              home-manager.extraSpecialArgs = { inherit user inputs flakeRoot; };
+            }
+          ];
+          specialArgs = { inherit user inputs flakeRoot; };
+        }
+      );
 
-    devShells.${system}.default = import ./generated/out_of_tree/terminal_shell/devshell.nix {
-      inherit (nixpkgs.legacyPackages.${system}) mkShell;
+      homeConfigurations = lib.genAttrs (map (machine: "${user.username}@${machine}") machines) (
+        userMachine:
+        home-manager.lib.homeManagerConfiguration {
+          inherit system;
+          configuration = import ./user.nix { inherit inputs user flakeRoot; };
+          extraSpecialArgs = { inherit user inputs flakeRoot; };
+        }
+      );
+
+      devShells.${system}.default = import ./generated/out_of_tree/terminal_shell/devshell.nix {
+        inherit (nixpkgs.legacyPackages.${system}) mkShell;
+      };
     };
-  };
 }
diff --git a/Droidnix/generated/out_of_tree/machines/traveldroid/gtk.nix b/Droidnix/generated/out_of_tree/machines/traveldroid/gtk.nix
index 9ada22ef5..415688a1d 100644
--- a/Droidnix/generated/out_of_tree/machines/traveldroid/gtk.nix
+++ b/Droidnix/generated/out_of_tree/machines/traveldroid/gtk.nix
@@ -1,28 +1,14 @@
-{
-  config,
-  pkgs,
-  inputs,
-  ...
-}:
+{ pkgs, inputs, ... }:
 
 {
-  imports = [
-    inputs.catppuccin.nixosModules.catppuccin
+  environment.systemPackages = with pkgs; [
+    inputs.catppuccin.gtk.mocha.standard
+    papirus-icon-theme
   ];
 
-  catppuccin = {
-    enable = true;
-    flavor = "mocha";
-    gtk = {
-      enable = true;
-      variant = "standard";
-    };
-  };
-
   environment.sessionVariables = {
     GTK_THEME = "Catppuccin-Mocha-Standard-Blue-Dark";
     GTK_ICON_THEME = "Papirus-Dark";
     GTK_ENABLE_DARK_MODE = "1";
   };
-
 }