diff --git a/aspects/programs/graphics.nix b/aspects/programs/graphics.nix
index 1488125..4b7a16b 100644
--- a/aspects/programs/graphics.nix
+++ b/aspects/programs/graphics.nix
@@ -1,27 +1,25 @@
 { ... }:
 
 {
-  flake.modules.nixos.programs-graphics = { pkgs, ... }: {
-    environment.systemPackages = with pkgs; [
-      # Image Editing
-      gimp
-      inkscape
-      # CAD & 3D Modeling
-      plasticity
-    ];
+  flake.modules.nixos.programs-graphics =
+    { pkgs, ... }:
+    {
+      environment.systemPackages = with pkgs; [
+        gimp
+        inkscape
+        plasticity
+      ];
 
-    services.flatpak.packages = [
-      # Vector Graphics
-      "com.boxy_svg.BoxySVG"
-      # 3D Printing / Slicing
-      rec {
-        appId = "io.github.softfever.OrcaSlicer";
-        sha256 = "0hdx5sg6fknj1pfnfxvlfwb5h6y1vjr6fyajbsnjph5gkp97c6p1";
-        bundle = "${pkgs.fetchurl {
-          url = "https://github.com/SoftFever/OrcaSlicer/releases/download/v2.3.0/OrcaSlicer-Linux-flatpak_V2.3.0_x86_64.flatpak";
-          inherit sha256;
-        }}";
-      }
-    ];
-  };
+      services.flatpak.packages = [
+        "com.boxy_svg.BoxySVG"
+        rec {
+          appId = "io.github.softfever.OrcaSlicer";
+          sha256 = "0hdx5sg6fknj1pfnfxvlfwb5h6y1vjr6fyajbsnjph5gkp97c6p1";
+          bundle = "${pkgs.fetchurl {
+            url = "https://github.com/SoftFever/OrcaSlicer/releases/download/v2.3.0/OrcaSlicer-Linux-flatpak_V2.3.0_x86_64.flatpak";
+            inherit sha256;
+          }}";
+        }
+      ];
+    };
 }
