diff --git a/firefox/user.js b/firefox/user.js
index 31be18a..a6a2560 100755
--- a/firefox/user.js
+++ b/firefox/user.js
@@ -1,19 +1,15 @@
-# Mozilla User Preferences
-#
-# 2020/04/25
-#
-# Based on Privacy-Handbuch, merged/adjusted minimal/moderate user.js
-# Download: https://www.privacy-handbuch.de/handbuch_21u.htm
-#
-# Install when Firefox is closed!
-# Feel free to comment in or modify if you don't like the default setting.
-
+// Mozilla User Preferences
+//
+// 2020/05/20
+//
+// Based on Privacy-Handbuch, merged/adjusted minimal/moderate user.js
+// Download: https://www.privacy-handbuch.de/handbuch_21u.htm
+//
+// Install when Firefox is closed!
+// Feel free to comment in or modify if you don't like the default setting.
 
 user_pref("app.normandy.enabled", false);
-user_pref("app.normandy.api_url", "");
 user_pref("app.shield.optoutstudies.enabled", false);
-user_pref("beacon.enabled", false);
-user_pref("browser.aboutHomeSnippets.updateUrl", "");
 user_pref("browser.cache.compression_level", 1);
 user_pref("browser.cache.disk.enable", false);
 user_pref("browser.cache.disk_cache_ssl", false);
@@ -24,25 +20,15 @@ user_pref("browser.fixup.alternate.enabled", false);
 user_pref("browser.formfill.enable", false);
 user_pref("browser.link.open_newwindow.restriction", 0);
 user_pref("browser.library.activity-stream.enabled", false);
-user_pref("browser.newtabpage.activity-stream.enabled", false);
 user_pref("browser.newtabpage.enabled", false);
-user_pref("browser.newtabpage.activity-stream.asrouterExperimentEnabled", false);
 user_pref("browser.newtabpage.activity-stream.asrouter.userprefs.cfr.addons", false);
 user_pref("browser.newtabpage.activity-stream.asrouter.userprefs.cfr.features", false);
-user_pref("browser.newtabpage.activity-stream.telemetry", false);
-user_pref("browser.newtabpage.activity-stream.feeds.sections", false);
-user_pref("browser.newtabpage.activity-stream.feeds.snippets", false);
+user_pref("browser.newtabpage.enabled", false);
 user_pref("browser.newtabpage.activity-stream.feeds.telemetry", false);
-user_pref("browser.newtabpage.activity-stream.feeds.systemtick", false);
-// set just for convenience
-user_pref("browser.newtabpage.activity-stream.feeds.topsites", true);
-user_pref("browser.newtabpage.activity-stream.feeds.section.topstories.options", "");
-user_pref("browser.newtabpage.activity-stream.telemetry.ping.endpoint", "");
+user_pref("browser.newtabpage.activity-stream.telemetry", false);
 user_pref("browser.onboarding.enabled", false);
 user_pref("browser.pagethumbnails.capturing_disabled", true);
 user_pref("browser.ping-centre.telemetry", false);
-user_pref("browser.ping-centre.production.endpoint", "");
-user_pref("browser.ping-centre.staging.endpoint", "");
 user_pref("browser.privatebrowsing.autostart", false);
 user_pref("browser.safebrowsing.downloads.remote.url", " ");
 user_pref("browser.safebrowsing.downloads.enabled", false);
@@ -62,8 +48,6 @@ user_pref("browser.safebrowsing.provider.mozilla.gethashURL", "");
 user_pref("browser.safebrowsing.provider.mozilla.updateURL", "");
 user_pref("browser.search.update", false);
 user_pref("browser.search.geoSpecificDefaults", false);
-user_pref("browser.search.geoSpecificDefaults.url", "");
-user_pref("browser.search.geoip.url", "");
 user_pref("browser.search.suggest.enabled", false);
 user_pref("browser.search.reset.enabled", false);
 user_pref("browser.search.reset.whitelist", "");
