diff --git a/modules/graphical.nix b/modules/graphical.nix
index b22da85..351ae6e 100644
--- a/modules/graphical.nix
+++ b/modules/graphical.nix
@@ -74,15 +74,12 @@ with lib; {
       services.blueman.enable = true;
 
       environment.systemPackages = with pkgs; [
-        firefox
-        thunderbird # v102 has various starting time issues - so back to stable
         ungoogled-chromium
         okular
         texlive.combined.scheme-full
         usbutils
         keepassxc
         libsecret
-        arandr
       ];
     };
 }
diff --git a/modules/sway.nix b/modules/sway.nix
index 6c4959d..3a44b34 100644
--- a/modules/sway.nix
+++ b/modules/sway.nix
@@ -73,6 +73,8 @@ with lib; {
       };
 
       environment.systemPackages = with pkgs; [
+        firefox-wayland
+        thunderbird-wayland
         gnome3.adwaita-icon-theme
         wdisplays
         wl-clipboard