diff --git a/modules/empty.nix b/modules/empty.nix
index 85d01c1..0e20366 100644
--- a/modules/empty.nix
+++ b/modules/empty.nix
@@ -1,5 +1,4 @@
 {
-  wrappers,
 	self,
   moduleWithSystem,
   ...
diff --git a/modules/features/gotify-desktop/default.nix b/modules/features/gotify-desktop/default.nix
index a0c1d14..22beefb 100644
--- a/modules/features/gotify-desktop/default.nix
+++ b/modules/features/gotify-desktop/default.nix
@@ -1,5 +1,5 @@
 {
-  wrappers,
+inputs,
   moduleWithSystem,
   ...
 }: {
@@ -24,9 +24,9 @@
           	min_priority = 1
         '';
       in
-        wrappers.lib.wrapPackage ({...}: {
+        inputs.wrappers.lib.wrapPackage ({...}: {
           inherit pkgs;
-          package = inputs'.gotify-desktop.default;
+          package = inputs'.gotify-desktop.packages.default;
           flags = {
             "-c" = config-file;
           };
diff --git a/modules/features/hypr/default.nix b/modules/features/hypr/default.nix
index b2b7f91..7eaa8f4 100644
--- a/modules/features/hypr/default.nix
+++ b/modules/features/hypr/default.nix
@@ -1,7 +1,7 @@
 {
-  wrappers,
   moduleWithSystem,
   self,
+	inputs,
   ...
 }: {
   flake.nixosModules.hyprland = moduleWithSystem ({
@@ -29,13 +29,14 @@
   perSystem = {
     pkgs,
     self',
+    system,
     inputs',
     ...
   }: {
     packages = {
       hyprland = inputs'.hyprland.packages.default.override {
         runtimePackages =
-          inputs'.hyprland.lib.defaultRuntimePkgs
+          inputs.hyprland.lib.defaultRuntimePkgs.${system}
           // {
             wpaperd = self'.packages.wpaperd;
             kitty = self'.packages.kitty;
@@ -58,7 +59,7 @@
           path = "${./wallpapers/topo3.png}"
         '';
       in
-        wrappers.lib.wrapPackage ({...}: {
+        inputs.wrappers.lib.wrapPackage ({...}: {
           inherit pkgs;
           package = pkgs.wpaperd;
           flags = {
diff --git a/modules/features/kitty/default.nix b/modules/features/kitty/default.nix
index 012309a..9ec0796 100644
--- a/modules/features/kitty/default.nix
+++ b/modules/features/kitty/default.nix
@@ -1,5 +1,5 @@
 {
-  wrappers,
+  inputs,
   moduleWithSystem,
   ...
 }: {
@@ -20,7 +20,7 @@
         fontDirectories = [fira-mono];
       };
     in
-      wrappers.wrappers.kitty.wrap {
+      inputs.wrappers.wrappers.kitty.wrap {
         inherit pkgs;
         environment = {
           "FONTCONFIG_FILE" = "${fontsConf}";
diff --git a/modules/features/otter-launcher/default.nix b/modules/features/otter-launcher/default.nix
index 190dbc8..01a55f7 100644
--- a/modules/features/otter-launcher/default.nix
+++ b/modules/features/otter-launcher/default.nix
@@ -1,5 +1,5 @@
 {
-  wrappers,
+  inputs,
   moduleWithSystem,
   ...
 }: {
@@ -29,7 +29,7 @@
           ${extra-config}
         '';
       in
-        wrappers.lib.wrapPackage ({...}: {
+        inputs.wrappers.lib.wrapPackage ({...}: {
           inherit pkgs;
           package = inputs'.otter-launcher.packages.default;
           runtimePkgs = with pkgs; [