diff --git a/homemanager/hyprland/hyprland.conf b/homemanager/hyprland/hyprland.conf
index cdf24ee..105ef63 100644
--- a/homemanager/hyprland/hyprland.conf
+++ b/homemanager/hyprland/hyprland.conf
@@ -42,18 +42,17 @@ exec-once = gsettings set org.gnome.desktop.interface cursor-size 24
 # This requires gpu-screen-recorder to be installed. I installed it with this https://wiki.nixos.org/wiki/Gpu-screen-recorder.
 exec-once = ~/.config/hypr/scripts/gpu-screen-recorder/start-replay.sh
 
+exec-once = spotify && signal-desktop && thunderbird && gnome-calendar && bitwarden && $browser
 
-exec-once = [workspace 4 silent] signal-desktop
-exec-once = [workspace 4 silent] spotify
-exec-once = [workspace 4 silent] thunderbird
-exec-once = [workspace 3 silent] gnome-calendar
-exec-once = [workspace 3 silent] bitwarden
-# https://github.com/quirinecker/dotfiles-modules/issues/13
-# exec-once = [workspace 3 silent] errands
-exec-once = [workspace 2 silent] $browser
 exec-once = [workspace 1 silent] $terminal
-# exec-once = [workspace 4 silent] discord
-# windowrulev2 = workspace 4 silent once, class:^(discord)$
+
+windowrule = match:class ^(zen-beta)$, workspace 2 silent
+windowrule = match:class ^(org.gnome.Calendar)$, workspace 3 silent
+windowrule = match:class ^(Bitwarden)$, workspace 3 silent
+windowrule = match:class ^(discord)$, workspace 4 silent
+windowrule = match:class ^(thunderbird)$, workspace 4 silent
+windowrule = match:class ^(signal)$, workspace 4 silent
+windowrule = match:class ^(Spotify)$, workspace 4 silent
 
 
 env = HYPRCURSOR_SIZE,28