@@ -89,15 +73,12 @@ user_pref("camera.control.face_detection.enabled", false);
 user_pref("camera.control.autofocus_moving_callback.enabled", false);
 user_pref("datareporting.healthreport.uploadEnabled", false);
 user_pref("datareporting.policy.dataSubmissionEnabled", false);
-//user_pref("devtools.webide.autoinstallADBHelper", false);
-//user_pref("devtools.webide.enabled", false);
 //user_pref("device.sensors.enabled", false);
 //user_pref("dom.enable_performance", false);
 //user_pref("dom.enable_performance_navigation_timing", false);
 //user_pref("dom.enable_resource_timing", false);
 //user_pref("dom.gamepad.enabled", false);
 //user_pref("dom.webnotifications.enabled", false);
-user_pref("dom.webaudio.enabled", true);
 user_pref("extensions.blocklist.enabled", false);
 user_pref("extensions.blocklist.url", "");
 user_pref("extensions.getAddons.cache.enabled", false);
@@ -111,12 +92,15 @@ user_pref("extensions.pocket.enabled", false);
 user_pref("extensions.screenshots.disabled", true);
 user_pref("extensions.screenshots.upload-disabled", true);
 user_pref("extensions.systemAddon.update.enabled", false);
-user_pref("extensions.systemAddon.update.url", "");
 user_pref("extensions.webextensions.restrictedDomains", "");
 //user_pref("font.blacklist.underline_offset", "");
 //user_pref("layers.acceleration.disabled", true);
 user_pref("media.cache_size", 0);
 user_pref("media.eme.enabled", false);
+// user_pref("media.gmp-gmpopenh264.enabled", false);
+// user_pref("media.gmp-gmpopenh264.autoupdate", false);
+// user_pref("media.gmp-gmpopenh264.provider.enabled", false);
+// user_pref("media.gmp-gmpopenh264.visible", false);
 user_pref("media.navigator.enabled", false);
 user_pref("media.navigator.video.enabled", false);
 user_pref("media.peerconnection.enabled", false);
@@ -138,10 +122,9 @@ user_pref("network.manage-offline-status", false);
 //user_pref("offline-apps.quota.warn", 0);
 user_pref("places.history.enabled", true);
 //user_pref("permissions.default.geo", 2);
-//user_pref("plugin.default.state", 0);
-//user_pref("plugins.enumerable_names", "");
-//user_pref("plugins.update.url", "");
-user_pref("privacy.clearOnShutdown.cache", false);
+user_pref("plugin.default.state", 0);
+user_pref("plugins.update.url", "");
+user_pref("privacy.clearOnShutdown.cache", true);
 user_pref("privacy.clearOnShutdown.cookies", true);
 user_pref("privacy.clearOnShutdown.downloads", true);
 user_pref("privacy.clearOnShutdown.history", false);
@@ -191,7 +174,6 @@ user_pref("toolkit.telemetry.hybridContent.enabled", false);
 user_pref("toolkit.telemetry.newProfilePing.enabled", false);
 user_pref("toolkit.telemetry.shutdownPingSender.enabled", false);
 user_pref("toolkit.telemetry.updatePing.enabled", false);
-user_pref("toolkit.telemetry.server", "");
 user_pref("toolkit.telemetry.unified", false);
 user_pref("toolkit.telemetry.infoURL", "");
 user_pref("ui.use_standins_for_native_colors", true);
@@ -201,11 +183,30 @@ user_pref("webgl.disable-fail-if-major-performance-caveat", true);
 user_pref("webgl.min_capability_mode", true);
 user_pref("webgl.enable-debug-renderer-info", false);
 
