diff --git a/modules/home/rice/compositor.nix b/modules/home/rice/compositor.nix
index add66fc..04e0eb0 100644
--- a/modules/home/rice/compositor.nix
+++ b/modules/home/rice/compositor.nix
@@ -3,6 +3,8 @@
     ./keybinds.nix
   ];
 
+  # TODO: https://github.com/sodiboo/niri-flake/issues/1393 for nwg-displays monitor dynamic config
+
   programs.niri = {
     settings = {
       outputs."eDP-1" = {
@@ -10,6 +12,7 @@
         position = { x=0; y=0; };
         scale   = 1.0;
       };
+      
       environment = {
         XCURSOR_SIZE = "24";
         XCURSOR_THEME = "catppuccin-${ctp-opt.flavor}-light-cursors";
@@ -31,6 +34,17 @@
         "nm-applet &"
         "tailscale systray &"
       ];
+
+      prefer-no-csd = true;
+      layout = {
+        tab-indicator.enable = false;
+        gaps = rice.gap.outer;
+        border = {
+          enable = true;
+          width = rice.borders.size;
+          
+        };
+      };
     };
   };
   
diff --git a/modules/home/rice/keybinds.nix b/modules/home/rice/keybinds.nix
index 6a9c841..a8c838f 100644
--- a/modules/home/rice/keybinds.nix
+++ b/modules/home/rice/keybinds.nix
@@ -29,6 +29,7 @@
     
     "Mod+Q".action.close-window = {};
     "Mod+W".action.maximize-column = {};
+    "Mod+S".action.fullscreen-window = {};
     "Print".action.screenshot-screen = {};
     
     "Mod+Up".action.focus-workspace-up = {};
@@ -36,11 +37,35 @@
     "Mod+Left".action.focus-column-left = {};
     "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+E".action.spawn = [ "pcmanfm-qt" ];
     "Mod+T".action.spawn = [ "kitty" ];
     "Mod+Y".action.spawn = [ "brave" "--restore-last-session" ];
     "Mod+Return".action.spawn-sh = "ls ~/Projects | rofi -dmenu -p \"Open Project\" | xargs -I {} sh -c 'mkdir -p ~/Projects/\"{}\" && zeditor ~/Projects/\"{}\"'";
+
+    "Mod+M".action.spawn = [ "wlogout" ];
+    "Mod+Tab".action.spawn = [ "pkill" "-SIGUSR1" "waybar" ];
+
+    "XF86Bluetooth".action.spawn = [ "blueman-manager" ];
+    "XF86Display".action.spawn = [ "nwg-displays" ];
+    "Ctrl+Alt+Delete".action.spawn = [ "wlogout" ];
+    "Ctrl+Shift+Escape".action.spawn = [ "kitty" "btop" ];
+    "Mod+Grave".action.spawn = [ "dunstctl" "set-paused" "toggle" ];
+
+    "Mod+N".action.spawn = [ "rofi-network-manager" ];
+    "Mod+J".action.spawn-sh = "notify-send -u critical ${hostname} 'Caffein Mode' && notify-send '(SUPER+X to reset)' && systemctl --user stop hypridle";
+    "Mod+Z".action.spawn = [ "dunstctl" "close-all" ];
+
+    "Mod+V".action.spawn = [ "rofi" "-modi" "clipboard:cliphist-rofi-img" "-show" "clipboard" "-show-icons" ];
+    "Mod+A".action.spawn = [ "zeditor" ];
+    "Mod+C".action.spawn = [ "kitty" "btop" ];
+    "Mod+Shift+C".action.spawn = [ "kitty" "zsh" "-c" "fastfetch; exec zsh -i" ];
+    "Mod+D".action.spawn = [ "steam" "steam://open/bigpicture" ];
+    "Mod+Shift+D".action.spawn = [ "steam" ];
+
+    "Mod+L".action.spawn = [ "loginctl" "lock-session" ];
   };
   
   wayland.windowManager.hyprland = {
diff --git a/modules/system/desktop.nix b/modules/system/desktop.nix
index 933e8b7..04cb286 100644
--- a/modules/system/desktop.nix
+++ b/modules/system/desktop.nix
@@ -11,7 +11,10 @@
   ];
 
   programs = {
-    niri.enable = true;
+    niri = {
+      enable = true;
+      package = pkgs.niri-unstable;
+    };
     hyprland = {
       enable = true;
       withUWSM = true;