diff --git a/common/default.nix b/common/default.nix
index 7e37bf9..f37b703 100644
--- a/common/default.nix
+++ b/common/default.nix
@@ -49,6 +49,7 @@ else
       ./units-config.nix
       ./units-impl.nix
       ./verify-system
+      ./thunderbird.nix
     ];
     options = {
       vacu.rootCAs = mkOption { type = types.listOf types.str; };
diff --git a/fw/default.nix b/fw/default.nix
index 125b99a..60b0332 100644
--- a/fw/default.nix
+++ b/fw/default.nix
@@ -151,4 +151,6 @@
   services.blueman.enable = true;
 
   services.postgresql.enable = true; # for development
+
+  vacu.programs.thunderbird.enable = true;
 }
diff --git a/modules/packageSet/module.nix b/modules/packageSet/module.nix
index 51be3ce..f08de26 100644
--- a/modules/packageSet/module.nix
+++ b/modules/packageSet/module.nix
@@ -14,6 +14,9 @@ let
   packagesSetType = types.attrsOf (
     types.submodule (
       { name, config, ... }:
+      let
+        pieces = lib.splitString "." name;
+      in
       {
         options = {
           enable = mkOption {
@@ -23,7 +26,7 @@ let
           };
           package = mkOption {
             type = types.package;
-            default = pkgs.${name};
+            default = lib.attrByPath pieces (throw "Could not find package pkgs.${name}") pkgs;
             defaultText = "pkgs.${name}";
           };
           overrides = mkOption {
@@ -43,14 +46,10 @@ let
   enable = lib.mkOverride 900 true; # more important than mkDefault, less important than setting explicitly
   nameToPackageSet =
     name:
-    let
-      pieces = lib.splitString "." name;
-    in
     {
-      name = lib.last pieces;
+      inherit name;
       value = {
         inherit enable;
-        package = lib.mkDefault (lib.attrByPath pieces (throw "Could not find package pkgs.${name}") pkgs);
       };
     };
   listToPackageSet =