diff --git a/modules/home/application/thunderbird/default.nix b/modules/home/application/thunderbird/default.nix
index ef38a21..c05f57b 100644
--- a/modules/home/application/thunderbird/default.nix
+++ b/modules/home/application/thunderbird/default.nix
@@ -10,11 +10,14 @@ in
   };
 
   config = mkIf cfg.enable {
-    # home.packages = with pkgs; [ thunderbird ];
+    programs.thunderbird = {
+      enable = true;
+      package = pkgs.thunderbird-latest;
 
-    # programs.thunderbird = {
-    #   enable = true;
-    # };
+      profiles.${config.snowfallorg.user.name} = {
+        isDefault = true;
+      };
+    };
 
     accounts.email.accounts = {
       kruining = {
@@ -27,7 +30,7 @@ in
         };
         thunderbird = {
           enable = true;
-          profiles = [ "chris" ];
+          profiles = [ config.snowfallorg.user.name ];
         };
       };
 
diff --git a/modules/nixos/application/thunderbird/default.nix b/modules/nixos/application/thunderbird/default.nix
deleted file mode 100644
index 09856ef..0000000
--- a/modules/nixos/application/thunderbird/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ config, lib, namespace, ... }:
-let
-  inherit (lib) mkIf mkEnableOption;
-
-  cfg = config.${namespace}.application.thunderbird;
-in
-{
-  options.${namespace}.application.thunderbird = {
-    enable = mkEnableOption "enable thunderbird";
-  };
-
-  config = mkIf cfg.enable {
-    programs.thunderbird = {
-      enable = true;
-    };
-  };
-}
diff --git a/systems/x86_64-linux/manwe/default.nix b/systems/x86_64-linux/manwe/default.nix
index 510c000..c333f85 100644
--- a/systems/x86_64-linux/manwe/default.nix
+++ b/systems/x86_64-linux/manwe/default.nix
@@ -21,7 +21,6 @@
 
     application = {
       steam.enable = true;
-      thunderbird.enable = true;
     };
 
     editor = {