diff --git a/aspects/programs/media.nix b/aspects/programs/media.nix
index 8b50b2e..7daaa87 100644
--- a/aspects/programs/media.nix
+++ b/aspects/programs/media.nix
@@ -2,28 +2,28 @@
 
 {
   flake.modules = {
-    nixos.programs-media = { pkgs, ... }: {
-      environment.systemPackages = with pkgs; [
-        # Audio
-        decibels
-        # Video
-        showtime
-        # Image Viewer
-        loupe
-        # Recording & Streaming
-        obs-studio
-      ];
-    };
-
-    homeManager.programs-media = { pkgs, ... }: {
-      programs.obs-studio = {
-        enable = true;
-        plugins = with pkgs.obs-studio-plugins; [
-          obs-vkcapture
-          obs-backgroundremoval
-          obs-pipewire-audio-capture
+    nixos.programs-media =
+      { pkgs, ... }:
+      {
+        environment.systemPackages = with pkgs; [
+          decibels
+          loupe
+          obs-studio
+          showtime
         ];
       };
-    };
+
+    homeManager.programs-media =
+      { pkgs, ... }:
+      {
+        programs.obs-studio = {
+          enable = true;
+          plugins = with pkgs.obs-studio-plugins; [
+            obs-vkcapture
+            obs-backgroundremoval
+            obs-pipewire-audio-capture
+          ];
+        };
+      };
   };
 }
diff --git a/aspects/programs/office.nix b/aspects/programs/office.nix
index 1fc6817..c3349f3 100644
--- a/aspects/programs/office.nix
+++ b/aspects/programs/office.nix
@@ -1,25 +1,22 @@
 { ... }:
 
 {
-  flake.modules.nixos.programs-office = { pkgs, ... }: {
-    environment.systemPackages = with pkgs; [
-      # Spelling
-      aspell
-      aspellDicts.de
-      aspellDicts.en
-      aspellDicts.en-computers
-      aspellDicts.pt_BR
-      # Document Viewing
-      papers
-      # Presentations
-      presenterm
-      # Note Taking & Drawing
-      rnote
-    ];
+  flake.modules.nixos.programs-office =
+    { pkgs, ... }:
+    {
+      environment.systemPackages = with pkgs; [
+        aspell
+        aspellDicts.de
+        aspellDicts.en
+        aspellDicts.en-computers
+        aspellDicts.pt_BR
+        papers
+        presenterm
+        rnote
+      ];
 
-    services.flatpak.packages = [
-      # Office Suite
-      "com.collabora.Office"
-    ];
-  };
+      services.flatpak.packages = [
+        "com.collabora.Office"
+      ];
+    };
 }
diff --git a/aspects/programs/utilities.nix b/aspects/programs/utilities.nix
index 15b267f..4a207af 100644
--- a/aspects/programs/utilities.nix
+++ b/aspects/programs/utilities.nix
@@ -2,64 +2,61 @@
 
 {
   flake.modules = {
-    nixos.programs-utilities = { pkgs, ... }: {
-      environment.systemPackages = with pkgs; [
-        # Terminal
-        ghostty
-        # File Management
-        nautilus
-        gnome-disk-utility
-        # Archive Tools
-        p7zip
-        unrar
-        # Cloud & Remote
-        rclone
-        # System Monitoring
-        mission-center
-        # Desktop Integration
-        adwaita-icon-theme
-        junction
-        libfido2
-        toggleaudiosink
-        # Xwayland Support
-        xwayland-satellite
-      ];
+    nixos.programs-utilities =
+      { pkgs, ... }:
+      {
+        environment.systemPackages = with pkgs; [
+          ghostty
+          gnome-disk-utility
+          mission-center
+          nautilus
+          p7zip
+          rclone
+          unrar
+          # Desktop Integration
+          adwaita-icon-theme
+          junction
+          libfido2
+          toggleaudiosink
+          # Xwayland Support
+          xwayland-satellite
+        ];
 
-      services.flatpak.packages = [
-        # Flatpak Management
-        "com.github.tchx84.Flatseal"
-        # Remote Desktop
-        "com.rustdesk.RustDesk"
-      ];
-    };
+        services.flatpak.packages = [
+          "com.github.tchx84.Flatseal"
+          "com.rustdesk.RustDesk"
+        ];
+      };
 
-    homeManager.programs-utilities = { pkgs, ... }: {
-      programs = {
-        ghostty = {
-          enable = true;
-          settings = {
-            cursor-style = "block";
-            shell-integration-features = "no-cursor";
-            cursor-style-blink = false;
-            custom-shader = "${builtins.fetchurl {
-              url = "https://raw.githubusercontent.com/hackr-sh/ghostty-shaders/cb6eb4b0d1a3101c869c62e458b25a826f9dcde3/cursor_blaze.glsl";
-              sha256 = "sha256:0g2lgqjdrn3c51glry7x2z30y7ml0y61arl5ykmf4yj0p85s5f41";
-            }}";
-            bell-features = "";
-            gtk-titlebar-style = "tabs";
-            keybind = [ "shift+enter=text:\\x1b\\r" ];
+    homeManager.programs-utilities =
+      { pkgs, ... }:
+      {
+        programs = {
+          ghostty = {
+            enable = true;
+            settings = {
+              cursor-style = "block";
+              shell-integration-features = "no-cursor";
+              cursor-style-blink = false;
+              custom-shader = "${builtins.fetchurl {
+                url = "https://raw.githubusercontent.com/hackr-sh/ghostty-shaders/cb6eb4b0d1a3101c869c62e458b25a826f9dcde3/cursor_blaze.glsl";
+                sha256 = "sha256:0g2lgqjdrn3c51glry7x2z30y7ml0y61arl5ykmf4yj0p85s5f41";
+              }}";
+              bell-features = "";
+              gtk-titlebar-style = "tabs";
+              keybind = [ "shift+enter=text:\\x1b\\r" ];
+            };
+          };
+
+          password-store = {
+            enable = true;
+            package = pkgs.pass-wayland;
           };
         };
 
-        password-store = {
-          enable = true;
-          package = pkgs.pass-wayland;
+        home.sessionVariables = {
+          TERMINAL = "ghostty";
         };
       };
-
-      home.sessionVariables = {
-        TERMINAL = "ghostty";
-      };
-    };
   };
 }
diff --git a/aspects/programs/web.nix b/aspects/programs/web.nix
index cc3753b..a11ca57 100644
--- a/aspects/programs/web.nix
+++ b/aspects/programs/web.nix
@@ -1,18 +1,21 @@
 { ... }:
 
 {
-  flake.modules.nixos.programs-web = { inputs, pkgs, system, ... }: {
-    environment.systemPackages = with pkgs; [
-      # Browsers
-      inputs.zen-browser.packages."${system}".default
-      tor-browser
-      # Communication
-      vesktop
-      # Cloud & Sync
-      bitwarden-desktop
-      nextcloud-client
-      # Downloads
-      fragments
-    ];
-  };
+  flake.modules.nixos.programs-web =
+    {
+      inputs,
+      pkgs,
+      system,
+      ...
+    }:
+    {
+      environment.systemPackages = with pkgs; [
+        inputs.zen-browser.packages."${system}".default
+        bitwarden-desktop
+        fragments
+        nextcloud-client
+        tor-browser
+        vesktop
+      ];
+    };
 }