diff --git a/modules/fcitx5/default.nix b/modules/fcitx5/default.nix
index 0cda3e7..e84f920 100644
--- a/modules/fcitx5/default.nix
+++ b/modules/fcitx5/default.nix
@@ -21,11 +21,14 @@ in
   };
 
   home.file = {
-    "${themeFolder}theme.conf".source = with colors; pkgs.substituteAll ({
+    "${themeFolder}theme.conf".source = with colors; pkgs.replaceVarsWith ({
       src = ./theme.conf;
-      background = "${bg1}80";
-      highlight = bg0;
-    } // colors);
+      replacements = {
+        background = "${bg1}80";
+        highlight = bg0;
+        inherit fg0 fg1;
+      };
+    });
     "${themeFolder}arrow.png".source = ./arrow.png;
     "${themeFolder}radio.png".source = ./radio.png;
     ".config/fcitx5/conf/classicui.conf".text = "Theme=${theme}";
diff --git a/modules/i3/default.nix b/modules/i3/default.nix
index 605a739..cc4b43d 100644
--- a/modules/i3/default.nix
+++ b/modules/i3/default.nix
@@ -108,10 +108,7 @@ in with theme.colors; {
         "${mod}+Return" = "exec kitty";
         "${mod}+Shift+e" = "exec i3-msg exit"; # bypass default session exit confirmation menu
         "${mod}+space" = "exec i3-msg open"; # Open blank space
-        "Mod1+Q" = let rofi-power = pkgs.substituteAll {
-          src = ./power.sh;
-          isExecutable = true;
-        }; in "exec ${rofi-power}";
+        "Mod1+Q" = "exec ${./power.sh}";
         "${mod}+a" = "exec com.github.alainm23.task-planner.quick-add";
 
         # Audio controls
diff --git a/modules/polybar/aozora.nix b/modules/polybar/aozora.nix
index 9169b67..0955347 100644
--- a/modules/polybar/aozora.nix
+++ b/modules/polybar/aozora.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "93MP1Iw1eklC+IEQXAhzLHJ+qsDASm53qw7vUEtEstI=";
   };
 
-  cargoHash = "sha256-aBuaXckalcBcfr/snUy+8W9ZITehoeMCsGt/4yb2BxA=";
+  cargoHash = "sha256-z0pLuWcfmFkV3xg+1XKmg/Zwvb3Ce8RpERCh1OjD+so=";
 
   meta = with lib; {
     description = "A simple CLI for fetching Plume Labs air quality info.";
diff --git a/modules/rofi/default.nix b/modules/rofi/default.nix
index 7a52c43..e3241a9 100644
--- a/modules/rofi/default.nix
+++ b/modules/rofi/default.nix
@@ -8,7 +8,8 @@ in {
     enable = true;
     inherit theme;
   };
-  home.file.".config/rofi/${theme}.rasi".source = pkgs.substituteAll ({
+  home.file.".config/rofi/${theme}.rasi".source = pkgs.replaceVarsWith ({
     src = ./theme.rasi;
-  } // _theme.colors);
+    replacements = with _theme.colors; { inherit fg0 fg1 bg0 bg1 primary; };
+  });
 }