diff --git a/config/dot_config/sway/config b/config/dot_config/sway/config
index b14a7fd..bbf0b4c 100644
--- a/config/dot_config/sway/config
+++ b/config/dot_config/sway/config
@@ -47,6 +47,7 @@ set $term-start ~/.config/sway/scripts/start-term.sh
 # on the original workspace that the command was run on.
 
 set $file-manager kitty -- zsh "-c" "lf"
+set $display-manager way-displays
 set $launcher-menu ~/.config/rofi/show-launcher-menu.sh
 set $power-menu ~/.config/rofi/show-power-menu.sh
 set $wireless-menu ~/.config/rofi/show-network-menu.sh --wireless
@@ -88,6 +89,7 @@ set $comm-ws 7:7:  
 set $ws-7 7:7:  
 set $comm signal-desktop
 set $comm-matrix element-desktop
+set $comm-slack slack
 
 set $mail-ws 8:8:  
 set $ws-8 8:8:  
diff --git a/config/dot_config/sway/config-applications b/config/dot_config/sway/config-applications
index e7b5cc4..4967141 100644
--- a/config/dot_config/sway/config-applications
+++ b/config/dot_config/sway/config-applications
@@ -2,9 +2,13 @@
 
 assign [class="(?i).*chrome.*"] $web-ws
 assign [app_id="(?i).*firefox.*"] $web-ws
-assign [class="(?i).*signal.*"] $comm-ws
+
 assign [app_id="(?i).*evolution.*"] $mail-ws
+
+assign [class="(?i).*signal.*"] $comm-ws
+assign [class="(?i).*slack.*"] $comm-ws
 assign [class="(?i).*element.*"] $comm-ws
+
 assign [class="(?i).*bitwarden.*"] $creds-ws
 
 # Set floating mode for generated windows
diff --git a/config/dot_config/sway/config-startup b/config/dot_config/sway/config-startup
index 5b357fe..cc27670 100644
--- a/config/dot_config/sway/config-startup
+++ b/config/dot_config/sway/config-startup
@@ -1,12 +1,13 @@
 ### Startup ===================================================================
 exec_always --no-startup-id flashfocus
 
-exec way-displays
+exec $display-manager 2>&1 ~/.way-displays.log
 exec $notifications
 exec $mail
 exec $web
 exec $comm
 exec $comm-matrix
+exec $comm-slack
 exec $creds
 exec $nightshifter
 
diff --git a/config/dot_config/sway/scripts/executable_start-up.sh b/config/dot_config/sway/scripts/executable_start-up.sh
index 1256189..11c566e 100644
--- a/config/dot_config/sway/scripts/executable_start-up.sh
+++ b/config/dot_config/sway/scripts/executable_start-up.sh
@@ -63,4 +63,10 @@ swaymsg "workspace \$ws-3; exec \$term-start Main-1 \$term-start-cmd"
 swaymsg "workspace \$ws-4; exec \$term-start Main-2 \$term-start-cmd"
 swaymsg "workspace \$ws-1; exec \$term-start NixOS \$term-start-cmd"
 
+echo "Start 'way-displays -g' to reassign the workspaces if needed."
+echo "Somehow 'way-displays' crashed on start-up sometimes and this helps."
+# See: https://github.com/alex-courtis/way-displays/issues/171
+sleep 1
+swaymsg exec "\$display-manager -g"
+
 echo "Finished"
diff --git a/config/dot_config/way-displays/cfg.yaml b/config/dot_config/way-displays/cfg.yaml
index a53d691..994539e 100644
--- a/config/dot_config/way-displays/cfg.yaml
+++ b/config/dot_config/way-displays/cfg.yaml
@@ -22,6 +22,7 @@ ORDER:
   #
   # Laptop Monitor comes always last.
   - "!^Tianma.*TL140ADXP24.*" # Internal monitor.
+  - "eDP-1"
 
 # Enable scaling, overrides AUTO_SCALE and SCALE
 SCALING: TRUE
@@ -55,6 +56,7 @@ MODE:
   - NAME_DESC: "!^Tianma.*TL140ADXP24.*" # Tuxedo - Internal
     WIDTH: 1920
     HEIGHT: 1200
+    HZ: 120
 
 # Rotate or translate the display.
 # 90, 180, 270, FLIPPED, FLIPPED-90, FLIPPED-180, FLIPPED-270
diff --git a/config/dot_config/waybar/config b/config/dot_config/waybar/config
index 2b3c62e..4b8ef0b 100644
--- a/config/dot_config/waybar/config
+++ b/config/dot_config/waybar/config
@@ -220,6 +220,7 @@
     },
 
     "sway/workspaces": {
+        "window-rewrite": {},
         "all-outputs": false,
         "disable-scroll": false,
         "smooth-scrolling-threshold": 10,