diff --git a/config/hypr/main.conf b/config/hypr/main.conf
index f2c11a9d..1a6cba08 100644
--- a/config/hypr/main.conf
+++ b/config/hypr/main.conf
@@ -18,7 +18,6 @@ exec-once = $HOME/.config/lisgd/config &
 exec-once = bash -c "sleep 3; XDG_DATA_DIRS=$kora nm-applet"
 exec-once = bash -c "sleep 4; blueberry-tray"
 exec-once = bash -c "sleep 5; nextcloud --background"
-exec-once = bash -c "sleep 6; tutanota-desktop -a"
 
 exec-once = eww daemon
 exec-once = eww open left-bar
@@ -46,7 +45,9 @@ exec-once = swayosd
 # Change HandleLidSwitch to lock in logind.conf
 exec-once = swayidle -w lock $LOCK_PATH/lock.sh
 
-exec-once = spot
+# Special window apps
+exec-once = thunderbird # Win + T
+exec-once = spot # Win + S
 
 # Some default env vars.
 env = XCURSOR_SIZE,24
@@ -142,6 +143,7 @@ gestures {
 
 windowrule = noborder,^(wofi)$
 windowrule = workspace special:spot,^(dev.alextren.Spot)$
+windowrule = workspace special:thunder,^(thunderbird)$
 
 windowrule = float,^(org.kde.polkit-kde-authentication-agent-1)$
 windowrule = size 741 288,^(org.kde.polkit-kde-authentication-agent-1)$
@@ -174,6 +176,7 @@ bind = $mainMod, V, exec, cliphist list | wofi --dmenu | cliphist decode | wl-co
 # Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more
 bind = $mainMod, Q, exec, alacritty
 bind = $mainMod, S, togglespecialworkspace, spot
+bind = $mainMod, T, togglespecialworkspace, thunder
 bind = $mainMod, C, killactive, 
 
 bind = $mainMod, L, exec, $LOCK_PATH/lock.sh
diff --git a/nixos/cfg/packages.nix b/nixos/cfg/packages.nix
index 559e9a9b..1951b7b6 100644
--- a/nixos/cfg/packages.nix
+++ b/nixos/cfg/packages.nix
@@ -1,6 +1,15 @@
 {config, pkgs, lib, ...}:
 
 {
+  systemd.user.services.protonmail-bridge = {
+    description = "Protonmail Bridge";
+    enable = true;
+    script = "${pkgs.protonmail-bridge}/bin/protonmail-bridge --noninteractive --log-level info";
+    path = [ pkgs.gnome.gnome-keyring ]; # HACK: https://github.com/ProtonMail/proton-bridge/issues/176
+    wantedBy = [ "graphical-session.target" ];
+    partOf = [ "graphical-session.target" ];
+  };
+
   services = {
     xserver = {
       enable = true;
diff --git a/nixos/home/packages.nix b/nixos/home/packages.nix
index 44bcbee5..d6344109 100644
--- a/nixos/home/packages.nix
+++ b/nixos/home/packages.nix
@@ -13,7 +13,6 @@
 
     waybar = {
       enable = true;
-      package = pkgs.waybar-hyprland;
     };
   };
 
@@ -67,7 +66,8 @@
       exec env SUDO_ASKPASS=${pkgs.plasma5Packages.ksshaskpass}/bin/${pkgs.plasma5Packages.ksshaskpass.pname} sudo -k -EA "${gparted}/bin/${gparted.pname}" "$@"
     '')
 
-    tutanota-desktop
+    protonmail-bridge
+    thunderbird
     input-emulator
     bc
     spot