diff --git a/machines/universedesktop/desktop/dwl.nix b/machines/universedesktop/desktop/dwl.nix
index 18d0319..4440bdb 100644
--- a/machines/universedesktop/desktop/dwl.nix
+++ b/machines/universedesktop/desktop/dwl.nix
@@ -1,7 +1,7 @@
 { config, pkgs, lib, ... }: let 
   dwl-startup = pkgs.writeScript "dwl-startup.sh" ''
     #!${pkgs.bash}/bin/bash
-    ${pkgs.yambar}/bin/yambar
+    exec <&-
   '';
 
   launch_emacs = pkgs.writeScript "emacsclient-or-start" ''
@@ -38,6 +38,10 @@ in {
     QT_QPA_PLATFORM="wayland-egl";
     QT_WAYLAND_DISABLE_WINDOW_DECORATIONS="1";
     __JAVA_AWT_WM_NONREPARENTING=1;
+    # Bug with Wayland: Fixed in 23.1
+    # Causes firefox & thunderbird to crash
+    # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21646/diffs?commit_id=ee5d2250fd159689aae3f7d632a6226971bea85c
+    MOZ_ENABLE_WAYLAND=0;
   };
 
   environment.systemPackages = with pkgs; [