diff --git a/modules/home/programs/gui/thunderbird/default.nix b/modules/home/programs/gui/thunderbird/default.nix
index 8fe91a50..e7c67571 100644
--- a/modules/home/programs/gui/thunderbird/default.nix
+++ b/modules/home/programs/gui/thunderbird/default.nix
@@ -7,49 +7,35 @@
         isDefault = true;
         settings = {
           "general.autoScroll" = true;
+          "browser.download.promptForDownload" = true;
 
           "security.mixed_content.block_active_content" = true;
           "security.mixed_content.block_display_content" = true;
 
-          "extensions.enabled" = false;
-          "extensions.autoDisableScopes" = 0;
-          "extensions.allow-non-mpc-extensions" = false;
-          "extensions.installDistroAddons" = false;
-          "extensions.getAddons.cache.enabled" = false;
-          "extensions.blocklist.enabled" = true;
-          "extensions.webextensions.userSelection" = false;
-          "extensions.checkCompatibility" = false;
-          "extensions.allowRemoteAddons" = false;
-          "extensions.ui.enabled" = false;
-          "extensions.ui.useSystemTheme" = true;
           "extensions.activeThemeID" = "thunderbird-compact-dark@mozilla.org";
+          "extensions.allow-non-mpc-extensions" = false;
+          "extensions.allowRemoteAddons" = false;
+          "extensions.blocklist.enabled" = true;
+          "extensions.checkCompatibility" = false;
+          "extensions.enabled" = false;
+          "extensions.getAddons.cache.enabled" = false;
+          "extensions.ui.enabled" = false;
+          "extensions.webextensions.userSelection" = false;
 
-          "privacy.clearOnShutdown.cookies" = true;
           "privacy.clearOnShutdown.cache" = true;
+          "privacy.clearOnShutdown.cookies" = true;
           "privacy.clearOnShutdown.formdata" = true;
           "privacy.clearOnShutdown.siteSettings" = true;
-          "privacy.trackingprotection.enabled" = true;
-          "privacy.firstparty.isolate" = true;
           "privacy.donottrackheader.enabled" = true;
           "privacy.resistFingerprinting" = true;
-
-          "browser.history.enabled" = false;
-          "browser.sessionstore.privacy_level" = 2;
-          "browser.tabs.warnOnClose" = false;
-          "browser.shell.checkDefaultBrowser" = false;
-          "browser.urlbar.suggest.openpage" = false;
-          "browser.urlbar.suggest.bookmark" = false;
-          "browser.urlbar.suggest.history" = false;
-          "browser.urlbar.suggest.searches" = false;
-          "browser.urlbar.suggest.topsites" = false;
-          "browser.download.promptForDownload" = true;
+          "privacy.trackingprotection.enabled" = true;
 
           "network.cookie.cookieBehavior" = 1;
-          "network.dns.dnsOverHttps.enabled" = true;
-          "network.http.speculative-parallel-limit" = 0;
-          "network.http.pipelining" = false;
-          "network.predictor.enabled" = false;
           "network.cookie.lifetimePolicy" = 2;
+          "network.dns.dnsOverHttps.enabled" = true;
+          "network.http.pipelining" = false;
+          "network.http.speculative-parallel-limit" = 0;
+          "network.predictor.enabled" = false;
         };
       };
     };