diff --git a/.config/sway/config b/.config/sway/config
index c469355..79d136b 100644
--- a/.config/sway/config
+++ b/.config/sway/config
@@ -1,4 +1,4 @@
-# Default config for sway
+# Default config for sway.conf
 #
 # Copy this to ~/.config/sway/config and edit it to your liking.
 #
@@ -41,15 +41,10 @@ set $screenshot "~/.config/scripts/wm/screenshot.sh"
 ### Monitor config
 # 
 # Monitor layout
-set $mon1 DP-2
-set $mon2 HDMI-A-3
-
-output $mon2 pos 0 0
-output $mon1 pos 1080 0
-
-# Xwayland related
 xwayland force
-exec xrandr --output XWAYLAND0 --primary
+
+include monitor
+
 #output $mon1 adaptive_sync on
 
 ### Output configuration
@@ -344,6 +339,7 @@ exec signal-desktop
 #
 # Xwayland applications tend to use 'class=<class>', whereas wayland applications use 'appid=<appid>'
 assign [app_id="firefox"] workspace 2:r
+assign [class="firefox"] workspace 2:r
 assign [app_id="Discord Firefox"] workspace 3:s
 for_window [title="^Discord — Mozilla Firefox$"] fullscreen disable
 assign [class="WebCord"] workspace 3:s