diff --git a/atau-wallpapers/assets/aos1.png b/atau-wallpapers/assets/aos1.png
new file mode 100644
index 0000000..57d04c6
Binary files /dev/null and b/atau-wallpapers/assets/aos1.png differ
diff --git a/atau-wallpapers/assets/aos2.jpg b/atau-wallpapers/assets/aos2.jpg
new file mode 100644
index 0000000..e50599c
Binary files /dev/null and b/atau-wallpapers/assets/aos2.jpg differ
diff --git a/atau-wallpapers/default.nix b/atau-wallpapers/default.nix
new file mode 100644
index 0000000..ad0c96b
--- /dev/null
+++ b/atau-wallpapers/default.nix
@@ -0,0 +1,20 @@
+{ stdenv }:
+
+stdenv.mkDerivation {
+  name = "atau-wallpapers";
+  pname = name;
+  version = "1.0.0";
+
+  src = ./assets;
+
+  installPhase = ''
+    mkdir -p "$out/share/backgrounds/atau-wallpapers"
+    mv assets/* "$out/share/backgrounds/atau-wallpapers"
+  '';
+
+  meta = with lib; {
+    description = "A collection of wallpapers for me";
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ atau ];
+  };
+}
diff --git a/flake.lock b/flake.lock
index 1ea0532..d4f92a9 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,12 +1,30 @@
 {
   "nodes": {
+    "flake-utils": {
+      "inputs": {
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1687171271,
+        "narHash": "sha256-BJlq+ozK2B1sJDQXS3tzJM5a+oVZmi1q0FlBK/Xqv7M=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "abfb11bd1aec8ced1c9bb9adfe68018230f4fb3c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1686921029,
-        "narHash": "sha256-J1bX9plPCFhTSh6E3TWn9XSxggBh/zDD4xigyaIQBy8=",
+        "lastModified": 1687288566,
+        "narHash": "sha256-VckkiJ88Gzdc2cstm0z5eFcrHbvkm4VjxavHBGssvZI=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "c7ff1b9b95620ce8728c0d7bd501c458e6da9e04",
+        "rev": "b6c73c5fe53bb3afbf65e870541e0645e9145171",
         "type": "github"
       },
       "original": {
@@ -18,8 +36,24 @@
     },
     "root": {
       "inputs": {
+        "flake-utils": "flake-utils",
         "nixpkgs": "nixpkgs"
       }
+    },
+    "systems": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
     }
   },
   "root": "root",
diff --git a/flake.nix b/flake.nix
index 6196e17..8cbd0ce 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,58 +1,24 @@
 {
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05";
+    flake-utils.url = "github:numtide/flake-utils";
   };
 
-  outputs = { self, nixpkgs }: {
+  outputs = { self, nixpkgs, flake-utils }:
+    flake-utils.lib.eachDefaultSystem (system:
+      let pkgs = nixpkgs.legacyPackages.${system};
+      in {
+        defaultPackage = pkgs.callPackage ./atau-wallpapers/default.nix { };
+      }
+    );
 
-    overlay = final: prev: {
-      theme-platinum9 = with final; stdenv.mkDerivation {
-        pname = "theme-platinum9";
-        name = "theme-platinum9";
-        version = "d3d2080c1a2d5772714d089d1dc1daeeb41db008";
+  # overlay = final: prev: {
+  #   theme-platinum9 = with final; final.callPackage ./theme-platinum9 { };
+  #   atau-wallpapers = with final; final.callPackage ./atau-wallpapers { };
+  # };
 
-        src = fetchGit {
-          url = "https://git.atauno.com/atau/Platinum9.git";
-          rev = theme-platinum9.version;
-        };
-
-        installPhase = ''
-          runHook preInstall
-
-          # Install themes
-          mkdir -p "$out/share/themes"
-          mv ClassicPlatinumStreamlined "$out/share/themes"
-          mv PlatiPlus "$out/share/themes"
-          mv PlatiPlus26 "$out/share/themes"
-
-          # Install icons
-          mkdir -p "$out/share/icons"
-          mv NineIcons/ "$out/share/icons" 
-
-          # Install fonts
-          mkdir -p "$out/share/fonts/truetype"
-          mv Charcoal.ttf "$out/share/fonts/truetype"
-          mv MONACO.TTF "$out/share/fonts/truetype"
-
-          # Install wallpapers
-          mkdir -p "$out/share/backgrounds"
-          mv OS9-wallpaper/ "$out/share/backgrounds"
-
-          runHook postInstall
-        '';
-
-        meta = with lib; {
-          homepage = "https://github.com/grassmunk/Platinum9.git";
-          description = "This is a quick and dirty theme meant to approximate (but not really be too pixel accurate) the MacOS 9 (or System 7) theme.";
-          platforms = platforms.unix;
-          maintainers = with maintainers; [ atau ];
-        };
-      };
-    };
-
-    packages.x86_64-linux.theme-platinum9 = (import nixpkgs {
-      system = "x86_64-linux";
-      overlays = [ self.overlay ];
-    }).theme-platinum9;
-  };
+  # packages.x86_64-linux.default = (import nixpkgs {
+  #   system = "x86_64-linux";
+  #   overlays = [ self.overlay ];
+  # });
 }
diff --git a/theme-platinum9/default.nix b/theme-platinum9/default.nix
new file mode 100644
index 0000000..9c7a3f1
--- /dev/null
+++ b/theme-platinum9/default.nix
@@ -0,0 +1,44 @@
+{ stdenv }:
+
+stdenv.mkDerivation {
+  pname = "theme-platinum9";
+  name = "theme-platinum9";
+  version = "d3d2080c1a2d5772714d089d1dc1daeeb41db008";
+
+  src = fetchGit {
+    url = "https://git.atauno.com/atau/Platinum9.git";
+    rev = theme-platinum9.version;
+  };
+
+  installPhase = ''
+    runHook preInstall
+
+    # Install themes
+    mkdir -p "$out/share/themes"
+    mv ClassicPlatinumStreamlined "$out/share/themes"
+    mv PlatiPlus "$out/share/themes"
+    mv PlatiPlus26 "$out/share/themes"
+
+    # Install icons
+    mkdir -p "$out/share/icons"
+    mv NineIcons/ "$out/share/icons" 
+
+    # Install fonts
+    mkdir -p "$out/share/fonts/truetype"
+    mv Charcoal.ttf "$out/share/fonts/truetype"
+    mv MONACO.TTF "$out/share/fonts/truetype"
+
+    # Install wallpapers
+    mkdir -p "$out/share/backgrounds"
+    mv OS9-wallpaper/ "$out/share/backgrounds"
+
+    runHook postInstall
+  '';
+
+  meta = with lib; {
+    homepage = "https://github.com/grassmunk/Platinum9.git";
+    description = "This is a quick and dirty theme meant to approximate (but not really be too pixel accurate) the MacOS 9 (or System 7) theme.";
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ atau ];
+  };
+}