diff --git a/system/.config/i3/config.base b/system/.config/i3/config.base
index e7f80d3..c134758 100644
--- a/system/.config/i3/config.base
+++ b/system/.config/i3/config.base
@@ -63,7 +63,6 @@ workspace $workspace10 output $output2
 # Assign applications to workspaces
 assign [class="Google-chrome-beta"] $workspace1
 assign [class="Chromium"] $workspace1
-assign [instance="cmus"] $workspace10
 assign [class="code-oss"] $workspace3
 assign [class="jetbrains-phpstorm"] $workspace3
 assign [class="Nemo"] $workspace4
@@ -72,11 +71,13 @@ assign [class="discord"] $workspace5
 assign [class="Riot"] $workspace5
 assign [class="Slack"] $workspace5
 assign [class="Rambox"] $workspace5
+assign [class="Hamsket"] $workspace5
 assign [class="Steam"] $workspace6
+assign [class="Notable"] $workspace7
 assign [class="keepassxc"] $workspace8
 assign [class="vlc"] $workspace9
 assign [class="mpv"] $workspace9
-assign [class="Notable"] $workspace7
+assign [instance="cmus"] $workspace10
 
 
 ###############################################################################
diff --git a/system/.config/i3/config.private b/system/.config/i3/config.private
index 87dbc37..1574979 100644
--- a/system/.config/i3/config.private
+++ b/system/.config/i3/config.private
@@ -26,7 +26,7 @@ exec_always --no-startup-id monitor-setup
 exec autokey-gtk
 exec google-chrome-beta
 
-exec rambox
+exec hamsket
 exec nemo
 exec nemo
 exec keepassxc
diff --git a/system/.config/i3/config.work b/system/.config/i3/config.work
index 16e1d78..f65f5c1 100644
--- a/system/.config/i3/config.work
+++ b/system/.config/i3/config.work
@@ -19,7 +19,7 @@ exec_always --no-startup-id monitor-setup
 # Other applications
 exec autokey-gtk
 exec google-chrome-beta
-exec rambox
+exec hamsket
 
 exec nemo
 exec nemo