diff --git a/hypr/config/rules.conf b/hypr/config/rules.conf
index 0cf0818..ff28ffe 100644
--- a/hypr/config/rules.conf
+++ b/hypr/config/rules.conf
@@ -14,19 +14,19 @@ windowrule = float, title:rofi
 
 # windowrule = workspace special:terminal, kitty
 windowrule = workspace special:music, initialClass:Spotify
-windowrulev2 = opacity 0.85 0.8, initialClass:Spotify
+windowrule = opacity 0.85 0.8, initialClass:Spotify
 
-windowrule = workspace 1, thunderbird
+windowrule = workspace:1, class:thunderbird
 
-windowrulev2 = workspace 2,class:(discord)
+windowrule = workspace 2,class:(discord)
 
-windowrulev2 = workspace 2,class:(Caprine)
-windowrule = opacity 0.999, Caprine
+windowrule = workspace 2,class:(signal)
+windowrule = opacity:0.999, class:signal
 
-windowrule = workspace 3, firefox
-windowrule = opacity 0.999, firefox
+windowrule = workspace:3, class:firefox
+windowrule = opacity:0.999, class:firefox
 
-windowrulev2 = workspace 5,float,class:(steam)
+windowrule = workspace 5,float,class:(steam)
 windowrule = workspace 5, class:^(steam_app_*)$
 
 # Workspaces
diff --git a/hypr/config/startup.conf b/hypr/config/startup.conf
index 290ebf6..382e19c 100644
--- a/hypr/config/startup.conf
+++ b/hypr/config/startup.conf
@@ -10,10 +10,11 @@ exec-once = emote
 exec-once = swww-daemon
 
 exec-once = [workspace 1 silent] thunderbird
+exec-once = [workspace 1 silent] proton-mail --password-store="gnome-libsecret"
 exec-once = [workspace 2 silent] discord --enable-features=UseOzonePlatform --ozone-platform=wayland
 exec-once = [workspace 2 silent] signal-desktop --password-store="gnome-libsecret"
 exec-once = [workspace 3 silent] zen-browser
 exec-once = [workspace 4 silent] kitty
 exec-once = [workspace special:terminal silent] kitty
-exec-once = [workspace special:music silent] spotify-launcher
+exec-once = [workspace special:music silent] deezer