-user_pref("network.trr.resolvers", '[{ "name": "Cloudflare", "url": "https://mozilla.cloudflare-dns.com/dns-query" },{ "name": "NextDNS", "url": "https://trr.dns.nextdns.io/" },{ "name": "dnsforge.de", "url": "https://dnsforge.de/dns-query" },{ "name": "Digitale Gesellschaft (CH)", "url": "https://dns.digitale-gesellschaft.ch/dns-query" }, { "name": "Freifunk Muenchen", "url": "https://doh.ffmuc.net" }, { "name": "Quad9", "url": "https://dns.quad9.net/dns-query" }]'); 
+user_pref("network.trr.resolvers", '[{ "name": "Cloudflare", "url": "https://mozilla.cloudflare-dns.com/dns-query" },{ "name": "NextDNS", "url": "https://trr.dns.nextdns.io/" },{ "name": "dnsforge.de", "url": "https://dnsforge.de/dns-query" },{ "name": "Digitale Gesellschaft (CH)", "url": "https://dns.digitale-gesellschaft.ch/dns-query" }, { "name": "Freifunk Muenchen", "url": "https://doh.ffmuc.net" }, { "name": "BlahDNS (DE)", "url": "https://doh-de.blahdns.com/dns-query" }, { "name": "BlahDNS (FI)", "url": "https://doh-fi.blahdns.com/dns-query" }, { "name": "Quad9", "url": "https://dns.quad9.net/dns-query" }]');
 
+// adjust the following to your liking
 // 0 = use system DNS, 2 = use DNS-over-HTTPS resolver, select one in UI under network, otherwise you might end up with cloudflare
 user_pref("network.trr.mode", 0);
 
+// use system PDF reader
+user_pref("pdfjs.disabled", true);
+
+// disable flash
+user_pref("plugin.state.flash", 1);
+
+// only allow plugins which are actively confirmed
+user_pref("plugins.click_to_play", true);
+
+// disable http and FTP
+//user_pref("dom.security.https_only_mode", true);
+user_pref("network.ftp.enabled", false);
+
+// disable auto-play
+user_pref("media.autoplay.default", 1);
+user_pref("media.autoplay.enabled.user-gestures-needed", 1);
+user_pref("media.autoplay.allow-muted", false);
+
 // additionally set, should be revised
 user_pref("general.warnOnAboutConfig", false);
 user_pref("experiments.activeExperiment", false);
diff --git a/thunderbird/README.md b/thunderbird/README.md
index c8331bd..4a97a9d 100755
--- a/thunderbird/README.md
+++ b/thunderbird/README.md
@@ -1,12 +1,22 @@
-# Thunderbird 
+# Thunderbird
 
-Go to `Settings -> Advanced -> config editor`
+You can just copy the `user.js` into Thunderbird's app data directory, e.g. `%AppData%\Mozilla\Thunderbird\profileName` or `~/.thunderbird/profileName` _or_ go to `Settings -> Advanced -> config editor` when editing values manually.
 
