diff --git a/modules/ags/config/ts/notifications/base.ts b/modules/ags/config/ts/notifications/base.ts
index bf55ed9..c7fd424 100644
--- a/modules/ags/config/ts/notifications/base.ts
+++ b/modules/ags/config/ts/notifications/base.ts
@@ -64,7 +64,7 @@ const NotificationIcon = (notif: NotifObj) => {
         if (wmClass != null) {
             iconCmd = (box) => {
                 if (!getDragState(box)) {
-                    if (wmClass === 'thunderbird') {
+                    if (wmClass === 'Proton Mail') {
                         Hyprland.messageAsync('dispatch ' +
                             'togglespecialworkspace thunder');
                     }
diff --git a/modules/hyprland/config/mimeapps.list b/modules/hyprland/config/mimeapps.list
index 4b64feb..09363ac 100644
--- a/modules/hyprland/config/mimeapps.list
+++ b/modules/hyprland/config/mimeapps.list
@@ -1,13 +1,8 @@
 [Added Associations]
 application/pdf=firefox.desktop;
 text/x-java=nvim.desktop;
-x-scheme-handler/mailto=userapp-Thunderbird-9ME591.desktop;
-x-scheme-handler/mid=userapp-Thunderbird-9ME591.desktop;
 
 [Default Applications]
 application/pdf=firefox.desktop;
-message/rfc822=userapp-Thunderbird-9ME591.desktop
 text/x-java=nvim.desktop;
-x-scheme-handler/mailto=userapp-Thunderbird-9ME591.desktop
-x-scheme-handler/mid=userapp-Thunderbird-9ME591.desktop
 x-scheme-handler/ror2mm=r2modman.desktop
diff --git a/modules/hyprland/packages.nix b/modules/hyprland/packages.nix
index b9920e8..cec91bf 100644
--- a/modules/hyprland/packages.nix
+++ b/modules/hyprland/packages.nix
@@ -70,8 +70,7 @@ in {
         hunspellDicts.en_CA
 
         # Apps
-        thunderbird # TODO: use programs.thunderbird
-        protonmail-bridge
+        protonmail-desktop
         spotifywm
         photoqt
         nextcloud-client
@@ -132,9 +131,8 @@ in {
           "wl-paste --watch cliphist store"
 
           "sleep 3; nextcloud --background"
-          "sleep 3; protonmail-bridge --noninteractive --log-level info"
 
-          "[workspace special:thunder silent] thunderbird"
+          "[workspace special:protonmail silent] proton-mail"
           "[workspace special:spot silent] spotify"
         ];
 
@@ -148,7 +146,7 @@ in {
           "move cursor -15 -10,^(com.nextcloud.desktopclient.nextcloud)$"
           "size 400 581,^(com.nextcloud.desktopclient.nextcloud)$"
 
-          "workspace special:thunder silent,^(thunderbird)$"
+          "workspace special:protonmail silent,^(Proton Mail)$"
           "workspace special:spot silent,^(Spotify)$"
         ];
 
@@ -157,7 +155,7 @@ in {
 
           "$mainMod SHIFT, C, exec, wl-color-picker"
 
-          "$mainMod, T, togglespecialworkspace, thunder"
+          "$mainMod, P, togglespecialworkspace, protonmail"
           "$mainMod, S, togglespecialworkspace, spot"
         ];
       };