diff --git a/sway/behaviours b/sway/behaviours
index 9d851cc52..d56f4cae6 100644
--- a/sway/behaviours
+++ b/sway/behaviours
@@ -4,14 +4,13 @@
 # Default workspaces
 ################################################################################
 
-#assign [class="Xchat"] 1-chat   Replaced by irssi which will open on the first workspace at startup
-assign [class="XTerm"] 1
 assign [class="Mattermost"] 1
+assign [class="Rocket.Chat"] 1
 assign [class="UXTerm"] grave
-assign [class="Thunderbird"] 2
+assign [app_id="thunderbird"] 2
 assign [class="Chromium"] 3
 assign [class="Linphone"] 5
-assign [class="firefox"] 7
+assign [app_id="firefox"] 7
 assign [app_id="com.github.gittyup.Gittyup"] 9
 
 # Don't use VNC viewer anymore. I've defaulted to running virt-manager on this workspace because it's similar