diff --git a/users/patrick/Xorg/sway3.nix b/users/patrick/Xorg/sway3.nix
index 0ab0235..ae45f78 100644
--- a/users/patrick/Xorg/sway3.nix
+++ b/users/patrick/Xorg/sway3.nix
@@ -28,15 +28,15 @@ in
         window.titlebar = false;
         floating.titlebar = false;
         workspaceLayout = "stacking";
-        bars = map (x: x // config.lib.stylix.i3.bar) [
-          {
-            mode = "dock";
-            workspaceButtons = true;
-            workspaceNumbers = false;
-            statusCommand = "${config.programs.i3status-rust.package}/bin/i3status-rs config-main.toml";
-            trayOutput = "primary";
-          }
-        ];
+        # bars = map (x: x // config.lib.stylix.i3.bar) [
+        #   {
+        #     mode = "dock";
+        #     workspaceButtons = true;
+        #     workspaceNumbers = false;
+        #     statusCommand = "${config.programs.i3status-rust.package}/bin/i3status-rs config-main.toml";
+        #     trayOutput = "primary";
+        #   }
+        # ];
         floating.criteria = [ { class = "Pavucontrol"; } ];
 
         assigns = {
@@ -69,15 +69,8 @@ in
           {
             "desktopnix" =
               output "HDMI-0" [
-                "1"
-                "2"
-                "3"
-                "4"
-                "5"
-                "6"
-                "7"
-                "8"
-                "9"
+                "F1"
+                "F2"
               ]
               ++ output "DP-4" [
                 "j"
@@ -88,8 +81,6 @@ in
                 "p"
               ]
               ++ output "DVI-D-0" [
-                "F1"
-                "F2"
                 "F3"
                 "F4"
               ];
diff --git a/users/patrick/wayland/default.nix b/users/patrick/wayland/default.nix
index c2aef2c..5c03df8 100644
--- a/users/patrick/wayland/default.nix
+++ b/users/patrick/wayland/default.nix
@@ -49,10 +49,10 @@
     wl-clipboard
     wev
   ];
-  # Autostart hyprland if on tty1 (once, don't restart after logout)
+  # Autostart compositor if on tty1 (once, don't restart after logout)
   hm.programs.zsh.initExtra = lib.mkOrder 9999 ''
     if uwsm check may-start ; then
-    	exec systemd-cat -t uwsm_start uwsm start -S -F Hyprland
+    	exec systemd-cat -t uwsm_start uwsm start -S -F Sway
     fi
   '';
 }
diff --git a/users/patrick/wayland/sway.nix b/users/patrick/wayland/sway.nix
index 5660e91..0f7dadc 100644
--- a/users/patrick/wayland/sway.nix
+++ b/users/patrick/wayland/sway.nix
@@ -1,4 +1,4 @@
-{ config, ... }:
+{ config, lib, ... }:
 let
   nixConfig = config;
 in
@@ -41,9 +41,12 @@ in
             keybindings =
               let
                 cfg = config.wayland.windowManager.sway.config;
+                modifier = "Mod4";
               in
               {
                 "Menu" = "exec ${cfg.menu}";
+                "${modifier}+b" = lib.mkForce "exec uwsm start firefox";
+                "${modifier}+m" = lib.mkForce "exec uwsm start thunderbird";
               };
           }
           // {
@@ -61,6 +64,8 @@ in
                   mode = "2560x1440@143.998Hz";
                   pos = "1920,720";
                   adaptive_sync = "on";
+                  allow_tearing = "yes";
+                  max_render_time = "off";
                 };
               };
             };