diff --git a/config/sway/config.d/02-keybinds b/config/sway/config.d/02-keybinds
index f4a854f..d23f8d7 100644
--- a/config/sway/config.d/02-keybinds
+++ b/config/sway/config.d/02-keybinds
@@ -63,6 +63,12 @@ bindsym XF86AudioPrev exec playerctl previous
 #
 # Workspaces:
 #
+    # Switch to next/prev workspace in current output
+    bindsym $mod+n workspace next_on_output
+    bindsym $mod+p workspace prev_on_output
+    # Switch to next/prev workspace
+    bindsym $mod+Shift+n workspace next
+    bindsym $mod+Shift+p workspace prev
     # Switch to workspace
     bindsym $mod+1 workspace number 1
     bindsym $mod+2 workspace number 2
diff --git a/config/sway/config.d/03-workspaces b/config/sway/config.d/03-workspaces
index a0f34b0..4b169ef 100644
--- a/config/sway/config.d/03-workspaces
+++ b/config/sway/config.d/03-workspaces
@@ -1,6 +1,8 @@
 workspace 1 output DP-3
 workspace 2 output DP-3
-workspace 3 output HDMI-A-1
+workspace Unity Editor output DP-3
 workspace 4 output HDMI-A-1
+workspace 5 output HDMI-A-1
 workspace Mail output HDMI-A-1
 workspace OBS output HDMI-A-1
+workspace Spotify output HDMI-A-1
diff --git a/config/sway/config.d/app_assignment b/config/sway/config.d/app_assignment
index eb53c96..8dda201 100644
--- a/config/sway/config.d/app_assignment
+++ b/config/sway/config.d/app_assignment
@@ -1,4 +1,7 @@
 assign [title="Steam"] 2
-assign [title="Discord"] 3
+assign [title="Discord"] 4
+assign [app_id="org.telegram.desktop"] 5
+assign [app_id="org.gajim.Gajim"] 5
 assign [app_id="thunderbird"] Mail
 assign [app_id="com.obsproject.Studio"] OBS
+assign [class="unityhub"] Unity Editor
diff --git a/config/sway/config.d/autostart b/config/sway/config.d/autostart
index f4bb623..191374f 100644
--- a/config/sway/config.d/autostart
+++ b/config/sway/config.d/autostart
@@ -3,8 +3,6 @@ exec gentoo-pipewire-launcher restart &
 
 # Run in bg/tray
 exec keepassxc
-exec nextcloud
-exec tmux new -ds profanity profanity
 
 workspace 1
 exec kitty
@@ -18,6 +16,7 @@ exec firefox-bin
 
 workspace 4 
 exec telegram-desktop
+exec gajim
 
 # Focus back to main workspace
 workspace 1