diff --git a/flake.nix b/flake.nix
index 2554486..490843d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -82,55 +82,60 @@
     };
   };
 
-  outputs = inputs@{ self, nixpkgs, ... }: {
-    nixosModules.default = import ./modules;
-    homeManagerModules.default = import ./home-modules;
-    nixosConfigurations = {
-      kami = nixpkgs.lib.nixosSystem {
-        system = "x86_64-linux";
-        specialArgs = inputs;
-        modules = [
-          ./systems/kami
-          self.outputs.nixosModules.default
-        ];
-      };
-      yokai = nixpkgs.lib.nixosSystem {
-        system = "aarch64-linux";
-        specialArgs = inputs;
-        modules = [
-          ./systems/yokai
-          self.outputs.nixosModules.default
-        ];
-      };
-      inugami = nixpkgs.lib.nixosSystem {
-        system = "aarch64-linux";
-        specialArgs = inputs;
-        modules = [
-          ./systems/inugami
-          self.outputs.nixosModules.default
-        ];
-      };
-      tuny = nixpkgs.lib.nixosSystem {
-        system = "x86_64-linux";
-        specialArgs = inputs;
-        modules = [
-          ./systems/tuny
-          self.outputs.nixosModules.default
-        ];
-      };
-      installer = nixpkgs.lib.nixosSystem {
-        system = "x86_64-linux";
-        specialArgs = inputs;
-        modules = [
-          ./systems/installer
-          self.outputs.nixosModules.default
-        ];
-      };
-      steamdeck = nixpkgs.lib.nixosSystem {
-        system = "x86_64-linux";
-        specialArgs = inputs;
-        modules = [ ./systems/steamdeck self.outputs.nixosModules.default ];
+  outputs = inputs@{ self, nixpkgs, ... }:
+    {
+      nixosModules.default = import ./modules;
+      homeManagerModules.default = import ./home-modules;
+      packages = nixpkgs.lib.attrsets.genAttrs nixpkgs.lib.systems.flakeExposed (system: import ./packages {
+        inherit system inputs;
+        pkgs = nixpkgs.legacyPackages.${system};
+      });
+      nixosConfigurations = {
+        kami = nixpkgs.lib.nixosSystem {
+          system = "x86_64-linux";
+          specialArgs = inputs;
+          modules = [
+            ./systems/kami
+            self.outputs.nixosModules.default
+          ];
+        };
+        yokai = nixpkgs.lib.nixosSystem {
+          system = "aarch64-linux";
+          specialArgs = inputs;
+          modules = [
+            ./systems/yokai
+            self.outputs.nixosModules.default
+          ];
+        };
+        inugami = nixpkgs.lib.nixosSystem {
+          system = "aarch64-linux";
+          specialArgs = inputs;
+          modules = [
+            ./systems/inugami
+            self.outputs.nixosModules.default
+          ];
+        };
+        tuny = nixpkgs.lib.nixosSystem {
+          system = "x86_64-linux";
+          specialArgs = inputs;
+          modules = [
+            ./systems/tuny
+            self.outputs.nixosModules.default
+          ];
+        };
+        installer = nixpkgs.lib.nixosSystem {
+          system = "x86_64-linux";
+          specialArgs = inputs;
+          modules = [
+            ./systems/installer
+            self.outputs.nixosModules.default
+          ];
+        };
+        steamdeck = nixpkgs.lib.nixosSystem {
+          system = "x86_64-linux";
+          specialArgs = inputs;
+          modules = [ ./systems/steamdeck self.outputs.nixosModules.default ];
+        };
       };
     };
-  };
 }
diff --git a/modules/overlays/default.nix b/modules/overlays/default.nix
index b8a1150..582a8ab 100644
--- a/modules/overlays/default.nix
+++ b/modules/overlays/default.nix
@@ -13,39 +13,8 @@ in {
         self.inputs.prismlauncher.overlays.default
 
         (_self: super: rec {
-
-          firefox-addons = self.inputs.firefox-addons.packages."${config.nixpkgs.hostPlatform.system}";
-
-          tela-icon-theme = super.tela-icon-theme.overrideAttrs
-            (_old: { src = self.inputs.tela-icon-theme; });
-
-          openrgb = super.openrgb.overrideAttrs
-            (_old: { src = self.inputs.openrgb; });
-
-          prismlauncher = super.prismlauncher.overrideAttrs (old: {
-            patches = (old.patches or [ ]) ++ [
-              self.inputs.prism-game-options-patch
-              ./prism-ftb.patch
-            ];
-          });
-
-          libadwaita = super.libadwaita.overrideAttrs (old: {
-            patches = (old.patches or [ ])
-              ++ [ ./adwaita-theming-support.patch ];
-            doCheck = false;
-          });
-
-          discord = (super.discord.overrideAttrs (old: {
-            desktopItem = old.desktopItem.override
-              (old: { exec = old.exec + " --disable-gpu-sandbox"; });
-          })).override {
-            withOpenASAR = true;
-            withVencord = true;
-            withTTS = true;
-          };
-
-          catppuccin-plymouth =
-            super.catppuccin-plymouth.override { variant = "frappe"; };
+          firefox-addons = self.inputs.firefox-addons.packages.${config.nixpkgs.hostPlatform.system};
+          localPkgs = self.outputs.packages.${config.nixpkgs.hostPlatform.system};
         })
       ];
     };
diff --git a/modules/overlays/adwaita-theming-support.patch b/packages/adwaita-theming-support.patch
similarity index 100%
rename from modules/overlays/adwaita-theming-support.patch
rename to packages/adwaita-theming-support.patch
diff --git a/packages/default.nix b/packages/default.nix
new file mode 100644
index 0000000..fb76a15
--- /dev/null
+++ b/packages/default.nix
@@ -0,0 +1,23 @@
+{ inputs, pkgs, system }:
+
+{
+  tela-icon-theme-git = pkgs.tela-icon-theme.overrideAttrs {
+    src = inputs.tela-icon-theme;
+  };
+
+  openrgb-git = pkgs.openrgb.overrideAttrs {
+    src = inputs.openrgb;
+  };
+
+  libadwaita-follow-theme = pkgs.libadwaita.overrideAttrs (old: {
+    patches = (old.patches or [ ])++ [ ./adwaita-theming-support.patch ];
+    doCheck = false;
+  });
+
+  prismlauncher-withExtraStuff = inputs.prismlauncher.packages.${system}.prismlauncher.overrideAttrs (old: {
+    patches = (old.patches or [ ]) ++ [
+      inputs.prism-game-options-patch
+      ./prism-ftb.patch
+    ];
+  });
+}
diff --git a/modules/overlays/prism-ftb.patch b/packages/prism-ftb.patch
similarity index 100%
rename from modules/overlays/prism-ftb.patch
rename to packages/prism-ftb.patch
diff --git a/systems/kami/default.nix b/systems/kami/default.nix
index cef3ba7..5621473 100644
--- a/systems/kami/default.nix
+++ b/systems/kami/default.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, lib, nixos-hardware, ... }:
+{ config, pkgs, lib, nixos-hardware, self, ... }:
 
 {
   imports = [
@@ -76,7 +76,7 @@
   };
 
   environment.systemPackages = with pkgs; [
-    prismlauncher
+    localPkgs.prismlauncher-withExtraStuff
     mixxx
     picard
     mangohud
@@ -93,7 +93,7 @@
     catppuccin-kvantum
     catppuccin-kde
     catppuccin-gtk
-    tela-icon-theme
+    localPkgs.tela-icon-theme-git
   ];
 
   programs = {