diff --git a/home/modules/linux/graphical/wayland.nix b/home/modules/linux/graphical/wayland.nix
index df956a8..c113db0 100644
--- a/home/modules/linux/graphical/wayland.nix
+++ b/home/modules/linux/graphical/wayland.nix
@@ -87,7 +87,7 @@ let
   rofi-rbw-script = pkgs.writeShellApplication {
     name = "rofi-rbw-script";
     runtimeInputs = with pkgs; [
-      rofi
+      config.programs.rofi.package
       wtype
       rofi-rbw
     ];
diff --git a/home/modules/programs/my-niri.nix b/home/modules/programs/my-niri.nix
index f459f04..1457bc6 100644
--- a/home/modules/programs/my-niri.nix
+++ b/home/modules/programs/my-niri.nix
@@ -12,7 +12,7 @@ let
   playerctl = lib.getExe pkgs.playerctl;
   amixer = lib.getExe' pkgs.alsa-utils "amixer";
   brightnessctl = lib.getExe pkgs.brightnessctl;
-  app-menu = "${pkgs.dmenu}/bin/dmenu_path | ${pkgs.bemenu}/bin/bemenu | ${pkgs.findutils}/bin/xargs swaymsg exec --";
+  app-menu = "${pkgs.dmenu}/bin/dmenu_path | ${pkgs.bemenu}/bin/bemenu | ${pkgs.findutils}/bin/xargs niri msg action spawn --";
 
   wallpaper = config.linux.graphical.wallpaper;
 
@@ -366,7 +366,7 @@ in
 
         # Some basic spawns
         "Mod+Return".action = spawn (lib.getExe config.linux.graphical.defaults.terminal.package);
-        "Mod+Space".action = spawn (lib.getExe pkgs.rofi) "-show" "drun";
+        "Mod+Space".action = spawn "rofi" "-show" "drun";
         "Mod+R".action = sh app-menu;
         "Mod+Semicolon".action = spawn cfg.lock-command;
         "Mod+Shift+P".action = spawn "rofi-rbw-script";
diff --git a/home/nki-framework.nix b/home/nki-framework.nix
index 47d0bb3..082977f 100644
--- a/home/nki-framework.nix
+++ b/home/nki-framework.nix
@@ -53,7 +53,7 @@
     let
       change-mode = pkgs.writeScript "change-mode" ''
         #!/usr/bin/env ${lib.getExe pkgs.fish}
-        set -ax PATH ${lib.getBin pkgs.power-profiles-daemon} ${lib.getBin pkgs.rofi} ${lib.getBin pkgs.ripgrep}
+        set -ax PATH ${lib.getBin pkgs.power-profiles-daemon} ${lib.getBin config.programs.rofi.package} ${lib.getBin pkgs.ripgrep}
 
         set profiles (powerprofilesctl list | rg "^[ *] (\S+):" -r '$1')
         set selected_index (math (contains -i (powerprofilesctl get) $profiles) - 1)