diff --git a/config/sway/config.d/03-workspaces b/config/sway/config.d/03-workspaces
new file mode 100644
index 0000000..a0f34b0
--- /dev/null
+++ b/config/sway/config.d/03-workspaces
@@ -0,0 +1,6 @@
+workspace 1 output DP-3
+workspace 2 output DP-3
+workspace 3 output HDMI-A-1
+workspace 4 output HDMI-A-1
+workspace Mail output HDMI-A-1
+workspace OBS output HDMI-A-1
diff --git a/config/sway/config.d/app_assignment b/config/sway/config.d/app_assignment
new file mode 100644
index 0000000..027dea7
--- /dev/null
+++ b/config/sway/config.d/app_assignment
@@ -0,0 +1,5 @@
+assign [title="Steam"] 2
+assign [title="Discord"] 3
+assign [class="com.wurmonline.client.launcherfx.WurmMain"] Wurm Online
+assign [app_id="thunderbird"] Mail
+assign [app_id="com.obsproject.Studio"] OBS
diff --git a/config/sway/config.d/autostart b/config/sway/config.d/autostart
index e51d7ad..209839a 100644
--- a/config/sway/config.d/autostart
+++ b/config/sway/config.d/autostart
@@ -1,12 +1,6 @@
 # Start audio
 exec gentoo-pipewire-launcher restart &
 
-# Assign workspaces to monitors
-workspace 1 output DP-3
-workspace 2 output DP-3
-workspace 3 output HDMI-A-1
-workspace 4 output HDMI-A-1
-
 # Run in bg/tray
 exec keepassxc
 exec nextcloud
@@ -25,9 +19,5 @@ exec firefox-bin
 workspace 4 
 exec telegram-desktop
 
-# Needs to be forced due to launcher loading
-assign [title="Steam"] 2
-assign [title="Discord"] 3
-
 # Focus back to main workspace
 workspace 1
diff --git a/config/sway/config.d/gamespaces b/config/sway/config.d/gamespaces
deleted file mode 100644
index 19a58b0..0000000
--- a/config/sway/config.d/gamespaces
+++ /dev/null
@@ -1 +0,0 @@
-assign [class="com.wurmonline.client.launcherfx.WurmMain"] Wurm Online