diff --git a/sway/behaviours b/sway/behaviours
index 13ee572c0..4f3365328 100644
--- a/sway/behaviours
+++ b/sway/behaviours
@@ -10,16 +10,22 @@ assign [app_id="Alacritty-grave"] grave
 assign [app_id="chrome-papillon.john.me.tz__-Default"] 0
 # 1 - Chat
 assign [class="Mattermost"] 1
-assign [app_id="Mattermost"] 1
+for_window [class="Mattermost"] layout tabbed
+assign [app_id="com.mattermost.Desktop"] 1
+for_window [app_id="Mattermost"] layout tabbed
 assign [class="Rocket.Chat"] 1
+for_window [class="Rocket.Chat"] layout tabbed
 assign [app_id="Rocket.Chat"] 1
+for_window [app_id="Rocket.Chat"] layout tabbed
+assign [class="Session"] 1
+for_window [class="Session"] layout tabbed
+assign [app_id="Session"] 1
+for_window [app_id="Session"] layout tabbed
 # 2 - Mail - Thunderbird seems to change the way it identifies with every update!
 assign [class="Thunderbird"] 2
-assign [class="thunderbird"] 2
-assign [class="thunderbird-default"] 2
-assign [app_id="thunderbird"] 2
+assign [app_id="org.mozilla.Thunderbird"] 2
 # 3 - Secondary Browser
-assign [class="Chromium"] 3
+assign [app_id="io.github.ungoogled_software.ungoogled_chromium"] 4
 # 4 - Git
 assign [app_id="com.github.gittyup.gittyup"] 4
 # 5 - Phone (TODO: pick something more useful)