-## Remove Autocrypt and PEP
+## Addons
+
+* Allow HTML Temp
+* Paranoia
+* DKIM Verifier
+* Enigmail
+
+## Manual configuration 
+Please follow [privacy-handbuch.de](https://www.privacy-handbuch.de/handbuch_31d.htm) as it's more detailed or use the following for okayish settings.
+
+### Remove Autocrypt and PEP
 
 In _config editor_ set to `false` or `""` for search values `pep`, `autocrypt` and `extraHeaders`.
 
-## Recommended settings
+### Recommended main settings
 
 ```
 mail.inline_attachments = false
@@ -20,31 +30,25 @@ extensions.getAddons.cache.enabled = false
 mailnews.start_page.enabled = false
 mailnews.start_page.url =
 mailnews.start_page.override_url =
+network.cookie.cookieBehavior =	1
+network.cookie.lifetimePolicy = 2
 ```
 
-## Check all folders
+### Recommended setting - Check all folders
 
 ```
 mail.server.default.check_all_folders_for_new = true
 ```
 
-## Sort view
+### Recommended settings Sort view
+
 ```
 mailnews.default_sort_type = 18
 mailnews.default_sort_order = 2 // 1 (ascending) to 2 (descending)
 mailnews.default_view_flags = 0 // 0 (unthreaded) to 1 (threaded)
 ```
 
-## Commons addons
-
-* Allow HTML Temp
-* Paranoia
-* DKIM Verifier
-* Enigmail
-
-Source: [privacy-handbuch.de](https://www.privacy-handbuch.de/handbuch_31d.htm)
-
-## Server specific settings
+### Server specific settings
 
 **POTENTIALLY DANGEROUS** and might end up in spam!
 
diff --git a/thunderbird/user.js b/thunderbird/user.js
new file mode 100755
index 0000000..3471f8e
--- /dev/null
+++ b/thunderbird/user.js
@@ -0,0 +1,115 @@
+// Mozilla User Preferences
+//
+// 2020/05/06
+//
+// Based on Privacy-Handbuch, merged/adjusted user.js
+// Download: https://privacy-handbuch.de/handbuch_31d.htm
+//
+// Install when Thunderbird is closed!
+// Feel free to comment in or modify if you don't like the default setting.
+
+user_pref("_user.js.prhdb", "tb_06052020");
+
+user_pref("beacon.enabled", false);
+user_pref("browser.chrome.site_icons", false);
+user_pref("browser.chrome.favicons", false);
+user_pref("browser.display.use_document_fonts", 0);
+user_pref("browser.cache.disk.enable", false);
+user_pref("browser.cache.memory.enable", false);
+user_pref("browser.cache.offline.enable", false);
+user_pref("browser.formfill.enable", false);
+user_pref("browser.safebrowsing.appRepURL", " ");
+user_pref("browser.safebrowsing.downloads.remote.url", "");
+user_pref("browser.safebrowsing.downloads.enabled", false);
+user_pref("browser.safebrowsing.phishing.enabled", false);
+user_pref("browser.safebrowsing.malware.enabled", false);
+user_pref("browser.safebrowsing.downloads.remote.enabled", false);
+user_pref("browser.safebrowsing.downloads.remote.block_dangerous", false);
+user_pref("browser.safebrowsing.downloads.remote.block_dangerous_host", false);
+user_pref("browser.safebrowsing.downloads.remote.block_potentially_unwanted", false);
+user_pref("browser.safebrowsing.downloads.remote.block_uncommon", false);
+user_pref("browser.safebrowsing.blockedURIs.enabled", false);
+user_pref("browser.safebrowsing.provider.google.gethashURL", "");
+user_pref("browser.safebrowsing.provider.google.updateURL", "");
+user_pref("browser.safebrowsing.provider.google4.gethashURL", "");
+user_pref("browser.safebrowsing.provider.google4.updateURL", "");
+user_pref("browser.safebrowsing.provider.mozilla.gethashURL", "");
+user_pref("browser.safebrowsing.provider.mozilla.updateURL", "");
+user_pref("calendar.useragent.extra", "");
+user_pref("datareporting.policy.dataSubmissionEnabled", false);
+user_pref("extensions.blocklist.enabled", false);
+user_pref("extensions.getAddons.cache.enabled", false);
+user_pref("extensions.enigmail.addHeaders", false);
+user_pref("extensions.enigmail.agentAdditionalParam", "--no-emit-version --no-comments");
+user_pref("extensions.enigmail.autoWkdLookup", 0);
+user_pref("extensions.enigmail.mimeHashAlgorithm", 5);
+user_pref("extensions.enigmail.useDefaultComment", true);
+user_pref("extensions.enigmail.protectedHeaders", 2);
+user_pref("extensions.enigmail.protectedSubjectText", "Encrypted Message");
+user_pref("extensions.ui.lastCategory", "addons://list/extension");
+user_pref("general.useragent.override", "");
+user_pref("javascript.enabled", false);
+user_pref("gfx.downloadable_fonts.enabled", false);
+user_pref("gfx.font_rendering.opentype_svg.enabled", false);
+user_pref("layout.css.visited_links_enabled", false);
+user_pref("mailnews.auto_config.guess.enabled", false);
+user_pref("mailnews.auto_config.fetchFromISP.sendEmailAddress", false);
+user_pref("mailnews.display.disallow_mime_handlers", 3);
+user_pref("mailnews.display.html_as", 1);
+user_pref("mailnews.display.prefer_plaintext", true);
+user_pref("mailnews.start_page.enabled", false);
+user_pref("mail.default_html_action", 1);
+user_pref("mail.identity.default.compose_html", false);
+user_pref("mail.inline_attachments", false);
+user_pref("mail.compose.big_attachments.notify", false);
+user_pref("mail.html_compose", false);
+user_pref("mail.provider.enabled", false);
+user_pref("mail.server.default.enableAutocrypt", false);
+user_pref("mail.showCondensedAddresses", false);
+user_pref("mail.smtpserver.default.hello_argument", "[127.0.0.1]");
+user_pref("mail.tabs.autoHide", true);
+user_pref("mailnews.headers.showSender", true);
+user_pref("mailnews.headers.showUserAgent", true);
+user_pref("media.hardware-video-decoding.enabled", false);
+user_pref("media.navigator.enabled", false);
+user_pref("media.peerconnection.enabled", false);
+user_pref("media.video_stats.enabled", false);
+user_pref("network.connectivity-service.enabled", false);
+user_pref("network.cookie.cookieBehavior", 2);
+user_pref("network.dns.disablePrefetch", true);
+user_pref("network.dns.disableIPv6", true);
+user_pref("network.IDN_show_punycode", true);
+user_pref("network.http.sendRefererHeader", 0);
+user_pref("network.http.speculative-parallel-limit", 0);
+user_pref("network.http.referer.XOriginPolicy", 2);
+user_pref("network.prefetch-next", false);
+user_pref("rss.display.disallow_mime_handlers", 3);
+user_pref("rss.display.html_as", 1);
+user_pref("rss.display.prefer_plaintext", true);
+user_pref("rss.show.content-base", 1);
+user_pref("security.family_safety.mode", 0);
+user_pref("security.cert_pinning.enforcement_level", 2);
+user_pref("security.mixed_content.block_display_content", false);
+user_pref("security.mixed_content.upgrade_display_content", true);
+user_pref("security.mixed_content.block_active_content", true);
+user_pref("security.OCSP.enabled", 0);
+user_pref("security.ssl.require_safe_negotiation", true);
+user_pref("security.ssl.treat_unsafe_negotiation_as_broken", true);
+user_pref("security.tls.version.min", 3);
+user_pref("purple.logging.log_chats", false);
+user_pref("purple.logging.log_ims", false);
+user_pref("purple.logging.log_system", false);
+user_pref("purple.conversations.im.send_typing", false);
+user_pref("privacy.firstparty.isolate", true);
+user_pref("security.ssl3.dhe_rsa_aes_128_sha", false);
+user_pref("security.ssl3.dhe_rsa_aes_256_sha", false);
+user_pref("security.ssl3.ecdhe_ecdsa_aes_128_sha", false);
+user_pref("security.ssl3.ecdhe_ecdsa_aes_256_sha", false);
+user_pref("security.ssl3.ecdhe_rsa_aes_128_sha", false);
+user_pref("security.ssl3.ecdhe_rsa_aes_256_sha", false);
+user_pref("security.ssl3.rsa_aes_128_sha", false);
+user_pref("security.ssl3.rsa_aes_256_sha", false);
+user_pref("security.ssl3.rsa_des_ede3_sha", false);
+
+user_pref("network.trr.resolvers", '[{ "name": "Cloudflare", "url": "https://mozilla.cloudflare-dns.com/dns-query" },{ "name": "NextDNS", "url": "https://trr.dns.nextdns.io/" },{ "name": "dnsforge.de", "url": "https://dnsforge.de/dns-query" },{ "name": "Digitale Gesellschaft (CH)", "url": "https://dns.digitale-gesellschaft.ch/dns-query" }, { "name": "Freifunk Muenchen", "url": "https://doh.ffmuc.net" }, { "name": "BlahDNS (DE)", "url": "https://doh-de.blahdns.com/dns-query" }, { "name": "BlahDNS (FI)", "url": "https://doh-fi.blahdns.com/dns-query" }, { "name": "Quad9", "url": "https://dns.quad9.net/dns-query" }]');
+