diff --git a/homes/x86_64-linux/philipp/default.nix b/homes/x86_64-linux/philipp/default.nix
index 78898f6..146e689 100644
--- a/homes/x86_64-linux/philipp/default.nix
+++ b/homes/x86_64-linux/philipp/default.nix
@@ -1,6 +1,7 @@
 {
-  lib, ...
+  lib, namespace, ...
 }:
+with lib.${namespace};
 {
   home.activation.removeBrowserBackups = lib.hm.dag.entryAfter ["checkLinkTargets"] ''  
     if [ -d "/home/philipp/.librewolf/philipp" ]; then
@@ -9,33 +10,33 @@
   '';
   awesome-flake = {
     cli-apps = {
-      fish.enable = true;
-      home-manager.enable = true;
-      lazygit.enable = true;
+      fish = enabled;
+      home-manager = enabled;
+      lazygit = enabled;
     };
 
     tools = {
-      git.enable = true;
+      git = enabled;
     };
 
     apps = {
-      librewolf.enable = true;
-      thunderbird.enable = true;
-      chatterino.enable = true;
-      mpv.enable = true;
+      librewolf = enabled;
+      thunderbird = enabled;
+      chatterino = enabled;
+      mpv = enabled;
       kitty = {
         enable = true;
-        plasma.enable = true;
+        plasma = enabled;
       };
     };
 
     games = {
-      runelite.enable = true;
+      runelite = enabled;
     };
 
     desktop = {
-      hotkeys.enable = true;
-      panel.enable = true;
+      hotkeys = enabled;
+      panel = enabled;
     };
   };
 }
diff --git a/systems/aarch64-linux/blarm/default.nix b/systems/aarch64-linux/blarm/default.nix
index 7bda6ef..b030646 100644
--- a/systems/aarch64-linux/blarm/default.nix
+++ b/systems/aarch64-linux/blarm/default.nix
@@ -1,10 +1,12 @@
 {
+  lib,
+  namespaces,
   modulesPath,
-  inputs,
   ...
 }:
+with lib.${namespaces};
 {
-  imports = with inputs.nixos-hardware.nixosModules; [
+  imports = [
     (modulesPath + "/installer/scan/not-detected.nix")
     (modulesPath + "/installer/sd-card/sd-image-aarch64.nix")
   ];
@@ -61,12 +63,12 @@
   };
 
   # Enable the OpenSSH daemon.
-  services.openssh.enable = true;
+  services.openssh = enabled;
 
-  awesome-flake.services.caddy.enable = true;
-  awesome-flake.container.technitium.enable = true;
-  awesome-flake.container.invidious.enable = true;
-  awesome-flake.cli.neovim.enable = true;
+  awesome-flake.services.caddy = enabled;
+  awesome-flake.container.technitium = enabled;
+  awesome-flake.container.invidious = enabled;
+  awesome-flake.cli.neovim = enabled;
 
   system.stateVersion = "24.11";
 
diff --git a/systems/x86_64-linux/bodenheizung/default.nix b/systems/x86_64-linux/bodenheizung/default.nix
index dc439a4..6f4ed4d 100644
--- a/systems/x86_64-linux/bodenheizung/default.nix
+++ b/systems/x86_64-linux/bodenheizung/default.nix
@@ -1,6 +1,9 @@
 {
+  lib,
+  namespace,
   ...
 }:
+with lib.${namespace};
 {
   imports = [
     ./hardware-configuration.nix
@@ -32,24 +35,28 @@
 
   awesome-flake = {
     cli = {
-      neovim.enable = true;
-      eza.enable = true;
+      neovim = enabled;
+      eza = enabled;
     };
 
     apps = {
-      steam.enable = true;
+      steam = enabled;
     };
 
-    desktop.plasma.enable = true;
-    hardware.audio.enable = true;
+    desktop.plasma = enabled;
+    hardware.audio = enabled;
 
     services = {
-      btrfs.enable = true;
+      btrfs = enabled;
     };
 
-    system.fonts.enable = true;
-    system.fonts.emoji = true;
-    system.gnupg.enable = true;
+    system = {
+      fonts = {
+        enable = true;
+        emoji = true;
+      };
+      gnupg = enabled;
+    };
   };
 
   # Set your time zone