diff --git a/Droidnix/README.org b/Droidnix/README.org
index 593bc900e..9ce4f644c 100644
--- a/Droidnix/README.org
+++ b/Droidnix/README.org
@@ -138,6 +138,7 @@ Machine-specific NixOS configurations (e.g., =configuration.nix= for =maindroid=
 
 This section contains the Org blocks for tangling Nix code into the generated folders.
 
+
 ** =flake.nix=
 The Nix flake definition for Droidnix.
 #+BEGIN_SRC nix :tangle flake.nix :noweb tangle :mkdirp yes :eval never-html
@@ -314,7 +315,6 @@ mkShell {
 }
 #+END_SRC
 
-
 ** =generated/out_of_tree/machines/traveldroid/top.nix=
 This is the top of the machine hierarchy
 #+BEGIN_SRC nix :tangle generated/out_of_tree/machines/traveldroid/top.nix :noweb tangle :mkdirp yes :eval never-html
diff --git a/Droidnix/flake.nix b/Droidnix/flake.nix
index 5835a87fe..beaa07cb3 100644
--- a/Droidnix/flake.nix
+++ b/Droidnix/flake.nix
@@ -15,7 +15,6 @@
       url = "github:catppuccin/nix";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-
     zen-browser = {
       url = "github:youwen5/zen-browser-flake";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -23,63 +22,62 @@
     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.default
+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; };
+      }
+    );
 
-            # 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; };
-        }
-      );
+    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; };
+      }
+    );
 
-      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;
-      };
+    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/top.nix b/Droidnix/generated/out_of_tree/machines/traveldroid/top.nix
index e400e75a6..8377ccafa 100644
--- a/Droidnix/generated/out_of_tree/machines/traveldroid/top.nix
+++ b/Droidnix/generated/out_of_tree/machines/traveldroid/top.nix
@@ -20,5 +20,11 @@
     ./networking.nix
     ./gtk.nix
     inputs.home-manager.nixosModules.home-manager
+    inputs.catppuccin.nixosModules.default
   ];
+
+    catppuccin = {
+      enable = true;
+      flavor = "mocha";
+    };
 }