diff --git a/home/features/desktop/hyprland.nix b/home/features/desktop/hyprland.nix
index 5208fc0..3a79db0 100644
--- a/home/features/desktop/hyprland.nix
+++ b/home/features/desktop/hyprland.nix
@@ -156,27 +156,29 @@ in {
           "nofocus, class:^(xwaylandvideobridge)$"
         ];
         "$mainMod" = "SUPER";
+        "$terminal" = "kitty";
 
         bind = [
-          "$mainMod, return, exec, nu -c zellij-ps"
+          "$mainMod, return, exec, $terminal nu -c zellij-ps"
           # "$mainMod, t, exec, warp-terminal"
-          "$mainMod, t, exec, kitty -e nu -c 'nitch; exec nu'"
-          "$mainMod SHIFT, t, exec, launch-timer"
-          "$mainMod SHIFT, e, exec, kitty -e zellij_nvim"
+          "$mainMod, t, exec, $terminal -e nu -c 'nitch; exec nu'"
+          "$mainMod SHIFT, t, exec, uwsm app --launch-timer"
+          "$mainMod, n, exec, $terminal -e nvim"
+          "$mainMod, z, exec, uwsm app -- zeditor"
           "$mainMod, o, exec, hyprctl setprop activewindow opaque toggle"
           "$mainMod, r, exec, hyprctl dispatch focuswindow \"initialtitle:.*alert-box.*\" && hyprctl dispatch moveactive exact 4300 102 && hyprctl dispatch focuswindow \"initialtitle:.*chat-box.*\" && hyprctl dispatch moveactive exact 4300 512"
-          "$mainMod, b, exec, thunar"
-          "$mainMod SHIFT, B, exec, vivaldi"
-          "$mainMod, Escape, exec, wlogout -p layer-shell"
+          "$mainMod, b, exec, uwsm app -- thunar"
+          "$mainMod SHIFT, B, exec, uwsm app -- vivaldi"
+          "$mainMod, Escape, exec, uwsm app -- wlogout -p layer-shell"
           "$mainMod, Space, togglefloating"
           "$mainMod, q, killactive"
           "$mainMod, M, exit"
           "$mainMod, F, fullscreen"
           "$mainMod SHIFT, V, togglefloating"
-          "$mainMod, D, exec, rofi -show"
-          "$mainMod, V, exec, cliphist list | rofi -dmenu | cliphist decode | wl-copy"
-          "$mainMod SHIFT, S, exec, bemoji"
-          "$mainMod, P, exec, rofi-pass"
+          "$mainMod, D, exec, uwsm app -- rofi -show"
+          "$mainMod, V, exec, uwsm app -- cliphist list | rofi -dmenu | cliphist decode | wl-copy"
+          "$mainMod SHIFT, S, exec, uwsm app -- rofi -show emoji"
+          "$mainMod, P, exec, uwsm app -- rofi-pass"
           "$mainMod SHIFT, P, pseudo"
           "$mainMod, J, togglesplit"
           "$mainMod, h, movefocus, l"
diff --git a/home/features/desktop/rofi.nix b/home/features/desktop/rofi.nix
index 37cb349..f2163ef 100644
--- a/home/features/desktop/rofi.nix
+++ b/home/features/desktop/rofi.nix
@@ -112,7 +112,7 @@ in {
             margin: 8px 0 0;
             lines: 10;
             columns: 1;
-            fixed-height: false;
+            fixed-height: true;
             scrollbar: false;
           }
 
diff --git a/home/m3tam3re/home.nix b/home/m3tam3re/home.nix
index 942bfe4..536998c 100644
--- a/home/m3tam3re/home.nix
+++ b/home/m3tam3re/home.nix
@@ -113,6 +113,7 @@
 
   programs.ssh = {
     enable = true;
+    enableDefaultConfig = false;
     matchBlocks = {
       "AZ-CLD-1" = {
         hostname = "152.53.186.119";