diff --git a/flake.nix b/flake.nix
index f9f448a..9d8a7d7 100644
--- a/flake.nix
+++ b/flake.nix
@@ -33,11 +33,15 @@
 
   outputs = inputs:
     let
-      system = "x86_64-linux";
-      pkgs   = inputs.nixpkgs.legacyPackages.${system};
+      system       = "x86_64-linux";
+      pkgs         = inputs.nixpkgs.legacyPackages.${system};
+      pkgs-unstable = import inputs.nixpkgs-unstable {
+        inherit system;
+        config.allowUnfree = true;
+      };
       flake  = (inputs.nixpkgs.lib.evalModules {
         modules      = [ (inputs.import-tree ./modules) ];
-        specialArgs.inputs = inputs;
+        specialArgs  = { inherit inputs pkgs-unstable; };
       }).config.flake;
     in flake // {
       nixosConfigurations = flake.nixosConfigurations // {
diff --git a/modules/creative.nix b/modules/creative.nix
index 5c4da02..b72b999 100644
--- a/modules/creative.nix
+++ b/modules/creative.nix
@@ -1,11 +1,5 @@
-{ den, inputs, ... }: {
-  den.aspects.creative.nixos = { pkgs, ... }:
-  let
-    pkgs-unstable = import inputs.nixpkgs-unstable {
-      system = pkgs.stdenv.hostPlatform.system;
-      config.allowUnfree = true;
-    };
-  in {
+{ den, pkgs-unstable, ... }: {
+  den.aspects.creative.nixos = { ... }: {
     environment.systemPackages = with pkgs-unstable; [
       # 3D
       blender
diff --git a/modules/den.nix b/modules/den.nix
index 6e603c2..90a8079 100644
--- a/modules/den.nix
+++ b/modules/den.nix
@@ -68,8 +68,7 @@ in {
       den.aspects.dev
       den.aspects.creative
       den.aspects.secrets
-      den.aspects.steam
-      den.aspects.prismlauncher
+      den.aspects.gaming
       den.aspects.androidcam
       den.aspects.winvm
       den.aspects.leisure
diff --git a/modules/dev.nix b/modules/dev.nix
index abc0693..82dc2c0 100644
--- a/modules/dev.nix
+++ b/modules/dev.nix
@@ -1,14 +1,8 @@
-{ den, inputs, config, ... }:
+{ den, pkgs-unstable, config, ... }:
 let
   username = config.local.identity.username;
 in {
-  den.aspects.dev.nixos = { pkgs, ... }:
-  let
-    pkgs-unstable = import inputs.nixpkgs-unstable {
-      system = pkgs.stdenv.hostPlatform.system;
-      config.allowUnfree = true;
-    };
-  in {
+  den.aspects.dev.nixos = { pkgs, ... }: {
     environment.systemPackages = with pkgs-unstable; [
       # CLI utilities
       gcc
@@ -71,8 +65,9 @@ in {
     };
 
     virtualisation.docker = {
-      enable  = true;
-      package = pkgs-unstable.docker_29;
+      enable        = true;
+      enableOnBoot  = false;
+      package       = pkgs-unstable.docker_29;
     };
     users.users.${username}.extraGroups = [ "docker" ];
   };
diff --git a/modules/steam.nix b/modules/gaming.nix
similarity index 50%
rename from modules/steam.nix
rename to modules/gaming.nix
index 6faa1e3..1ce0e7e 100644
--- a/modules/steam.nix
+++ b/modules/gaming.nix
@@ -1,7 +1,13 @@
-{ den, ... }: {
-  den.aspects.steam.nixos = { pkgs, ... }: {
+{ den, pkgs-unstable, ... }: {
+  den.aspects.gaming.nixos = { pkgs, ... }: {
+    hardware.graphics = {
+      enable = true;
+      enable32Bit = true;
+    };
+
     programs.steam = {
       enable = true;
+      package = pkgs-unstable.steam;
 
       remotePlay.openFirewall = false;
       dedicatedServer.openFirewall = false;
@@ -12,23 +18,19 @@
       extraCompatPackages = with pkgs; [
         proton-ge-bin
       ];
-
-      # Extra packages that steam might need
-      extraPackages = with pkgs; [
-        xorg.libXcursor
-        xorg.libXi
-        xorg.libXinerama
-        xorg.libXScrnSaver
-        libpng
-        libpulseaudio
-        libvorbis
-        stdenv.cc.cc.lib
-        libkrb5
-        keyutils
-      ];
     };
 
-    # Fonts for better game text rendering
+    environment.systemPackages = with pkgs; [
+      (prismlauncher.override {
+        jdks = [
+          temurin-bin-8
+          temurin-bin-17
+          temurin-bin-21
+          temurin-bin-25
+        ];
+      })
+    ];
+
     fonts.packages = with pkgs; [
       liberation_ttf
       wqy_zenhei
diff --git a/modules/leisure.nix b/modules/leisure.nix
index 1522fd3..51f93c7 100644
--- a/modules/leisure.nix
+++ b/modules/leisure.nix
@@ -1,11 +1,5 @@
-{ den, inputs, ... }: {
-  den.aspects.leisure.nixos = { pkgs, ... }:
-  let
-    pkgs-unstable = import inputs.nixpkgs-unstable {
-      system = pkgs.system;
-      config.allowUnfree = true;
-    };
-  in {
+{ den, pkgs-unstable, ... }: {
+  den.aspects.leisure.nixos = { ... }: {
     environment.systemPackages = with pkgs-unstable; [
       # Streaming
       stremio-linux-shell
diff --git a/modules/prismlauncher.nix b/modules/prismlauncher.nix
deleted file mode 100644
index f6feb3f..0000000
--- a/modules/prismlauncher.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ den, ...}: {
-  den.aspects.prismlauncher.nixos = { pkgs, ... }: {
-    environment.systemPackages = with pkgs; [
-      (prismlauncher.override {
-        jdks = [
-            temurin-bin-8 
-            temurin-bin-17
-            temurin-bin-21
-            temurin-bin-25
-          ];
-      })
-    ]; 
-  };
-}