diff --git a/modules/home-manager/dotfiles/aerospace/aerospace.toml b/modules/home-manager/dotfiles/aerospace/aerospace.toml
index a5702ca4..f2825c49 100644
--- a/modules/home-manager/dotfiles/aerospace/aerospace.toml
+++ b/modules/home-manager/dotfiles/aerospace/aerospace.toml
@@ -18,7 +18,7 @@ after-startup-command = []
 start-at-login = true
 
 # Normalizations. See: https://nikitabobko.github.io/AeroSpace/guide.html#normalization
-enable-normalization-flatten-containers = true
+enable-normalization-flatten-containers = false
 enable-normalization-opposite-orientation-for-nested-containers = true
 
 # See: https://nikitabobko.github.io/AeroSpace/guide.html#layouts
@@ -193,6 +193,10 @@ run = 'move-node-to-workspace T'
 if.app-id = 'com.google.Chrome'
 run = 'move-node-to-workspace B'
 
+[[on-window-detected]]
+if.app-id = 'com.microsoft.edgemac'
+run = 'move-node-to-workspace B'
+
 [[on-window-detected]]
 if.app-id = 'org.mozilla.firefox'
 run = 'move-node-to-workspace B'
@@ -228,6 +232,10 @@ run = 'move-node-to-workspace I'
 if.app-id = 'com.jetbrains.pycharm'
 run = 'move-node-to-workspace I'
 
+[[on-window-detected]]
+if.app-id = 'com.jetbrains.datagrip'
+run = 'move-node-to-workspace I'
+
 # mnemonics P - PowerPoint
 [[on-window-detected]]
 if.app-id = 'com.microsoft.PowerPoint'
@@ -266,16 +274,35 @@ run = 'move-node-to-workspace N'
 if.app-id = 'com.apple.Notes'
 run = 'move-node-to-workspace N'
 
-# mnemonics S - slack
+# mnemonics S - slack/sms
 [[on-window-detected]]
 if.app-id = 'com.tinyspeck.slackmacgap'
 run = 'move-node-to-workspace S'
 
 [[on-window-detected]]
-# not really a better place to put this one
 if.app-id = 'com.cisco.Jabber'
 run = 'move-node-to-workspace S'
 
+[[on-window-detected]]
+if.app-id = 'com.apple.MobileSMS'
+run = 'move-node-to-workspace S'
+
+[[on-window-detected]]
+if.app-id = 'keybase.Electron'
+run = 'move-node-to-workspace S'
+
+[[on-window-detected]]
+if.app-id = 'com.facebook.archon.developerID'
+run = 'move-node-to-workspace S'
+
+[[on-window-detected]]
+if.app-id = 'com.hnc.Discord'
+run = 'move-node-to-workspace S'
+
+[[on-window-detected]]
+if.app-id = 'org.whispersystems.signal-desktop'
+run = 'move-node-to-workspace S'
+
 # mnemonics V - vscode
 [[on-window-detected]]
 if.app-id = 'com.microsoft.VSCode'
@@ -286,6 +313,10 @@ run = 'move-node-to-workspace V'
 if.app-id = 'us.zoom.xos'
 run = 'move-node-to-workspace Z'
 
+[[on-window-detected]]
+if.app-id = 'com.apple.FaceTime'
+run = 'move-node-to-workspace Z'
+
 [workspace-to-monitor-force-assignment]
 B = [1, 'secondary', 'main']
 I = [3, 'secondary', 'main']