Swapped Lemy for Rabble

* New email client section, thanks @freddy-m

* That email clients cleanup (#1990)

Co-authored-by: Freddy <freddy@privacytools.io>

README.md

@@ -45,15 +45,14 @@ If you want to discuss privacy in general, a new tool, or just something else, f
 
 Like what we're doing? [Become a backer](https://opencollective.com/privacytools) and show your support for our project.
 
-![](https://opencollective.com/privacytools/tiers/sponsor.svg?avatarHeight=64&width=890)
+<a href="https://opencollective.com/privacytools">
+	<img src="https://opencollective.com/privacytools/tiers/sponsor.svg?avatarHeight=64&width=890" height="64px" width="890px" alt="opencollective.com" />
+</a>
 
 ## Sponsors
 
 Are you working with a privacy focused company? Ask your manager or marketing team if your company would be interested in supporting our project. Your support will help us continue to develop this website, promote privacy-respecting tools and services, and reach out to thousands of data privacy newcomers every month. Also, your company's logo will show on GitHub and [our site](https://www.privacytools.io/sponsors/), and who doesn't like a little extra exposure?
 
-[![](https://opencollective.com/privacytools/tiers/gold.svg?avatarHeight=64&width=890&button=false)](https://opencollective.com/privacytools/contribute/gold-12312)
-[![](https://opencollective.com/privacytools/tiers/silver.svg?avatarHeight=64&width=890&button=false)](https://opencollective.com/privacytools/contribute/silver-12311)
-
 ## Community Translations
 - [繁体中文 / Chinese](https://privacytools.twngo.xyz/) - [GitHub](https://github.com/twngo/privacytools-zh)
 - [Español / Spanish](https://victorhck.gitlab.io/privacytools-es/) - [GitLab](https://gitlab.com/victorhck/privacytools-es)

_includes/badge.html

@@ -3,7 +3,7 @@
   href="{{ include.link }}" class="badge badge-{{ include.color | default: "info" }}"
   {% if include.tooltip %}
   data-toggle="tooltip"
-  title="{{ include.tooltip }}"><i class="{{ include.icon | default: "far fa-question-circle"}}"></i> {{ include.text }}
+  data-original-title="{{ include.tooltip }}"><i class="{{ include.icon | default: "far fa-question-circle"}}"></i> {{ include.text }}
 {% else %}><i class="{{ include.icon | default: "fas fa-external-link-alt"}}"></i> {{ include.text }}{% endif %}
 </a>
 {% else %}
@@ -11,7 +11,7 @@
   class="badge badge-{{ include.color | default: "info" }}"
   {% if include.tooltip %}
     data-toggle="tooltip"
-    title="{{ include.tooltip }}"
+    data-original-title="{{ include.tooltip }}"
     > <i class="{{ include.icon | default: "far fa-question-circle"}}"></i> {{include.text}}
   {% else %}
     > {% if include.icon %}<i class="{{ include.icon }}"></i>{% endif %} {{include.text}}

_includes/card.html

@@ -17,7 +17,7 @@
                     {% assign text = label_data[1] %}
                     {% assign tooltip = label_data[2] | default: "" %}
                     {% assign help_icon = '<i class="far fa-question-circle"></i>' %}
-                    <span class="badge badge-{{color}}" {% if tooltip %} data-toggle="tooltip" title="{{ tooltip }}">{{text}} {{ help_icon
+                    <span class="badge badge-{{color}}" {% if tooltip %} data-toggle="tooltip" data-original-title="{{ tooltip }}">{{text}} {{ help_icon
                         }}
                         {% else %}
                         >{{text}}

_includes/cardv2.html

@@ -14,7 +14,7 @@
             class="badge badge-{{color}}"
             {% if tooltip %}
               data-toggle="tooltip"
-              title="{{ tooltip }}"
+              data-original-title="{{ tooltip }}"
               > {{text}} {{ help_icon }}
             {% else %}
               > {{text}}

_includes/footer.html

@@ -55,7 +55,7 @@
       <span class="fab fa-creative-commons-zero fa-2x mr-2"></span>
       <a
         href="/LICENSE.txt"
-        title="This work is free. You can redistribute it and/or modify it under the terms of the &quot;Creative Commons CC0 1.0 Universal Public Domain Dedication&quot;."
+        data-original-title="This work is free. You can redistribute it and/or modify it under the terms of the &quot;Creative Commons CC0 1.0 Universal Public Domain Dedication&quot;."
         data-toggle="tooltip"
         data-placement="top">
         CC0

_includes/scripts.html

@@ -1,4 +1,3 @@
-<script src="/assets/js/jquery-3.3.1.min.js?v=4"></script>
 <script src="/assets/js/popper.min.js?v=4"></script>
 <script src="/assets/js/bootstrap.min.js?v=4"></script>
 <script src="/assets/js/sortable.min.js?v=4"></script>

_includes/sections/browser-addons.html

@@ -31,6 +31,19 @@
   opera="https://addons.opera.com/en/extensions/details/https-everywhere"
 %}
 
+{% include cardv2.html
+  title="Decentraleyes: Block Content Delivery Networks"
+  image="/assets/img/svg/3rd-party/decentraleyes.svg"
+  description="<strong>Decentraleyes</strong> emulates Content Delivery Networks locally by intercepting requests, finding the required resource, and injecting it into the environment. This all happens instantaneously, automatically, and no prior configuration is required."
+  website="https://decentraleyes.org/"
+  privacy-policy="https://decentraleyes.org/privacy-policy/"
+  forum="https://forum.privacytools.io/t/discussion-decentraleyes/269"
+  gitlab="https://git.synz.io/Synzvato/decentraleyes"
+  firefox="https://addons.mozilla.org/firefox/addon/decentraleyes"
+  chrome="https://chrome.google.com/webstore/detail/decentraleyes/ldpochfccmkkmhdbclfhpagapcfdljkj"
+  opera="https://addons.opera.com/extensions/details/decentraleyes"
+%}
+
 {% include cardv2.html
   title="ClearURLs"
   image="/assets/img/svg/3rd-party/clearurls.svg"
@@ -62,22 +75,23 @@
   <li><a href="https://floccus.org/">floccus</a> - Synchronize bookmarks across browsers via Nextcloud, WebDAV or a local file (and thus any file sync solution). For <a href="https://addons.mozilla.org/firefox/addon/floccus/">Firefox</a>, <a href="https://chrome.google.com/webstore/detail/floccus-bookmarks-sync/fnaicdffflnofjppbagibeoednhnbjhg">Chrome</a>, <a href="https://microsoftedge.microsoft.com/addons/detail/gjkddcofhiifldbllobcamllmanombji">Edge</a>.</li>
 </ul>
 
-<h2 id="afunc" class="anchor"><a href="#afunc"><i class="fas fa-link anchor-icon"></i></a> Additional Functionality</h2>
+<h2>Additional Functionality</h2>
 
 <div class="alert alert-secondary" role="alert">
   These add-ons don't necessarily add to your privacy when browsing the web, but add additional functionality to your browser you may find useful.
 </div>
 
 {% include cardv2.html
-title="PrivacySpy"
-  image="/assets/img/svg/3rd-party/privacyspy.svg"
-  description="<strong>PrivacySpy</strong> uses a consistent rubric to grade major services' privacy practices on a ten-point scale. It's a new open source project that is dedicated to making privacy policies more accessible."
-  website="https://privacyspy.org/"
-  privacy-policy="https://privacyspy.org/terms-and-privacy"
-  forum="https://forum.privacytools.io/t/discussion-privacyspy/4508"
-  github="https://github.com/politiwatch"
-  firefox="https://addons.mozilla.org/firefox/addon/privacyspy"
-  chrome="https://chrome.google.com/webstore/detail/ppembnadnhiknioggbglgiciihgmkmnd"
+  title="Terms of Service; Didn’t Read: Be Informed"
+  image="/assets/img/svg/3rd-party/terms_of_service_didnt_read.svg"
+  description='<strong>Terms of Service; Didn’t Read</strong> is an addon that believes "I have read and agree to the Terms of Service" is the biggest lie on the web, and wants to fix it by grading websites based on their terms of service agreements and privacy policies. It also gives short summaries of those agreements. The analysis and ratings are published transparently by a community of reviewers.'
+  website="https://tosdr.org/"
+  privacy-policy="https://addons.mozilla.org/firefox/addon/terms-of-service-didnt-read/privacy/"
+  forum="https://forum.privacytools.io/t/discussion-terms-of-service-didn-t-read/270"
+  github="https://github.com/tosdr/"
+  firefox="https://addons.mozilla.org/firefox/addon/terms-of-service-didnt-read/"
+  chrome="https://chrome.google.com/webstore/detail/terms-of-service-didn%E2%80%99t-r/hjdoplcnndgiblooccencgcggcoihigg"
+  opera="https://addons.opera.com/extensions/details/terms-of-service-didnt-read"
 %}
 
 {% include cardv2.html
@@ -91,7 +105,9 @@ title="PrivacySpy"
   chrome="https://chrome.google.com/webstore/detail/snowflake/mafpmfcccpbjnhfhjnllmmalhifmlcie"
 %}
 
-<h2 id="psmanage" class="anchor"><a href="#psmanage"><i class="fas fa-link anchor-icon"></i></a> Persistent storage management (Desktop only)</h2>
+<h2>Persistent storage management</h2>
+
+<h3>Desktop</h3>
 
 <div class="alert alert-warning" role="alert">
   These add-ons are the preferred method for controlling persistent storage data that various websites and web-apps may create on your computer.
@@ -119,7 +135,34 @@ title="PrivacySpy"
   firefox="https://addons.mozilla.org/firefox/addon/multi-account-containers/"
 %}
 
-<h2 id="advaddons" class="anchor"><a href="#advaddons"><i class="fas fa-link anchor-icon"></i></a> For Advanced Users</h2>
+<h3>Android</h3>
+
+<div class="alert alert-warning" role="alert">
+  Unfortunately the Android version of Firefox <a href="https://bugzilla.mozilla.org/show_bug.cgi?id=1398097">doesn't support managing tabs as containers</a>. The recommended extensions below are a substitute, however as APIs do not exist for clearing <a href="https://en.wikipedia.org/wiki/Indexed_Database_API">IndexedDB</a>, <a href="https://en.wikipedia.org/wiki/Progressive_web_application#Service_workers">Service Workers</a> cache, <a href="https://en.wikipedia.org/wiki/Progressive_web_application#AppCache_(obsolete)">appCache</a>, or cache by host. As a result they are not as good as the above Temporary Container suggestions.
+</div>
+
+{% include cardv2.html
+  title="ETag Stoppa"
+  image="/assets/img/svg/3rd-party/etag_stoppa.svg"
+  description="<strong>ETag Stoppa</strong> Prevents Firefox from storing entity tags by removing ETag response headers unconditionally and without exceptions."
+  website="https://addons.mozilla.org/firefox/addon/etag-stoppa/"
+  forum=""
+  github="https://github.com/claustromaniac/etag-stoppa"
+  firefox="https://addons.mozilla.org/firefox/addon/etag-stoppa/"
+%}
+
+{% include cardv2.html
+  title="Cookie AutoDelete: Automatically Delete Cookies"
+  image="/assets/img/png/3rd-party/cookie_autodelete.png"
+  description="<strong>Cookie AutoDelete</strong> automatically removes cookies, lingering sessions, and other information that can be used to spy on you when they are no longer used by open browser tabs."
+  website="https://addons.mozilla.org/firefox/addon/cookie-autodelete/"
+  forum="https://forum.privacytools.io/t/discussion-cookie-autodelete/267"
+  github="https://github.com/Cookie-AutoDelete/Cookie-AutoDelete"
+  firefox="https://addons.mozilla.org/firefox/addon/cookie-autodelete"
+  chrome="https://chrome.google.com/webstore/detail/cookie-autodelete/fhcgjolkccmbidfldomjliifgaodjagh"
+%}
+
+<h2>For Advanced Users</h2>
 
 <div class="alert alert-warning" role="alert">
   These addons require quite a lot of interaction from the user, and some of them completely replace the add-ons we've recommended above. Some sites may not work properly without careful configuration.

_includes/sections/browser-easy-tweaks.html

@@ -1,64 +0,0 @@
-<h1 id="easy_tweaks" class="anchor"><a href="#easy_tweaks"><i class="fas fa-link anchor-icon"></i></a> Firefox: Easy Privacy Enhancing Tweaks</h1>
-
-<div class="alert alert-success" role="alert">With <a href="https://blog.mozilla.org/blog/2020/08/04/latest-firefox-rolls-out-enhanced-tracking-protection-2-0-blocking-redirect-trackers-by-default/">Enhanced Tracking Protection (ETP)</a> that Firefox offers, you can <a href="https://blog.mozilla.org/blog/2019/09/03/todays-firefox-blocks-third-party-tracking-cookies-and-cryptomining-by-default/">control cookies</a> and data saved on your device.</div>
-
-<h2>Enhanced Tracking Protection</h2>
-<p>ETP can be made more strict by clicking on the main menu (or Edit) and then <strong>Preferences</strong>. From the side menu select <strong>&#128274; Privacy &amp; Security</strong>.</p>
-
-<p>We recommend that <strong>All third-party cookies</strong> be blocked. The only pages likely to break under this configuration are <a href="https://en.wikipedia.org/wiki/Social_login">social logins</a> (i.e. authentication with services using your Google, Facebook account etc). Social logins are terrible for privacy and they link all services you use to a single identity, that is mostly used for advertising purposes, such as targeted advertising.
-
-<p>When you use a social login you also run the risk of being locked out of services you use, if you lose access to the account. We recommend creating <strong>individual accounts</strong> with <strong>separate passwords</strong>. Passwords can be managed with a <a href="software/passwords/">Password Manager</a>.</p>
-
-For more information about <a href="https://support.mozilla.org/kb/trackers-and-scripts-firefox-blocks-enhanced-track">Enhanced Tracking Protection</a>, see Mozilla's for <a href="https://support.mozilla.org/kb/enhanced-tracking-protection-firefox-desktop">Desktop</a> and <a href="https://support.mozilla.org/kb/enhanced-tracking-protection-firefox-android">Android</a>.
-
-The only suggestion we would make is to switch from <strong>standard</strong> to <strong>custom</strong> with the configuration listed below.
-
-<h5>Custom</h5>
-<ul class="checkmark">
-  <li><img src="/assets/img/svg/etp/3rdpartycookies-disabled.svg"
-       class="mx-3" width="15" height="15"
-       title="3rd Party Cookies disabled"
-       alt="3rd Party Cookies disabled">
-    Cookies: <strong>All third-party cookies (may cause websites to break)</strong>
-  </li>
-  <li><img src="/assets/img/svg/etp/tracker-image-disabled.svg"
-       class="mx-3" width="15" height="15"
-       title="Tracking content disabled"
-       alt="Tracking content disabled">
-    Tracking content: <strong> In all windows</strong>
-  </li>
-  <li><img src="/assets/img/svg/etp/cryptominers-disabled.svg"
-       class="mx-3" width="15" height="15"
-       title="Cryptominers disabled"
-       alt="Cryptominers disabled">
-    Cryptominers
-  </li>
-  <li><img src="/assets/img/svg/etp/fingerprinters-disabled.svg"
-       class="mx-3" width="15" height="15"
-       title="Fingerprinters disabled"
-       alt="Fingerprinters disabled">
-    Fingerprinters
-  </li>
-</ul>
-
-<p>The <strong>strict</strong> setting will only block known cross-site and/or social media trackers. This may still let through third party cookies that can be used for tracking.</p>
-
-<h2>Firefox sessions and saved data</h2>
-<p>We also suggest clearing history, and persistent data upon close of your browser. If you wish to remain logged in for some websites we suggest <a href="https://support.mozilla.org/kb/block-websites-storing-cookies-site-data-firefox">setting some exceptions</a>. For desktop users we suggest using the <a href="/browsers/#psaddons">Persistent storage management</a> addons.</p>
-
-<h5>History</h5>
-Firefox will <strong>Use custom settings for history</strong>
-<ul class="checkmark">
-  <li>Remember browsing and download history</li>
-  <li>Clear history when Firefox closes</li><br>
-  Next select <strong>Settings&#8230;</strong> the <strong>Settings for Clearing History</strong> will load. Make sure there is a checkmark next to each item:
-  <ul class="checkmark">
-    <li>Browsing &amp; Download History</li>
-    <li>Active Logins</li>
-    <li>Form &amp; Search History</li>
-    <li>Cookies</li>
-    <li>Cache</li>
-    <li>Data</li>
-    <li>Offline Website Data</li>
-  </ul>
-</ul>

_includes/sections/browser-tweaks.html

@@ -1,4 +1,4 @@
-<h1 id="about_config" class="anchor"><a href="#about_config"><i class="fas fa-link anchor-icon"></i></a> Firefox: Advanced Privacy Tweaks using "about:config"</h1>
+<h1 id="about_config" class="anchor"><a href="#about_config"><i class="fas fa-link anchor-icon"></i></a> Firefox: Privacy Related "about:config" Tweaks</h1>
 
 <div class="alert alert-success" role="alert">This is a collection of privacy-related <strong>about:config</strong> tweaks. We'll show you how to enhance the privacy of your Firefox browser.</div>
 
@@ -6,43 +6,38 @@
 
 <ol>
   <li>Enter "about:config" in the firefox address bar and press enter.</li>
-  <li>Press the button "Accept the Risk and Continue"</li>
-  <li>Copy and paste each of the preferences below (for example "<strong>webgl.disabled</strong>") into the search bar, and set each of them to the stated value (such as "true").</li>
+  <li>Press the button "Accept the Risk and Continue" [FF71+] or "I accept the risk".</li>
+  <li>Copy and paste each of the preferences below (for example "webgl.disabled") into the search bar, and set each of them to the stated value (such as "true").</li>
 </ol>
 
-<h4>Firefox Desktop:</h4>
+<h3>Getting started:</h3>
 
-<h5 id="fpid" class="anchord"><a href="#fpi"><i class="fas fa-link anchor-icon"></i></a> First Party Isolation</h5>
-<p>These settings should be safe, however first party isolation may break some third party login systems.</p>
 <dl class="long-string-list">
   <dt>privacy.firstparty.isolate = true</dt>
   <dd>A result of the <a href="https://wiki.mozilla.org/Security/Tor_Uplift">Tor Uplift</a> effort, this preference isolates all browser identifier sources (e.g. cookies) to the first party domain, with the goal of preventing tracking across different domains. (Don't do this if you are using the Firefox Addon "Cookie AutoDelete" with Firefox v58 or below.)</dd>
 
-<h5 id="rfpd" class="anchor"><a href="#rfpd"><i class="fas fa-link anchor-icon"></i></a> Resist Fingerprinting</h5>
-<p>One of the features of resist fingerprinting is to set the reported browser timezone to UTC. If you depend on having your real time zone reported to the websites you visit, this setting may break that.</p>
   <dt>privacy.resistFingerprinting = true</dt>
   <dd>A result of the <a href="https://wiki.mozilla.org/Security/Tor_Uplift">Tor Uplift</a> effort, this preference makes Firefox more resistant to browser fingerprinting.</dd>
 
-<h5 id="blockOut" class="anchor"><a href="#blockOut"><i class="fas fa-link anchor-icon"></i></a> Block outbound</h5>
+  <dt>privacy.trackingprotection.fingerprinting.enabled = true</dt>
+  <dd>[FF67+] Blocks Fingerprinting</dd>
+
+  <dt>privacy.trackingprotection.cryptomining.enabled = true</dt>
+  <dd>[FF67+] Blocks CryptoMining</dd>
+
+  <dt>privacy.trackingprotection.enabled = true</dt>
+  <dd>This is Mozilla's new built-in tracking protection. One of it's benefits is blocking tracking (i.e. Google Analytics) on <a href="https://github.com/gorhill/uMatrix/wiki/Privileged-Pages">privileged pages</a> where add-ons that usually do that are disabled.</dd>
+
   <dt>browser.send_pings = false</dt>
   <dd>The attribute would be useful for letting websites track visitors' clicks.</dd>
 
-  <dt>Disable Firefox prefetching pages it thinks you will visit next:</dt>
-  <dd>
-  Prefetching causes cookies from the prefetched site to be loaded and other potentially unwanted behavior. Details <a href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Link_prefetching_FAQ">here</a> and <a href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/X-DNS-Prefetch-Control">here</a>.
-  <ul>
-    <li>network.dns.disablePrefetch = true</li>
-    <li>network.dns.disablePrefetchFromHTTPS = true</li>
-    <li>network.predictor.enabled = false</li>
-    <li>network.predictor.enable-prefetch = false</li>
-    <li>network.prefetch-next = false</li>
-  </dd>
-
-<h5 id="locbar" class="anchor"><a href="#locbar"><i class="fas fa-link anchor-icon"></i></a> Location bar</h5>
   <dt>browser.urlbar.speculativeConnect.enabled = false</dt>
   <dd>Disable preloading of autocomplete URLs. Firefox preloads URLs that autocomplete when a user types into the address bar, which is a concern if URLs are suggested that the user does not want to connect to. <a href="https://www.ghacks.net/2017/07/24/disable-preloading-firefox-autocomplete-urls/">Source</a></dd>
 
-<h5 id="plugins" class="anchor"><a href="#plugins"><i class="fas fa-link anchor-icon"></i></a> Plugins</h5>
+
+  <dt>dom.event.clipboardevents.enabled = false</dt>
+  <dd>Disable that websites can get notifications if you copy, paste, or cut something from a web page, and it lets them know which part of the page had been selected.</dd>
+
   <dt>media.eme.enabled = false</dt>
   <dd>
   <p>Disables playback of DRM-controlled HTML5 content, which, if enabled, automatically downloads the Widevine Content Decryption Module provided by Google Inc. <a href="https://support.mozilla.org/kb/enable-drm#w_opt-out-of-cdm-playback-uninstall-cdms-and-stop-all-cdm-downloads">Details</a></p>
@@ -52,22 +47,21 @@
   <dt>media.gmp-widevinecdm.enabled = false</dt>
   <dd>Disables the Widevine Content Decryption Module provided by Google Inc., used for the playback of DRM-controlled HTML5 content. <a href="https://support.mozilla.org/kb/enable-drm#w_disable-the-google-widevine-cdm-without-uninstalling">Details</a></dd>
 
-<h5 id="hwfping" class="anchor"><a href="#hwfping"><i class="fas fa-link anchor-icon"></i></a> Hardware Fingerprinting</h5>
   <dt>media.navigator.enabled = false</dt>
   <dd>Websites can track the microphone and camera status of your device.</dd>
 
-<h5 id="pstorage" class="anchor"><a href="#pstorage"><i class="fas fa-link anchor-icon"></i></a> Persistent Storage</h5>
   <dt>network.cookie.cookieBehavior = 1</dt>
   <dd>
-  Disable cookies. 2 is likely to break some sites. 4 is the default default. 1 is more strict than 4.
+  Disable cookies
   <ul>
+    <li>0 = Accept all cookies by default</li>
     <li>1 = Only accept from the originating site (block third-party cookies)</li>
     <li>2 = Block all cookies by default</li>
-    <li>4 = Block Cross-site and social media trackers</li>
   </ul>
   </dd>
 
-<h5 id="headref" class="anchor"><a href="#headref"><i class="fas fa-link anchor-icon"></i></a> Headers/Referers</h5>
+
+
   <dt>network.http.referer.XOriginPolicy = 2</dt>
   <dd>
   Only send <code>Referer</code> header when the full hostnames match. (Note: if you notice significant breakage, you might try <code>1</code> combined with an <code>XOriginTrimmingPolicy</code> tweak below.) <a href="https://feeding.cloud.geek.nz/posts/tweaking-referrer-for-privacy-in-firefox/">Source</a>
@@ -88,12 +82,9 @@
   </ul>
   </dd>
 
-<h5 id="mediad" class="anchor"><a href="#mediad"><i class="fas fa-link anchor-icon"></i></a> Media</h5>
-<p>This may break some websites which use VOIP based features.</p>
   <dt>webgl.disabled = true</dt>
   <dd>WebGL is a potential security risk. <a href="https://security.stackexchange.com/questions/13799/is-webgl-a-security-concern">Source</a></dd>
 
-<h5 id="sessions" class="anchor"><a href="#sessions"><i class="fas fa-link anchor-icon"></i></a> Sessions and session restoration</h5>
   <dt>browser.sessionstore.privacy_level = 2</dt>
   <dd>
   This preference controls when to store extra information about a session: contents of forms, scrollbar positions, cookies, and POST data. <a href="http://kb.mozillazine.org/Browser.sessionstore.privacy_level">Details</a>
@@ -104,44 +95,35 @@
   </ul>
   </dd>
 
-<h5 id="misc" class="anchor"><a href="#misc"><i class="fas fa-link anchor-icon"></i></a> Miscellaneous</h5>
   <dt>beacon.enabled = false</dt>
   <dd>Disables sending additional analytics to web servers. <a href="https://developer.mozilla.org/en-US/docs/Web/API/Navigator/sendBeacon">Details</a></dd>
 
+  <dt>browser.safebrowsing.downloads.remote.enabled = false</dt>
+  <dd>Prevents Firefox from sending information about downloaded executable files to Google Safe Browsing to determine whether it should be blocked for safety reasons. <a href="https://support.mozilla.org/en-US/kb/how-does-phishing-and-malware-protection-work#w_what-information-is-sent-to-mozilla-or-its-partners-when-phishing-and-malware-protection-are-enabled">Details</a></dd>
+
+  <dt>Disable Firefox prefetching pages it thinks you will visit next:</dt>
+  <dd>
+  Prefetching causes cookies from the prefetched site to be loaded and other potentially unwanted behavior. Details <a href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Link_prefetching_FAQ">here</a> and <a href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/X-DNS-Prefetch-Control">here</a>.
+  <ul>
+    <li>network.dns.disablePrefetch = true</li>
+    <li>network.dns.disablePrefetchFromHTTPS = true</li>
+    <li>network.predictor.enabled = false</li>
+    <li>network.predictor.enable-prefetch = false</li>
+    <li>network.prefetch-next = false</li>
+  </dd>
+
   <dt>network.IDN_show_punycode = true</dt>
   <dd>Not rendering IDNs as their Punycode equivalent leaves you open to phishing attacks that can be very difficult to notice. <a href="https://krebsonsecurity.com/2018/03/look-alike-domains-and-visual-confusion/#more-42636">Source</a></dd>
 
-<h5 id="sb" class="anchor"><a href="#sb"><i class="fas fa-link anchor-icon"></i></a> Safe Browsing</h5>
-  <dt>browser.safebrowsing.downloads.remote.enabled = false</dt>
-  <dd>Prevents Firefox from sending information about downloaded executable files to Google Safe Browsing to determine whether it should be blocked for safety reasons. <a href="https://support.mozilla.org/en-US/kb/how-does-phishing-and-malware-protection-work#w_what-information-is-sent-to-mozilla-or-its-partners-when-phishing-and-malware-protection-are-enabled">Details</a></dd>
-
-<h4>Firefox Android (Fenix):</h4>
-
-<h5 id="fpia" class="anchor"><a href="#fpia"><i class="fas fa-link anchor-icon"></i></a> First Party Isolation</h5>
-<p>These settings should be safe, however first party isolation may break some third party login systems.</p>
-  <dt>privacy.firstparty.isolate = true</dt>
-  <dd>A result of the <a href="https://wiki.mozilla.org/Security/Tor_Uplift">Tor Uplift</a> effort, this preference isolates all browser identifier sources (e.g. cookies) to the first party domain, with the goal of preventing tracking across different domains. (Don't do this if you are using the Firefox Addon "Cookie AutoDelete" with Firefox v58 or below.)</dd>
-
-<h5 id="rfpa" class="anchor"><a href="#rfpa"><i class="fas fa-link anchor-icon"></i></a> Resist Fingerprinting</h5>
-<p>One of the features of resist fingerprinting is to set the reported browser timezone to UTC. If you depend on having your real time zone reported to the websites you visit, this setting may break that.</p>
-  <dt>privacy.resistFingerprinting = true</dt>
-  <dd>A result of the <a href="https://wiki.mozilla.org/Security/Tor_Uplift">Tor Uplift</a> effort, this preference makes Firefox more resistant to browser fingerprinting.</dd>
-  <dt>privacy.resistFingerprinting.letterboxing = true</dt>
-  <dd>This sets the resolution of your Firefox window to a standard resolution. Only use this if you are using the above <strong>privacy.resistFingerprinting</strong>
-
-<h5 id="mediaa" class="anchor"><a href="#mediaa"><i class="fas fa-link anchor-icon"></i></a> Media</h5>
-<p>This may break some websites which use VOIP based features.</p>
-  <dt>webgl.disabled = true</dt>
-  <dd>WebGL is a potential security risk. <a href="https://security.stackexchange.com/questions/13799/is-webgl-a-security-concern">Source</a></dd>
-
-  <dt>Disable WebRTC</dt>
-  <dd>See <a href="#webrtc"><i class="fas fa-link"></i> WebRTC</a> section</dd>
+  <dt>Looking for TRR, DoH or ESNI?</dt>
+  <dd>They have moved to <a href="/providers/dns/#dns">our DNS page</a>.</dd>
 
 <h3 id="user.js">Firefox user.js Templates</h3>
 <ul>
-  <li><a href="https://github.com/arkenfox/user.js">arkenfox user.js</a> An ongoing comprehensive user.js template for configuring and hardening Firefox privacy, security and anti-fingerprinting. <strong>Desktop Firefox Only</strong></li>
+   <li><a href="https://github.com/arkenfox/user.js">arkenfox user.js</a> (formerly ghacks-user.js) - An ongoing comprehensive user.js template for configuring and hardening Firefox privacy, security and anti-fingerprinting.</li>
 </ul>
 
+
 <h3>Related Information</h3>
 
 <ul>

_includes/sections/cloud-storage.html

@@ -8,7 +8,6 @@
   title="Nextcloud - Choose your hoster"
   image="/assets/img/svg/3rd-party/nextcloud.svg"
   description="<strong>Nextcloud</strong> is a suite of free and open-source client-server software for creating your own file hosting services on a private server you control. The only limits on storage and bandwidth are the limits on the <a href=\"/providers/hosting\">server provider</a> you choose."
-  labels="color==warning::link==https://github.com/nextcloud/end_to_end_encryption/issues/111::text==Experimental E2EE::tooltip==Regarding E2EE their description states 'End-to-end encryption is still in alpha state, don't use this in production and only with test data!'."
   website="https://nextcloud.com/"
   privacy-policy="https://nextcloud.com/privacy/"
   forum="https://forum.privacytools.io/t/discussion-nextcloud/287"

_includes/sections/dns.html

@@ -95,7 +95,7 @@ We also log how many times this or that tracker has been blocked. We need this i
         <td>
           <div
             class="btn-secondary btn-icon"
-            title="&quot;No logs.&quot;"
+            data-original-title="&quot;No logs.&quot;"
             data-toggle="tooltip"
             data-placement="bottom">
             <span class="fas fa-globe"></span>
@@ -186,7 +186,7 @@ We also log how many times this or that tracker has been blocked. We need this i
         <td>
           <div
             class="btn-secondary btn-icon"
-            title="&quot;CZ.NIC resolvers neither collect any personal data nor gather information on pages where your computer sends personal data.&quot;"
+            data-original-title="&quot;CZ.NIC resolvers neither collect any personal data nor gather information on pages where your computer sends personal data.&quot;"
             data-toggle="tooltip"
             data-placement="bottom">
             <span class="fas fa-globe"></span>
@@ -507,7 +507,7 @@ We also log how many times this or that tracker has been blocked. We need this i
         <td>
           <div
             class="btn-secondary btn-icon"
-            title="&quot;Absolutely nothing is being logged, neither about the users nor the usage of this service. I do keep graphs of the total number of queries, but no personally identifiable information is saved. The data that is saved will never be sold or used for anything except capacity planning of the service.&quot;"
+            data-original-title="&quot;Absolutely nothing is being logged, neither about the users nor the usage of this service. I do keep graphs of the total number of queries, but no personally identifiable information is saved. The data that is saved will never be sold or used for anything except capacity planning of the service.&quot;"
             data-toggle="tooltip"
             data-placement="bottom">
             <span class="fas fa-globe"></span>
@@ -538,97 +538,113 @@ We also log how many times this or that tracker has been blocked. We need this i
 </h1>
 
 {%
-	include cardv2.html
-	title="Unbound"
-	image="/assets/img/svg/3rd-party/unbound.svg"
-	description='A validating, recursive, caching DNS resolver, supporting DNS-over-TLS, and has been <a href="https://ostif.org/our-audit-of-unbound-dns-by-x41-d-sec-full-results/">independently audited</a>.'
-	website="https://nlnetlabs.nl/projects/unbound/about/"
-	forum="https://forum.privacytools.io/t/discussion-unbound/3563"
-	github="https://github.com/NLnetLabs/unbound"
+  include cardv2.html
+  title="Unbound"
+  image="/assets/img/svg/3rd-party/unbound.svg"
+  description='A validating, recursive, caching DNS resolver, supporting DNS-over-TLS, and has been <a href="https://ostif.org/our-audit-of-unbound-dns-by-x41-d-sec-full-results/">independently audited</a>.'
+  website="https://nlnetlabs.nl/projects/unbound/about/"
+  forum="https://forum.privacytools.io/t/discussion-unbound/3563"
+  github="https://github.com/NLnetLabs/unbound"
 %}
 
 {%
-	include cardv2.html
-	title="dnscrypt-proxy"
-	image="/assets/img/svg/3rd-party/dnscrypt-proxy.svg"
-	description='A DNS proxy with support for DNSCrypt, DNS-over-HTTPS, and <a href="https://github.com/DNSCrypt/dnscrypt-protocol/blob/master/ANONYMIZED-DNSCRYPT.txt">Anonymized DNSCrypt</a>, a <a href="https://github.com/DNSCrypt/dnscrypt-proxy/wiki/Anonymized-DNS">relay-based protocol that the hides client IP address.</a>'
-	website="https://github.com/DNSCrypt/dnscrypt-proxy/wiki"
-	forum="https://forum.privacytools.io/t/discussion-dnscrypt-proxy/1498"
-	github="https://github.com/DNSCrypt/dnscrypt-proxy"
+  include cardv2.html
+  title="dnscrypt-proxy"
+  image="/assets/img/svg/3rd-party/dnscrypt-proxy.svg"
+  description='A DNS proxy with support for DNSCrypt, DNS-over-HTTPS, and <a href="https://github.com/DNSCrypt/dnscrypt-protocol/blob/master/ANONYMIZED-DNSCRYPT.txt">Anonymized DNSCrypt</a>, a <a href="https://github.com/DNSCrypt/dnscrypt-proxy/wiki/Anonymized-DNS">relay-based protocol that the hides client IP address.</a>'
+  website="https://github.com/DNSCrypt/dnscrypt-proxy/wiki"
+  forum="https://forum.privacytools.io/t/discussion-dnscrypt-proxy/1498"
+  github="https://github.com/DNSCrypt/dnscrypt-proxy"
 %}
 
 {%
-	include cardv2.html
-	title="Stubby"
-	image="/assets/img/png/3rd-party/stubby.png"
-	description='An application that acts as a local DNS-over-TLS stub resolver. Stubby can be used in <a href="https://dnsprivacy.org/wiki/display/DP/DNS+Privacy+Clients#DNSPrivacyClients-Unbound/Stubbycombination">combination with Unbound</a> by managing the upstream TLS connections (since Unbound cannot yet re-use TCP/TLS connections) with Unbound providing a local cache.'
-	website="https://dnsprivacy.org/wiki/display/DP/DNS+Privacy+Daemon+-+Stubby"
-	forum="https://forum.privacytools.io/t/discussion-stubby/3582"
-	github="https://github.com/getdnsapi/stubby"
+  include cardv2.html
+  title="Stubby"
+  image="/assets/img/png/3rd-party/stubby.png"
+  description='An application that acts as a local DNS-over-TLS stub resolver. Stubby can be used in <a href="https://dnsprivacy.org/wiki/display/DP/DNS+Privacy+Clients#DNSPrivacyClients-Unbound/Stubbycombination">combination with Unbound</a> by managing the upstream TLS connections (since Unbound cannot yet re-use TCP/TLS connections) with Unbound providing a local cache.'
+  website="https://dnsprivacy.org/wiki/display/DP/DNS+Privacy+Daemon+-+Stubby"
+  forum="https://forum.privacytools.io/t/discussion-stubby/3582"
+  github="https://github.com/getdnsapi/stubby"
 %}
 
 {%
-	include cardv2.html
-	title="Firefox's built-in DNS-over-HTTPS resolver"
-	image="/assets/img/svg/3rd-party/firefox_browser.svg"
-	description='Firefox comes with built-in DNS-over-HTTPS support for <a href="https://blog.mozilla.org/blog/2020/02/25/firefox-continues-push-to-bring-dns-over-https-by-default-for-us-users/">NextDNS and Cloudflare</a> but users can manually any other DoH resolver.'
-	labels="color==warning::icon==fas fa-exclamation-triangle::link==https://developers.cloudflare.com/1.1.1.1/privacy/firefox::text==Warning::tooltip==Cloudflare logs a limited amount of data about the DNS requests that are sent to their custom resolver for Firefox."
-	website="https://support.mozilla.org/en-US/kb/firefox-dns-over-https"
-	privacy-policy="https://wiki.mozilla.org/Security/DOH-resolver-policy"
-	forum="https://forum.privacytools.io/t/discussion-firefox-s-built-in-dns-over-https-resolver/3564"
+  include cardv2.html
+  title="Firefox's built-in DNS-over-HTTPS resolver"
+  image="/assets/img/svg/3rd-party/firefox_browser.svg"
+  description='Firefox comes with built-in DNS-over-HTTPS support for <a href="https://blog.mozilla.org/blog/2020/02/25/firefox-continues-push-to-bring-dns-over-https-by-default-for-us-users/">NextDNS and Cloudflare</a> but users can manually use any other DoH resolver.'
+  labels="color==warning::icon==fas fa-exclamation-triangle::link==https://developers.cloudflare.com/1.1.1.1/privacy/firefox::text==Warning::tooltip==Cloudflare logs a limited amount of data about the DNS requests that are sent to their custom resolver for Firefox."
+  website="https://support.mozilla.org/en-US/kb/firefox-dns-over-https"
+  privacy-policy="https://wiki.mozilla.org/Security/DOH-resolver-policy"
+  forum="https://forum.privacytools.io/t/discussion-firefox-s-built-in-dns-over-https-resolver/3564"
 %}
 
 <h1 id="dns-android-clients" class="anchor">
-	<a href="#dns-android-clients">
-		<i class="fas fa-link anchor-icon"></i>
-	</a> Encrypted DNS Client Recommendations for Android
+  <a href="#dns-android-clients">
+    <i class="fas fa-link anchor-icon"></i>
+  </a> Encrypted DNS Client Recommendations for Android
 </h1>
 
 {%
-	include cardv2.html
-	title="Android 9's built-in DNS-over-TLS resolver"
-	image="/assets/img/svg/3rd-party/android.svg"
-	description="Android 9 (Pie) comes with built-in DNS-over-TLS support without the need for a 3rd-party application."
-	labels="color==warning::icon==fas fa-exclamation-triangle::link==https://developers.google.com/speed/public-dns/docs/using#android_9_pie_or_later::text==Warning::tooltip==Android 9's DoT settings have no effect when used concurrently with VPN-based apps which override the DNS."
-	website="https://support.google.com/android/answer/9089903#private_dns"
-	forum="https://forum.privacytools.io/t/discussion-android-9s-built-in-dns-over-tls-resolver/3562"
+  include cardv2.html
+  title="Android 9's built-in DNS-over-TLS resolver"
+  image="/assets/img/svg/3rd-party/android.svg"
+  description="Android 9 (Pie) comes with built-in DNS-over-TLS support without the need for a 3rd-party application."
+  labels="color==warning::icon==fas fa-exclamation-triangle::link==https://developers.google.com/speed/public-dns/docs/using#android_9_pie_or_later::text==Warning::tooltip==Android 9's DoT settings have no effect when used concurrently with VPN-based apps which override the DNS."
+  website="https://support.google.com/android/answer/9089903#private_dns"
+  forum="https://forum.privacytools.io/t/discussion-android-9s-built-in-dns-over-tls-resolver/3562"
 %}
 
 {%
-	include cardv2.html
-	title="Nebulo"
-	image="/assets/img/png/3rd-party/nebulo.png"
-	description='An open-source Android client supporting DNS-over-HTTPS and DNS-over-TLS, caching DNS responses, and locally logging DNS queries.'
-	website="https://git.frostnerd.com/PublicAndroidApps/smokescreen/-/blob/master/README.md"
-	privacy-policy="https://smokescreen.app/privacypolicy"
-	forum="https://forum.privacytools.io/t/discussion-nebulo/3565"
-	fdroid="https://git.frostnerd.com/PublicAndroidApps/smokescreen#f-droid"
-	googleplay="https://play.google.com/store/apps/details?id=com.frostnerd.smokescreen"
-	source="https://git.frostnerd.com/PublicAndroidApps/smokescreen"
+  include cardv2.html
+  title="Nebulo"
+  image="/assets/img/png/3rd-party/nebulo.png"
+  description='An open-source Android client supporting DNS-over-HTTPS and DNS-over-TLS, caching DNS responses, and locally logging DNS queries.'
+  website="https://git.frostnerd.com/PublicAndroidApps/smokescreen/-/blob/master/README.md"
+  privacy-policy="https://smokescreen.app/privacypolicy"
+  forum="https://forum.privacytools.io/t/discussion-nebulo/3565"
+  fdroid="https://git.frostnerd.com/PublicAndroidApps/smokescreen#f-droid"
+  googleplay="https://play.google.com/store/apps/details?id=com.frostnerd.smokescreen"
+  source="https://git.frostnerd.com/PublicAndroidApps/smokescreen"
 %}
 
 <h1 id="dns-ios-clients" class="anchor">
-	<a href="#dns-ios-clients">
-		<i class="fas fa-link anchor-icon"></i>
-	</a> Encrypted DNS Client Recommendations for iOS
+  <a href="#dns-ios-clients">
+    <i class="fas fa-link anchor-icon"></i>
+  </a> Encrypted DNS Client Recommendations for iOS
 </h1>
 
 {%
-	include cardv2.html
-	title="DNSCloak"
-	image="/assets/img/png/3rd-party/dnscloak.png"
-	description='An open-source iOS client supporting DNS-over-HTTPS, DNSCrypt, and <a href="https://github.com/DNSCrypt/dnscrypt-proxy/wiki">dnscrypt-proxy</a> options such as caching DNS responses, locally logging DNS queries, and custom block lists. Users can <a href="https://blog.privacytools.io/adding-custom-dns-over-https-resolvers-to-dnscloak/">add custom resolvers by DNS stamp</a>.'
-	website="https://github.com/s-s/dnscloak/blob/master/README.md"
-	privacy-policy="https://drive.google.com/file/d/1050No_pU74CAWUS5-BwQWyO2x_aiMzWc/view"
-	forum="https://forum.privacytools.io/t/discussion-dnscloak/3566"
-	ios="https://apps.apple.com/app/id1452162351"
-	github="https://github.com/s-s/dnscloak"
+  include cardv2.html
+  title="DNSCloak"
+  image="/assets/img/png/3rd-party/dnscloak.png"
+  description='An open-source iOS client supporting DNS-over-HTTPS, DNSCrypt, and <a href="https://github.com/DNSCrypt/dnscrypt-proxy/wiki">dnscrypt-proxy</a> options such as caching DNS responses, locally logging DNS queries, and custom block lists. Users can <a href="https://blog.privacytools.io/adding-custom-dns-over-https-resolvers-to-dnscloak/">add custom resolvers by DNS stamp</a>.'
+  website="https://github.com/s-s/dnscloak/blob/master/README.md"
+  privacy-policy="https://drive.google.com/file/d/1050No_pU74CAWUS5-BwQWyO2x_aiMzWc/view"
+  forum="https://forum.privacytools.io/t/discussion-dnscloak/3566"
+  ios="https://apps.apple.com/app/id1452162351"
+  github="https://github.com/s-s/dnscloak"
 %}
 
+<h2 id="appledns" class="anchor">
+  <a href="#appledns">
+    <i class="fas fa-link anchor-icon"></i>
+  </a>Apple's native support
+</h2>
+
+<p>
+  In iOS, iPadOS, tvOS 14 and macOS 11, DoT and DoH were introduced. DoT and DoH are supported natively by installation of profiles (through mobileconfig files opened in <em>Safari</em>).
+  After installation, the encrypted DNS server can be selected in <em>Settings &rarr; General &rarr; VPN and Network &rarr; DNS</em>.
+</p>
+
+<ul>
+  <li><strong>Signed profiles</strong> are offered by <a href="https://adguard.com/en/blog/encrypted-dns-ios-14.html">AdGuard</a> and <a href="https://apple.nextdns.io/">NextDNS</a>.</li>
+  <li>User contributed <strong>unsigned profiles</strong> for several DNS providers are hosted by <a href="https://encrypted-dns.party/">encrypted-dns.party</a>.</li>
+</ul>
+
 <h2 id="dns-definitions" class="anchor">
-	<a href="#dns-definitions">
-		<i class="fas fa-link anchor-icon"></i>
-	</a> Definitions
+  <a href="#dns-definitions">
+    <i class="fas fa-link anchor-icon"></i>
+  </a> Definitions
 </h2>
 
 <h4>DNS-over-TLS (DoT)</h4>

_includes/sections/email-clients.html

@@ -1,51 +1,99 @@
-<h1 id="clients" class="anchor"><a href="#clients"><i class="fas fa-link anchor-icon"></i></a> Email Clients</h1>
+<h1 id="desktopclients" class="anchor"><a href="#desktopclients"><i class="fas fa-link anchor-icon"></i></a> Desktop Email Clients</h1>
 
 {% include cardv2.html
   title="Thunderbird"
   image="/assets/img/svg/3rd-party/thunderbird.svg"
   description="Thunderbird is a free, open source, cross-platform email, newsgroup, news feed, and chat (XMPP, IRC, Twitter) client developed by the Thunderbird community, and previously by the Mozilla Foundation."
   website="https://www.thunderbird.net/"
-  privacy-policy="https://www.mozilla.org/en-US/privacy/thunderbird/"
+  privacy-policy="https://www.mozilla.org/privacy/thunderbird/"
   forum="https://forum.privacytools.io/t/discussion-thunderbird/659"
   source="https://hg.mozilla.org/comm-central/"
-  windows="https://www.thunderbird.net/en-US/"
-  mac="https://www.thunderbird.net/en-US/"
-  linux="https://www.thunderbird.net/en-US/"
+  windows="https://www.thunderbird.net"
+  mac="https://www.thunderbird.net"
+  linux="https://www.thunderbird.net/"
   freebsd="https://www.freshports.org/mail/thunderbird/"
   openbsd="http://openports.se/mail/mozilla-thunderbird"
   netbsd="http://pkgsrc.se/mail/thunderbird"
 %}
 
 {% include cardv2.html
-  title="Claws Mail"
-  image="/assets/img/png/3rd-party/claws_mail.png"
-  description="Claws Mail is a free and open source, GTK-based email and news client. It offers easy configuration and an abundance of features. It is included with Gpg4win, an encryption suite for Windows."
-  website="https://www.claws-mail.org/"
-  forum="https://forum.privacytools.io/t/discussion-claws-mail/660"
-  git="https://git.claws-mail.org/"
-  windows="https://www.claws-mail.org/win32/"
-  mac="https://www.claws-mail.org/faq/index.php/Installation_and_Configuration#What_do_I_need_to_compile_Claws_Mail.3F"
-  linux="https://www.claws-mail.org/downloads.php?section=downloads"
-  freebsd="https://www.freshports.org/mail/claws-mail/"
-  openbsd="http://openports.se/mail/claws-mail"
-  netbsd="http://pkgsrc.se/mail/claws-mail"
+  title="Mailpile"
+  image="/assets/img/svg/3rd-party/mailpile.svg"
+  description="Mailpile is a free, community funded, open source email client with user-friendly encryption and privacy features."
+  website="https://www.mailpile.is/"
+  privacy-policy="https://www.mailpile.is/privacy.html"
+  tor="clgs64523yi2bkhz.onion"
+  forum="https://forum.privacytools.io/t/"
+  github="https://github.com/mailpile/Mailpile"
+  linux="https://www.mailpile.is/download/linux.html"
 %}
 
-
-<h3>Privacy Email Tools</h3>
-
-<ul>
-  <li><a href="https://www.gpg4usb.org/">gpg4usb</a> - A very easy to use and small portable editor to encrypt and decrypt any text-message or -file. For Windows and Linux. <a href="https://theprivacyguide.org/tutorials/gpg.html">GPG tutorial</a>.</li>
-  <li><a href="https://www.mailvelope.com/">Mailvelope</a> - A browser extension that enables the exchange of encrypted emails following the <a href="https://theprivacyguide.org/tutorials/pgp.html">OpenPGP encryption standard</a>.</li>
-  <li><a href="https://www.enigmail.net/">Enigmail</a> - A security extension to Thunderbird and Seamonkey. It enables you to write and receive email messages signed and/or encrypted with the <a href="https://theprivacyguide.org/tutorials/pgp.html">OpenPGP standard</a>.</li>
-  <li><a href="https://addons.thunderbird.net/thunderbird/addon/torbirdy/">TorBirdy</a> - TorBirdy configures Thunderbird to make connections over the Tor anonymity network. This extension is in beta and should be considered experimental.</li>
-  <li><a href="https://www.emailprivacytester.com/">Email Privacy Tester</a> - This tool will send an Email to your address and perform privacy-related tests.</li>
-</ul>
+{% include cardv2.html
+  title="Mailvelope"
+  image="/assets/img/svg/3rd-party/mailvelope.svg"
+  description="Mailvelope is a browser extension that enables the exchange of encrypted emails following the OpenPGP encryption standard."
+  website="https://www.mailvelope.com/en"
+  privacy-policy="https://www.mailvelope.com/en/privacy-policy"
+  forum="https://forum.privacytools.io/t/"
+  github="https://github.com/mailvelope/mailvelope"
+  firefox="https://addons.mozilla.org/firefox/addon/mailvelope/"
+  chrome="https://chrome.google.com/webstore/detail/mailvelope/kajibbejlbohfaggdiogboambcijhkke?hl"
+  edge="https://microsoftedge.microsoft.com/addons/detail/mailvelope/dgcbddhdhjppfdfjpciagmmibadmoapc"
+%}
 
 <h3>Worth Mentioning</h3>
 
 <ul>
-  <li><a href="https://github.com/k9mail/k-9/releases">K-9 Mail</a> - An independent mail application for Android. It supports both POP3 and IMAP mailboxes, but only supports push mail for IMAP.</li>
-  <li><a href="https://www.gnupg.org/">GNU Privacy Guard</a> - Email Encryption. GnuPG is a GPL Licensed alternative to the PGP suite of cryptographic software. <a href="https://theprivacyguide.org/tutorials/gpg.html">Tutorial.</a> Use <a href="https://gpgtools.org/">GPGTools for macOS.</a></li>
-  <li><a href="https://www.mailpile.is/">Mailpile (Beta)</a> - A modern, fast web-mail client with user-friendly encryption and privacy features.</li>
+  <li><a href="https://neomutt.org/">NeoMutt</a> - NeoMutt is an open-source command line mail reader (or MUA) for Linux and BSD. It’s a fork of <a href="https://en.wikipedia.org/wiki/Mutt_(email_client)">Mutt</a> with added features.
 </ul>
+
+
+
+<h1 id="mobileclients" class="anchor"><a href="#mobileclients"><i class="fas fa-link anchor-icon"></i></a> Mobile Email Clients</h1>
+
+<h2 id="adroidclients" class="anchor"><a href="#adroidclients"><i class="fas fa-link anchor-icon"></i></a> Android Email Clients</h1>
+
+{% include cardv2.html
+  title="FairEmail"
+  image="/assets/img/svg/3rd-party/fairemail.svg"
+  description="FairEmail is a minimal, open source email app, using open standards (IMAP, SMTP, OpenPGP) with a low data and battery usage."
+  website="https://email.faircode.eu/"
+  privacy-policy="https://github.com/M66B/FairEmail/blob/master/PRIVACY.md"
+  forum="https://forum.privacytools.io/t/"
+  github="https://github.com/M66B/FairEmail"
+  fdroid="https://f-droid.org/en/packages/eu.faircode.email/"
+  googleplay="https://play.google.com/store/apps/details?id=eu.faircode.email"
+%}
+
+{% include cardv2.html
+  title="K-9 Mail"
+  image="/assets/img/svg/3rd-party/k9mail.svg"
+  description="K-9 Mail is an independent mail application that supports both POP3 and IMAP mailboxes, but only supports push mail for IMAP."
+  website="https://k9mail.app/"
+  privacy-policy="https://k9mail.app/privacy"
+  forum="https://forum.privacytools.io/t/"
+  github="https://github.com/k9mail"
+  fdroid="https://f-droid.org/packages/com.fsck.k9/"
+  googleplay="https://play.google.com/store/apps/details?id=com.fsck.k9"
+%}
+
+<h2 id="iosclients" class="anchor"><a href="#iosclients"><i class="fas fa-link anchor-icon"></i></a> iOS Email Clients</h1>
+
+{% include cardv2.html
+  title="Canary Mail"
+  image="/assets/img/svg/3rd-party/canarymail.svg"
+  labels="color==warning::link==https://canarymail.io/faq.html::text==Closed source::tooltip==The source programming code for Canary Mail is not available. Canary Mail is a proprietary application."
+  description="Canary Mail is a paid email client designed to make end-to-end encryption seamless with security features such as a biometric app lock."
+  website="https://canarymail.io/"
+  privacy-policy="https://canarymail.io/privacy.html"
+  forum="https://forum.privacytools.io/t/"
+  ios="https://apps.apple.com/us/app/canary-mail/id1236045954"
+%}
+
+
+<h3>Worth Mentioning</h3>
+
+<ul>
+  <li><a href="https://letterbox-app.org/">Letterbox</a> - Letterbox is a free open-source mail client for iOS made as a part of an ongoing research project at the Freie Universität Berlin, Germany.</li>
+</ul>
+

_includes/sections/file-encryption.html

@@ -55,21 +55,26 @@
 <h3>Worth Mentioning</h3>
 
 <ul>
-  <li><a href="https://cryptomator.org/">Cryptomator</a> - Free client-side AES encryption for your cloud files. Open source software: No backdoors, no registration.
+  <li>
+    <a href="https://cryptomator.org/">Cryptomator</a> - Free client-side AES encryption for your cloud files. Open source software: No backdoors, no registration.
     {% include badge.html
-    color="warning"
-    icon="fas fa-exclamation-triangle"
-    link="https://github.com/cryptomator/cryptomator-android/issues/1#issuecomment-257979375"
-    tooltip="Cryptomator's mobile apps are not open-source."
-    %}</li>
+      color="warning"
+      text="Closed source"
+      icon="fas fa-exclamation-triangle"
+      link="https://github.com/cryptomator/cryptomator-android/issues/1#issuecomment-257979375"
+      tooltip="Cryptomator's mobile apps are not open-source."
+    %}
+  </li>
   <li><a href="https://gitlab.com/cryptsetup/cryptsetup/">Linux Unified Key Setup (LUKS)</a> - A full disk encryption system for Linux using dm-crypt as the disk encryption backend. Included by default in Ubuntu. Available for Windows and Linux.</li>
   <li><a href="https://www.dyne.org/software/tomb/">Tomb</a> - A simple zsh script for making LUKS containers on the commandline.</li>
   <li><a href="https://hat.sh/">Hat.sh</a> - A cross-platform, serverless JavaScript web application that provides secure file encryption using the AES-256-GCM algorithm in your browser. It can also be downloaded and run offline.</li>
-  <li><a href="https://www.keka.io/">Keka</a> - A macOS-only, file archiver with the ability to encrypt files.
-    {% include badge.html
-    color="warning"
-    icon="fas fa-exclamation-triangle"
-    link="https://github.com/aonez/Keka#so-where-is-the-source-code"
-    tooltip="This software is no longer open source."
-    %}</li>
+    <li>
+      <a href="https://kryptor.co.uk/">Kryptor</a> is a file encryption program for Windows, MacOS, and Linux.
+      {% include badge.html
+        color="warning"
+        icon="fas fa-exclamation-triangle"
+        text="Beta"
+        tooltip="As Kryptor is still in beta, it may not be stable."
+      %}
+    </li>
 </ul>

_includes/sections/notebooks.html

@@ -63,6 +63,7 @@
 <h3>Worth Mentioning</h3>
 
 <ul>
+  <li><a href="https://www.etesync.com/">EteSync</a> - Secure, end-to-end encrypted, and privacy respecting sync for your contacts, calendars, tasks and notes.</li>
   <li><a href="https://paperwork.cloud/">Paperwork</a> - An open-source and self-hosted solution. For PHP / MySQL servers.</li>
   <li><a href="https://orgmode.org">Org-mode</a> - A major mode for GNU Emacs. Org-mode is for keeping notes, maintaining TODO lists, planning projects, and authoring documents with a fast and effective plain-text system. </li>
 </ul>

_includes/sections/selfhosted-cloud.html

@@ -8,7 +8,6 @@
   title="Nextcloud"
   image="/assets/img/svg/3rd-party/nextcloud.svg"
   description="<strong>Nextcloud</strong> is a suite of free and open-source client-server software for creating your own file hosting services on a private server you control. The only limits on storage and bandwidth are the limits on the <a href=\"/providers/hosting\">server provider</a> you choose."
-  labels="color==warning::link==https://github.com/nextcloud/end_to_end_encryption/issues/111::text==Experimental E2EE::tooltip==Regarding E2EE their description states 'End-to-end encryption is still in alpha state, don't use this in production and only with test data!'."
   website="https://nextcloud.com/"
   privacy-policy="https://nextcloud.com/privacy/"
   forum="https://forum.privacytools.io/t/discussion-nextcloud/287"

_includes/sections/social-news-aggregator.html

@@ -29,20 +29,21 @@ web="https://tildes.net"
 %}
 
 {% include cardv2.html
-title="Raddle"
-image="/assets/img/png/3rd-party/raddle.png"
-description="Raddle is a public Postmill instance focused on privacy and anti-censorship."
-website="https://raddle.me"
-privacy-policy="https://raddle.me/wiki/privacy_policy"
-forum="https://forum.privacytools.io/t/discussion-raddle/1258"
-gitlab="https://gitlab.com/postmill/"
-web="https://raddle.me"
+title="Lemmy"
+image="/assets/img/png/3rd-party/lemmy.svg"
+description="An <a href="https://github.com/dessalines/lemmy/blob/master/LICENSE">AGPL</a>-licensed self-hostable link aggregator intended to work in the <a href="https://www.wikipedia.org/wiki/Fediverse">Fediverse</a>."
+website="https://dev.lemmy.ml/"
+forum="https://forum.privacytools.io/t/"
+github="https://github.com/LemmyNet/lemmy/"
+web="https://dev.lemmy.ml/"
 %}
 
 <h3>Worth Mentioning</h3>
 
 <ul>
   <li><a href="https://beta.akasha.world/">Akasha</a> - A decentralized online bulletin board using <a href="https://www.wikipedia.org/wiki/InterPlanetary_File_System">IPFS</a> and <a href="https://www.wikipedia.org/wiki/Ethereum">Ethereum</a>.</li>
-  <li><a href="https://dev.lemmy.ml/">Lemmy</a> - An <a href="https://github.com/dessalines/lemmy/blob/master/LICENSE">AGPL</a>-licensed self-hostable link aggregator intended to work in the <a href="https://www.wikipedia.org/wiki/Fediverse">Fediverse</a>.</li>
+  <li><a href="https://raddle.me">Raddle</a> - A is a public Postmill instance focused on privacy and anti-censorship.</li>
   <li><a href="https://notabug.io/">notabug.io</a> - A <a href="https://github.com/notabugio/notabug/blob/master/LICENSE.md">free and open-source</a> P2P link aggregator with a strong resemblance to old.reddit.com (not to be confused with <a href="https://notabug.org/">NotABug.org</a>).</li>
+  <li><a href="https://freepo.st">freepost</a> - A <a href="https://notabug.org/zPlus/freepost/src/master/LICENSE">free and open-source</a> discussion board based on free software and free culture with a highly motivated community.
+
 </ul>

_includes/sponsors/gold.html

@@ -22,4 +22,11 @@
       title="Insurgo Technologies Libres / Open Technologies — Empower yourself!"
       alt="Insurgo Logo" />
   </a>
+  <a class="m-3" href="https://joindeleteme.com" target="_blank" rel="noreferrer">
+    <img
+      src="/assets/img/png/3rd-party/sponsors/deleteme.png"
+      height="70rem"
+      title="DeleteMe is a hands-free subscription service that removes your personal information from data brokers and prevents it from being sold online."
+      alt="DeleteMe Logo" />
+  </a>
 </div>

_includes/sponsors/list.html

@@ -1,5 +1,7 @@
 <ul class="d-flex flex-wrap list-group-flush">
+  <li class="list-group-item flex-fill">Alex</li>
   <li class="list-group-item flex-fill">Daw-Ran Liou</li>
+  <li class="list-group-item flex-fill">Greg Werbin</li>
   <li class="list-group-item flex-fill">Michael DeMichillie</li>
   <li class="list-group-item flex-fill">Nathan Myers</li>
   <li class="list-group-item flex-fill">PablO</li>

assets/css/style.scss

@@ -28,11 +28,6 @@ a,
   }
 }
 
-ul.checkmark {
-  list-style-type: '\2714';
-  display:block;
-}
-
 .card-ol {
   padding-left: 1.25rem;
 }
@@ -411,3 +406,55 @@ input#nav-toggle,
   font-size: 0.875em;
   content: "\f186";
 }
+
+/* Vanilla CSS implementation for tooltip */
+[data-toggle="tooltip"] {
+  cursor: pointer;
+  position: relative;
+  z-index: 1337;
+}
+
+[data-toggle="tooltip"]:before,
+[data-toggle="tooltip"]:after {
+  opacity: 0;
+  transition: opacity 0.15s linear;
+  pointer-events: none;
+}
+
+[data-toggle="tooltip"]:before {
+  background-color: #000;
+  border-radius: 3px;
+  bottom: 150%;
+  content: attr(data-original-title);
+  color: #fff;
+  font-size: 14px;
+  left: 50%;
+  line-height: 1.2;
+  margin-bottom: 5px;
+  margin-left: -100px;
+  padding: 7px;
+  position: absolute;
+  text-align: center;
+  width: 200px;
+}
+
+/* Little arrow */
+[data-toggle="tooltip"]:after {
+  border-style: solid;
+  border-left-color: transparent;
+  border-right-color: transparent;
+  border-top-color: #000;
+  border-width: 5px;
+  border-bottom: none;
+  bottom: 150%;
+  content: " ";
+  left: 50%;
+  margin-left: -5px;
+  position: absolute;
+  width: 0;
+}
+
+[data-toggle="tooltip"]:hover:before,
+[data-toggle="tooltip"]:hover:after {
+  opacity: .9;
+}

assets/img/svg/3rd-party/fairemail.svg

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="128" height="128" version="1.1" viewBox="0 0 33.867 33.867" xmlns="http://www.w3.org/2000/svg"><defs><linearGradient id="color-1" x2="0" gradientUnits="userSpaceOnUse"><stop stop-opacity=".3" offset="0"/><stop stop-opacity="0" offset="1"/></linearGradient></defs><g transform="matrix(.7697 0 0 .7697 -1.5394 -1.5394)" font-family="none" font-size="none" font-weight="none" stroke-miterlimit="10" text-anchor="none" style="mix-blend-mode:normal"><path d="m7 43c-1.1046 0-2-0.89543-2-2v-34c0-1.1046 0.89543-2 2-2h34c1.1046 0 2 0.89543 2 2v34c0 1.1046-0.89543 2-2 2z" fill="#039be5"/><path d="m31.816 16.184h-15.632c-1.0796 0-1.9442 0.87442-1.9442 1.954l-0.0098 11.724c0 1.0796 0.87442 1.954 1.954 1.954h15.632c1.0796 0 1.954-0.87442 1.954-1.954v-11.724c0-1.0796-0.87442-1.954-1.954-1.954zm0 3.908-7.8161 4.885-7.8161-4.885v-1.954l7.8161 4.885 7.8161-4.885z" fill="none" stroke-width="0"/><path d="m33.77 18.138v11.724c0 1.0796-0.87442 1.954-1.954 1.954h-15.632c-1.0796 0-1.954-0.87442-1.954-1.954l0.0098-11.724c0-1.0796 0.86465-1.954 1.9442-1.954h15.632c1.0796 0 1.954 0.87442 1.954 1.954zm-1.954 0-7.8161 4.885-7.8161-4.885v1.954l7.8161 4.885 7.8161-4.885z" fill="#fff" stroke-width="0"/><g fill="none"><path d="m2 24c0-12.15 9.8497-22 22-22s22 9.8497 22 22-9.8497 22-22 22-22-9.8497-22-22z"/><rect x="2" y="2" width="44" height="22"/><path d="m2 24v-22h44v22z"/><path d="m2 24v-22h44v22z"/><path d="m2 24v-22h44v22z"/><path d="m2 24v-22h44v22z"/></g></g></svg>

assets/img/svg/3rd-party/mailpile.svg

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="128" height="128" version="1.1" viewBox="0 0 33.867 33.867" xmlns="http://www.w3.org/2000/svg"><g transform="matrix(.66524 0 0 .66524 -.96517 4.1927)"><g fill="#3a6b8c"><polygon points="31.845 13.283 30.104 2.644 24.619 9.464 21.684 12.224 25.706 16.172 30.831 19.932 30.34 20.619 26.846 18.665 20.871 12.907 17.647 16.924 12.939 14.392 11.562 17.32 6.347 24.443 5.34 23.793 10.494 16.707 12.289 13.473 7.505 11.245 1.663 7.159 2.218 14.629 4.142 25.806 14.08 26.266 25.38 23.949 31.398 23.161 32.59 21.342"/><polygon points="8.158 4.18 1.451 5.672 8.049 9.999 13.166 12.295 17.285 15.103 19.747 12.096 23.805 8.276 29.932 1.152 17.013 2.814"/></g><g fill="#a31304"><polygon points="38.792 31.277 39.955 24.488 35.223 27.465 32.873 28.522 34.481 31.744 36.794 35.083 36.356 35.396 34.651 33.488 32.239 28.765 29.455 30.521 27.139 28.01 25.697 29.492 21.063 32.711 20.59 32.107 25.18 28.899 26.937 27.319 24.511 24.978 22.343 25.521 20.612 25.922 19.447 33.074 25.356 35.422 32.665 36.375 36.464 37.152 37.563 36.301"/><polygon points="40.162 23.551 33.186 22.152 32.029 23.9 28.28 24.32 26.385 24.489 25.48 24.721 27.711 26.791 29.617 29.346 31.729 28.041 34.976 26.578"/></g><path d="m49.834 2.655-7.384 1.315-7.405 1.542-2.728 0.433 1.311 7.074 1.35 6.243 4.976-1.134 7.71-1.351 4.696-1.044-1.01-4.363zm-4.591 11.343 0.073 0.423-2.605 0.403-5.568 1.019-0.08-0.463-0.113-0.472 2.204-0.486 0.03-5e-3 3.517-0.531 2.488-0.343zm-8.631-0.677-1e-3 -0.36 2.865-0.582 2.808-0.494 1.329-0.286 1.144-0.211 0.101 0.769-1.396 0.317-3.988 0.682-2.714 0.56zm7.806-3.594 0.095 0.434-2.764 0.534-2.992 0.457-2.437 0.434-0.219-0.808 5.709-1.049 2.569-0.423zm4.722-3.305-2.325 0.365-0.326-1.106-0.15-1.333 1.068-0.134 1.336-0.275 0.319 1.245z" fill="#4b7945"/></g></svg>

assets/img/svg/3rd-party/mailvelope.svg

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="128" height="128" version="1.1" viewBox="0 0 33.867 33.867" xmlns="http://www.w3.org/2000/svg"><g transform="matrix(4 0 0 4 -201.36 -187.41)" fill-rule="evenodd" stroke-width=".26458"><circle cx="54.572" cy="51.087" r="4.2333" fill="#ff004f"/><path d="m54.571 54.438c-0.89694 0-1.7383-0.34687-2.3693-0.97658-0.63156-0.6305-0.98002-1.4729-0.98081-2.3723a3.3412 3.3412 0 0 1 0.15663-1.0149l0.0018-0.0074c0.02302-0.08096 0.05133-0.15875 0.08414-0.23151 0.0058-0.01455 0.01243-0.03069 0.01931-0.04657 0.0291-0.06641 0.1442-0.29501 0.42016-0.46831 0.2495-0.1569 0.46831-0.17039 0.49371-0.17145 0.06032-0.0071 0.12277-0.01058 0.18494-0.01058 0.2831 0 0.53314 0.11192 0.70432 0.31591 0.13018 0.15531 0.20108 0.34581 0.20638 0.55483a1.1433 1.1433 0 0 1 0.51832-0.12726c0.2831 0 0.5334 0.11218 0.70432 0.31591 0.01032 0.01217 0.02011 0.02487 0.0299 0.03757 0.22728-0.22542 0.52731-0.35348 0.83079-0.35348 0.2831 0 0.53314 0.11218 0.70432 0.31591 0.17357 0.2069 0.24156 0.4789 0.19103 0.76544l-0.1778 1.0073c-0.02381 0.13573 0.0045 0.25982 0.07964 0.34952 0.0725 0.08652 0.18415 0.13414 0.31406 0.13414 0.39211 0 0.52996-0.28575 0.62045-0.59425 0.07752-0.27332 0.11324-0.55748 0.1061-0.84429a2.8244 2.8244 0 0 0-0.85169-1.9545 2.8265 2.8265 0 0 0-1.9698-0.8165h-0.01958c-0.56621 0-1.1136 0.16669-1.5827 0.48286a0.25665 0.25665 0 0 1-0.14393 0.04419 0.25347 0.25347 0 0 1-0.19288-0.08864l-0.0013-0.0016a0.254 0.254 0 0 1 0.05186-0.37518 3.3298 3.3298 0 0 1 1.936-0.57044 3.3348 3.3348 0 0 1 2.2886 0.97102 3.334 3.334 0 0 1 0.9943 2.2786 3.3507 3.3507 0 0 1-0.10848 0.95409h2.64e-4l-0.01138 0.0418-5e-3 0.01667a3.3258 3.3258 0 0 1-0.10583 0.31406c-0.0209 0.04948-0.13705 0.30242-0.42307 0.48207-0.24738 0.15558-0.44265 0.16351-0.46567 0.16404a1.2938 1.2938 0 0 1-0.11615 0.0053c-0.2831 0-0.5334-0.11218-0.70432-0.31591-0.17357-0.20717-0.24156-0.47889-0.19103-0.76544l0.1778-1.0075c0.02381-0.13547-0.0045-0.25982-0.07964-0.34925-0.0725-0.08652-0.18415-0.13414-0.31406-0.13414-0.3085 0-0.61516 0.26194-0.66966 0.57203l-0.19447 1.0578a0.1397 0.1397 0 0 1-0.13758 0.1143h-0.23363a0.13944 0.13944 0 0 1-0.13758-0.16484l0.20161-1.0964c0.02381-0.13494-0.0045-0.25929-0.07937-0.34899-0.07276-0.08625-0.18442-0.13388-0.31432-0.13388-0.30824 0-0.61489 0.26194-0.66966 0.57203l-0.1942 1.0578a0.1397 0.1397 0 0 1-0.13758 0.1143h-0.23336a0.13917 0.13917 0 0 1-0.13758-0.16484l0.20214-1.1004 0.13547-0.74057c0.02381-0.13467-0.0048-0.25823-0.0799-0.34793-0.0725-0.08652-0.18415-0.13414-0.31406-0.13414-0.32015 0-0.52626 0.12303-0.64929 0.38708a2.821 2.821 0 0 0-0.19976 1.1663c0.02858 0.72416 0.33496 1.4057 0.86254 1.9188 0.52784 0.51303 1.2179 0.8001 1.9428 0.80883h0.03413c0.59955 0 1.1734-0.18521 1.6595-0.53605a0.24924 0.24924 0 0 1 0.14684-0.04763 0.25453 0.25453 0 0 1 0.14949 0.46117 3.3261 3.3261 0 0 1-1.9571 0.63209" fill="#fff2f6"/></g></svg>

assets/img/svg/3rd-party/privacyspy.svg

@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="128" height="128" version="1.1" viewBox="0 0 33.867 33.867" xmlns="http://www.w3.org/2000/svg"><g id="fingerprint" transform="matrix(.091982 0 0 .091982 -1.4319 -1.7656)" fill="#202020"><path d="m187.89 20.011c-56.055 5.836-104.18 33.869-132.62 77.255-17.71 27.016-43.556 94.786-43.556 114.21 0 14.178 18.302 21.359 27.9 10.947 2.823-3.062 3.275-4.263 6.731-17.882 20.808-81.975 52.937-124.67 108.33-143.95 97.472-33.927 194.13 36.69 200.45 146.44 3.312 57.515-39.038 105.48-73.195 82.908-19.564-12.93-21.571-21.661-13.762-59.861 10.015-48.992 1.365-72.203-33.407-89.639-47.664-23.901-88.926-0.797-109.32 61.212-14.419 43.84-4.916 105.76 22.765 148.33 10.174 15.648 27.047 33.654 34.037 36.323 10.441 3.988 21.658-3.562 21.658-14.576 0-6.02-1.74-8.837-11.929-19.319-43.259-44.502-53.583-121.56-22.621-168.84 14.224-21.719 31.863-25.494 55.214-11.815 15.766 9.235 18.182 18.966 12.12 48.799-9.382 46.167-6.382 65.457 13.214 84.96 40.176 39.985 96.72 25.264 124.69-32.463 20.191-41.667 16.649-101.12-9.077-152.34-33.003-65.715-107.57-107.99-177.63-100.69m1.178 53.496c-85.832 8.259-142.86 118.61-118.26 228.84 5.186 23.238 10.812 30.464 22.124 28.415 12.984-2.351 15.885-9.902 11.13-28.965-27.116-108.69 35.548-213.83 115.52-193.8 62.457 15.637 88.885 67.878 68.602 135.6-5.391 18.003 6.86 31.308 21.806 23.683 13.72-6.999 21.801-62.411 14.196-97.337-11.42-52.441-57.47-90.99-115.24-96.468-9.392-0.891-10.23-0.889-19.874 0.038m3.119 121.4c-7.475 2.413-13.126 9.52-13.833 17.397-2.223 24.748 32.384 31.258 39.321 7.397 4.397-15.125-10.513-29.628-25.488-24.794" fill-rule="evenodd"/></g></svg>

assets/img/svg/etp/3rdpartycookies-disabled.svg

@@ -1,7 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity">
-  <path d="M15.379,8a.142.142,0,0,0,.02,0,7.978,7.978,0,0,1-1.858-.356.981.981,0,0,1-.054.847,1,1,0,1,1-1.735-.994.981.981,0,0,1,.481-.407c-.069-.036-.13-.083-.2-.121L6.613,12.387a.977.977,0,0,1-.4.476.85.85,0,0,1-.117.04L4.031,14.969c.509.219,1,.24,1.161-.147-.424,1.025,2.823,1.668,2.822.558,0,1.11,3.246.461,2.821-.564.425,1.025,3.175-.816,2.39-1.6.785.784,2.621-1.97,1.6-2.394C15.846,11.246,16.489,8,15.379,8Zm-5.073,5a1,1,0,1,1,1-1A1,1,0,0,1,10.306,13Z"/>
-  <path d="M14.707,1.293a1,1,0,0,0-1.414,0L9.679,4.907A7.942,7.942,0,0,1,8,.61C8,.619,8,.626,8,.635,8-.474,4.753.174,5.179,1.2,4.753.174,2,2.016,2.788,2.8,2,2.016.167,4.77,1.193,5.193.167,4.77-.476,8.016.634,8.015c-1.11,0-.461,3.247.564,2.821-.639.265-.163,1.428.475,2.077l-.38.38a1,1,0,1,0,1.414,1.414l12-12A1,1,0,0,0,14.707,1.293Zm-9,1.7a1,1,0,1,1-1,1A1,1,0,0,1,5.706,3ZM2.524,7.508a1,1,0,1,1,.37,1.364A1,1,0,0,1,2.524,7.508Zm4.769-.215Z"/>
-</svg>

assets/img/svg/etp/cryptominers-disabled.svg

@@ -1,7 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity">
-  <path d="M14.71 1.29a1 1 0 0 0-1.42 0l-.7.71H9v-.5a.5.5 0 0 0-.5-.5h-1a.5.5 0 0 0-.5.5V2H5a2 2 0 0 0-1.6.8L2.2 4.4A1 1 0 0 0 3 6h4v1.59l-5.71 5.7a1 1 0 0 0 0 1.42 1 1 0 0 0 1.42 0l12-12a1 1 0 0 0 0-1.42z"/>
-  <path d="M7 14.5a.5.5 0 0 0 .5.5h1a.5.5 0 0 0 .5-.5V10l-2 2z"/>
-</svg>

assets/img/svg/etp/fingerprinters-disabled.svg

@@ -1,8 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity">
-  <path d="M14.71 1.29a1 1 0 0 0-1.42 0l-.56.57A7 7 0 0 0 1 7a1 1 0 0 0 2 0 5 5 0 0 1 5-5 5 5 0 0 1 3.31 1.28l-.7.7A4 4 0 0 0 8 3a4 4 0 0 0-4 4 2 2 0 0 1-2 2 1 1 0 0 0 0 2 3.86 3.86 0 0 0 2.33-.75l-3 3a.91.91 0 0 0-.08.13.82.82 0 0 0-.11.17 1.17 1.17 0 0 0-.06.2A.86.86 0 0 0 1 14a.61.61 0 0 0 0 .23.62.62 0 0 0 0 .13v.08a.76.76 0 0 0 .12.19s0 .06.06.09a1 1 0 0 0 1.42 0l12-12a1 1 0 0 0 .11-1.43zM6 7a2 2 0 0 1 2-2 1.94 1.94 0 0 1 1.18.41l-.72.72A.91.91 0 0 0 8 6a1 1 0 0 0-1 1 4.76 4.76 0 0 1-.06.65L5.12 9.47A4.1 4.1 0 0 0 6 7z"/>
-  <path d="M9.68 9.32a8.06 8.06 0 0 1-1.42 2.48 11 11 0 0 0-1.15 1.75 1 1 0 0 0 .44 1.34A.93.93 0 0 0 8 15a1 1 0 0 0 .89-.55 9.74 9.74 0 0 1 1-1.44A8.84 8.84 0 0 0 12 7z"/>
-  <path d="M12.91 6.09A5.5 5.5 0 0 1 13 7a8.24 8.24 0 0 1-1.14 4.28A5.75 5.75 0 0 0 11 14a1 1 0 0 0 2 0 3.91 3.91 0 0 1 .63-1.79A10.18 10.18 0 0 0 15 7a6.81 6.81 0 0 0-.48-2.52z"/>
-</svg>

assets/img/svg/etp/tracker-image-disabled.svg

@@ -1,11 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" width="16" height="16">
-  <path fill="context-fill" fill-opacity="context-fill-opacity" d="M2 15a1 1 0 0 1-.71-.29 1 1 0 0 1 0-1.42l12-12a1 1 0 1 1 1.42 1.42l-12 12A1 1 0 0 1 2 15z"/>
-  <path fill="context-fill" fill-opacity="context-fill-opacity" d="M14 5v7a1 1 0 0 1-1 1H6l-2 2h9a3 3 0 0 0 3-3V4a3 3 0 0 0-.14-.86z"/>
-  <path fill="context-fill" fill-opacity="context-fill-opacity" d="M3 13a1 1 0 0 1-1-1V4a1 1 0 0 1 1-1h10l1.55-1.55A2.93 2.93 0 0 0 13 1H3a3 3 0 0 0-3 3v8a3 3 0 0 0 1.45 2.55z"/>
-  <path fill="context-fill" fill-opacity="context-fill-opacity" d="M11.64 7.36L7 12h6V9.18a.47.47 0 0 0-.12-.32z"/>
-  <path fill="context-fill" fill-opacity="context-fill-opacity" d="M7.29 8.71l-1.52-.6a.5.5 0 0 0-.5.07L3.19 9.85a.49.49 0 0 0-.19.39V12h1z"/>
-  <circle fill="context-fill" fill-opacity="context-fill-opacity" cx="5" cy="6" r="1"/>
-</svg>

assets/js/main.js

@@ -1,6 +1,3 @@
-$(function() {
-  $("[data-toggle='tooltip']").tooltip();
-});
 document.querySelectorAll(".onclick-select").forEach(element => {
   element.addEventListener("click", element.select);
 });

pages/about/about.html

@@ -27,19 +27,6 @@ hidedesc: true
 </div>
 
 <div class="row">
-{% include team.html
-avatar="jonah.png"
-name="Jonah Aragon"
-role="Administrator"
-bio="I run the website and services for PrivacyTools. My goal is to spread the word about data privacy as widely as possible."
-email="mailto:jonah@privacytools.io"
-website="https://www.jonaharagon.com"
-keys="https://keybase.io/jonaharagon"
-mastodon="https://social.privacytools.io/@jonah"
-twitter="JonahAragon"
-blog="jonah"
-%}
-
 {% include team.html
 avatar="burung.png"
 name="Burung Hantu"
@@ -70,10 +57,10 @@ email="https://dngray.netlify.com/email"
 keys="https://keybase.io/dngray"
 mastodon="https://social.privacytools.io/@dngray"
 %}
-  
+
 {% include team.html
 avatar="freddy.png"
-name="Freddy Marsden" 
+name="Freddy Marsden"
 nick="Freddy"
 bio="I'm an amateur writer covering privacy, security and open-source development."
 role="Blogging & Education"
@@ -82,8 +69,9 @@ email="mailto:freddy@privacytools.io"
 mastodon="https://social.privacytools.io/@freddy"
 blog="freddy"
 %}
-  
+
 {% include team.html
+avatar="lynn.png"
 name="Lynn Stephenson"
 bio="I'm a software developer doing some pentesting on the side, specializing in security, cryptography, networking, web development, and accessibility."
 role="Researcher"
@@ -152,6 +140,17 @@ keys="https://nitrohorse.com/keys"
 blog="nitrohorse"
 emeritus=true
 %}
+
+{% include team.html
+name="Jonah Aragon"
+role="Former Sysadmin"
+website="https://jonaharagon.com"
+keys="https://jonaharagon.com/accounts/"
+mastodon="https://social.privacytools.io/@jonah"
+blog="jonah"
+twitter="JonahAragon"
+emeritus=true
+%}
 </div>
 
 <div class="row">
@@ -162,7 +161,7 @@ emeritus=true
     <p><a href="https://github.com/privacytools/privacytools.io/issues"><i class="fab fa-github fa-lg fa-fw"></i> Open an issue on GitHub</a></p>
     <p><a href="https://www.reddit.com/r/privacytoolsIO/"><i class="fab fa-reddit fa-lg fa-fw"></i> Suggest something new on our subreddit</a></p>
     <p>For complete transparency, software and providers will only be considered for this website after discussions take place on our GitHub issue tracker. We of course don't make any changes in secret.</p>
-    <p>Join our Matrix room at <code>#general:privacytools.io</code> to chat with us and other members about this site and privacy in general! If you need a Matrix account, you can sign up with our own homeserver (<code>https://chat.privacytools.io</code>) using <a href="https://riot.privacytools.io">Riot</a>.</p>
+    <p>Join our Matrix room at <code>#general:privacytools.io</code> to chat with us and other members about this site and privacy in general! If you need a Matrix account, you can sign up with our own homeserver (<code>https://chat.privacytools.io</code>) using <a href="https://element.privacytools.io">Element</a>.</p>
     <p>You can also email the team at <a itemprop="email" href="mailto:support@privacytools.io">support@privacytools.io</a> and find us on <a itemprop="sameAs" href="https://twitter.com/privacytoolsIO">Twitter</a> and <a itemprop="sameAs" href="https://social.privacytools.io/@privacytools">Mastodon</a>.</p>
     <link itemprop="sameAs" href="https://blog.privacytools.io">
     <link itemprop="sameAs" href="https://www.youtube.com/channel/UCen3taxHtzByXV8Da73B1Vg">

pages/about/librejs.html

@@ -17,11 +17,7 @@ permalink: /about/javascript/
   </tr>
   <tr>
     <td><a href="/assets/js/bootstrap.min.js">bootstrap.min.js</a></td>
-    <td><a href="https://github.com/twbs/bootstrap/raw/master/LICENSE">Expat</a></td>
-  </tr>
-  <tr>
-    <td><a href="/assets/js/jquery-3.3.1.min.js">jquery-3.3.1.min.js</a></td>
-    <td><a href="https://github.com/jquery/jquery/raw/master/LICENSE.txt">Expat</a></td>
+    <td><a href="https://github.com/twbs/bootstrap/raw/main/LICENSE">Expat</a></td>
   </tr>
   <tr>
     <td><a href="/assets/js/popper.min.js">popper.min.js</a></td>

pages/browsers.html

@@ -13,6 +13,4 @@ description: "These are our current web browser recommendations and some tweaks
 
 {% include sections/browser-addons.html %}
 
-{% include sections/browser-easy-tweaks.html %}
-
-{% include sections/browser-advanced-tweaks.html %}
+{% include sections/browser-tweaks.html %}

pages/notices.md

@@ -28,7 +28,6 @@ In certain jurisdictions, namely those in which the copyright waiver in the CC0-
 Code, including source files and code samples if any in the content, is released under CC-1.0, with the following exceptions:
 
 - Bootstrap code is under the MIT license. See: [github.com/twbs/bootstrap/blob/master/LICENSE](https://github.com/twbs/bootstrap/blob/master/LICENSE)
-- [jQuery](https://github.com/privacytools/privacytools.io/blob/master/assets/js/jquery-3.3.1.min.js) is under the MIT license. See: [jquery.org/license](https://jquery.org/license/)
 - [Popper.js](https://github.com/privacytools/privacytools.io/blob/master/assets/js/popper.min.js) is under the MIT license. See: [github.com/FezVrasta/popper.js/raw/master/LICENSE.md](https://github.com/FezVrasta/popper.js/raw/master/LICENSE.md)
 - [Sortable](https://github.com/privacytools/privacytools.io/blob/master/assets/js/sortable.min.js) is under the MIT license. See: [github.com/HubSpot/sortable/raw/master/LICENSE](https://github.com/HubSpot/sortable/raw/master/LICENSE)
 - The Font Awesome icons are under CC-BY-4.0, Font Awesome fonts are under SIL OFL 1.1, and Font Awesome code is under the MIT License. See: [fontawesome.com/license/free](https://fontawesome.com/license/free)

pages/old.html

@@ -27,9 +27,7 @@ permalink: /classic/
 
 {% include sections/browser-addons.html %}
 
-{% include sections/browser-easy-tweaks.html %}
-
-{% include sections/browser-advanced-tweaks.html %}
+{% include sections/browser-tweaks.html %}
 
 {% include sections/email-providers.html %}
 

pages/providers/vpn.html

@@ -221,7 +221,6 @@ breadcrumb: "VPN"
         <h3>Related VPN information</h3>
 
         <ul>
-          <li><a href="https://thatoneprivacysite.net/vpn-comparison-chart/">Spreadsheet with unbiased, independently verifiable data on over 100 VPN services.</a></li>
           <li><a href="https://blog.privacytools.io/the-trouble-with-vpn-and-privacy-reviews/">The Trouble with VPN and Privacy Review Sites</a></li>
           <li><a href="https://vikingvpn.com/blogs/off-topic/beware-of-vpn-marketing-and-affiliate-programs">Beware of False Reviews - VPN Marketing and Affiliate Programs</a></li>
           <li><a href="https://torrentfreak.com/proxy-sh-vpn-provider-monitored-traffic-to-catch-hacker-130930/">Proxy.sh VPN Provider Sniffed Server Traffic to Catch Hacker</a></li>
@@ -267,6 +266,21 @@ breadcrumb: "VPN"
 
   <hr>
 
+  <div id="vpn-breaches" class="container">
+    <div class="row">
+      <div class="col-md-12">
+
+        <h3>VPN Related breaches - why external auditing is important!</h3>
+
+        <ul>
+          <li><a href="https://www.comparitech.com/blog/vpn-privacy/ufo-vpn-data-exposure/">"Zero logs" VPN exposes millions of logs including user passwords, claims data is anonymous</a> July 2020 </li>
+          <li><a href="https://www.zdnet.com/article/nordvpn-http-post-bug-exposed-sensitive-customer-information/">NordVPN HTTP POST bug exposed customer information, no authentication required</a> March 2020</li>
+          <li><a href="https://www.theregister.com/2019/10/21/nordvpn_security_issue/">Row erupts over who to blame after NordVPN says: One of our servers was hacked via remote management tool</a> October 2019</li>
+        </ul>
+      </div>
+    </div>
+  </div>
+
   <div class="container">
     <div class="row">
       <div class="col-lg-6 col-12">