diff --git a/modules/gui.nix b/modules/gui.nix
index d9f6752..54325a8 100644
--- a/modules/gui.nix
+++ b/modules/gui.nix
@@ -38,13 +38,15 @@ in {
     ];
     extraSessionCommands = ''
       export MOZ_ENABLE_WAYLAND=1
-      export MOZ_DBUS_REMOTE=1
+      export MOZ_USE_XINPUT2=1
       export GRIM_DEFAULT_DIR=/home/coolneng/Photos/Screenshots
       export _JAVA_AWT_WM_NONREPARENTING=1
       export QT_QPA_PLATFORM=wayland
-      export QT_WAYLAND_DISABLE_WINDOWDECORATION="1"
+      export QT_WAYLAND_DISABLE_WINDOWDECORATION=1
       export SDL_VIDEODRIVER=wayland
       export GTK_THEME=Adapta-Eta
+      export XDG_SESSION_TYPE=wayland
+      export XDG_CURRENT_DESKTOP=sway
     '';
   };
 
@@ -120,4 +122,12 @@ in {
   # Integrate pass with the browser
   programs.browserpass.enable = true;
 
+  # Enable WebRTC screensharing
+  services.pipewire.enable = true;
+
+  xdg.portal = {
+    enable = true;
+    gtkUsePortal = true;
+    extraPortals = with pkgs; [ xdg-desktop-portal-wlr xdg-desktop-portal-gtk ];
+  };
 }
diff --git a/modules/software.nix b/modules/software.nix
index 66b64b2..7bdff35 100644
--- a/modules/software.nix
+++ b/modules/software.nix
@@ -12,7 +12,7 @@
     gitAndTools.pass-git-helper
     pinentry-gtk2
     # Browsers
-    firefox
+    firefox-wayland
     ungoogled-chromium
     # LaTeX
     texlive.combined.scheme-full