diff --git a/modules/home/rice/compositor.nix b/modules/home/rice/compositor.nix
index 0b59e39..a01997b 100644
--- a/modules/home/rice/compositor.nix
+++ b/modules/home/rice/compositor.nix
@@ -1,4 +1,4 @@
-{ pkgs, rice, ctp-opt, ... }: {
+{ lib, pkgs, rice, ctp-opt, ... }: {
   imports = [
     ./keybinds.nix
   ];
@@ -18,6 +18,7 @@
           max-scroll-amount = "5%";
           enable = true;
         };
+        keyboard.xkb.options = "caps:none";
       };
       
       environment = {
@@ -42,6 +43,11 @@
         "tailscale systray &"
       ];
 
+      xwayland-satellite = {
+        enable = true;
+        path = lib.getExe pkgs.xwayland-satellite;
+      };
+
       prefer-no-csd = true;
       layout = {
         tab-indicator.enable = false;
diff --git a/modules/home/rice/keybinds.nix b/modules/home/rice/keybinds.nix
index a8c838f..5cd72ee 100644
--- a/modules/home/rice/keybinds.nix
+++ b/modules/home/rice/keybinds.nix
@@ -38,7 +38,7 @@
     "Mod+Right".action.focus-column-right = {};
     
     "Mod+Space" = { action.spawn = [ "playerctl" "play-pause" ]; allow-when-locked = true; };
-    "Mod+R".action.spawn = [ "rofi" "-show" "drun" "-show-icons" "-display-drun" ":" "-run-command" "uwsm app -- {cmd}" ];
+    "Mod+R".action.spawn = [ "rofi" "-show" "drun" "-show-icons" "-display-drun" "" "-run-command" "uwsm app -- {cmd}" ];
     
     "Mod+E".action.spawn = [ "pcmanfm-qt" ];
     "Mod+T".action.spawn = [ "kitty" ];
diff --git a/modules/home/rice/logout.nix b/modules/home/rice/logout.nix
index da57d5a..cad5b72 100644
--- a/modules/home/rice/logout.nix
+++ b/modules/home/rice/logout.nix
@@ -4,13 +4,13 @@
     layout = [
       {
         label = "shutdown";
-        action = "hyprshutdown -t 'Shutting down...' --post-cmd 'systemctl poweroff'";
+        action = "systemctl poweroff";
         text = "(S)hutdown";
         keybind = "s";
       }
       {
         label = "reboot";
-        action = "hyprshutdown -t 'Rebooting...' --post-cmd 'systemctl reboot'";
+        action = "systemctl reboot";
         text = "(R)eboot";
         keybind = "r";
       }
@@ -28,7 +28,7 @@
       }
       {
         label = "logout";
-        action = "hyprshutdown -t 'Logging Out...' --post-cmd 'uwsm stop'";
+        action = "niri msg action quit";
         text = "L(o)gout";
         keybind = "o";
       }