diff --git a/home-manager/default.nix b/home-manager/default.nix
index 5a1ca50d..4d1e6840 100644
--- a/home-manager/default.nix
+++ b/home-manager/default.nix
@@ -16,7 +16,7 @@
   ++ lib.optional (builtins.isString desktop) ./common/software/gui                    # GUI packages
   ++ lib.optional (builtins.isString desktop) ./common/desktops/${desktop}             # Machine-agnostic desktop configs
   ++ lib.optional (builtins.isString desktop) ./hosts/${hostname}/desktops/${desktop}  # Machine-specific desktop configs
-  ++ lib.optional {builtins.isString image  } ./common/image-specific.nix              # Disables things that require secrets
+  ++ lib.optional (builtins.isString image  ) ./common/image-specific.nix              # Image specific items
   ;
 
   news.display = "silent";
diff --git a/lib/default.nix b/lib/default.nix
index df112deb..4cb5b348 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -23,10 +23,11 @@
     desktop  ? null, 
     system   ? "x86_64-linux", 
     theme    ? "default",
-    type     ? "default"
+    type     ? "default",
+    image    ? null
   }: inputs.home-manager.lib.homeManagerConfiguration {
     pkgs = inputs.nixpkgs.legacyPackages.${system};
-    extraSpecialArgs = { inherit inputs outputs desktop hostname system username hmStateVersion theme; };
+    extraSpecialArgs = { inherit inputs outputs desktop hostname system username hmStateVersion theme image; };
     modules = [ ../home-manager/${type}.nix ];
   };
 
diff --git a/nixos/common/modules/installer.nix b/nixos/common/modules/installer.nix
index 4697a618..c810fcbb 100644
--- a/nixos/common/modules/installer.nix
+++ b/nixos/common/modules/installer.nix
@@ -1,7 +1,7 @@
 { config, desktop, lib, pkgs, username, ... }:
 let
   ifExists = groups: builtins.filter (group: builtins.hasAttr group config.users.groups) groups;
-  install-system = pkgs.writeScriptBin "install-system" ${builtins.readFile ../../../docs/install.sh}";
+  install-system = pkgs.writeScriptBin "install-system" "${builtins.readFile ../../../docs/install.sh}";
 in
 {
   config.environment.systemPackages = [ install-system ];