diff --git a/hosts/canopus/default.nix b/hosts/canopus/default.nix
index 8d6c65c..96c4e5d 100755
--- a/hosts/canopus/default.nix
+++ b/hosts/canopus/default.nix
@@ -184,7 +184,6 @@
   programs = {
     ssh.startAgent = true;
     xfconf.enable = true;
-    file-roller.enable = true;
     thunar = {
       enable = true;
       plugins = with pkgs.xfce; [
@@ -194,7 +193,7 @@
     };
     nix-ld = {
       enable = true;
-      package = pkgs.nix-ld-rs;
+      package = pkgs.nix-ld;
     };
     nm-applet.enable = true;
     noisetorch.enable = true;
diff --git a/hosts/homelab/default.nix b/hosts/homelab/default.nix
index 34dcbf2..afde133 100755
--- a/hosts/homelab/default.nix
+++ b/hosts/homelab/default.nix
@@ -124,7 +124,7 @@
   programs = {
     nix-ld = {
       enable = true;
-      package = pkgs.nix-ld-rs;
+      package = pkgs.nix-ld;
     };
   };
 
diff --git a/hosts/sirius/default.nix b/hosts/sirius/default.nix
index b679806..081847b 100644
--- a/hosts/sirius/default.nix
+++ b/hosts/sirius/default.nix
@@ -58,7 +58,7 @@
     nix-ld = {
       enable = true;
       libraries = config.hardware.graphics.extraPackages;
-      package = pkgs.nix-ld-rs;
+      package = pkgs.nix-ld;
     };
 
     dconf.enable = true;
diff --git a/modules/home/picom/default.nix b/modules/home/picom/default.nix
index d3a298f..04dfeab 100644
--- a/modules/home/picom/default.nix
+++ b/modules/home/picom/default.nix
@@ -1,7 +1,7 @@
 {pkgs, ...}: {
   services.picom = {
     enable = true;
-    package = pkgs.picom-next;
+    package = pkgs.picom;
 
     backend = "glx";
     vSync = true;
diff --git a/modules/home/wezterm/default.nix b/modules/home/wezterm/default.nix
index f907b1c..5abffa7 100644
--- a/modules/home/wezterm/default.nix
+++ b/modules/home/wezterm/default.nix
@@ -1,11 +1,7 @@
-{
-  inputs,
-  pkgs,
-  ...
-}: {
+{pkgs, ...}: {
   programs.wezterm = {
     enable = true;
-    package = inputs.wezterm-flake.packages."${pkgs.system}".default;
+    package = pkgs.wezterm-git;
     enableZshIntegration = false;
 
     extraConfig = ''
diff --git a/overlays/default.nix b/overlays/default.nix
index 86a7c8d..e834a7b 100755
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -2,24 +2,25 @@
   additions = final: _prev: import ../pkgs {pkgs = final;};
 
   modifications = final: prev: {
-    awesome = inputs.nixpkgs-f2k.packages.${prev.system}.awesome-git;
-    ghostty = inputs.ghostty.packages.${prev.system}.default;
-    tawm = inputs.tawm.packages.${prev.system}.default;
-    tnvim = inputs.tnvim.packages.${prev.system}.default;
-    tpanel = inputs.tpanel.packages.${prev.system}.default;
-    ags = inputs.tpanel.packages.${prev.system}.ags.default;
-    tfolio = inputs.tfolio.packages.${prev.system}.default;
-    trok = inputs.trok.packages.${prev.system}.default;
-    cyber-tux = inputs.cyber-tux.packages.${prev.system}.default;
-    hyprland-git = inputs.hyprland.packages.${prev.system};
-    hyprland-plugins = inputs.hyprland-plugins.packages.${prev.system};
+    awesome = inputs.nixpkgs-f2k.packages.${prev.stdenv.hostPlatform.system}.awesome-git;
+    ghostty = inputs.ghostty.packages.${prev.stdenv.hostPlatform.system}.default;
+    tawm = inputs.tawm.packages.${prev.stdenv.hostPlatform.system}.default;
+    tnvim = inputs.tnvim.packages.${prev.stdenv.hostPlatform.system}.default;
+    tpanel = inputs.tpanel.packages.${prev.stdenv.hostPlatform.system}.default;
+    ags = inputs.tpanel.packages.${prev.stdenv.hostPlatform.system}.ags.default;
+    tfolio = inputs.tfolio.packages.${prev.stdenv.hostPlatform.system}.default;
+    trok = inputs.trok.packages.${prev.stdenv.hostPlatform.system}.default;
+    cyber-tux = inputs.cyber-tux.packages.${prev.stdenv.hostPlatform.system}.default;
+    hyprland-git = inputs.hyprland.packages.${prev.stdenv.hostPlatform.system};
+    hyprland-plugins = inputs.hyprland-plugins.packages.${prev.stdenv.hostPlatform.system};
+    wezterm-git = inputs.wezterm-flake.packages.${prev.stdenv.hostPlatform.system}.default;
   };
 
   # When applied, the stable nixpkgs set (declared in the flake inputs) will
   # be accessible through 'pkgs.stable'
   stable-packages = final: _prev: {
     stable = import inputs.nixpkgs-stable {
-      system = final.system;
+      system = final.stdenv.hostPlatform.system;
       config.allowUnfree = true;
     };
   };
diff --git a/pkgs/firefox-mod-blur/default.nix b/pkgs/firefox-mod-blur/default.nix
index 4337164..a802414 100644
--- a/pkgs/firefox-mod-blur/default.nix
+++ b/pkgs/firefox-mod-blur/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
     owner = "datguypiko";
     repo = "Firefox-Mod-Blur";
     rev = "refs/heads/master";
-    sha256 = "sha256-BZ1NvKQwUDTMxQHEKX61PvD99cTDmBURSUKEKZNQDR4=";
+    sha256 = "sha256-J/SBMxDWxDC7o8P0t/3surUod52uUwy+xaD5dzZPGq0=";
   };
 
   installPhase = ''