Merge branch 'master' into startpage

.github/CODEOWNERS

@@ -9,6 +9,9 @@
 # Administration Related Files
 /pages/donate.html @JonahAragon @BurungHantu1605
 /pages/notices.md @JonahAragon
+/pages/sponsors.html @JonahAragon
+/_includes/sponsors/ @JonahAragon
+/assets/img/svg/3rd-party/sponsors/ @JonahAragon
 /README.md @JonahAragon @BurungHantu1605
 /assets/js/redirects.js @JonahAragon
 /.well-known/ @JonahAragon
@@ -19,3 +22,11 @@
 /.travis.yml @JonahAragon @Shifterovich @nitrohorse
 /CNAME @JonahAragon
 /nginx/ @JonahAragon
+
+# WKD
+/.well-known/openpgpkey/hu/mrobfoimg5wz876m7kp6spyu66941weo @Mikaela
+/.well-known/openpgpkey/hu/nqspr7yd4bgs8ry43zbzpjd45p4iug5b @dawidpotocki
+/.well-known/openpgpkey/hu/dnrefmbtd6i58w8xfy4imj94cmbw3u3h @dngray
+/.well-known/openpgpkey/hu/rse6m7dxfdjo86qhyj6wqs1hcdcp7em4 @danarel
+/.well-known/openpgpkey/hu/zt71pstaerw1jpa5ru3borqmfsnbwnf6 @nitrohorse
+/.well-known/openpgpkey/hu/omn8s4nziz8zmyz6f756asto39gefr63 @JonahAragon

.github/CONTRIBUTING.md

@@ -95,8 +95,9 @@ See https://www.privacytools.io/providers/vpn/#criteria for more details.
 
 ## Images
 
-- Provider logos are 200px x 70px ([example](https://github.com/privacytoolsIO/privacytools.io/blob/master/assets/img/provider/Mullvad.png))
-- Tool logos are 120px x 120px ([example](https://github.com/privacytoolsIO/privacytools.io/blob/master/assets/img/tools/Firefox.png))
+- SVG file format is strongly preferred. PNG files can be used as a fallback if images are too complex or otherwise unsuitable as a vector format.
+- Provider logo dimensions are 384px x 128px ([example](https://github.com/privacytoolsIO/privacytools.io/blob/master/assets/img/svg/3rd-party/mullvad.svg))
+- Tool logo dimensions are 120px x 120px ([SVG example](https://github.com/privacytoolsIO/privacytools.io/blob/master/assets/img/svg/3rd-party/firefox_browser.svg), [PNG example](https://github.com/privacytoolsIO/privacytools.io/blob/master/assets/img/png/3rd-party/claws_mail.png))
 
 ## Licensing
 

.github/ISSUE_TEMPLATE/1_Software_Suggestion.md

@@ -12,3 +12,16 @@ labels: 🆕 software suggestion
 **URL:**
 
 ## Description
+
+
+
+## Why I am making the suggestion
+
+<!-- Anything you would like to tell us about the software? -->
+
+
+## My connection with the software
+
+<!-- Are you the author? Enthustiastic or early adopter? Friends with the author or requested by them to open the isue? An employee of the software maker? -->
+
+- [ ] I will keep the issue up-to-date if something I have said changes or I remember a connection with the software.

.github/ISSUE_TEMPLATE/2_Software_Removal.md

@@ -7,3 +7,15 @@ labels: ❌ software removal
 
 ## Description
 
+
+
+## Why I am making the suggestion
+
+<!-- Anything you would like to tell us about the software? -->
+
+
+## My connection with the software
+
+<!-- Are you the author? Competitor? Just hating the software with passsion for some reason? -->
+
+- [ ] I will keep the issue up-to-date if something I have said changes or I remember a connection with the software.

.github/ISSUE_TEMPLATE/3_Discussion.md

@@ -1,13 +0,0 @@
-<!--
-    Is there already a discussion about this on the forum (https://forum.privacytools.io/search)?
-    If not, please open a new discussion there. Thank you!
--->
-
----
-name: "💬 Discussion"
-about: Discuss the website or any mentioned software in general.
-title: "💬 Discussion | "
-labels: 💬 discussion, feedback wanted
----
-
-<!-- Remember to stay civil! -->

.github/ISSUE_TEMPLATE/3_Feature_Suggestion.md

@@ -1,9 +1,8 @@
 ---
 name: "✨ Feature Suggestion"
-about: Suggest a new feature for the website.
+about: Suggest a new feature/section/page for the website.
 title: "✨ Feature Suggestion | "
 labels: ✨ enhancement
 ---
 
-## Description:
-
+## Description

.github/ISSUE_TEMPLATE/4_Content_Correction.md

@@ -0,0 +1,21 @@
+---
+name: "📝 Content Correction"
+about: Report any inaccurate, incorrect, or outdated information on the website.
+title: "📝 Correction | "
+labels: 📝 correction
+---
+
+## Description
+
+
+
+## Why I am making the suggestion
+
+<!-- Anything you would like to tell us about the software? -->
+
+
+## My connection with the software
+
+<!-- Are you the author? Competitor? Just hating the software with passsion for some reason? -->
+
+- [ ] I will keep the issue up-to-date if something I have said changes or I remember a connection with the software.

.github/ISSUE_TEMPLATE/5_Website_Issues.md

@@ -1,10 +1,19 @@
 ---
 name: "🌐 Website Issue"
-about: Report an issue with the website.
+about: Report a bug with the website. (NO CONTENT ISSUES)
 title: "🌐 Website Issue | "
-labels: 🌐 website issue, high priority
+labels: 🌐 website issue
 ---
 
+<!--
+
+READ ME FIRST:
+This is NOT the place to request changes to the content of the website.
+This is NOT the place to report issues with our services. (That is https://github.com/privacytoolsIO/services/issues/new)
+This is ONLY for reporting bugs or technical issues with www.privacytools.io.
+
+-->
+
 ## Description
 
 <!--

.github/ISSUE_TEMPLATE/7_DNS_provider.md

@@ -1,36 +0,0 @@
----
-name: "🗄️ encrypted DNS provider suggestion"
-about: Suggest a new encrypted DNS provider.
-title: "🗄️ DNS provider suggestion | "
-labels: 🌐 website issue, 🗄️ DNS
----
-
-<!-- Please feel free to overwrite these comments -->
-
-## Basic Information
-
-**Name:** 
-**Filtering:** <!-- What is being filtered? Is it opt-in with separate address or not? -->
-**Privacy policy:** <!-- Link, especially when there is logging -->
-**Protocols:** <!-- at least DoH or DoT? DNSCrypt? -->
-**Server/Location:** <!-- Where is the provider based? Where are their servers located? Anycast if there are multiple servers answering to the same address -->
-**Source:** <!-- link to the source code, preferred, but optional -->
-**Type:** <!-- Non-profit, commercial, hobby project? -->
-**Website:** 
-
-## Description
-
-<!-- Why should we list your suggestion? Anything else, that you wish us to know? -->
-
-
-### Required features:
-
-<!-- DoH and DoT are supported natively by platforms like Firefox and Android 9+ -->
-
-* [ ] supports DoH or DoT <!-- We love DNSCrypt, but there is already https://github.com/DNSCrypt/dnscrypt-resolvers which is directly supported by dnscrypt-proxy, so we don't consider useful to list providers only supporting it.  -->
-* [ ] supports DNSSEC <!--  https://dnssec.vs.uni-due.de/ can test your current DNS provider. -->
-* [ ] doesn't log IP addresses during normal operation <!-- If your suggestion logs, please compare its privacy policy with other servers on our table that keep logs. -->
-
-#### Desired features
-
-* [ ] supports QNAME minimization <!-- if you have access to the dig command run `dig +short txt qnamemintest.internet.nl` or `Resolve-DnsName -Type TXT -Name qnamemintest.internet.nl` if you are on Windows 10 -->

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,7 @@
+contact_links:
+  - name: Services issues
+    url: https://github.com/privacytoolsIO/services/issues/new/choose
+    about: Open any issues/bug reports/requests related to our services (Mastodon, Matrix, etc) here.
+  - name: PrivacyTools Community
+    url: https://forum.privacytools.io/
+    about: Please ask any generic questions on our forum.

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,4 +1,4 @@
-<!-- PLEASE READ OUR CODE OF CONDUCT (https://github.com/privacytoolsIO/privacytools.io/blob/master/CODE_OF_CONDUCT.md) AND CONTRIBUTING GUIDELINES (https://github.com/privacytoolsIO/privacytools.io/blob/master/.github/CONTRIBUTING.md) BEFORE SUBMITTING -->
+<!-- PLEASE READ OUR CODE OF CONDUCT (https://wiki.privacytools.io/view/PrivacyTools:Code_of_Conduct) AND CONTRIBUTING GUIDELINES (https://github.com/privacytoolsIO/privacytools.io/blob/master/.github/CONTRIBUTING.md) BEFORE SUBMITTING -->
 
 ## Description
 
@@ -6,6 +6,8 @@ Resolves: #none <!-- A link to the (discussion) issue resolved by this pull requ
 
 #### Check List <!-- Please add an x in each box below, like so: [x] -->
 
+- [ ] I understand that by not opening an issue about a software/service/similar addition/removal, this pull request will be closed without merging.
+
 - [ ] I have read and understand [the contributing guidelines](https://github.com/privacytoolsIO/privacytools.io/blob/master/.github/CONTRIBUTING.md).
 
 - [ ] The project is [Free Libre](https://en.wikipedia.org/wiki/Free_software) and/or [Open Source](https://en.wikipedia.org/wiki/Open-source_software) Software

.github/stale.yml

@@ -0,0 +1,16 @@
+# Number of days of inactivity before an issue becomes stale
+daysUntilStale: 60
+# Number of days of inactivity before a stale issue is closed
+daysUntilClose: 7
+# Issues with these labels will never be considered stale
+exemptLabels:
+  - approved
+# Label to use when marking an issue as stale
+staleLabel: stale
+# Comment to post when marking an issue as stale. Set to `false` to disable
+markComment: >
+  This issue has been automatically marked as stale because it has not had
+  recent activity. It will be closed if no further activity occurs. Thank you
+  for your contributions.
+# Comment to post when closing a stale issue. Set to `false` to disable
+closeComment: false

.gitignore

@@ -6,3 +6,5 @@ font/assets/
 font/_sass/
 font/.fontcustom-manifest.json
 assets/webfonts/ptio-font-preview.html
+vendor
+.bundle

Gemfile.lock

@@ -205,7 +205,7 @@ GEM
       jekyll-seo-tag (~> 2.1)
     minitest (5.11.3)
     multipart-post (2.1.1)
-    nokogiri (1.10.4)
+    nokogiri (1.10.8)
       mini_portile2 (~> 2.4.0)
     octokit (4.14.0)
       sawyer (~> 0.8.0, >= 0.5.3)

README.md

@@ -10,18 +10,23 @@ _Encryption Against Global Mass Surveillance._
 
 It's important for a website like PrivacyTools to be up-to-date. Keep an eye on software updates of the applications listed here. Follow recent news about providers that are recommended. We try our best to keep up but we're not perfect and the internet is changing fast. So if you find an error, or you think a provider should not be listed here, or a qualified service provider is missing or a browser plugin is not the best choice anymore or anything else...
 
-**Talk to us please.** Join our [subreddit](https://www.reddit.com/r/privacytoolsIO/) or [our Discourse community](https://forum.privacytools.io/) and start a discussion. This is a community project and we're aiming to deliver the best information available for a better privacy. Thank you for participating.
+**Talk to us!** If you want to help make privacytools.io the best website it can be, join our Matrix discussion chat at [`#dev:privacytools.io`](https://matrix.to/#/#dev:privacytools.io), where we talk about open issues and PRs in this repo, and changes to the site. You may submit any website suggestions here on GitHub [Issues](https://github.com/privacytoolsIO/privacytools.io/issues). Please refer to the [contribution guidelines](.github/CONTRIBUTING.md) and consider stopping by our chat room before submitting. Thank you.
 
-You can submit your suggestions here on GitHub [(Issues)](https://github.com/privacytoolsIO/privacytools.io/issues) and also in our [subreddit](https://www.reddit.com/r/privacytoolsIO/). Please refer to the [Contributing Guidelines](.github/CONTRIBUTING.md) before submitting. Thank you.
+If you want to discuss privacy in general, a new tool, or just something else, feel free to join [our Discourse community](https://forum.privacytools.io/) or our general Matrix room at [`#general:privacytools.io`](https://matrix.to/#/#general:privacytools.io) and start a discussion! This is a community project and we're aiming to deliver the best information available. Thank you for participating.
 
-## Building
+## Developing
 
-1. Install [Ruby](https://www.ruby-lang.org/en/documentation/installation/)
-1. Install [bundler](https://bundler.io/) by running `gem install bundler`.
-1. Run `bundle install` to install the required dependencies.
-1. Use `bundle exec jekyll build` to build the website. The output can be found in the `_site` directory.  Live preview is also possible by running `bundle exec jekyll serve`
+1. Install the latest stable version of [Ruby](https://www.ruby-lang.org/en/downloads/).
+1. Install [Bundler](https://bundler.io/) v2.0.1:
+	* `gem install bundler -v 2.0.1`
+1. Install the required dependencies:
+	* `bundle install`
+1. Build the website (the output can be found in the `_site` directory):
+	* `bundle exec jekyll build`
+1. Serve the website locally with live reloading:
+	* `bundle exec jekyll serve --incremental --livereload`
 
-# Support privacytools.io
+# Support
 
 - [Donate.](https://www.privacytools.io/donate/)
 - [Liberapay](https://liberapay.com/privacytools.io/donate) or [Patreon.](https://www.patreon.com/privacytools)
@@ -30,6 +35,10 @@ You can submit your suggestions here on GitHub [(Issues)](https://github.com/pri
 - [Make suggestions on reddit.](https://www.reddit.com/r/privacytoolsIO/)
 - View and edit our website source code here on GitHub.
 
+# Sponsors
+
+- [Safing](https://safing.io/)
+
 # 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/cardv2.html

@@ -61,7 +61,7 @@
       {% endif %}
     </p>
     <div class="d-flex justify-content-between flex-column flex-md-row align-items-start align-items-md-center">
-      <div class="d-flex flex-shrink-0 mr-1">
+      <div class="flow-root flex-shrink-0 mr-1">
         <a
           href="{{include.website}}"
           rel="noopener"
@@ -69,6 +69,15 @@
           <i class="fas fa-external-link-alt fa-fw"></i>
           Website
         </a>
+        {% if include.privacy-policy %}
+        <a
+          href="{{include.privacy-policy}}"
+          rel="noopener"
+          class="btn btn-warning mt-1 mr-1">
+          <i class="fas fa-book fa-fw"></i>
+          Privacy Policy
+        </a>
+        {% endif %}
         {% if include.forum %}
           <a
             href="{{include.forum}}"
@@ -82,7 +91,7 @@
           <a
             href="{{include.tor}}"
             rel="noopener"
-            class="hover-text-decoration-none mt-1 mr-1"
+            class="btn icon-btn hover-text-decoration-none mt-1 mr-1"
             data-toggle="tooltip"
             data-placement="bottom"
             data-original-title="Requires specific software to access: torproject.org">
@@ -93,7 +102,7 @@
           <a
             href="{{include.i2p}}"
             rel="noopener"
-            class="hover-text-decoration-none mt-1 mr-1"
+            class="btn icon-btn hover-text-decoration-none mt-1 mr-1"
             data-toggle="tooltip"
             data-placement="bottom"
             data-original-title="Requires specific software to access: geti2p.net">

_includes/footer.html

@@ -89,7 +89,8 @@
     <small>
       <a href="/privacy/">Privacy Statement</a> |
       <a href="/notices/">Notices &amp; Disclaimers</a> |
-      <a href="https://github.com/privacytoolsIO/brand">Brand Assets &amp; Guidelines</a>
+      <a href="https://github.com/privacytoolsIO/brand">Brand Assets &amp; Guidelines</a> |
+      <a href="https://status.privacytools.io">Status Page</a>
     </small>
 
   </div>

_includes/head.html

@@ -22,7 +22,7 @@
   <meta property="og:locale" content="en_GB" />
   <meta property="og:site_name" content="{{ site.name }}" />
 
-  {% if page.url == "/" or page.url == "/about/" %}
+  {% if page.url == "/" %}
   <script type="application/ld+json">
   {
     "@context": "https://schema.org",

_includes/nav.html

@@ -1,7 +1,7 @@
 <nav class="fixed-top bg-dark">
   <div id="navbar" class="d-flex flex-wrap justify-content-between align-items-center">
     <div class="w-50">
-      <a id="nav-home-mobile" class="nav-anchor" href="/index.html">
+      <a id="nav-home-mobile" class="nav-anchor" href="/">
         <img src="/assets/img/svg/layout/brand/horizontal.svg" width="150px" />
       </a>
     </div>
@@ -10,7 +10,7 @@
 
     <div class="menu w-100">
       <div id="nav-left" class="position-relative flex-col">
-        <a class="nav-anchor" href="/index.html">
+        <a class="nav-anchor" href="/">
           <span id="nav-home" class="fas fa-home fa-fw"></span>
         </a>
 
@@ -87,7 +87,7 @@
           </summary>
           <span class="nav-dropdown">
             <a class="dropdown-item" href="/operating-systems/#os"><span class="fas fa-th-large fa-fw"></span> PC OS</a>
-            <a class="dropdown-item" href="/operating-systems/#live_os"><span class="fas fa-compact-disc fa-fw"></span> Live CD OS</a>
+            <a class="dropdown-item" href="/operating-systems/#live_os"><span class="fas fa-compact-disc fa-fw"></span> PC Live OS</a>
             <a class="dropdown-item" href="/operating-systems/#mobile_os"><span class="fas fa-mobile-alt fa-fw"></span> Mobile OS</a>
             <a class="dropdown-item" href="/operating-systems/#aaddons"><span class="fas fa-th fa-fw"></span> Android Privacy Add-ons</a>
             <a class="dropdown-item" href="/operating-systems/#firmware"><span class="fas fa-signal fa-fw"></span> Router Firmware</a>

_includes/sections/browser-addons.html

@@ -9,6 +9,7 @@ title="uBlock Origin: Block Ads and Trackers"
 image="/assets/img/svg/3rd-party/ublock_origin.svg"
 description="<strong>uBlock Origin</strong> is an efficient <a href=https://github.com/gorhill/uBlock/wiki/Blocking-mode>wide-spectrum blocker</a> that is easy on memory, and yet can load and enforce thousands more filters than other popular blockers out there. It has no monetization strategy and is completely open source."
 website="https://addons.mozilla.org/firefox/addon/ublock-origin/"
+privacy-policy="https://github.com/gorhill/uBlock/wiki/Privacy-policy"
 forum="https://forum.privacytools.io/t/discussion-ublock-origin/266"
 github="https://github.com/gorhill/uBlock/"
 firefox="https://addons.mozilla.org/en-US/firefox/addon/ublock-origin/"
@@ -22,6 +23,7 @@ title="HTTPS Everywhere: Secure Connections"
 image="/assets/img/svg/3rd-party/https_everywhere.svg"
 description="<strong>HTTPS Everywhere</strong> enables encryption of your connections to many major websites, making your browsing more secure. It is a collaboration between The Tor Project and the Electronic Frontier Foundation."
 website="https://www.eff.org/https-everywhere"
+privacy-policy="https://www.eff.org/code/privacy/policy"
 forum="https://forum.privacytools.io/t/discussion-https-everywhere/268"
 github="https://github.com/EFForg/https-everywhere"
 firefox="https://addons.mozilla.org/en-US/firefox/addon/https-everywhere"
@@ -34,6 +36,7 @@ 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/en-US/firefox/addon/decentraleyes"
@@ -57,6 +60,7 @@ 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/en-US/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/en-US/firefox/addon/terms-of-service-didnt-read/"
@@ -67,7 +71,7 @@ opera="https://addons.opera.com/en/extensions/details/terms-of-service-didnt-rea
 {% include cardv2.html
 title="Snowflake"
 image="/assets/img/svg/3rd-party/snowflake.svg"
-description="<strong>Snowflake</strong> is a new <a href=https://2019.www.torproject.org/docs/pluggable-transports.html.en>pluggable transport</a> from the Tor Project. If you have an uncensored connection, running this extension volunteers your connection to be used as a Snowflake proxy to help users unable to connect to the Tor network. Your IP will not be visible to the sites users visit using your proxy, as this extension will not make you an exit node. If your access to the Tor network is blocked, this extension will not assist you, and you should use the <a href=https://www.torproject.org>Tor Browser</a> instead."
+description="<strong>Snowflake</strong> is a new <a href=https://2019.www.torproject.org/docs/pluggable-transports.html.en>pluggable transport</a> from the Tor Project. If you have an uncensored connection, running this extension volunteers your connection to be used as a Snowflake proxy to help users unable to connect to the Tor network. Your IP will not be visible to the sites users visit using your proxy, as this extension will not make you an exit node. If your access to the Tor network is blocked, this extension will not assist you, and you should use the <a href=https://www.torproject.org>Tor Browser</a> instead. <b>Note:</b> This add-on does not work with WebRTC disabled."
 website="https://snowflake.torproject.org"
 forum="https://forum.privacytools.io/t/discussion-snowflake/1146"
 git="https://gitweb.torproject.org/pluggable-transports/snowflake.git"
@@ -80,6 +84,7 @@ title="Privacy Badger: Stop Tracking"
 image="/assets/img/svg/3rd-party/privacy_badger.svg"
 description="<strong>Privacy Badger</strong> is a browser add-on that stops advertisers and other third-party trackers from secretly tracking where you go and what pages you look at on the web. Privacy Badger learns about trackers as you browse."
 website="https://www.eff.org/privacybadger"
+privacy-policy="https://www.eff.org/code/privacy/policy"
 forum="https://forum.privacytools.io/t/discussion-privacy-badger/265"
 github="https://github.com/EFForg/privacybadger"
 firefox="https://addons.mozilla.org/en-US/firefox/addon/privacy-badger17"
@@ -98,6 +103,7 @@ title="uMatrix: Stop Cross-Site Requests"
 image="/assets/img/png/3rd-party/umatrix.png"
 description="<strong>uMatrix</strong> gives you control over the requests that websites make to other websites. Many websites integrate features which let other websites track you, such as Facebook Like Buttons or Google Analytics."
 website="https://addons.mozilla.org/firefox/addon/umatrix/"
+privacy-policy="https://github.com/gorhill/uMatrix/wiki/Privacy-policy"
 forum="https://forum.privacytools.io/t/discussion-umatrix/271"
 github="https://github.com/gorhill/uMatrix"
 firefox="https://addons.mozilla.org/en-US/firefox/addon/umatrix"
@@ -109,7 +115,8 @@ opera="https://addons.opera.com/en/extensions/details/umatrix"
 title="NoScript Security Suite: Be in total control"
 image="/assets/img/svg/3rd-party/noscript.svg"
 description="<strong>NoScript</strong> is a highly customizable plugin to selectively allow JavaScript, Java, and Flash to run only on websites you trust. Not for casual users, it requires technical knowledge to configure."
-website="https://addons.mozilla.org/firefox/addon/noscript/"
+website="https://noscript.net/"
+privacy-policy="https://addons.mozilla.org/en-US/firefox/addon/noscript/privacy/"
 forum="https://forum.privacytools.io/t/discussion-noscript-security-suite/272"
 github="https://github.com/hackademix/noscript"
 firefox="https://addons.mozilla.org/en-US/firefox/addon/noscript"

_includes/sections/browser-recommendation.html

@@ -9,6 +9,7 @@ image="/assets/img/svg/3rd-party/firefox_browser.svg"
 description='Firefox is fast, reliable, open-source, and respects your privacy. Don\'t forget to adjust the settings according to our
 recommendations: <a href="#addons"><i class="fas fa-link"></i> Privacy Add-ons</a> <a href="#webrtc"><i class="fas fa-link"></i> WebRTC</a> <a href="#about_config"><i class="fas fa-link"></i> about:config tweaks</a>.'
 website="https://firefox.com"
+privacy-policy="https://www.mozilla.org/en-US/privacy/firefox/"
 forum="https://forum.privacytools.io/t/discussion-firefox/279"
 source="https://hg.mozilla.org/mozilla-central/"
 windows="https://www.mozilla.org/firefox/windows/"
@@ -24,6 +25,7 @@ title="Tor Browser - Provides Anonymity"
 image="/assets/img/svg/3rd-party/tor_browser.svg"
 description='Tor Browser is your choice if you need an extra layer of anonymity. It\'s a modified version of Firefox ESR, which comes with pre-installed privacy add-ons, encryption, and an advanced proxy. <a href="https://write.privacytools.io/my-thoughts-on-security/slicing-onions-part-1-myth-busting-tor">How does Tor work?</a>'
 website="https://www.torproject.org/"
+privacy-policy="https://support.torproject.org/tbb/tbb-3/"
 tor="http://expyuzz4wqqyqhjn.onion/"
 forum="https://forum.privacytools.io/t/discussion-tor-browser/278"
 git="https://trac.torproject.org/projects/tor"
@@ -43,6 +45,7 @@ image="/assets/img/svg/3rd-party/firefox_browser.svg"
 description='Firefox is fast, reliable, open-source, and respects your privacy. Don\'t forget to adjust the settings according to our
 recommendations: <a href="#addons"><i class="fas fa-link"></i> Privacy Add-ons</a> <a href="#webrtc"><i class="fas fa-link"></i> WebRTC</a> <a href="#about_config"><i class="fas fa-link"></i> about:config tweaks</a>.'
 website="https://www.mozilla.org/en-US/firefox/mobile/"
+privacy-policy="https://www.mozilla.org/en-US/privacy/firefox/"
 forum="https://forum.privacytools.io/t/discussion-firefox/279"
 source="https://github.com/mozilla-mobile"
 fdroid="https://f-droid.org/en/packages/org.mozilla.fennec_fdroid/"
@@ -55,6 +58,7 @@ title="Tor Browser - Provides Anonymity"
 image="/assets/img/svg/3rd-party/tor_browser.svg"
 description='Tor Browser is your choice if you need an extra layer of anonymity. It\'s a modified version of Firefox ESR, which comes with pre-installed privacy add-ons, encryption and an advanced proxy. <a href="https://write.privacytools.io/my-thoughts-on-security/slicing-onions-part-1-myth-busting-tor">How does Tor work?</a>'
 website="https://www.torproject.org/"
+privacy-policy="https://support.torproject.org/tbb/tbb-3/"
 tor="http://expyuzz4wqqyqhjn.onion/"
 forum="https://forum.privacytools.io/t/discussion-tor-browser-for-android-browsers/1522"
 git="https://gitweb.torproject.org/tor-browser.git/"
@@ -66,7 +70,7 @@ googleplay="https://play.google.com/store/apps/details?id=org.torproject.torbrow
 {% include cardv2.html
 title="Bromite"
 image="/assets/img/svg/3rd-party/bromite.svg"
-description='Bromite is a Chromium-based browser with security enhancement patches from GrapheneOS and other security-focused projects, built-in adblocking, and DNS over HTTPS support. More info can be found <a href="https://www.bromite.org/#main-features">on their website</a>.'
+description='Bromite is a Chromium-based browser with privacy and security enhancements, built-in adblocking and DNS over HTTPS support; it includes patches from ungoogled-chromium and other privacy-focused projects. More info can be found <a href="https://www.bromite.org/#main-features">on the official website</a>.'
 website="https://www.bromite.org/"
 forum="https://forum.privacytools.io/t/discussion-bromite-browsers/1521"
 github="https://github.com/bromite/bromite"
@@ -97,6 +101,7 @@ title="Firefox"
 image="/assets/img/svg/3rd-party/firefox_browser.svg"
 description='Firefox is fast, reliable, open-source, and respects your privacy. Note: Because of limitations set by Apple in iOS, our recommended tweaks cannot be applied. However, Firefox for iOS has an <a href="https://support.mozilla.org/en-US/kb/enhanced-tracking-protection-firefox-ios">Enhanced Tracking Protection</a> feature that uses a list provided by <a href="https://disconnect.me/trackerprotection">Disconnect</a> to identify and block ad, social, and analytics trackers, as well as cryptominers and fingerprinters.'
 website="https://www.mozilla.org/en-US/firefox/mobile/"
+privacy-policy="https://www.mozilla.org/en-US/privacy/firefox/"
 forum="https://forum.privacytools.io/t/discussion-firefox/279"
 source="https://github.com/mozilla-mobile/firefox-ios"
 ios="https://apps.apple.com/us/app/firefox-private-safe-browser/id989804926"
@@ -108,6 +113,7 @@ title="Onion Browser"
 image="/assets/img/svg/3rd-party/onion_browser.svg"
 description='Onion Browser is an open-source browser that lets you browse the web anonymously over the Tor network on iOS devices and is endorsed by the Tor Project. Warning: there are certain anonymity-related <a href="https://onionbrowser.com/#security-advisories">issues</a> with Onion Browser due to iOS limitations.'
 website="https://onionbrowser.com/"
+privacy-policy="https://onionbrowser.com/privacy-policy"
 forum="https://forum.privacytools.io/t/discussion-onion-browser-browsers/1523"
 github="https://github.com/OnionBrowser/OnionBrowser"
 ios="https://apps.apple.com/us/app/onion-browser/id519296448"
@@ -119,6 +125,7 @@ title="DuckDuckGo Privacy Browser"
 image="/assets/img/svg/3rd-party/duckduckgo.svg"
 description='DuckDuckGo Privacy Browser is an open-source web browser that has built-in ad and tracker blocking and utilizes <a href="https://tosdr.org/">ToS;DR</a> to rate the privacy policies of the sites you visit.'
 website="https://duckduckgo.com/app"
+privacy-policy="https://duckduckgo.com/privacy"
 tor="https://3g2upl4pq6kufc4m.onion/app"
 forum="https://forum.privacytools.io/t/discussion-duckduckgo-privacy-browser-browsers/1524"
 github="https://github.com/duckduckgo/iOS"

_includes/sections/browser-tweaks.html

@@ -6,7 +6,7 @@
 
 <ol>
   <li>Enter "about:config" in the firefox address bar and press enter.</li>
-  <li>Press the button "I'll be careful, I promise!"</li>
+  <li>Press the button "Accept the Risk and Continue" [FF71+] or "I accept the risk".</li>
   <li>Follow the instructions below...</li>
 </ol>
 
@@ -26,14 +26,11 @@
   <dd>[FF67+] Blocks CryptoMining</dd>
 
   <dt>privacy.trackingprotection.enabled = true</dt>
-  <dd>This is Mozilla's new built-in tracking protection. It uses Disconnect.me filter list, which is redundant if you are already using uBlock Origin 3rd party filters, therefore you should set it to false if you are using the add-on functionalities.</dd>
+  <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>browser.sessionstore.max_tabs_undo = 0</dt>
-  <dd>Even with Firefox set to not remember history, your closed tabs are stored temporarily at Menu -&gt; History -&gt; Recently Closed Tabs.</dd>
-
   <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>
 
@@ -85,9 +82,6 @@
   </ul>
   </dd>
 
-  <dt>Looking for TRR, DoH or ESNI?</dt>
-  <dd>They have moved to <a href="/providers/dns/#icanndns">our DNS page</a>.</dd>
-
   <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>
 
@@ -101,14 +95,32 @@
   </ul>
   </dd>
 
+  <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>
 
+  <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/ghacksuserjs/ghacks-user.js">ghacks-user.js</a> - An ongoing comprehensive user.js template for configuring and hardening Firefox privacy, security and anti-fingerprinting.</li>
+   <li><a href="https://github.com/ghacksuserjs/ghacks-user.js">ghacks-user.js</a> - An ongoing comprehensive user.js template for configuring and hardening Firefox privacy, security and anti-fingerprinting.</li>
 </ul>
 
 
@@ -117,7 +129,6 @@
 <ul>
   <li><a href="https://blog.privacytools.io/firefox-privacy-an-introduction-to-safe/">Firefox Privacy: Tips and Tricks for Better Browsing</a> - A good starting guide for users looking to keep their data private and secure.</li>
   <li><a href="https://ffprofile.com/">ffprofile.com</a> - Helps you to create a Firefox profile with the defaults you like.</li>
-  <li><a href="http://kb.mozillazine.org/Category:Security_and_privacy-related_preferences">mozillazine.org</a> - Security and privacy-related preferences. </li>
   <li><a href="https://addons.mozilla.org/firefox/addon/privacy-settings/">Privacy Settings</a> - A Firefox add-on to alter built-in privacy settings easily with a toolbar panel.</li>
   <li><a href="https://12bytes.org/articles/tech/firefox/the-firefox-privacy-guide-for-dummies/">Firefox Privacy Guide For Dummies</a> - Guide on ways (already discussed and others) to improve your privacy and safety on Firefox.</li>
 </ul>

_includes/sections/browser-webrtc.html

@@ -4,7 +4,7 @@
   <strong>WebRTC is a new communication protocol that relies on JavaScript that can leak your actual IP address from behind your VPN.</strong>
 </div>
 
-<p>While software like NoScript prevents this, it's probably a good idea to block this protocol directly as well, just to be safe.</p>
+<p>While software like NoScript prevents this, it's probably a good idea to block this protocol directly as well, just to be safe. <b>Note:</b> This disables browser-based call functionality that is used for webapps like Discord, Hangouts, Jitsi, etc.</p>
 
 <p>
 <a class="btn btn-warning" target="_blank" rel="noopener noreferrer" href="https://ipleak.net">Test your Browser now</a>
@@ -38,10 +38,21 @@
 <a class="btn btn-primary" target="_blank" rel="noopener noreferrer" href="https://ipleak.net">Test your Browser again</a>
 </p>
 
-<h3>How to fix the WebRTC Leak in Google Chrome?</h3>
+<h3>How to disable WebRTC in Safari?</h3>
+
+<p>Safari is far stricter with WebRTC than other major browsers, and it does not leak your IP address in its default configuration. If you'd like, you can follow these steps just to double-check your browser:</p>
+
+<ol class="long-string-list">
+  <li>Choose "Preferences" under the Safari menu in your menu bar.</li>
+  <li>Select the Advanced tab and check the "Show Develop menu in menu bar" box.</li>
+  <li>Exit Preferences and open the Develop menu in your menu bar.</li>
+  <li>In the drop-down menu, open the "WebRTC" submenu and ensure "Enable Legacy WebRTC API" is unchecked. If it's grayed out, even better.</li>
+</ol>
+
+<h3>How to disable WebRTC in Google Chrome?</h3>
 
 <p>WebRTC cannot be fully disabled in Chrome; however, it is possible to change its routing settings (and prevent leaks) using an extension. Two open-source solutions include <a href="https://chrome.google.com/webstore/detail/webrtc-leak-prevent/eiadekoaikejlgdbkbdfeijglgfdalml">WebRTC Leak Prevent</a> (options may need to be changed depending on the scenario), and <a href="https://chrome.google.com/webstore/detail/ublock-origin/cjpalhdlnbpafiamejdnhcphjbkeiagm">uBlock Origin</a> (select "Prevent WebRTC from leaking local IP addresses" in Settings).</p>
 
 <h3>What about other browsers?</h3>
 
-<p>Chrome on iOS, Internet Explorer and Safari does not implement WebRTC yet. <a href="#browser"><i class="fas fa-link"></i> But we recommend using Firefox on all devices.</a></p>
+<p>Chrome on macOS and Internet Explorer do not implement WebRTC yet. <a href="#browser"><i class="fas fa-link"></i> But we recommend using Firefox on all devices.</a></p>

_includes/sections/calendar-contacts-sync.html

@@ -10,6 +10,7 @@
   image="/assets/img/svg/3rd-party/nextcloud.svg"
   description="<strong>Nextcloud</strong> is a suite of client-server software for creating and using file hosting services. This includes calendar sync via CalDAV and contacts sync via CardDAV. Nextcloud is free and open-source, thereby allowing anyone to install and operate it without charge on a private server."
   website="https://nextcloud.com/"
+  privacy-policy="https://nextcloud.com/privacy/"
   forum="https://forum.privacytools.io/t/discussion-nextcloud-calender-contacts-sync-tools/1535"
   github="https://github.com/nextcloud"
   windows="https://nextcloud.com/install/"
@@ -28,6 +29,7 @@
   image="/assets/img/svg/3rd-party/etesync.svg"
   description="<strong>EteSync</strong> is a secure, end-to-end encrypted, and privacy-respecting cloud backup and synchronization software for your personal information (e.g. contacts and calendars). There are native clients for Android, iOS, and the web, and an adapter layer for most desktop clients. It costs $24 per year to use, or you can host the server yourself for free."
   website="https://www.etesync.com/"
+  privacy-policy="https://www.etesync.com/tos/#privacy"
   forum="https://forum.privacytools.io/t/discussion-etesync-calender-contacts-sync-tools/1536"
   github="https://github.com/etesync"
   web="https://client.etesync.com/"

_includes/sections/cloud-storage.html

@@ -5,21 +5,23 @@
 </div>
 
 {% include cardv2.html
-title="Nextcloud - Choose your hoster"
-image="/assets/img/svg/3rd-party/nextcloud.svg"
-description="<strong>Nextcloud</strong> is a suite of client-server software for creating your own file hosting services on a private server you control. Nextcloud is free and open-source, and supports end-to-end encryption with many of its clients. The only limits on storage and bandwidth are the limits on the <a href=\"/providers/hosting\">server provider</a> you choose."
-website="https://nextcloud.com/"
-forum="https://forum.privacytools.io/t/discussion-nextcloud/287"
-github="https://github.com/nextcloud"
-windows="https://nextcloud.com/install/#install-clients"
-mac="https://nextcloud.com/install/#install-clients"
-linux="https://nextcloud.com/install/#install-clients"
-freebsd="https://www.freshports.org/www/nextcloud/"
-openbsd="http://openports.se/www/nextcloud"
-netbsd="http://pkgsrc.se/www/php-nextcloud"
-ios="https://itunes.apple.com/us/app/nextcloud/id1125420102?mt=8"
-fdroid="https://f-droid.org/packages/com.nextcloud.client/"
-googleplay="https://play.google.com/store/apps/details?id=com.nextcloud.client"
+  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="warning:<a href=//github.com/nextcloud/end_to_end_encryption/issues/111>Experimental E2EE</a>: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"
+  windows="https://nextcloud.com/install/#install-clients"
+  mac="https://nextcloud.com/install/#install-clients"
+  linux="https://nextcloud.com/install/#install-clients"
+  freebsd="https://www.freshports.org/www/nextcloud/"
+  openbsd="http://openports.se/www/nextcloud"
+  netbsd="http://pkgsrc.se/www/php-nextcloud"
+  fdroid="https://f-droid.org/packages/com.nextcloud.client/"
+  googleplay="https://play.google.com/store/apps/details?id=com.nextcloud.client"
+  ios="https://itunes.apple.com/us/app/nextcloud/id1125420102"
+  github="https://github.com/nextcloud"
 %}
 
 

_includes/sections/dns.html

@@ -154,7 +154,7 @@
         </td>
         <td>Commercial</td>
         <td><a data-toggle="tooltip" data-placement="bottom" data-original-title='"We will collect limited DNS query data that is sent to the resolvers. This data does not contain user IP addresses or any other personally identifiable information, and the bulk of the data is only stored for 24 hours."' href="https://developers.cloudflare.com/1.1.1.1/commitment-to-privacy/privacy-policy/privacy-policy/">Some</a></td>
-        <td>DoH, DoT, DNSCrypt</td>
+        <td>DoH, DoT</td>
         <td>Yes</td>
         <td>Yes</td>
         <td>No</td>
@@ -191,49 +191,6 @@
         <td>Self</td>
       </tr>
 
-      <tr>
-        <td data-value="dnswarden">
-          <a href="https://github.com/bhanupratapys/dnswarden/blob/master/README.md">dnswarden</a>
-        </td>
-        <td>
-          <span class="no-text-wrap">
-            <span class="flag-icon flag-icon-de"></span>
-            Germany
-          </span>
-        </td>
-        <td>
-          <a
-            class="btn-secondary btn-icon"
-            href="https://github.com/bhanupratapys/dnswarden/blob/master/README.md#privacy-policy-and-tc">
-            <span class="fas fa-globe"></span>
-          </a>
-        </td>
-        <td>Hobby Project</td>
-        <td>No</td>
-        <td data-value="dot/443">
-          <span class="no-text-wrap">
-            DoH,
-            <span data-toggle="tooltip" data-placement="bottom" data-original-title="Supports port 443 in addition to 853">
-              DoT <span class="fas fa-info-circle fa-sm text-secondary"></span>,
-            </span>
-          </span>
-          DNSCrypt
-        </td>
-        <td>Yes</td>
-        <td>Yes</td>
-        <td>
-          <span class="no-text-wrap">
-            Based on server choice
-          </span>
-        </td>
-        <td>?</td>
-        <td>
-          <span class="no-text-wrap">
-            <a href="https://www.hetzner.com/">Hetzner Online GmbH</a>
-          </span>
-        </td>
-      </tr>
-
       <tr>
         <td data-value="Foundation for Applied Privacy">
           <a href="https://appliedprivacy.net/services/dns/">Foundation for Applied Privacy</a>

_includes/sections/email-clients.html

@@ -5,6 +5,7 @@ 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/"
 forum="https://forum.privacytools.io/t/discussion-thunderbird/659"
 source="https://hg.mozilla.org/comm-central/"
 windows="https://www.thunderbird.net/en-US/"

_includes/sections/email-providers.html

@@ -1,321 +1,273 @@
-<h1 id="email" class="anchor"><a href="#email"><i class="fas fa-link anchor-icon"></i></a> Privacy-Conscious Email Providers - No Affiliates</h1>
+<h1 id="email" class="anchor"><a href="#email"><i class="fas fa-link anchor-icon"></i></a> Recommended Email Services</h1>
 
 <div class="alert alert-success" role="alert">
-  <strong>All providers listed here are operating outside the US and support <a data-toggle="tooltip" data-placement="bottom" data-original-title="When sending or receiving emails, if both the sending and receiving servers support TLS encryption, the email is sent between servers using an encrypted connection.">SMTP TLS.</a> The table is sortable.</strong>
+  <strong>Our recommended providers operate outside of the US, adopt modern email technology, and meet <a href="/providers/email/#criteria">our other criteria</a> for listing.</strong> We also have a <a href="https://wiki.privacytools.io/view/Comparison_of_email_providers#Provider_comparison">detailed comparison table</a> of the below providers on the wiki.
 </div>
 
-<div class="table-responsive">
-  <table class="table sortable-theme-bootstrap" data-sortable>
-    <thead>
-      <tr>
-        <th data-sorted="true" data-sorted-direction="ascending">Email Provider</th>
-        <th data-sortable="false">Website</th>
-        <th data-sortable="true">Since</th>
-        <th data-sortable="true">Jurisdiction</th>
-        <th data-sortable="true">Storage</th>
-        <th data-sortable="true">Yearly Price</th>
-        <th data-sortable="true">Bitcoin</th>
-        <th data-sortable="true">Encryption</th>
-        <th data-sortable="true">Own Domain</th>
-      </tr>
-    </thead>
+<div class="container-fluid">
 
-    <tbody>
+  <div class="row mb-2">
+    <div class="col-lg-3 col-sm-12 pt-lg-5">
+      <img
+        src="/assets/img/svg/3rd-party/protonmail.svg"
+        height="70"
+        width="200"
+        class="img-fluid d-block mr-auto ml-auto align-middle"
+        alt="ProtonMail">
+    </div>
+    <div class="col">
+    <h2 id="protonmail" class="anchor"><a href="#protonmail"><i class="fas fa-link anchor-icon"></i></a> ProtonMail <span class="badge badge-info">Free</span></h2>
+    <p><strong><a href="https://protonmail.com">ProtonMail.com</a></strong> is an email service with a focus on privacy, encryption, security, and ease of use. They have been in operation since <strong>2013</strong>. ProtonMail is based in Genève, <span class="flag-icon flag-icon-ch"></span> Switzerland. Accounts start with 500 MB storage with their free plan.</p>
 
-      <tr>
-        <td data-value="disroot">
-          <img
-            alt="Disroot"
-            src="/assets/img/svg/3rd-party/disroot.svg"
-            data-theme-src="/assets/img/svg/3rd-party/disroot-dark.svg"
-            width="200"
-            height="70">
-        </td>
-        <td>
-          <a
-            class="btn-secondary btn-icon"
-            href="https://disroot.org">
-            <span class="fas fa-globe"></span>
-          </a>
-        </td>
-        <td data-value="2015">2015</td>
-        <td>
-          <span class="no-text-wrap">
-            <span class="flag-icon flag-icon-nl"></span> Netherlands
-          </span>
-        </td>
-        <td data-value="1000">1 GB</td>
-        <td data-value="0"><span class="label label-warning">Free</span></td>
-        <td data-value="1"><span class="label label-success">Accepted</span></td>
-        <td data-value="1"><span class="label label-success">Built-in</span></td>
-        <td data-value="1"><span class="label label-success">Yes</span></td>
-      </tr>
+    <p>Free accounts have some limitations and do not allow the use of the <a href="https://protonmail.com/bridge">ProtonMail Bridge</a>, which is required to use a <a href="/software/email">recommended email client</a> (e.g. Thunderbird) or to search email by body text. Paid accounts are available starting at <strong>€48/y</strong> which include features like ProtonMail Bridge, additional storage, custom domain support, and more. The webmail and mobile apps can only search <code>To:</code>, <code>From:</code>, <code>Date:</code> and <code>Subject:</code> (this is likely to change when <a href="https://reddit.com/comments/cqwk2a/comment/ex21b4e">v4.0</a> of ProtonMail is released).</p>
 
-      <tr>
-        <td data-value="kolabnow">
-          <img
-            alt="Kolab Now"
-            src="/assets/img/svg/3rd-party/kolab_now.svg"
-            data-theme-src="/assets/img/svg/3rd-party/kolab_now-dark.svg"
-            width="200"
-            height="70">
-        </td>
-        <td>
-          <a
-            class="btn-secondary btn-icon"
-            href="https://kolabnow.com">
-            <span class="fas fa-globe"></span>
-          </a>
-        </td>
-        <td data-value="2010">2010</td>
-        <td>
-          <span class="no-text-wrap">
-            <span class="flag-icon flag-icon-ch"></span> Switzerland
-          </span>
-        </td>
-        <td data-value="2048">2 GB</td>
-        <td data-value="6000">$ 60</td>
-        <td data-value="1"><span class="label label-success">Accepted</span></td>
-        <td data-value="1"><span class="label label-success">Built-in</span></td>
-        <td data-value="1"><span class="label label-success">Yes</span></td>
-      </tr>
+    <h5><span class="badge badge-success">Domains and Aliases</span></h5>
+    <p>Paid ProtonMail users can use their own domain with the service. <a href="https://protonmail.com/support/knowledge-base/catch-all/">Catch-all</a> addresses are supported with custom domains for Professional and Visionary plans. ProtonMail also supports <a href="https://protonmail.com/support/knowledge-base/creating-aliases/">subaddressing</a>, which is useful for users who don't want to purchase a domain.</p>
 
-      <tr>
-        <td data-value="mailbox">
-          <img alt="mailbox.org" src="/assets/img/svg/3rd-party/mailboxorg.svg" width="200" height="70">
+    <h5><span class="badge badge-success">Payment Methods</span></h5>
+    <p>ProtonMail accepts Bitcoin in addition to accepting credit/debit cards and PayPal.</p>
 
-        </td>
-        <td>
-          <a
-            class="btn-secondary btn-icon"
-            href="https://mailbox.org">
-            <span class="fas fa-globe"></span>
-          </a>
-        </td>
-        <td data-value="2014">2014</td>
-        <td>
-          <span class="no-text-wrap">
-            <span class="flag-icon flag-icon-de"></span> Germany
-          </span>
-        </td>
-        <td data-value="2000">2 GB</td>
-        <td data-value="1444">12 €</td>
-        <td data-value="0"><span class="label label-success">No</span></td>
-        <td data-value="1"><span class="label label-success">Built-in</span></td>
-        <td data-value="1"><span class="label label-success">Yes</span></td>
-      </tr>
+    <h5><span class="badge badge-success">Account Security</span></h5>
+    <p>ProtonMail supports <a href="https://en.wikipedia.org/wiki/Time-based_One-time_Password_Algorithm">TOTP</a> <a href="https://protonmail.com/support/knowledge-base/two-factor-authentication/">two factor authentication</a> only. The use of a <a href="https://en.wikipedia.org/wiki/Universal_2nd_Factor">U2F</a> security key is not yet supported. ProtonMail is planning to implement U2F upon completion of their <a href="https://reddit.com/comments/cheoy6/comment/feh2lw0/">Single Sign On (SSO)</a> code.</p>
 
-      <tr>
-        <td data-value="mailfence">
-          <img
-            alt="Mailfence"
-            src="/assets/img/svg/3rd-party/mailfence.svg"
-            data-theme-src="/assets/img/svg/3rd-party/mailfence-dark.svg"
-            width="200"
-            height="70">
-        </td>
-        <td>
-          <a
-            href="https://mailfence.com"
-            class="btn-secondary btn-icon">
-            <span class="fas fa-globe"></span>
-          </a>
-        </td>
-        <td data-value="2013">2013</td>
-        <td>
-          <span class="no-text-wrap">
-            <span class="flag-icon flag-icon-be"></span> Belgium
-          </span>
-        </td>
-        <td data-value="500">500 MB</td>
-        <td data-value="0"><span class="label label-warning">Free</span></td>
-        <td data-value="1"><span class="label label-success">Accepted</span></td>
-        <td data-value="1"><span class="label label-success">Built-in</span></td>
-        <td data-value="1"><span class="label label-success">Yes</span></td>
-      </tr>
+    <h5><span class="badge badge-success">Data Security</span></h5>
+    <p>ProtonMail has <a href="https://protonmail.com/blog/zero-access-encryption">zero access encryption at rest</a> for your emails, <a href="https://protonmail.com/blog/encrypted-contacts-manager">address book contacts</a>, and <a href="https://protonmail.com/blog/protoncalendar-security-model">calendars</a>. This means the messages and other data stored in your account are only readable by you. </p>
 
-      <tr>
-        <td data-value="posteo">
-          <img alt="Posteo" src="/assets/img/svg/3rd-party/posteo.svg" width="200" height="70">
-        </td>
-        <td>
-          <a
-            class="btn-secondary btn-icon"
-            href="https://posteo.de">
-            <span class="fas fa-globe"></span>
-          </a>
-        </td>
-        <td data-value="2009">2009</td>
-        <td>
-          <span class="no-text-wrap">
-            <span class="flag-icon flag-icon-de"></span> Germany
-          </span>
-        </td>
-        <td data-value="2000">2 GB</td>
-        <td data-value="1444">12 €</td>
-        <td data-value="0"><span class="label label-primary">No</span></td>
-        <td data-value="1"><span class="label label-success">Built-in</span></td>
-        <td data-value="0"><span class="label label-primary">No</span></td>
-      </tr>
+    <h5><span class="badge badge-success">Email Encryption</span></h5>
+    <p>ProtonMail has <a href="https://protonmail.com/support/knowledge-base/how-to-use-pgp">integrated OpenPGP encryption</a> in their webmail. Emails to other ProtonMail users are encrypted automatically, and encryption to non-ProtonMail users with an OpenPGP key can be enabled easily in your account settings. They also allow you to <a href="https://protonmail.com/support/knowledge-base/encrypt-for-outside-users">encrypt messages to non-ProtonMail users</a> without the need for them to sign up for a ProtonMail account or use software like OpenPGP.</p>
+    <p>ProtonMail also supports the discovery of public keys via HTTP from their <a href="https://wiki.gnupg.org/WKD">Web Key Directory (WKD)</a>. This allows users outside of ProtonMail to find the OpenPGP keys of ProtonMail users easily, for cross-provider E2EE.</p>
 
-      <tr>
-        <td data-value="protonmail">
-          <img alt="ProtonMail" src="/assets/img/svg/3rd-party/protonmail.svg" width="200" height="70">
-        </td>
-        <td>
-          <a
-            class="btn-secondary btn-icon"
-            href="https://protonmail.com">
-            <span class="fas fa-globe"></span>
-          </a>
-          <a
-            class="btn-tor btn-icon mt-1"
-            href="https://protonirockerxow.onion"
-            title="Requires specific software to access: torproject.org"
-            data-toggle="tooltip"
-            data-placement="bottom">
-            <span class="ptio-tor"></span>
-          </a>
-        </td>
-        <td data-value="2013">2013</td>
-        <td>
-          <span class="no-text-wrap">
-            <span class="flag-icon flag-icon-ch"></span> Switzerland
-          </span>
-        </td>
-        <td data-value="500">500 MB</td>
-        <td data-value="0"><span class="label label-warning">Free</span></td>
-        <td data-value="1"><span class="label label-success">Accepted</span></td>
-        <td data-value="1"><span class="label label-success">Built-in</span></td>
-        <td data-value="1"><span class="label label-success">Yes</span></td>
-      </tr>
+    <h5><span class="badge badge-success">.onion Service</span></h5>
+    <p>ProtonMail is accessible via Tor at <a href="https://protonirockerxow.onion/">protonirockerxow.onion</a>.</p>
 
-      <tr>
-        <td data-value="runbox">
-          <img
-            alt="Runbox"
-            src="/assets/img/png/3rd-party/runbox.png"
-            data-theme-src="/assets/img/png/3rd-party/runbox-dark.png"
-            width="200"
-            height="70">
-        </td>
-        <td>
-          <a
-            class="btn-secondary btn-icon"
-            href="https://runbox.com">
-            <span class="fas fa-globe"></span>
-          </a>
-        </td>
-        <td data-value="1999">1999</td>
-        <td>
-          <span class="no-text-wrap">
-            <span class="flag-icon flag-icon-no"></span> Norway
-          </span>
-        </td>
-        <td data-value="1000">1 GB</td>
-        <td data-value="1995">$ 19.95</td>
-        <td data-value="1"><span class="label label-primary">Accepted</span></td>
-        <td data-value="0"><span class="label label-primary">No</span></td>
-        <td data-value="1"><span class="label label-success">Yes</span></td>
-      </tr>
+    <h5><span class="badge badge-info">Extra Functionality</span></h5>
+    <p>ProtonMail offers a "Visionary" account for €24/Month, which also enables access to ProtonVPN in addition to providing multiple accounts, domains, aliases, and extra storage.</p>
+    </div>
+  </div>
+  <div class="row mb-2">
+    <div class="col-lg-3 col-sm-12 pt-lg-5">
+      <img
+        src="/assets/img/svg/3rd-party/mailboxorg.svg"
+        height="70"
+        width="200"
+        class="img-fluid d-block mr-auto ml-auto align-middle"
+        alt="Mailbox">
+    </div>
+    <div class="col">
+    <h2 id="mailbox" class="anchor"><a href="#mailbox"><i class="fas fa-link anchor-icon"></i></a> Mailbox.org <span class="badge badge-info">€12/y</span></h2>
+    <p><strong><a href="https://mailbox.org">Mailbox.org</a></strong> is an email service with a focus on being secure, ad-free, and privately powered by 100% eco-friendly energy. They have been in operation since <strong>2014</strong>. Mailbox.org is based in Berlin, <span class="flag-icon flag-icon-de"></span> Germany. Accounts start with 2 GB of storage, which can be upgraded as needed.</p>
 
-      <tr>
-        <td data-value="soverin">
-          <img alt="Soverin" src="/assets/img/svg/3rd-party/soverin.svg" width="200" height="70">
-        </td>
-        <td>
-          <a
-            class="btn-secondary btn-icon"
-            href="https://soverin.net">
-            <span class="fas fa-globe"></span>
-          </a>
-        </td>
-        <td data-value="2015">2015</td>
-        <td>
-          <span class="no-text-wrap">
-            <span class="flag-icon flag-icon-nl"></span> Netherlands
-          </span>
-        </td>
-        <td data-value="25000">25 GB</td>
-        <td data-value="3489">29 €</td>
-        <td data-value="0"><span class="label label-success">No</span></td>
-        <td data-value="0"><span class="label label-success">No</span></td>
-        <td data-value="1"><span class="label label-success">Yes</span></td>
-      </tr>
+    <h5><span class="badge badge-success">Domains and Aliases</span></h5>
+    <p>Mailbox.org lets users use their own domain and they support <a href="https://kb.mailbox.org/display/MBOKBEN/Using+catch-all+alias+with+own+domain">catch-all</a> addresses. Mailbox.org also supports <a href="https://kb.mailbox.org/display/BMBOKBEN/What+is+an+alias+and+how+do+I+use+it">subaddressing</a>, which is useful for users who don't want to purchase a domain.</p>
 
-      <tr>
-        <td data-value="startmail">
-          <img
-            alt="StartMail"
-            src="/assets/img/svg/3rd-party/startmail.svg"
-            data-theme-src="/assets/img/svg/3rd-party/startmail-dark.svg"
-            width="200"
-            height="70">
-        </td>
-        <td>
-          <a
-            class="btn-secondary btn-icon"
-            href="https://startmail.com">
-            <span class="fas fa-globe"></span>
-          </a>
-        </td>
-        <td data-value="2014">2014</td>
-        <td>
-          <span class="no-text-wrap">
-            <span class="flag-icon flag-icon-nl"></span> Netherlands
-          </span>
-        </td>
-        <td data-value="10000">10 GB</td>
-        <td data-value="5995">$ 59.95</td>
-        <td data-value="1"><span class="label label-success">Accepted</span></td>
-        <td data-value="1"><span class="label label-success">Built-in</span></td>
-        <td data-value="1"><span class="label label-success">Yes</span></td>
-      </tr>
+    <h5><span class="badge badge-warning">Payment Methods</span></h5>
+    <p>Mailbox.org doesn't accept Bitcoin or any other cryptocurrencies as a result of their payment processor BitPay suspending operations in Germany. However, they do accept Cash by mail, cash payment to bank account, bank transfer, credit card, PayPal and couple of German-specific processors: paydirekt and Sofortüberweisung.</p>
 
-      <tr>
-        <td data-value="tutanota">
-          <img
-            alt="Tutanota"
-            src="/assets/img/svg/3rd-party/tutanota.svg"
-            data-theme-src="/assets/img/svg/3rd-party/tutanota-dark.svg"
-            width="200"
-            height="70">
-        </td>
-        <td>
-          <a
-            class="btn-secondary btn-icon"
-            href="https://tutanota.com">
-            <span class="fas fa-globe"></span>
-          </a>
-        </td>
-        <td data-value="2011">2011</td>
-        <td>
-          <span class="no-text-wrap">
-            <span class="flag-icon flag-icon-de"></span> Germany
-          </span>
-        </td>
-        <td data-value="1000">1 GB</td>
-        <td data-value="0"><span class="label label-warning">Free</span></td>
-        <td data-value="0"><span class="label label-primary">No</span></td>
-        <td data-value="1"><span class="label label-success">Built-in</span></td>
-        <td data-value="1"><span class="label label-success">Yes</span></td>
-      </tr>
+    <h5><span class="badge badge-success">Account Security</span></h5>
+    <p>Mailbox.org supports <a href="https://kb.mailbox.org/display/MBOKBEN/How+to+use+two-factor+authentication+-+2FA">two factor authentication</a> for their webmail only. You can use either <a href="https://en.wikipedia.org/wiki/Time-based_One-time_Password_Algorithm">TOTP</a> or a <a href="https://en.wikipedia.org/wiki/YubiKey">Yubikey</a> via the <a href="https://www.yubico.com/products/services-software/yubicloud">Yubicloud</a>. Web standards such as <a href="https://en.wikipedia.org/wiki/Universal_2nd_Factor">U2F</a> and <a href="https://en.wikipedia.org/wiki/WebAuthn">WebAuthn</a> are not yet supported.</p>
 
-    </tbody>
-  </table>
+    <h5><span class="badge badge-warning">Data Security</span></h5>
+    <p>Mailbox.org allows for encryption of incoming mail using their <a href="https://kb.mailbox.org/display/MBOKBEN/The+Encrypted+Mailbox">encrypted mailbox</a>. New messages that you receive will then be immediately encrypted with your public key.</p>
+    <p>However, <a href="https://en.wikipedia.org/wiki/Open-Xchange">Open-Exchange</a>, the software platform used by Mailbox.org, <a href="https://kb.mailbox.org/display/BMBOKBEN/Encryption+of+calendar+and+address+book">does not support</a> the encryption of your address book and calendar. A <a href="/software/calendar-contacts/">standalone option</a> may be more appropriate for that information.</p>
+
+    <h5><span class="badge badge-success">Email Encryption</span></h5>
+    <p>Mailbox.org has <a href="https://kb.mailbox.org/display/MBOKBEN/Send+encrypted+e-mails+with+Guard">integrated encryption</a> in their webmail, which simplifies sending messages to users with public OpenPGP keys. They also allow <a href="https://kb.mailbox.org/display/MBOKBEN/My+recipient+does+not+use+PGP">remote recipients to decrypt an email</a> on Mailbox.org's servers. This feature is useful when the remote recipient does not have OpenPGP and cannot decrypt a copy of the email in their own mailbox.</p>
+    <p>Mailbox.org also supports the discovery of public keys via HTTP from their <a href="https://wiki.gnupg.org/WKD">Web Key Directory (WKD)</a>. This allows users outside of Mailbox.org to find the OpenPGP keys of Mailbox.org users easily, for cross-provider E2EE.</p>
+
+    <h5><span class="badge badge-warning">.onion Service</span></h5>
+    <p>You can access your Mailbox.org account via IMAP/SMTP using <a href="https://kb.mailbox.org/display/MBOKBEN/The+Tor+exit+node+of+mailbox.org">their .onion service</a>. However, their webmail interface cannot be accessed via their .onion service, and users may experience TLS certificate errors.</p>
+
+    <h5><span class="badge badge-info">Extra Functionality</span></h5>
+    <p>All accounts come with limited cloud storage that <a href="https://kb.mailbox.org/display/MBOKBEN/Encrypt+files+on+your+Drive">can be encrypted</a>. Mailbox.org also offers the alias <a href="https://kb.mailbox.org/display/MBOKBEN/Ensuring+E-Mails+are+Sent+Securely">@secure.mailbox.org</a>, which enforces the TLS encryption on the connection between mail servers, otherwise the message will not be sent at all. Mailbox.org also supports <a href="https://en.wikipedia.org/wiki/Exchange_ActiveSync">Exchange ActiveSync</a> in addition to standard access protocols like IMAP and POP3.</p>
+    </div>
+  </div>
+  <div class="row mb-2">
+    <div class="col-lg-3 col-sm-12 pt-lg-5">
+      <img
+        src="/assets/img/svg/3rd-party/posteo.svg"
+        height="70"
+        width="200"
+        class="img-fluid d-block mr-auto ml-auto align-middle"
+        alt="Posteo">
+    </div>
+    <div class="col">
+    <h2 id="posteo" class="anchor"><a href="#posteo"><i class="fas fa-link anchor-icon"></i></a> Posteo <span class="badge badge-info">€12/y</span></h2>
+    <p><strong><a href="https://posteo.de">Posteo.de</a></strong> is an email provider that focuses on anonymous, secure, and private email. Their servers are powered by 100% sustainable energy. They have been in operation since <strong>2009</strong>. Posteo is based in <span class="flag-icon flag-icon-de"></span> Germany and has a free 14-day trial. Posteo comes with 2 GB for the monthly cost and an extra gigabyte can be purchased for €0.25 per month.</p>
+
+    <h5><span class="badge badge-warning">Domains and Aliases</span></h5>
+    <p>Posteo does <a href="https://posteo.de/en/site/faq">not allow the use of custom domains</a>, however users may still make use of <a href="https://posteo.de/en/help/what-is-an-email-alias">subaddressing</a>.</p>
+
+    <h5><span class="badge badge-warning">Payment Methods</span></h5>
+    <p>Posteo does not accept Bitcoin or other cryptocurrencies as a form of payment, however they do accept cash-by-mail. They also accept credit/debit cards, bank transfers, and PayPal, and remove PII (personally identifiable information) <a href="https://posteo.de/en/site/payment">that they receive</a> in connection with these payment methods.</p>
+
+    <h5><span class="badge badge-success">Account Security</span></h5>
+    <p>Posteo supports <a href="https://posteo.de/en/help/what-is-two-factor-authentication-and-how-do-i-set-it-up">two factor authentication</a> for their webmail only. You can use either <a href="https://en.wikipedia.org/wiki/Time-based_One-time_Password_Algorithm">TOTP</a> a <a href="https://en.wikipedia.org/wiki/YubiKey">Yubikey</a> with TOTP. Web standards such as <a href="https://en.wikipedia.org/wiki/Universal_2nd_Factor">U2F</a> and <a href="https://en.wikipedia.org/wiki/WebAuthn">WebAuthn</a> are not yet supported.</p>
+
+    <h5><span class="badge badge-warning">Data Security</span></h5>
+    <p>Posteo has <a href="https://posteo.de/en/site/encryption#cryptomailstorage">zero access encryption</a> for email storage. This means the messages stored in your account are only readable by you.</p>
+    <p>Posteo also supports the encryption of your <a href="https://posteo.de/en/site/features#featuresaddressbook">address book contacts</a> and <a href="https://posteo.de/en/site/features#featurescalendar">calendars</a> at rest. However, Posteo still uses standard <a href="https://en.wikipedia.org/wiki/CalDAV">CalDAV</a> and <a href="https://en.wikipedia.org/wiki/CardDAV">CardDAV</a> for calendars and contacts. These protocols do not support <a href="https://en.wikipedia.org/wiki/End-to-end_encryption">E2EE (End-To-End Encryption)</a>. A <a href="/software/calendar-contacts/">standalone option</a> may be more appropiate.</p>
+
+    <h5><span class="badge badge-success">Email Encryption</span></h5>
+    <p>Posteo has <a href="https://posteo.de/en/site/encryption#pgp_webmailer">integrated encryption</a> in their webmail, which simplifies sending messages to users with public OpenPGP keys. They also support the discovery of public keys via HTTP from their <a href="https://wiki.gnupg.org/WKD">Web Key Directory (WKD)</a>. This allows users outside of Posteo to find the OpenPGP keys of Posteo users easily, for cross-provider E2EE.</p>
+
+    <h5><span class="badge badge-danger">.onion Service</span></h5>
+    <p>Posteo does not operate a .onion service.</p>
+
+    <h5><span class="badge badge-info">Extra Functionality</span></h5>
+    <p>Posteo allows users to <a href="https://posteo.de/en/help/does-posteo-offer-mailing-lists">set up their own mailing lists</a>. Each account can create one list for free.</p>
+    </div>
+  </div>
+  <div class="row mb-2">
+    <div class="col-lg-3 col-sm-12 pt-lg-5">
+      <img
+        src="/assets/img/svg/3rd-party/soverin.svg"
+        height="70"
+        width="200"
+        class="img-fluid d-block mr-auto ml-auto align-middle"
+        alt="Soverin">
+    </div>
+    <div class="col">
+    <h2 id="soverin" class="anchor"><a href="#soverin"><i class="fas fa-link anchor-icon"></i></a> Soverin <span class="badge badge-info">€29/y</span></h2>
+    <p><strong><a href="https://soverin.net">Soverin.net</a></strong> is an email provider which focuses on being private, ad-free, and powered by sustainable energy. They have been in operation since <strong>2015</strong>. Soverin is based in <span class="flag-icon flag-icon-nl"></span> Amsterdam and does not have a free trial. Accounts start at 25 GB.</p>
+
+    <h5><span class="badge badge-success">Domains and Aliases</span></h5>
+    <p>Soverin lets users use their own domain. Soverin users can also use <a href="https://support.soverin.net/hc/en-us/articles/115004811093-How-can-I-setup-a-catch-all-on-my-domain-">catch-all</a> and <a href="https://support.soverin.net/hc/en-us/articles/115004811073-How-can-I-add-an-alias-to-my-domain-">aliases</a> for domains they own. Soverin also allows for <a href="https://support.soverin.net/hc/en-us/articles/115004811033-Do-support-the-plus-syntax-subaddressing-">subaddressing</a>, which is useful for users who don't want to purchase a domain.</p>
+
+    <h5><span class="badge badge-success">Payment Methods</span></h5>
+    <p>Soverin accepts Bitcoin as payment. They also accept credit/debit cards, PayPal, and the Netherlands-specific payment gateway iDEAL.</p>
+
+    <h5><span class="badge badge-success">Account Security</span></h5>
+    <p>Soverin supports <a href="https://en.wikipedia.org/wiki/Time-based_One-time_Password_Algorithm">TOTP</a> two factor authentication <a href="https://support.soverin.net/hc/en-us/articles/360008819553-Setting-up-2-Factor-Authentication-2FA-Webmail-only">for webmail only</a>. They do not allow <a href="https://en.wikipedia.org/wiki/Universal_2nd_Factor">U2F</a> security key authentication.</p>
+
+    <h5><span class="badge badge-warning">Data Security</span></h5>
+    <p>Soverin has <a href="https://support.soverin.net/hc/en-us/articles/115004810713-Technical-details-about-Soverin">encryption at rest</a> however it doesn't appear to be "zero access", meaning it is technically possible for them to decrypt the data they have.</p>
+    <p>Soverin also uses the standard <a href="https://en.wikipedia.org/wiki/CalDAV">CalDAV</a> and <a href="https://en.wikipedia.org/wiki/CardDAV">CardDAV</a> protocols for calendars and contacts, which do not support E2EE. A <a href="/software/calendar-contacts/">standalone option</a> may be more appropriate.</p>
+
+    <h5><span class="badge badge-success">Email Encryption</span></h5>
+    <p>Soverin has integrated encryption in their webmail, which simplifies sending messages to users. However, Soverin has not integrated a <a href="https://wiki.gnupg.org/WKD">Web Key Directory (WKD)</a> for users on their platform.<p>
+
+    <h5><span class="badge badge-danger">.onion Service</span></h5>
+    <p>Soverin does not operate a .onion service.</p>
+
+    <h5><span class="badge badge-info">Extra Functionality</span></h5>
+    <p>Soverin also providers users with space for a personal webpage.</p>
+    </div>
+  </div>
+  <div class="row mb-2">
+    <div class="col-lg-3 col-sm-12 pt-lg-5">
+      <img
+        src="/assets/img/svg/3rd-party/disroot.svg"
+        data-theme-src="/assets/img/svg/3rd-party/disroot-dark.svg"
+        height="70"
+        width="200"
+        class="img-fluid d-block mr-auto ml-auto align-middle"
+        alt="Disroot">
+    </div>
+    <div class="col">
+    <h2 id="disroot" class="anchor"><a href="#disroot"><i class="fas fa-link anchor-icon"></i></a> Disroot <span class="badge badge-info">Free</span></h2>
+    <p><strong><a href="https://disroot.org/en/services/email">Disroot</a></strong> offers email amongst <a href="https://disroot.org/en/#services">other services</a>. The service is maintained by volunteers and its community. They have been in operation since <strong>2015</strong>. Disroot is based in <span class="flag-icon flag-icon-nl"></span> Amsterdam. Disroot is free and uses open source software such as Rainloop to provide service. Users support the service through donations and buying extra storage. The mailbox limit is 1 GB, but extra storage can be purchased 0.15€ per GB per month paid yearly.</p>
+
+    <h5><span class="badge badge-success">Domains and Aliases</span></h5>
+    <p>Disroot lets users use their own domain. They have aliases, however you must <a href="https://disroot.org/en/forms/alias-request-form">manually apply</a> for them.</p>
+
+    <h5><span class="badge badge-success">Payment Methods</span></h5>
+    <p>Disroot accepts Bitcoin and Faircoin as payment methods. They also accept PayPal, direct bank deposit, and Patreon payments. Disroot is a not-for-profit organization that also accepts donations through Liberapay, Flattr, and Monero, but these payment methods cannot be used to purchase services.</p>
+
+    <h5><span class="badge badge-success">Account Security</span></h5>
+    <p>Disroot supports <a href="https://en.wikipedia.org/wiki/Time-based_One-time_Password_Algorithm">TOTP</a> two factor authentication for webmail only. They do not allow <a href="https://en.wikipedia.org/wiki/Universal_2nd_Factor">U2F</a> security key authentication.</p>
+
+    <h5><span class="badge badge-warning">Data Security</span></h5>
+    <p>Disroot uses full disk encryption. However, it doesn't appear to be "zero access", meaning it is technically possible for them to decrypt the data they have.</p>
+    <p>Disroot also uses the standard <a href="https://en.wikipedia.org/wiki/CalDAV">CalDAV</a> and <a href="https://en.wikipedia.org/wiki/CardDAV">CardDAV</a> protocols for calendars and contacts, which do not support E2EE. A <a href="/software/calendar-contacts/">standalone option</a> may be more appropriate.</p>
+
+    <h5><span class="badge badge-success">Email Encryption</span></h5>
+    <p>Disroot allows for encrypted emails to be sent from their webmail application using OpenPGP. However, Disroot has not integrated a <a href="https://wiki.gnupg.org/WKD">Web Key Directory (WKD)</a> for users on their platform.</p>
+
+    <h5><span class="badge badge-danger">.onion Service</span></h5>
+    <p>Disroot does not operate a .onion service.</p>
+
+    <h5><span class="badge badge-info">Extra Functionality</span></h5>
+    <p>They offer <a href="https://disroot.org/en/#services">other services</a> such as NextCloud, XMPP Chat, Etherpad, Ethercalc, Pastebin, Online polls and a Gitea instance. They also have an app <a href="https://f-droid.org/packages/org.disroot.disrootapp/">available in F-Droid</a>.</p>
+    </div>
+  </div>
+  <div class="row mb-2">
+    <div class="col-lg-3 col-sm-12 pt-lg-5">
+      <img
+        src="/assets/img/svg/3rd-party/tutanota.svg"
+        data-theme-src="/assets/img/svg/3rd-party/tutanota-dark.svg"
+        height="70"
+        width="200"
+        class="img-fluid d-block mr-auto ml-auto align-middle"
+        alt="Tutanota">
+    </div>
+    <div class="col">
+    <h2 id="tutanota" class="anchor"><a href="#tutanota"><i class="fas fa-link anchor-icon"></i></a> Tutanota <span class="badge badge-info">Free</span></h2>
+    <p><strong><a href="https://tutanota.com">Tutanota.com</a></strong> is an email service with a focus on security and privacy through the use of encryption. Tutanota has been in operation since <strong>2011</strong> and is based in Hanover, <span class="flag-icon flag-icon-de"></span> Germany. Accounts start with 1GB storage with their free plan.</p>
+    <p>Tutanota <a href="https://tutanota.com/faq/#imap">doesn't allow</a> the use of third-party <a href="/software/email/">email clients</a>. There are plans to allow Tutanota pull email from <a href="https://github.com/tutao/tutanota/issues/544">external email accounts</a> using the <a href="https://en.wikipedia.org/wiki/Internet_Message_Access_Protocol">IMAP</a> protocol. <a href="https://github.com/tutao/tutanota/issues/630">Email import</a> is currently not possible.</p>
+    <p>Emails can be exported <a href="https://tutanota.com/howto#generalMail">individually or by bulk selection</a>. Tutanota does not allow for <a href="https://github.com/tutao/tutanota/issues/927">subfolders</a> as you might expect with other email providers.</p>
+    <p>Tutanota is working on a <a href="https://tutanota.com/blog/posts/desktop-clients/">desktop client</a> and they have an app <a href="https://f-droid.org/packages/de.tutao.tutanota">available in F-Droid</a>. They also have their app in conventional stores such as <a href="https://apps.apple.com/us/app/tutanota/id922429609">App Store</a> on iOS and <a href="https://play.google.com/store/apps/details?id=de.tutao.tutanota">Google Play</a> for Android.</p>
+
+    <h5><span class="badge badge-success">Domains and Aliases</span></h5>
+    <p>Paid Tutanota accounts can use up to 5 <a href="https://tutanota.com/faq#alias">aliases</a> and <a href="https://tutanota.com/faq#custom-domain">custom domains</a>. Tutanota doesn't allow for <a href="https://tutanota.com/faq#plus">subaddressing (plus addresses)</a>, but you can use a <a href="https://tutanota.com/howto#settings-global">catch-all</a> with a custom domain.</p>
+
+    <h5><span class="badge badge-danger">Payment Methods</span></h5>
+    <p>Tutanota accepts only credit cards and PayPal.</p>
+
+    <h5><span class="badge badge-success">Account Security</span></h5>
+    <p>Tutanota supports <a href="https://tutanota.com/faq#2fa">two factor authentication</a>. Users can either use <a href="https://en.wikipedia.org/wiki/Time-based_One-time_Password_Algorithm">TOTP</a> or <a href="https://en.wikipedia.org/wiki/Universal_2nd_Factor">U2F</a>. U2F support is <a href="https://github.com/tutao/tutanota/issues/443">not yet available on Android</a>.</p>
+
+    <h5><span class="badge badge-success">Data Security</span></h5>
+    <p>Tutanota has <a href="https://tutanota.com/faq#what-encrypted">zero access encryption at rest</a> for your emails, <a href="https://tutanota.com/faq#encrypted-address-book">address book contacts</a>, and <a href="https://tutanota.com/faq#calendar">calendars</a>. This means the messages and other data stored in your account are only readable by you. </p>
+
+    <h5><span class="badge badge-warning">Email Encryption</span></h5>
+    <p>Tutanota <a href="https://www.tutanota.com/faq/#pgp">does not use OpenPGP</a>. Tutanota users can only receive encrypted emails when external users send them through a <a href="https://www.tutanota.com/howto/#encrypted-email-external">temporary Tutanota mailbox</a>.</p>
+    <p>Tutanota <a href="https://github.com/tutao/tutanota/issues/198">does have plans</a> to support <a href="https://autocrypt.org">AutoCrypt</a>. This would allow for external users to send encrypted emails to Tutanota users as long as their email client supports the AutoCrypt headers.</p>
+
+    <h5><span class="badge badge-danger">.onion Service</span></h5>
+    <p>Tutanota does not operate a .onion service but <a href="https://github.com/tutao/tutanota/issues/528">may consider</a> it in the future.</p>
+
+    <h5><span class="badge badge-info">Extra Functionality</span></h5>
+    <p>Tutanota offers the business version of <a href="https://tutanota.com/blog/posts/secure-email-for-non-profit">Tutanota to non-profit organizations</a> for free or with a heavy discount.</p>
+
+    <p>Tutanota also has a business feature called <a href="https://tutanota.com/secure-connect/">Secure Connect</a>. This ensures customer contact to the business uses E2EE. The feature costs €240/y.</p>
+    </div>
+  </div>
+  <div class="row mb-2">
+    <div class="col-lg-3 col-sm-12 pt-lg-5">
+      <img
+        src="/assets/img/svg/3rd-party/startmail.svg"
+        data-theme-src="/assets/img/svg/3rd-party/startmail-dark.svg"
+        height="70"
+        width="200"
+        class="img-fluid d-block mr-auto ml-auto align-middle"
+        alt="StartMail">
+    </div>
+    <div class="col">
+    <h2 id="startmail" class="anchor"><a href="#startmail"><i class="fas fa-link anchor-icon"></i></a> StartMail <span class="badge badge-info">Personal USD $59.95/y</span></h2>
+    <p><strong><a href="https://startmail.com">StartMail.com</a></strong> is an email service with a focus on security and privacy through the use of standard OpenPGP encryption. StartMail has been in operation since <strong>2014</strong> and is based in Boulevard 11, Zeist <span class="flag-icon flag-icon-nl"></span> Netherlands. Accounts start with 10GB. They offer a 30-day trial.</p>
+
+    <h5><span class="badge badge-success">Domains and Aliases</span></h5>
+    <p>Personal accounts can use <a href="https://support.startmail.com/hc/en-us/articles/360007297457-Aliases">Custom or Generated</a> aliases. Business accounts can use <a href="https://support.startmail.com/hc/en-us/articles/360006840058">Domain aliases</a>.</p>
+
+    <h5><span class="badge badge-warning">Payment Methods</span></h5>
+    <p>StartMail accepts Visa, MasterCard, American Express and Paypal. StartMail also has other <a href="https://support.startmail.com/hc/en-us/articles/360006620637-Payment-methods">payment options</a> such as Bitcoin (currently only for Personal accounts) and SEPA Direct Debit for accounts older than a year.</p>
+
+    <h5><span class="badge badge-success">Account Security</span></h5>
+    <p>StartMail supports <a href="https://en.wikipedia.org/wiki/Time-based_One-time_Password_Algorithm">TOTP</a> two factor authentication <a href="https://support.startmail.com/hc/en-us/articles/360006682158-Two-factor-authentication-2FA">for webmail only</a>. They do not allow <a href="https://en.wikipedia.org/wiki/Universal_2nd_Factor">U2F</a> security key authentication.</p>
+
+    <h5><span class="badge badge-warning">Data Security</span></h5>
+    <p>StartMail has <a href="https://www.startmail.com/en/whitepaper/#_Toc458527835">zero access encryption at rest</a>, using their "user vault" system. When a user logs in, the vault is opened, and the email is then moved to the vault out of the queue where it is decrypted by the corresponding private key.</p>
+
+    <p>StartMail supports importing <a href="https://support.startmail.com/hc/en-us/articles/360006495557-Import-contacts">contacts</a> however, they are only accessible in the webmail and not through protocols such as <a href="https://en.wikipedia.org/wiki/CalDAV">CalDAV</a>. Contacts are also not stored using zero knowledge encryption, so a <a href="/software/calendar-contacts/">standalone option</a> may be more appropriate.</p>
+
+    <h5><span class="badge badge-success">Email Encryption</span></h5>
+    <p>StartMail has <a href="https://support.startmail.com/hc/en-us/sections/360001889078-Encryption">integrated encryption</a> in their webmail, which simplifies sending messages to users with public OpenPGP keys.</p>
+
+    <h5><span class="badge badge-danger">.onion Service</span></h5>
+    <p>StartMail does not operate a .onion service.</p>
+
+    <h5><span class="badge badge-info">Extra Functionality</span></h5>
+    <p>StartMail allows for proxying of images within emails. If a user allows the remote image to be loaded, the sender won't know what the user's IP address is.</p>
+    </div>
+  </div>
 </div>
-
-<h3>Interesting Email Providers Under Development</h3>
-
-<ul>
-  <li><a href="https://www.confidantmail.org/">Confidant Mail</a> - An open-source non-SMTP cryptographic email system optimized for large file attachments. It is a secure and spam-resistant alternative to regular email and online file drop services. It
-    uses <a href="https://theprivacyguide.org/tutorials/gpg.html">GNU Privacy Guard (GPG)</a> for content encryption and authentication, and TLS 1.2 with ephemeral keys for transport encryption.</li>
-</ul>
-
-<h3>Become Your Own Email Provider</h3>
-
-<a href="https://mailinabox.email/"><img src="/assets/img/svg/3rd-party/mail-in-a-box.svg" width="80rem" class="img-fluid float-left mr-3" alt="Mail-in-a-Box"></a>
-<p><strong>Mail-in-a-Box</strong> lets you become your own mail service provider in a few easy steps. It's sort of like making your own Gmail, but one you control from top to bottom. Technically, Mail-in-a-Box turns a fresh cloud computer into a working mail server. But you don't need to be a technology expert to set it up. <strong>More: <a href="https://mailinabox.email/">https://mailinabox.email/</a></strong></p>
-
-<a href="https://mailcow.email/"><img src="/assets/img/svg/3rd-party/mailcow.svg" width="80rem" class="img-fluid float-left mr-3" alt="Mailcow"></a>
-<p><strong>Mailcow</strong> is a slightly more advanced mail server perfect for those with a bit more Linux experience. It has everything you need in a Docker container: A mailserver with DKIM support, antivirus and spam monitoring, webmail and ActiveSync with SOGo, and web-based administration with 2FA support. <strong>More: <a href="https://mailcow.github.io/mailcow-dockerized-docs/">Mailcow Dockerized docs</a></strong></p>

_includes/sections/email-warning.html

@@ -0,0 +1,10 @@
+
+<div class="card border-danger">
+  <div class="card-header text-danger"><i class="fas fa-exclamation-circle fa-fw"></i> Warning</div>
+    <div class="card-body">
+      <p class="card-text text-danger">When using end-to-end encryption (E2EE) technology like <a href="https://en.wikipedia.org/wiki/Pretty_Good_Privacy">OpenPGP</a>, email will still have some metadata that is not encrypted in the header of the email. <a href="/providers/email/#metadata">Read more about email metadata.</a></p>
+      <p class="card-text text-danger">OpenPGP also does not support <a href="https://en.wikipedia.org/wiki/Forward_secrecy">Forward secrecy</a>, which means if either your or the recipient's private key is ever stolen, <strong>all</strong> previous messages encrypted with it will be exposed. <a href="/providers/email/#email-encryption">How do I protect my private keys?</a></p>
+      <p class="card-text text-secondary">Rather than use email for prolonged conversations, consider using a medium that does support Forward secrecy.</p>
+      <a href="/software/real-time-communication/" class="btn btn-outline-secondary">Recommended Instant Messengers</a>
+    </div>
+</div>

_includes/sections/file-encryption.html

@@ -24,6 +24,7 @@
   image="/assets/img/svg/3rd-party/gnupg.svg"
   description="<strong>GnuPG</strong> is a GPL-licensed alternative to the PGP suite of cryptographic software. GnuPG is compliant with RFC 4880, which is the current IETF standards track specification of OpenPGP. Current versions of PGP (and Veridis' Filecrypt) are interoperable with GnuPG and other OpenPGP-compliant systems. GnuPG is a part of the Free Software Foundation's GNU software project, and has received major funding from the German government."
   website="https://gnupg.org/"
+  privacy-policy="https://gnupg.org/privacy-policy.html"
   forum="https://forum.privacytools.io/t/discussion-gnupg-file-encryption/1533"
   git="https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git"
   windows="https://gpg4win.org/download.html"
@@ -38,17 +39,17 @@
 
 {%
   include cardv2.html
-  title="PeaZip - File Archive Encryption"
-  image="/assets/img/svg/3rd-party/peazip.svg"
-  description="<strong>PeaZip</strong> is a free and open-source file manager and file archiver made by Giorgio Tani. It supports its native PEA archive format (featuring compression, multi volume split and flexible authenticated encryption and integrity check schemes) and other mainstream formats, with special focus on handling open formats. It also supports 180+ archive formats."
-  website="http://www.peazip.org"
-  forum="https://forum.privacytools.io/t/discussion-peazip-file-encryption/1534"
-  source="https://osdn.net/projects/peazip"
-  windows="https://www.peazip.org/peazip-64bit.html"
-  linux="https://www.peazip.org/peazip-linux.html"
-  freebsd="https://www.freshports.org/archivers/peazip/"
-  openbsd="https://www.peazip.org/peazip-bsd.html"
-  netbsd="https://www.peazip.org/peazip-bsd.html"
+  title="7 Zip"
+  image="/assets/img/svg/3rd-party/7zip.svg"
+  description='<strong>7-Zip</strong> is a free and open-source file archiver, a utility used to place groups of files within compressed containers. On Linux, MacOS etc. the command-line tool <a href="http://p7zip.sourceforge.net/"><strong>p7zip</strong></a> is used and integrates into various interfaces such as <a href="https://wiki.gnome.org/Apps/FileRoller">FileRoller</a>, <a href="https://github.com/ib/xarchiver">Xarchiver</a>, <a href="https://kde.org/applications/utilities/ark">Ark</a>.'
+  website="https://7-zip.org"
+  forum="https://forum.privacytools.io/t/discussion-7-zip/3024"
+  source="https://sourceforge.net/projects/sevenzip/files/"
+  windows="https://7-zip.org/download.html"
+  linux="https://sourceforge.net/projects/p7zip/files"
+  freebsd="https://www.freshports.org/archivers/p7zip"
+  openbsd="https://sourceforge.net/projects/p7zip"
+  netbsd="https://sourceforge.net/projects/p7zip"
 %}
 
 <h3>Worth Mentioning</h3>
@@ -56,6 +57,8 @@
 <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. <span class="badge badge-warning" data-toggle="tooltip" title="Cryptomator's mobile apps are not open-source."><a href="https://github.com/cryptomator/cryptomator-android/issues/1#issuecomment-257979375"><i class="fas fa-exclamation-triangle"></i></a></span></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, open-source file archiver with the ability to encrypt files.</li>
+  <li><a href="https://www.keka.io/">Keka</a> - A macOS-only, file archiver with the ability to encrypt files. <span class="badge badge-warning" data-toggle="tooltip" title="This software isn't open source anymore"><a href="https://github.com/aonez/Keka#so-where-is-the-source-code"><i class="fas fa-exclamation-triangle"></i></a></span>
+  </li>
 </ul>

_includes/sections/file-sharing.html

@@ -3,8 +3,10 @@
 {% include cardv2.html
 title="Firefox Send"
 image="/assets/img/svg/3rd-party/firefox_send.svg"
-website="https://send.firefox.com/"
+labels="warning:<a href=//send.firefox.com/legal>Warning</a>: IP addresses are retained in logs for 90 days."
 description="Firefox Send uses end-to-end encryption to keep your data secure from the moment you share to the moment your file is opened. It also offers security controls that you can set. You can choose when your file link expires, the number of downloads, and whether you would like to add a password for an extra layer of security."
+website="https://send.firefox.com/"
+privacy-policy="https://send.firefox.com/legal"
 forum="https://forum.privacytools.io/t/discussion-firefox-send/755"
 github="https://github.com/mozilla/send"
 web="https://send.firefox.com/"
@@ -15,8 +17,8 @@ googleplay="https://play.google.com/store/apps/details?id=org.mozilla.firefoxsen
 title="OnionShare"
 image="/assets/img/svg/3rd-party/onionshare.svg"
 website="https://onionshare.org/"
-tor="http://elx57ue5uyfplgva.onion/"
-description="OnionShare is an open-source tool that lets you securely and anonymously share a file of any size. It works by starting a web server, making it accessible as a Tor onion service, and generating an unguessable URL for you to share so that the recipients can access and download the files."
+tor="http://lldan5gahapx5k7iafb3s4ikijc4ni7gx5iywdflkba5y2ezyg6sjgyd.onion/"
+description="OnionShare is an open-source tool that lets you securely and anonymously share a file of any size. It works by starting a web server accessible as a Tor onion service, with an unguessable URL that you can share with the recipients to download or send files."
 forum="https://forum.privacytools.io/t/discussion-onionshare/754"
 github="https://github.com/micahflee/onionshare"
 windows="https://onionshare.org/#downloads"
@@ -44,6 +46,7 @@ netbsd="https://pypi.org/project/magic-wormhole/"
 <h3>Worth Mentioning</h3>
 
 <ul>
-  <li><a href="https://github.com/schollz/croc">croc</a> - Easily and securely send things from one computer to another.</li>
-  <li><a href="https://freedombox.org/">FreedomBox</a> - Designed to be your own inexpensive server at home. It runs free software and offers an increasing number of services ranging from a calendar or Jabber server, to a wiki, or VPN.</li>
+  <li><a href="https://framadrop.org/">FramaDrop</a> - Stores a file of any size for 24h. Data is end-to-end encrypted from your browser, powered by <a href="https://framagit.org/fiat-tux/hat-softwares/lufi">LuFi</a>. <span class="badge badge-warning" data-toggle="tooltip" title="FramaDrop logs IP addresses and fingerprints the browser for an unclear amount of time."><a href="https://framasoft.org/en/cgu/"><i class="fas fa-exclamation-triangle"></i></a></span></li>
+  <li><a href="https://github.com/schollz/croc">croc</a> - Easily and securely send arbitrary-sized files from one computer to another. Similar to Magic Wormhole but without dependencies.</li>
+  <li><a href="https://freedombox.org/">FreedomBox</a> - Designed to be your own inexpensive server at home. It runs free software and offers an increasing number of services ranging from a calendar or XMPP server, to a wiki, or VPN.</li>
 </ul>

_includes/sections/file-sync.html

@@ -20,18 +20,6 @@
   googleplay="https://play.google.com/store/apps/details?id=com.github.catfriend1.syncthingandroid"
 %}
 
-{%
-  include cardv2.html
-  title="SparkleShare"
-  image="/assets/img/svg/3rd-party/sparkleshare.svg"
-  description="<strong>SparkleShare</strong> creates a special folder on your computer. You can add remotely hosted folders (or \"projects\") to this folder. These projects will be automatically kept in sync with both the host and all of your peers when someone adds, removes, or edits a file."
-  website="https://sparkleshare.org/"
-  forum="https://forum.privacytools.io/t/discussion-sparkleshare/1626"
-  github="https://github.com/hbons/SparkleShare"
-  linux="https://www.sparkleshare.org/"
-  mac="https://github.com/hbons/SparkleShare/releases/"
-%}
-
 <h3>Worth Mentioning</h3>
 
 <ul>

_includes/sections/hosting-provider.html

@@ -6,6 +6,7 @@ image="/assets/img/svg/3rd-party/bahnhof.svg"
 image-dark="/assets/img/svg/3rd-party/bahnhof-dark.svg"
 description="Bahnhof is one of Sweden’s largest network operators, founded in 1994. They specialize in innovative data center construction: Extreme security coupled with low-cost green energy has made them world famous."
 website="https://www.bahnhof.net/"
+privacy-policy="https://www.bahnhof.net/page/privacy-policy"
 forum="https://forum.privacytools.io/t/discussion-bahnhof-net/341"
 %}
 
@@ -13,7 +14,7 @@ forum="https://forum.privacytools.io/t/discussion-bahnhof-net/341"
 title="VPS & Domain: Njalla"
 image="/assets/img/svg/3rd-party/njalla.svg"
 image-dark="/assets/img/svg/3rd-party/njalla-dark.svg"
-description="Njalla is a privacy-aware domain registration service and VPS provider based in Nevis (with VPS data centers in Sweden). It is created by people from The Pirate Bay and IPredator VPN. Accepted payments: Bitcoin, Litecoin, Monero, DASH, Bitcoin Cash and PayPal."
+description="Njalla is a privacy-aware domain registration service and VPS provider based in Nevis (with VPS data centers in Sweden). It is created by people from The Pirate Bay and IPredator VPN. Accepted payments: Bitcoin, Litecoin, Monero, Zcash, DASH, Bitcoin Cash and PayPal."
 website="https://njal.la/"
 tor="http://njalladnspotetti.onion"
 forum="https://forum.privacytools.io/t/discussion-njalla/339"
@@ -24,6 +25,7 @@ title="Colocation: DataCell"
 image="/assets/img/png/3rd-party/datacell.png"
 description="DataCell is a data center providing secure colocating in Switzerland and Iceland."
 website="https://datacell.is/"
+privacy-policy="https://datacell.is/privacy/"
 forum="https://forum.privacytools.io/t/discussion-datacell-is/342"
 %}
 
@@ -32,5 +34,6 @@ title="VPS, Hosting, & Domain: Orange Website"
 image="/assets/img/png/3rd-party/orange_website.png"
 description="Orange Website is an Icelandic web hosting provider that prides themselves in protecting online privacy and free speech."
 website="https://www.orangewebsite.com/"
+privacy-policy="https://www.orangewebsite.com/docs/privacy-policy.php"
 forum="https://forum.privacytools.io/t/discussion-orange-website/343"
 %}

_includes/sections/instant-messenger.html

@@ -1,4 +1,10 @@
-<h1 id="im" class="anchor"><a href="#im"><i class="fas fa-link anchor-icon"></i></a> Encrypted Instant Messengers</h1>
+<h1 id="im" class="anchor">
+  <a href="#im"><i class="fas fa-link anchor-icon"></i></a>
+  Encrypted Instant Messengers
+</h1>
+
+<div class="alert alert-warning" role="alert">
+  <strong>If you are currently using an Instant Messenger like Telegram, LINE, Viber, <a href="https://www.eff.org/deeplinks/2016/10/where-whatsapp-went-wrong-effs-four-biggest-security-concerns">WhatsApp</a>, or plain SMS, you should pick an alternative here.</strong></div>
 
 <p>We only recommend instant messenger programs or apps that support <a href="https://en.wikipedia.org/wiki/End-to-end_encryption">end-to-end encryption (E2EE)</a>. When E2EE is used, all transmissions (messages, voice, video, etc.) are encrypted <strong>before</strong> they are sent from your device. E2EE protects both the authenticity and confidentiality of the transmission as they pass through any part of the network (servers, etc.).</p>
 
@@ -6,45 +12,29 @@
 
 <p>We have described the three main types of messaging programs that exist: Centralized, Federated and Peer-to-Peer (P2P), with the advantages and disadvantages of each.</p>
 
-<h2 id="centralized" class="anchor"><a href="#centralized"><i class="fas fa-link anchor-icon"></i></a> Centralized</h2>
+<h2 id="centralized" class="anchor">
+  <a href="#centralized"><i class="fas fa-link anchor-icon"></i></a>
+  Centralized
+</h2>
 
 <p>Centralized messengers are those where every participant is on the same server or network of servers controlled by the same organization.</p>
 
-<h3>Advantages</h3>
-<ul>
-    <li>New features and changes can be implemented more quickly.</li>
-    <li>Easier to get started with and to find contacts.</li>
-</ul>
-
-<h3>Disadvantages</h3>
-<ul>
-    <li>Centralized services could be more susceptible to <a href="#exploiting-centralized-networks">legislation requiring backdoor access</a>.</li>
-    <li>Can include <a href="https://drewdevault.com/2018/08/08/Signal.html">restricted control or access</a>. This can include things like:</li>
-    <ul>
-        <li>Being <a href="https://github.com/LibreSignal/LibreSignal/issues/37#issuecomment-217211165">forbidden from connecting third-party clients</a> to the centralized network that might provide for greater customization or better user experience. Often defined in Terms and Conditions of usage.</li>
-        <li>Poor or no documentation for third-party developers.</li>
-    </ul>
-    <li>The <a href="https://blog.privacytools.io/delisting-wire">ownership</a>, privacy policy, and operations of the service can change easily when a single entity controls it, potentially compromising the service later on.</li>
-</ul>
-
-<div class="alert alert-warning" role="alert">
-  <strong>If you are currently using an Instant Messenger like Telegram, LINE, Viber, <a href="https://www.eff.org/deeplinks/2016/10/where-whatsapp-went-wrong-effs-four-biggest-security-concerns">WhatsApp</a>, or plain SMS, you should pick an alternative here.</strong></div>
-
 {%
-   include cardv2.html
-   title="Signal"
-   image="/assets/img/svg/3rd-party/signal.svg"
-   description='Signal is a mobile app developed by Signal Messenger LLC. The app provides instant messaging, as well as voice and video calling. All communications are E2EE unless you choose to send as SMS. Its protocol has also been <a href="https://eprint.iacr.org/2016/1013.pdf">indepedently audited (PDF)</a>'
-   labels="warning:<a>Requires phone number</a>:Signal requires your phone number as an personal identifier which means anyone you communicate with will see it.|success:VoIP"
-   website="https://signal.org/"
-   forum="https://forum.privacytools.io/t/discussion-signal/664"
-   github="https://github.com/signalapp"
-   windows="https://signal.org/download/"
-   mac="https://signal.org/download/"
-   linux="https://signal.org/download/"
-   googleplay="https://play.google.com/store/apps/details?id=org.thoughtcrime.securesms"
-   android="https://signal.org/android/apk/#apk-danger"
-   ios="https://apps.apple.com/app/signal-private-messenger/id874139669"
+  include cardv2.html
+  title="Signal"
+  image="/assets/img/svg/3rd-party/signal.svg"
+  description='Signal is a mobile app developed by Signal Messenger LLC. The app provides instant messaging, as well as voice and video calling. All communications are E2EE unless you choose to send as SMS. Its protocol has also been <a href="https://eprint.iacr.org/2016/1013.pdf">indepedently audited (PDF)</a>'
+  labels="warning:<a>Requires phone number</a>:Signal requires your phone number as an personal identifier which means anyone you communicate with will see it.|success:VoIP"
+  website="https://signal.org/"
+  privacy-policy="https://signal.org/legal/"
+  forum="https://forum.privacytools.io/t/discussion-signal/664"
+  github="https://github.com/signalapp"
+  windows="https://signal.org/download/"
+  mac="https://signal.org/download/"
+  linux="https://signal.org/download/"
+  googleplay="https://play.google.com/store/apps/details?id=org.thoughtcrime.securesms"
+  android="https://signal.org/android/apk/#apk-danger"
+  ios="https://apps.apple.com/app/signal-private-messenger/id874139669"
 %}
 
 {%
@@ -54,6 +44,7 @@
   description='Keybase provides a hosted team chat with E2EE. Its protocol has also been <a href="https://keybase.io/docs-assets/blog/NCC_Group_Keybase_KB2018_Public_Report_2019-02-27_v1.3.pdf">indepedently audited (PDF)</a>. Keybase can help you prove you own social media accounts though the use of cryptographic signing of "<a href="https://en.wikipedia.org/wiki/Keybase#Identity_proofs">identity proofs</a>".'
   labels="warning:<a href=//github.com/keybase/client/issues/6374>Warning</a>:This software relies on a closed-source central server."
   website="https://keybase.io/"
+  privacy-policy="https://keybase.io/docs/privacypolicy"
   forum="https://forum.privacytools.io/t/discussion-keybase/1224"
   tor="http://keybase5wmilwokqirssclfnsqrjdsi7jdir5wy7y7iu3tanwmtp6oid.onion/"
   github="https://github.com/Keybase"
@@ -67,38 +58,47 @@
   chrome="https://chrome.google.com/webstore/detail/keybase-for-reddit/ognfafcpbkogffpmmdglhbjboeojlefj"
 %}
 
-<div>
-    <h2 id="federated" class="anchor"><a href="#federated"><i class="fas fa-link anchor-icon"></i></a> Federated</h2>
-
-    <p>Federated messengers use multiple, independent servers that are able to talk to each other (email is one example of a federated service). Federation allows system administrators to control their own server and still be a part of the larger communications network.</p>
-
+<div class="container">
+  <div class="row">
+    <div class="col-md-6">
     <h3>Advantages</h3>
     <ul>
-        <li>Allows for greater control over your own data when running your own server.</li>
-        <li>Allows you to choose who to trust your data with by choosing between multiple "public" servers.</li>
-        <li>Often allows for third party clients which can provide a more native, customized, or accessible experience.</li>
-        <li>Generally a less juicy target for governments wanting <a href="#exploiting-centralized-networks">backdoor access to everything</a> as the trust is decentralized. The server may be hosted independently from the organization developing the software.</li>
-        <li>Server software can be verified that it matches public source code, assuming you have access to the server or you trust the person who does (e.g., a family member)</li>
-        <li>Third-party developers can contribute code and add new features, instead of waiting for a private development team to do so.</li>
+      <li>New features and changes can be implemented more quickly.</li>
+      <li>Easier to get started with and to find contacts.</li>
     </ul>
-
+    </div>
+  <div class="col-md-6">
     <h3>Disadvantages</h3>
     <ul>
-        <li>Adding new features is more complex, because these features need to be standardized and tested to ensure they work with all servers on the network.</li>
-        <li>Some metadata may be available (e.g., information like "who is talking to whom," but not actual message content if E2EE is used).</li>
-        <li>Federated servers generally require trusting your server's administrator. They may be a hobbyist or otherwise not a "security professional," and may not serve standard documents like a privacy policy or terms of service detailing how your data is utilized.</li>
-        <li>Server administrators sometimes choose to block other servers, which are a source of unmoderated abuse or break general rules of accepted behavior. This will hinder your ability to communicate with users on those servers.</li>
+      <li>Centralized services could be more susceptible to <a href="#exploiting-centralized-networks">legislation requiring backdoor access</a>.</li>
+      <li>Can include <a href="https://drewdevault.com/2018/08/08/Signal.html">restricted control or access</a>. This can include things like:</li>
+      <ul>
+        <li>Being <a href="https://github.com/LibreSignal/LibreSignal/issues/37#issuecomment-217211165">forbidden from connecting third-party clients</a> to the centralized network that might provide for greater customization or better user experience. Often defined in Terms and Conditions of usage.</li>
+        <li>Poor or no documentation for third-party developers.</li>
+      </ul>
+      <li>The <a href="https://blog.privacytools.io/delisting-wire">ownership</a>, privacy policy, and operations of the service can change easily when a single entity controls it, potentially compromising the service later on.</li>
     </ul>
+  </div>
+  </div>
 </div>
 
+<div>
+  <h2 id="federated" class="anchor">
+    <a href="#federated"><i class="fas fa-link anchor-icon"></i></a>
+    Federated
+  </h2>
+
+  <p>Federated messengers use multiple, independent servers that are able to talk to each other (email is one example of a federated service). Federation allows system administrators to control their own server and still be a part of the larger communications network.</p>
+
 {%
   include cardv2.html
-  title="Matrix"
-  image="/assets/img/svg/3rd-party/matrix.svg"
-  image-dark="/assets/img/svg/3rd-party/matrix-dark.svg"
-  description='<a href="https://matrix.org/docs/guides/introduction">Matrix</a> is an open-source project that publishes the <a href="https://matrix.org/docs/spec">Matrix open standard</a> for secure, decentralized, real-time communication.<br />
-  <a href="https://en.wikipedia.org/wiki/Riot.im">Riot.im</a> is the popular reference client produced by the Matrix.org team. It offers optional E2EE for 1:1 and group conversations that <strong>must</strong> be turned on by the user. (This can be done by clicking on the toggle switch which is accessed by clicking the room name or user name of the chat → Security &amp; Privacy → Encrypted). In the future it will be <a href="https://github.com/vector-im/riot-web/issues/6779">on by default.</a>'
+  title="Riot"
+  image="/assets/img/svg/3rd-party/riotim.svg"
+  description='<a href="//about.riot.im">Riot.im</a> is the reference client for the <a href="//matrix.org/docs/guides/introduction">Matrix</a> network. The <a href="//matrix.org/docs/spec">Matrix open standard</a> is an open-source standard for secure, decentralized, real-time communication.<br />'
+  labels="warning:<a href=//github.com/vector-im/riot-web/issues/6779>Warning</a>:Riot offers optional E2EE for 1&#x3a;1 and group conversations that must be turned on by the user.
+  (This can be done by clicking on the toggle switch which is accessed by clicking the room name or user name of the chat → Security &amp; Privacy → Encrypted).|success:VoIP"
   website="https://about.riot.im/"
+  privacy-policy="https://riot.im/privacy"
   forum="https://forum.privacytools.io/t/discussion-riot-im/665/"
   github="https://github.com/vector-im/riot-web/"
   windows="https://riot.im/download/desktop/"
@@ -110,49 +110,52 @@
   web="https://riot.im/app/"
 %}
 
-<div>
-    <h4>Worth Mentioning</h4>
-
-    <ul>
-        <li>Other <a href="https://matrix.org/clients">Matrix</a> clients, that may however be less feature complete than Riot.im.</li>
-        <li><a href="https://xmpp.org/about">XMPP</a> (Extensible Messaging and Presence Protocol) is an open-source communications protocol that began development in 1999. Since then, XMPP has been extended by the publishing of XEPs (XMPP Extension Protocols). <a href="https://conversations.im/omemo/">OMEMO</a> is the most popular XEP (XMPP extension) for E2EE. Clients are developed by the community and not by the XSF (XMPP Standards Foundation). <span class="badge badge-warning" data-toggle="tooltip" title="VoIP and file transfers/names may not be end-to-end encrypted.">Inconsistent E2EE</span></li>
-        <ul>
-            <li><a href="https://gajim.org/">Gajim</a></li>
-            <li><a href="https://conversations.im">Conversations</a></li>
-            <li><a href="https://siskin.im/">Siskin</a></li>
-            <li>Other <a href="https://omemo.top">OMEMO</a> capable clients for XMPP.</li>
-        </ul>
-        <li><a href="https://www.kontalk.org">Kontalk</a> is a community-driven instant messaging network based on XMPP.</li>
-    </ul>
-
-    <h2 id="peer-to-peer" class="anchor"><a href="#peer-to-peer"><i class="fas fa-link anchor-icon"></i></a> Peer to Peer (P2P)</h2>
-
-    <p>Peer-to-Peer instant messengers connect directly to each other without requiring third-party servers. Clients (peers) usually find each other through the use of a <a href="https://en.wikipedia.org/wiki/Distributed_computing">distributed computing</a> network. Examples of this include <a href="https://en.wikipedia.org/wiki/Distributed_hash_table">DHT (distributed hash table)</a> (used with technologies like <a href="https://en.wikipedia.org/wiki/BitTorrent_(protocol)">torrents</a> and <a href="https://en.wikipedia.org/wiki/InterPlanetary_File_System">IPFS</a>, for example), or <a href="https://en.wikipedia.org/wiki/Ethereum">Ethereum</a>'s <a href="https://github.com/ethereum/wiki/wiki/Whisper">Whisper</a> protocol (used with some newer DApps). Another approach is proximity based networks, where a connection is established over WiFi or Bluetooth (for example, Briar or the <a href="https://www.scuttlebutt.nz">Scuttlebutt</a> social networking protocol). Once a peer has found a route to its contact via any of these methods, a direct connection between them is made.</p>
-
-
-    <h3>Advantages</h3>
-    <ul>
-        <li>Minimal information is exposed to third parties.</li>
-        <li>Modern P2P platforms implement end-to-end encryption by default. There are no servers that could potentially intercept and decrypt your transmissions, unlike centralized and federated models.</li>
-    </ul>
-
-    <h3>Disadvantages</h3>
-    <ul>
-        <li>Reduced feature set:</li>
-        <ul>
-            <li>Messages can only be sent when both peers are online, however, your client may store messages locally to wait for the contact to return online.</li>
-            <li>Generally increases battery usage on mobile devices, because the client must stay connected to the distributed network to learn about who is online.</li>
-        </ul>
-        <li>Your <a href="https://en.wikipedia.org/wiki/IP_address">IP address</a> and that of the contacts you're communicating with may be visible if you do not use the software in conjunction with a <a href="/software/networks">self contained network</a>, such as <a href="https://www.torproject.org">Tor</a> or <a href="https://geti2p.net/">I2P</a>. Many countries have some form of mass surveillance and/or metadata retention.</li>
-    </ul>
+<div class="container">
+  <div class="row">
+    <div class="col-md-6">
+      <h3>Advantages</h3>
+      <ul>
+        <li>Allows for greater control over your own data when running your own server.</li>
+        <li>Allows you to choose who to trust your data with by choosing between multiple "public" servers.</li>
+        <li>Often allows for third party clients which can provide a more native, customized, or accessible experience.</li>
+        <li>Generally a less juicy target for governments wanting <a href="#exploiting-centralized-networks">backdoor access to everything</a> as the trust is decentralized. The server may be hosted independently from the organization developing the software.</li>
+        <li>Server software can be verified that it matches public source code, assuming you have access to the server or you trust the person who does (e.g., a family member)</li>
+        <li>Third-party developers can contribute code and add new features, instead of waiting for a private development team to do so.</li>
+      </ul>
+    </div>
+    <div class="col-md-6">
+      <h3>Disadvantages</h3>
+      <ul>
+        <li>Adding new features is more complex, because these features need to be standardized and tested to ensure they work with all servers on the network.</li>
+        <li>Some metadata may be available (e.g., information like "who is talking to whom," but not actual message content if E2EE is used).</li>
+        <li>Federated servers generally require trusting your server's administrator. They may be a hobbyist or otherwise not a "security professional," and may not serve standard documents like a privacy policy or terms of service detailing how your data is utilized.</li>
+        <li>Server administrators sometimes choose to block other servers, which are a source of unmoderated abuse or break general rules of accepted behavior. This will hinder your ability to communicate with users on those servers.</li>
+      </ul>
+    </div>
+  </div>
 </div>
 
+<div>
+  <h4>Worth Mentioning</h4>
+
+  <ul>
+    <li><a href="https://status.im">Status.im</a> - Encrypted instant messenger with an integrated <a href="https://en.wikipedia.org/wiki/Ethereum">Ethereum</a> wallet (cryptocurrency) that also includes support for <a href="https://our.status.im/tag/dapps">DApps (decentralized apps)</a> (web apps in a curated store). Uses the <a href="https://our.status.im/status-launches-private-peer-to-peer-messaging-protocol/">Waku protocol (a fork of Whisper)</a> for P2P communication. Only available for iOS and Android.</li>
+  </ul>
+
+  <h2 id="peer-to-peer" class="anchor">
+    <a href="#peer-to-peer"><i class="fas fa-link anchor-icon"></i></a>
+    Peer to Peer (P2P)
+  </h2>
+
+  <p>Peer-to-Peer instant messengers connect directly to each other without requiring third-party servers. Clients (peers) usually find each other through the use of a <a href="https://en.wikipedia.org/wiki/Distributed_computing">distributed computing</a> network. Examples of this include <a href="https://en.wikipedia.org/wiki/Distributed_hash_table">DHT (distributed hash table)</a> (used with technologies like <a href="https://en.wikipedia.org/wiki/BitTorrent_(protocol)">torrents</a> and <a href="https://en.wikipedia.org/wiki/InterPlanetary_File_System">IPFS</a>, for example). Another approach is proximity based networks, where a connection is established over WiFi or Bluetooth (for example, Briar or the <a href="https://www.scuttlebutt.nz">Scuttlebutt</a> social networking protocol). Once a peer has found a route to its contact via any of these methods, a direct connection between them is made.</p>
+
 {%
   include cardv2.html
   title="Briar"
   image="/assets/img/svg/3rd-party/briar.svg"
   description="Encrypted instant messenger that connects to contacts via Wi-Fi, Bluetooth, or Tor over the internet to synchronize messages. Technology such as this has proven to be useful when Internet availability is an issue, such as in times of crisis."
   website="https://briarproject.org"
+  privacy-policy="https://briarproject.org/privacy-policy/"
   forum="https://forum.privacytools.io/t/discussion-briar/2114"
   gitlab="https://code.briarproject.org/briar/briar"
   fdroid="https://f-droid.org/packages/org.briarproject.briar.android/"
@@ -163,9 +166,10 @@
   include cardv2.html
   title="Jami"
   image="/assets/img/svg/3rd-party/jami.svg"
-  description="Encrypted instant messaging and video calling software. Uses <a href=//jami.net/improving-performance-and-security-with-tls-1-3/>TLS 1.3</a> for encryption."
-  labels="success:VoIP"
+  description="Encrypted instant messaging and video calling software. All communications are E2EE using <a href=//jami.net/improving-performance-and-security-with-tls-1-3/>TLS 1.3</a> and never stored elsewhere than on user's devices, even when <a href=//jami.net/why-is-jami-truly-distributed/>TURN servers are used</a>."
+  labels="warning:<a href=//git.jami.net/savoirfairelinux/ring-project/issues/765>Warning</a>:This software is partially centralized but can be self-hosted.|success:VoIP"
   website="https://jami.net/"
+  privacy-policy="https://jami.net/privacy-policy/"
   forum="https://forum.privacytools.io/t/discussion-jami/2116"
   gitlab="https://git.jami.net/savoirfairelinux"
   windows="https://jami.net/download-jami-windows"
@@ -176,30 +180,25 @@
   ios="https://itunes.apple.com/app/ring-a-gnu-package/id1306951055?mt=8"
 %}
 
-{%
-  include cardv2.html
-  title="Tox"
-  image="/assets/img/svg/3rd-party/tox.svg"
-  image-dark="/assets/img/svg/3rd-party/tox-dark.svg"
-  description='Encrypted instant messaging and video calling software. Uses its <a href="https://toktok.ltd/spec.html"> own encryption protocol</a> that has not yet been officially audited by cryptographers.'
-  labels="warning:<a href=//tox.chat/download.html#warning>Experimental</a>:Encryption has not been audited by professional cryptographers|success:VoIP"
-  website="https://tox.chat"
-  forum="https://forum.privacytools.io/t/discussion-tox/2115"
-  windows="https://tox.chat/download.html#oses"
-  mac="https://tox.chat/download.html#oses"
-  linux="https://tox.chat/download.html#oses"
-  freebsd="https://tox.chat/download.html#oses"
-  openbsd="http://openports.se/search.php?so=tox"
-  netbsd="http://pkgsrc.se/search.php?so=tox"
-  fdroid="https://tox.chat/download.html#oses"
-  googleplay="https://tox.chat/download.html#oses"
-  ios="https://tox.chat/download.html#oses"
-%}
-
-<h4>Worth Mentioning</h4>
-
-<ul>
-    <li><a href="https://status.im">Status.im</a> - Encrypted instant messenger with an integrated <a href="https://en.wikipedia.org/wiki/Ethereum">Ethereum</a> wallet (cryptocurrency) that also includes support for <a href="https://our.status.im/tag/dapps">DApps (decentralized apps)</a> (web apps in a curated store). Uses the <a href="https://blog.enuma.io/update/2018/08/08/decentralized-application-messaging-with-whisper.html">Whisper protocol</a> for P2P communication. <span class="badge badge-warning">Experimental</span></li>
-    <li><a href="https://retroshare.cc">Retroshare</a> - Encrypted instant messaging and voice/video call client. RetroShare supports both <a href="https://www.torproject.org/">Tor</a> and <a href="https://geti2p.net">I2P</a>.</li>
-    <li><a href="https://bitmessage.org">Bitmessage</a> is a decentralized, encrypted, peer-to-peer, trustless communications protocol that can be used by one person to send encrypted messages to another person, or to multiple subscribers.</li>
-</ul>
+<div class="container">
+  <div class="row">
+    <div class="col-md-6">
+    <h3>Advantages</h3>
+    <ul>
+      <li>Minimal information is exposed to third parties.</li>
+      <li>Modern P2P platforms implement end-to-end encryption by default. There are no servers that could potentially intercept and decrypt your transmissions, unlike centralized and federated models.</li>
+    </ul>
+    </div>
+    <div class="col-md-6">
+      <h3>Disadvantages</h3>
+      <ul>
+        <li>Reduced feature set:</li>
+        <ul>
+          <li>Messages can only be sent when both peers are online, however, your client may store messages locally to wait for the contact to return online.</li>
+          <li>Generally increases battery usage on mobile devices, because the client must stay connected to the distributed network to learn about who is online.</li>
+        </ul>
+        <li>Your <a href="https://en.wikipedia.org/wiki/IP_address">IP address</a> and that of the contacts you're communicating with may be visible if you do not use the software in conjunction with a <a href="/software/networks">self contained network</a>, such as <a href="https://www.torproject.org">Tor</a> or <a href="https://geti2p.net/">I2P</a>. Many countries have some form of mass surveillance and/or metadata retention.</li>
+      </ul>
+    </div>
+  </div>
+</div>

_includes/sections/key-disclosure-law.html

@@ -28,7 +28,7 @@
   title="Key disclosure laws may apply"
   body='
   <ol class="card-ol">
-    <li><a href="https://en.wikipedia.org/wiki/Key_disclosure_law#Belgium">Belgium *</a> <div class="float-right"><span class="flag-icon flag-icon-be"></span></div></li>
+    <li><a href="https://tweakers.net/nieuws/163116/belgische-rechter-verdachte-mag-verplicht-worden-code-smartphone-af-te-staan.html">Belgium</a> <div class="float-right"><span class="flag-icon flag-icon-be"></span></div></li>
     <li><a href="https://www.riigiteataja.ee/akt/106012016019">Estonia</a> <div class="float-right"><span class="flag-icon flag-icon-ee"></span></div></li>
     <li><a href="https://en.wikipedia.org/wiki/Key_disclosure_law#Finland">Finland *</a> <div class="float-right"><span class="flag-icon flag-icon-fi"></span></div></li>
     <li><a href="https://en.wikipedia.org/wiki/Key_disclosure_law#New_Zealand">New Zealand</a> (unclear) <div class="float-right"><span class="flag-icon flag-icon-nz"></span></div></li>

_includes/sections/live-operating-systems.html

@@ -1,4 +1,4 @@
-<h1 id="live_os" class="anchor"><a href="#live_os"><i class="fas fa-link anchor-icon"></i></a> Live CD Operating Systems</h1>
+<h1 id="live_os" class="anchor"><a href="#live_os"><i class="fas fa-link anchor-icon"></i></a> PC Live Operating Systems</h1>
 
 {% include cardv2.html
 title="Tails"
@@ -10,30 +10,17 @@ website="https://tails.boum.org/"
 git="https://git-tails.immerda.ch/tails/"
 %}
 
-{% include cardv2.html
-title="KNOPPIX"
-image="/assets/img/svg/3rd-party/knoppix.svg"
-image="/assets/img/svg/3rd-party/knoppix-dark.svg"
-description='Knoppix is an operating system based on Debian designed to be run directly from a CD / DVD (Live CD) or a USB flash drive (Live USB), one of the first of its kind for any operating system. When starting a program, it is loaded from the removable medium and decompressed into a RAM drive. The decompression is transparent and on-the-fly.'
-badges="info:GNU/Linux"
-labels="warning:contrib:This software may depend on or recommend non-free software."
-website="https://www.knopper.net/knoppix/index-en.html"
-source="https://www.knopper.net/knoppix-info/index-en.html#license"
-%}
-
-{% include cardv2.html
-title="Puppy Linux"
-image="/assets/img/svg/3rd-party/puppy_linux.svg"
-description='Puppy Linux operating system is a lightweight Linux distribution that focuses on ease of use and minimal memory footprint. The entire system can be run from RAM with current versions generally taking up about 210 MB, allowing the boot medium to be removed after the operating system has started.'
-badges="info:GNU/Linux"
-labels="warning:contrib:This software may depend on or recommend non-free software."
-website="http://puppylinux.org/"
-source="http://distro.ibiblio.org/puppylinux/"
-%}
-
 <h3>Worth Mentioning</h3>
 
 <ul>
-  <li><a href="https://distro.ibiblio.org/tinycorelinux/">Tiny Core Linux</a> <span class="badge badge-info">GNU/Linux</span> <span class="badge badge-warning" data-toggle="tooltip" title="This software may depend on or recommend non-free software.">contrib <i class="far fa-question-circle"></i></span> - A minimal Linux operating system focusing on providing a base system using BusyBox and FLTK. The distribution is notable for its size (15 MB) and minimalism, with additional functionality
-    provided by extensions.</li>
+  <li>
+    <a href="https://getfedora.org/">Fedora Workstation</a>
+    <span class="badge badge-info">GNU/Linux</span>
+    - Fedora is a Linux distribution developed by the Fedora Project and sponsored by Red Hat. Fedora Workstation is a secure, reliable, and user-friendly edition developed for desktops and laptops, using GNOME as the default desktop environment.
+  </li>
+  <li>
+    <a href="https://debian.org/">Debian</a>
+    <span class="badge badge-info">GNU/Linux</span>
+    - Debian is a Unix-like computer operating system and a Linux distribution that is composed entirely of free and open-source software, most of which is under the GNU General Public License, and packaged by a group of individuals known as the Debian project.
+  </li>
 </ul>

_includes/sections/mobile-operating-systems.html

@@ -22,6 +22,7 @@ description='LineageOS is a free and open-source operating system for smartphone
 badges="info:AOSP"
 labels="warning:contrib:This software may depend on or recommend non-free software."
 website="https://www.lineageos.org/"
+privacy-policy="https://www.lineageos.org/legal/"
 github="https://github.com/LineageOS"
 %}
 
@@ -32,6 +33,7 @@ description="Ubuntu Touch is a free and open-source operating system for smartph
 badges="info:GNU/Linux"
 labels="warning:contrib:This software may depend on or recommend non-free software."
 website="https://ubuntu-touch.io/"
+privacy-policy="https://ubports.com/privacy"
 github="https://github.com/ubports"
 %}
 

_includes/sections/notebooks.html

@@ -9,12 +9,13 @@ title="Joplin"
 image="/assets/img/svg/3rd-party/joplin.svg"
 description="Joplin is a free, open-source, and fully-featured note-taking and to-do application which can handle a large number of markdown notes organized into notebooks and tags. It offers end-to-end encryption and can sync through Nextcloud, Dropbox, and more. It also offers easy import from Evernote and plain-text notes."
 website="https://joplinapp.org/"
+privacy-policy="https://joplinapp.org/privacy/"
 github="https://github.com/laurent22/joplin"
 windows="https://joplinapp.org/#desktop-applications"
 mac="https://joplinapp.org/#desktop-applications"
 linux="https://joplinapp.org/#desktop-applications"
 freebsd="https://www.npmjs.com/package/joplin"
-googleplay="https://joplinapp.org/images/BadgeAndroid.png"
+googleplay="https://play.google.com/store/apps/details?id=net.cozic.joplin"
 android="https://joplinapp.org/#mobile-applications"
 ios="https://itunes.apple.com/us/app/joplin/id1315599797"
 firefox="https://addons.mozilla.org/en-US/firefox/addon/joplin-web-clipper/"
@@ -26,6 +27,7 @@ title="Standard Notes"
 image="/assets/img/svg/3rd-party/standard_notes.svg"
 description='Standard Notes is a simple and private notes app that makes your notes easy and available everywhere you are. It features end-to-end encryption on every platform, and a powerful desktop experience with themes and custom editors. It has also been <a href="https://s3.amazonaws.com/standard-notes/security/Report-SN-Audit.pdf">independently audited (PDF)</a>.'
 website="https://standardnotes.org/"
+privacy-policy="https://standardnotes.org/privacy"
 github="https://github.com/standardnotes"
 windows="https://standardnotes.org/#get-started"
 mac="https://standardnotes.org/#get-started"
@@ -41,6 +43,7 @@ title="Turtl"
 image="/assets/img/svg/3rd-party/turtl.svg"
 description="Turtl lets you take notes, bookmark websites, and store documents for sensitive projects. From sharing passwords with your coworkers to tracking research on an article you're writing, Turtl keeps it all safe from everyone but you and those you share with."
 website="https://turtlapp.com/"
+privacy-policy="https://turtlapp.com/privacy/"
 github="https://github.com/turtl"
 windows="https://turtlapp.com/download/"
 mac="https://turtlapp.com/download/"
@@ -60,7 +63,6 @@ chrome="https://chrome.google.com/webstore/detail/turtl/dgcojenhfdjhieoglmiaheih
 <h3>Worth Mentioning</h3>
 
 <ul>
-  <li><a href="https://github.com/notable/notable">Notable</a> - The markdown-based note-taking app that doesn't suck.</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/operating-systems.html

@@ -11,6 +11,7 @@ description='Qubes is an open-source operating system designed to provide strong
 badges="info:Xen"
 labels="warning:contrib:This software may depend on or recommend non-free software."
 website="https://www.qubes-os.org/"
+privacy-policy="https://www.qubes-os.org/privacy/"
 github="https://github.com/QubesOS"
 tor="http://qubesosfasa4zl44o4tws22di6kepyzfeqv3tg4e3ztknltfxqrymdad.onion/"
 %}
@@ -22,6 +23,7 @@ description='Fedora is a Linux distribution developed by the Fedora Project and
 badges="info:GNU/Linux"
 labels="warning:contrib:This software may depend on or recommend non-free software."
 website="https://getfedora.org/"
+privacy-policy="https://fedoraproject.org/wiki/Legal:PrivacyPolicy?rd=Legal/PrivacyPolicy"
 git="https://src.fedoraproject.org/"
 %}
 
@@ -31,6 +33,7 @@ image="/assets/img/svg/3rd-party/debian.svg"
 description='Debian is a Unix-like computer operating system and a Linux distribution that is composed entirely of free and open-source software, most of which is under the GNU General Public License, and packaged by a group of individuals known as the Debian project.'
 badges="info:GNU/Linux"
 website="https://www.debian.org/"
+privacy-policy="https://www.debian.org/legal/privacy"
 tor="http://sejnfjrq6szgca7v.onion"
 gitlab="https://salsa.debian.org/qa/debsources"
 %}

_includes/sections/participate.html

@@ -2,7 +2,7 @@
   <h1 id="participate" class="anchor"><a href="#participate"><i class="fas fa-link anchor-icon"></i></a> Participate with suggestions and constructive criticism</h1>
 </div>
 
-<p>It's important for a website like {{ site.name }} to stay up-to-date. Keep an eye on software updates for the applications listed on our site. Follow recent news about providers that we recommend. We try our best to keep up, but we're not perfect and the internet is changing fast. If you find an error, or you think a provider should not be listed here, or a qualified service provider is missing, or a browser plugin is not the best choice anymore, or anything else... <strong>Talk to us please.</strong> You can also find us on <a rel="me" href="https://social.privacytools.io/@privacytools">our own Mastodon instance</a> or on <a href="https://chat.privacytools.io">Matrix</a> at <code class="highlighter-rouge">#general:privacytools.io</code>.</p>
+<p>It's important for a website like {{ site.name }} to stay up-to-date. Keep an eye on software updates for the applications listed on our site. Follow recent news about providers that we recommend. We try our best to keep up, but we're not perfect and the internet is changing fast. If you find an error, or you think a provider should not be listed here, or a qualified service provider is missing, or a browser plugin is not the best choice anymore, or anything else... <strong>Talk to us please.</strong> You can also find us on <a href="https://chat.privacytools.io">several Matrix rooms</a> mainly <code class="highlighter-rouge">#general:privacytools.io</code>. XMPP users can join there through <a href="https://conversations.im/j/%23general%23privacytools.io@matrix.org">#general#privacytools.io@matrix.org</a>. When using our services, users should follow our <a href="https://wiki.privacytools.io/view/PrivacyTools:Code_of_Conduct">Code of Conduct</a>.</p>
 
 <div class="row">
 
@@ -18,7 +18,7 @@
   {% include card.html color="primary"
   title="Follow on Mastodon & Twitter"
   image="/assets/img/svg/3rd-party/mastodon.svg"
-  url="https://social.privacytools.io/"
+  url="https://social.privacytools.io/@privacytools"
   website="Mastodon"
   extra_button='<a class="btn btn-primary mb-1" href="https://twitter.com/privacytoolsIO">Twitter</a>'
   description="Get the latest privacy-related updates from our Mastodon Feed. Follow us today!"

_includes/sections/password-managers.html

@@ -10,6 +10,7 @@
   image="/assets/img/svg/3rd-party/bitwarden.svg"
   description="<strong>Bitwarden</strong> is a free and open-source password manager. It aims to solve password management problems for individuals, teams, and business organizations. Bitwarden is among the easiest and safest solutions to store all of your logins and passwords while conveniently keeping them synced between all of your devices. If you don't want to use the Bitwarden cloud, you can easily host your own Bitwarden server."
   website="https://bitwarden.com/"
+  privacy-policy="https://bitwarden.com/privacy/"
   forum="https://forum.privacytools.io/t/discussion-bitwarden/1343"
   github="https://github.com/bitwarden"
   web="https://vault.bitwarden.com/#/"
@@ -35,6 +36,7 @@
   image="/assets/img/svg/3rd-party/keepassxc.svg"
   description="<strong>KeePassXC</strong> is a community fork of KeePassX, a native cross-platform port of KeePass Password Safe, with the goal to extend and improve it with new features and bugfixes to provide a feature-rich, fully cross-platform and modern open-source password manager."
   website="https://keepassxc.org/"
+  privacy-policy="https://keepassxc.org/privacy/"
   forum="https://forum.privacytools.io/t/discussion-keepassxc/1344/2"
   github="https://github.com/keepassxreboot/keepassxc"
   windows="https://keepassxc.org/download/#windows"
@@ -55,6 +57,7 @@
   image="/assets/img/svg/3rd-party/lesspass.svg"
   description="<strong>LessPass</strong> is a free and open-source password manager that generates unique passwords for websites, email accounts, or anything else based on a master password and information you know. No sync needed. Uses PBKDF2 and SHA-256. It's advised to use the browser addons for more security."
   website="https://lesspass.com/"
+  privacy-policy="https://addons.mozilla.org/en-US/firefox/addon/lesspass/privacy/"
   forum="https://forum.privacytools.io/t/discussion-keepassxc/1344/2"
   github="https://github.com/lesspass/lesspass"
   windows="https://pypi.org/project/lesspass/"
@@ -81,4 +84,7 @@
   <li>
     <a href="https://pwsafe.org/">Password Safe</a> - Whether the answer is one or hundreds, Password Safe allows you to safely and easily create a secured and encrypted username/password list. With Password Safe all you have to do is create and remember a single "Master Password" of your choice in order to unlock and access your entire username/password list.
   </li>
+  <li>
+    <a href="https://www.passwordstore.org/">Pass</a> - Pass is a bare-bones password store that keeps passwords using gpg2 encrypted files inside a simple directory tree residing at <code>~/.password-store</code>. It has a simple terminal interface where the user can perform the usual actions, and it's functionality can be extended by plugins. It can also be used in scripts without having to input the actual password in plain text.
+  </li>
 </ul>

_includes/sections/paste-services.html

@@ -15,6 +15,7 @@ title="CryptPad"
 image="/assets/img/svg/3rd-party/cryptpad.svg"
 description="CryptPad is an open-source, zero knowledge, and real-time collaborative editor. Data is encrypted/decrypted in the browser, using Salsa20 with Poly1305 to encrypt pads."
 website="https://cryptpad.fr/pad/"
+privacy-policy="https://cryptpad.fr/privacy.html"
 forum="https://forum.privacytools.io/t/discussion-cryptpad/1270"
 github="https://github.com/xwiki-labs/cryptpad"
 %}

_includes/sections/privacy-resources.html

@@ -22,7 +22,6 @@
   <li><a href="https://www.grc.com/securitynow.htm"><strong>Security Now!</strong></a> - Weekly Internet Security Podcast by Steve Gibson and Leo Laporte.</li>
   <li><a href="https://www.jupiterbroadcasting.com/show/techsnap/"><strong>TechSNAP</strong></a> - Weekly Systems, Network, and Administration Podcast. Every week TechSNAP covers the stories that impact those of us in the tech industry.</li>
   <li><a href="https://tosdr.org/"><strong>Terms of Service; Didn't Read</strong></a> - "I have read and agree to the Terms" is the biggest lie on the web. We aim to fix that.</li>
-  <li><a href="https://codeberg.org/crimeflare/cloudflare-tor"><strong>The Great Cloudwall</strong></a> - Critique and information on why to avoid Cloudflare, a big company with a huge portion of the internet behind it.</li>
 </ul>
 
 <h3>Tools</h3>

_includes/sections/productivity-tools.html

@@ -6,6 +6,7 @@
   image="/assets/img/svg/3rd-party/cryptpad.svg"
   description="<strong>CryptPad</strong> is a private-by-design alternative to popular office tools and cloud services. All content is end-to-end encrypted. It is free and open-source, enabling anyone to verify its security by auditing the code. The development team is supported by donations and grants. No registration is required, and it can be used anonymously via Tor Browser."
   website="https://cryptpad.fr/"
+  privacy-policy="https://cryptpad.fr/privacy.html"
   forum="https://forum.privacytools.io/t/discussion-cryptpad-productivity-tools/1537"
   github="https://github.com/xwiki-labs/cryptpad"
   web="https://cryptpad.fr/"
@@ -35,6 +36,7 @@
   image-dark="/assets/img/svg/3rd-party/writeas-dark.svg"
   description="<strong>Write.as</strong> is a cross-platform, privacy-oriented blogging platform. It's anonymous by default, letting you publish without signing up. If you create an account, it doesn't require any personal information. No ads, distraction-free, and built on a sustainable business model."
   website="https://write.as/"
+  privacy-policy="https://write.as/privacy"
   forum="https://forum.privacytools.io/t/discussion-write-as-productivity-tools/1539"
   tor="http://writeas7pm7rcdqg.onion"
   git="https://code.as/writeas"
@@ -56,7 +58,7 @@
   <li><a href="https://dudle.inf.tu-dresden.de/anonymous/">dudle</a> - An online scheduling application, free and open-source. Schedule meetings or make small online polls. No email collection or the need of registration.</li>
   <li><a href="https://framadate.org/">Framadate</a> - A free and open-source online service for planning an appointment or making a decision quickly and easily. No registration is required.</li>
   <li><a href="https://www.libreoffice.org/">LibreOffice</a> - Free and open-source office suite.</li>
-  <li><a href="https://vscodium.com/">VSCodium</a> - Fork of Microsoft's Visual Studio Code editor without branding or telemetry.</li>
+  <li><a href="https://vscodium.com/">VSCodium</a> - Scripts to automatically build Microsoft's Visual Studio Code editor without branding or telemetry.</li>
 </ul>
 
 <h1 id="metadata-removal-tools" class="anchor">
@@ -65,7 +67,6 @@
   </a> Metadata Removal Tools
 </h1>
 
-<div class="row mb-2">
 {%
   include cardv2.html
   title="MAT2"
@@ -81,4 +82,16 @@
   openbsd="https://pypi.org/project/mat2/"
   netbsd="https://pypi.org/project/mat2/"
 %}
-</div>
+
+{%
+  include cardv2.html
+  title="ExifCleaner"
+  image="/assets/img/svg/3rd-party/exifcleaner.svg"
+  description='<strong>ExifCleaner</strong> is a freeware, open source graphical app that uses <a href="https://exiftool.org/">ExifTool</a> to remove <a href="https://en.wikipedia.org/wiki/Exif">exif</a> metadata from images, videos, and PDF documents using a simple drag and drop interface. It supports multi-core batch processing and dark mode.'
+  website="https://exifcleaner.com"
+  forum="https://forum.privacytools.io/t/discussion-mat/TODOADDTHIS"
+  github="https://github.com/szTheory/exifcleaner"
+  windows="https://github.com/szTheory/exifcleaner/releases"
+  mac="https://github.com/szTheory/exifcleaner/releases"
+  linux="https://github.com/szTheory/exifcleaner/releases"
+%}

_includes/sections/quotes.html

@@ -14,6 +14,16 @@
    <footer class="blockquote-footer">Joshua in <cite title="The Crypto Paper"><a href="https://github.com/cryptoseb/CryptoPaper#let-me-explain-further">The Crypto Paper</a></cite></footer>
 </blockquote>
 
+<blockquote class="blockquote">
+  <p>[...] But saying that you don't need or want privacy because you have nothing to hide is to assume that no one should have, or could have, to hide anything -- including their immigration status, unemployment history, financial history, and health records. You're assuming that no one, including yourself, might object to revealing to anyone information about their religious beliefs, political affiliations, and sexual activities, as casually as some choose to reveal their movie and music tastes and reading preferences.</p>
+  <footer class="blockquote-footer">Edward Snowden in <cite title="Permanent Record"><a href="https://en.wikipedia.org/wiki/Permanent_Record_(autobiography)">Permanent Record</a></cite></footer>
+</blockquote>
+
+<blockquote class="blockquote">
+  <p>Privacy is not a luxury [in America]: it is a right – one that we need to defend in the digital realm as much as in the physical realm. We need to stay vigilant to maintain access to that right, though ... especially as technology continues to advance...</p>
+  <footer class="blockquote-footer">Chelsea Manning in <cite title="The Guardian"><a href="https://www.theguardian.com/commentisfree/2016/feb/22/privacy-is-a-right-not-a-luxury-and-its-increasingly-at-risk-for-lgbt-people">The Guardian</a></cite></footer>
+</blockquote>
+
 <h4>Read also:</h4>
 
 <ul>
@@ -25,8 +35,8 @@
 <h1 id="quotes" class="anchor"><a href="#quotes"><i class="fas fa-link anchor-icon"></i></a> Quotes</h1>
 
 <blockquote class="blockquote">
-  <p>Arguing that you don't care about the right to privacy because you have nothing to hide is no different than saying you don't care about free speech because you have nothing to say.</p>
-  <footer class="blockquote-footer">Edward Snowden on <cite title="Just days left to kill mass surveillance under Section 215 of the Patriot Act. We are Edward Snowden and the ACLU's Jameel Jaffer. AUA."><a href="https://www.reddit.com/r/IAmA/comments/36ru89/just_days_left_to_kill_mass_surveillance_under/crglgh2">Reddit</a></cite></footer>
+  <p>Ultimately, saying that you don't care about privacy because you have nothing to hide is no different from saying you don't care about freedom of speech because you have nothing to say.  Or that you don't care about freedom of the press because you don't like to read. Or that you don't care about freedom of religion because you don't believe in God. Or that you don't care about the freedom to peacably assemble because you're a lazy, antisocial agoraphobe. </p>
+  <footer class="blockquote-footer">Edward Snowden in <cite title="Permanent Record"><a href="https://en.wikipedia.org/wiki/Permanent_Record_(autobiography)">Permanent Record</a></cite></footer>
 </blockquote>
 
 <blockquote class="blockquote">

_includes/sections/router-firmware.html

@@ -19,6 +19,7 @@ description="pfSense is an open source firewall/router computer software distrib
 badges="info:BSD"
 labels="warning:contrib:This software may depend on or recommend non-free software."
 website="https://www.pfsense.org/"
+privacy-policy="https://www.pfsense.org/privacy.html"
 github="https://github.com/pfsense/"
 %}
 

_includes/sections/search-engines.html

@@ -1,60 +1,56 @@
 <h1 id="search" class="anchor"><a href="#search"><i class="fas fa-link anchor-icon"></i></a> Privacy Respecting Search Engines</h1>
 
 <div class="alert alert-warning" role="alert">
-  <strong> If you are currently using search engines like Google, Bing, or Yahoo, you should pick an alternative here. </strong>
+  <strong>If you are currently using search engines like Google, Bing, or Yahoo, you should pick an alternative here.</strong>
 </div>
 
-{% include cardv2.html
-title="searx - Decentral"
+{%
+include cardv2.html
+title="Searx"
 image="/assets/img/svg/3rd-party/searx.svg"
-description='searx is an <a href="https://github.com/asciimoo/searx">open-source</a> metasearch engine, aggregating the results of other search engines while not storing information about its users. No logs, no ads and no tracking. There is a <a href="https://github.com/asciimoo/searx/wiki/Searx-instances">list of public instances</a>, or you can try <a href="https://search.privacytools.io/">the PrivacyTools Search</a>'
+description='Searx is an <a href="https://github.com/asciimoo/searx">open-source</a>, self-hostable, metasearch engine, aggregating the results of other search engines while not storing information about its users. There is a <a href="https://searx.space/">list of public instances</a> or you can try the <a href="https://search.privacytools.io/">PrivacyTools instance</a>.'
 website="https://searx.me/"
 tor="http://ulrn6sryqaifefld.onion"
 forum="https://forum.privacytools.io/t/discussion-searx/283"
 github="https://github.com/asciimoo/searx"
 %}
 
-{% include cardv2.html
-title="DuckDuckGo - USA"
+{%
+include cardv2.html
+title="DuckDuckGo"
 image="/assets/img/svg/3rd-party/duckduckgo.svg"
-description='DuckDuckGo is a "search engine that doesn\'t track you." Some of DuckDuckGo\'s code is free software hosted at GitHub, but the core is proprietary. <span class="flag-icon flag-icon-us"></span> <a href="../../providers/#ukusa">The company is based in the USA.</a>'
+description='DuckDuckGo is a "search engine that doesn\'t track you." Some of DuckDuckGo\'s code is free software hosted at GitHub, but the core is proprietary. <span class="flag-icon flag-icon-us"></span> <a href="../../providers/#ukusa"> The company is based in the USA.</a>'
 website="https://duckduckgo.com/"
+privacy-policy="https://duckduckgo.com/privacy"
 tor="http://3g2upl4pq6kufc4m.onion"
 forum="https://forum.privacytools.io/t/discussion-duckduckgo/285"
 github="https://github.com/duckduckgo"
 %}
 
 {% include cardv2.html
-title="Qwant - France"
-image="/assets/img/svg/3rd-party/qwant.svg"
-description='Qwant is a search engine with its philosophy based on two principles: no user tracking and no filter bubble. Qwant was launched in France in February 2013.'
-website="https://www.qwant.com/"
-forum="https://forum.privacytools.io/t/discussion-qwant/286"
-github="https://github.com/Qwant/"
-%}
-
-{% include cardv2.html
-title="StartPage - Netherlands"
+title="StartPage"
 image="/assets/img/svg/3rd-party/startpage.svg"
-description='StartPage is a search engine that provides Google search results with complete privacy protection. Behind StartPage is a European company that has been obsessive about privacy since 2006.'
+description='StartPage is a search engine that provides Google search results with complete privacy protection. <span class="flag-icon flag-icon-nl"></span> Behind StartPage is a European company based in the Netherlands that has been obsessive about privacy since 2006.'
 labels="warning:<a href=//support.startpage.com/index.php?/Knowledgebase/Article/View/1277/0/startpage-ceo-robert-beens-discusses-the-investment-from-privacy-one--system1>Warning</a>:StartPage was recently acquired by an advertising company."
 website="https://www.startpage.com/"
 forum="https://forum.privacytools.io/t/delisted-discussion-startpage/284"
 %}
 
-<h3>Firefox Addon</h3>
-
-<ul>
-  <li>
-    <a href="https://addons.mozilla.org/firefox/addon/google-search-link-fix/">Google search link fix</a> - Firefox extension that prevents Google and Yandex search pages from modifying search result links when you click them. This is useful when
-    copying links but it also helps privacy by preventing the search engines from recording your clicks. (<a href="https://github.com/palant/searchlinkfix">Open Source</a>)
-  </li>
-</ul>
+{%
+include cardv2.html
+title="Qwant"
+image="/assets/img/svg/3rd-party/qwant.svg"
+description='Qwant is a search engine with its philosophy based on two principles: no user tracking and no filter bubble. <span class="flag-icon flag-icon-fr"></span> <a href="../../providers/#ukusa"> The company is based in France.</a>'
+website="https://www.qwant.com/"
+privacy-policy="https://about.qwant.com/legal/privacy/"
+forum="https://forum.privacytools.io/t/discussion-qwant/286"
+github="https://github.com/Qwant/"
+%}
 
 <h3>Worth Mentioning</h3>
 
 <ul>
-  <li><a href="https://yacy.net/">YaCy</a> - A free-software P2P search engine powered by its users.</li>
-  <li><a href="https://metager.de/en/">MetaGer</a> - An open-source metasearch engine, which is based in Germany. It focuses on protecting the user's privacy.</li>
-  <li><a href="https://www.mojeek.com/">Mojeek</a> - Independent and unbiased search results with no user tracking.</li>
+  <li><a href="https://metager.org/">MetaGer</a> - An <a href="https://gitlab.metager.de/open-source/MetaGer">open-source</a>, metasearch engine run as a non-profit based in Germany. (<a href="https://metager.org/datenschutz">Privacy Policy</a>)</li>
+  <li><a href="https://www.mojeek.com/">Mojeek</a> - An independent search engine based in the UK, and the <a href="https://blog.mojeek.com/2018/10/search-that-does-not-follow-you-around.html">first search engine to have a policy of not tracking its users.</a> (<a href="https://www.mojeek.com/about/privacy/">Privacy Policy</a>)</li>
+  <li><a href="https://yacy.net/">YaCy</a> - An <a href="https://github.com/yacy/yacy_search_server">open-source</a>, peer-to-peer search engine powered by its users.</li>
 </ul>

_includes/sections/selfhosted-cloud.html

@@ -5,35 +5,37 @@
 </div>
 
 {% include cardv2.html
-title="Nextcloud"
-image="/assets/img/svg/3rd-party/nextcloud.svg"
-description="<strong>Nextcloud</strong> is a suite of client-server software for creating your own file hosting services on a private server you control. Nextcloud is free and open-source, and supports end-to-end encryption with many of its clients. The only limits on storage and bandwidth are the limits on the <a href=\"/providers/hosting\">server provider</a> you choose."
-website="https://nextcloud.com/"
-forum="https://forum.privacytools.io/t/discussion-nextcloud/287"
-windows="https://nextcloud.com/install/#install-clients"
-mac="https://nextcloud.com/install/#install-clients"
-linux="https://nextcloud.com/install/#install-clients"
-freebsd="https://www.freshports.org/www/nextcloud/"
-openbsd="http://openports.se/www/nextcloud"
-netbsd="http://pkgsrc.se/www/php-nextcloud"
-fdroid="https://f-droid.org/packages/com.nextcloud.client/"
-googleplay="https://play.google.com/store/apps/details?id=com.nextcloud.client"
-ios="https://itunes.apple.com/us/app/nextcloud/id1125420102?mt=8"
-github="https://github.com/nextcloud"
+  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="warning:<a href=//github.com/nextcloud/end_to_end_encryption/issues/111>Experimental E2EE</a>: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"
+  windows="https://nextcloud.com/install/#install-clients"
+  mac="https://nextcloud.com/install/#install-clients"
+  linux="https://nextcloud.com/install/#install-clients"
+  freebsd="https://www.freshports.org/www/nextcloud/"
+  openbsd="http://openports.se/www/nextcloud"
+  netbsd="http://pkgsrc.se/www/php-nextcloud"
+  fdroid="https://f-droid.org/packages/com.nextcloud.client/"
+  googleplay="https://play.google.com/store/apps/details?id=com.nextcloud.client"
+  ios="https://itunes.apple.com/us/app/nextcloud/id1125420102"
+  github="https://github.com/nextcloud"
 %}
 
 {% include cardv2.html
-title="Tahoe-LAFS"
-image="/assets/img/svg/3rd-party/tahoe-lafs.svg"
-image-dark="/assets/img/svg/3rd-party/tahoe-lafs-dark.svg"
-website="https://www.tahoe-lafs.org/"
-forum="https://forum.privacytools.io/t/discussion-tahoe-lafs/1662"
-description="Tahoe-LAFS is a free and open decentralized cloud storage system. It distributes your data across multiple servers. Even if some of the servers fail or are taken over by an attacker, the entire file store continues to function correctly, preserving your privacy and security."
-windows="https://github.com/tahoe-lafs/tahoe-lafs#via-pip"
-mac="https://github.com/tahoe-lafs/tahoe-lafs#via-pip"
-linux="https://github.com/tahoe-lafs/tahoe-lafs#using-os-packages"
-netbsd="http://pkgsrc.se/filesystems/tahoe-lafs"
-git="https://www.tahoe-lafs.org/trac/tahoe-lafs/browser"
+  title="Tahoe-LAFS"
+  image="/assets/img/svg/3rd-party/tahoe-lafs.svg"
+  image-dark="/assets/img/svg/3rd-party/tahoe-lafs-dark.svg"
+  website="https://www.tahoe-lafs.org/"
+  forum="https://forum.privacytools.io/t/discussion-tahoe-lafs/1662"
+  description="Tahoe-LAFS is a free and open decentralized cloud storage system. It distributes your data across multiple servers. Even if some of the servers fail or are taken over by an attacker, the entire file store continues to function correctly, preserving your privacy and security."
+  windows="https://github.com/tahoe-lafs/tahoe-lafs#via-pip"
+  mac="https://github.com/tahoe-lafs/tahoe-lafs#via-pip"
+  linux="https://github.com/tahoe-lafs/tahoe-lafs#using-os-packages"
+  netbsd="http://pkgsrc.se/filesystems/tahoe-lafs"
+  git="https://www.tahoe-lafs.org/trac/tahoe-lafs/browser"
 %}
 
 <h3>Worth Mentioning</h3>

_includes/sections/social-networks.html

@@ -59,17 +59,23 @@ web="https://pixelfed.org/"
 %}
 
 {% include cardv2.html
-title="GNU social - Twitter Alternative"
-image="/assets/img/svg/3rd-party/gnu_social.svg"
-description="GNU social is social-communication software for both public and private communications. It is widely supported and has a large userbase. It is already used by the Free Software Foundation."
-website="https://gnu.io/social/"
-forum="https://forum.privacytools.io/t/discussion-gnu-social/292"
-gitlab="https://git.gnu.io/gnu/gnu-social/"
-web="https://gnu.io/social/"
+title="Pleroma - Twitter Alternative"
+image="/assets/img/svg/3rd-party/pleroma.svg"
+description="Pleroma is a free, federated social networking server built on open protocols. It is compatible with Mastodon and many other ActivityPub and OStatus implementations."
+website="https://pleroma.social"
+forum="https://forum.privacytools.io/t/discussion-pleroma/2307"
+gitlab="https://git.pleroma.social/pleroma/pleroma/"
+windows="https://docs-develop.pleroma.social/backend/clients/#desktop"
+mac="https://docs-develop.pleroma.social/backend/clients/#desktop"
+linux="https://docs-develop.pleroma.social/backend/clients/#desktop"
+android="https://docs-develop.pleroma.social/backend/clients/#handheld"
+fdroid="https://docs-develop.pleroma.social/backend/clients/#handheld"
+googleplay="https://docs-develop.pleroma.social/backend/clients/#handheld"
+ios="https://docs-develop.pleroma.social/backend/clients/#handheld"
+web="https://docs-develop.pleroma.social/backend/clients/#alternative-web-interfaces"
 %}
 
 <h3>Worth Mentioning</h3>
 <ul>
-  <li><a href="https://www.minds.com/">Minds</a> - An <a href="https://gitlab.com/minds">open-source</a> and distributed social networking service, integrating the blockchain to reward the community.</li>
   <li><a href="https://movim.eu/">Movim</a> - A federated social platform that relies on the XMPP standard and therefore allows you to exchange with many other clients on all devices.</li>
 </ul>

_includes/sections/social-news-aggregator.html

@@ -9,6 +9,7 @@ title="Aether"
 image="/assets/img/svg/3rd-party/aether.svg"
 description='<a href="https://github.com/nehbit/aether/blob/master/LICENSE.md">Aether is a free and open-source</a> decentralized social news aggregator with a built-in voting system.'
 website="https://getaether.net/"
+privacy-policy="https://getaether.net/privacypolicy/"
 forum="https://forum.privacytools.io/t/discussion-aether/1256"
 github="https://github.com/nehbit/aether"
 windows="https://getaether.net/download/"
@@ -21,6 +22,7 @@ title="Tildes"
 image="/assets/img/svg/3rd-party/tildes.svg"
 description='Tildes is a web-based self-hostable online bulletin board. It is licensed under <a href="https://gitlab.com/tildes/tildes/blob/master/LICENSE">GPL 3.0</a>.'
 website="https://tildes.net"
+privacy-policy="https://docs.tildes.net/policies/privacy-policy"
 forum="https://forum.privacytools.io/t/discussion-tildes/1257"
 gitlab="https://gitlab.com/tildes/tildes"
 web="https://tildes.net"
@@ -31,6 +33,7 @@ 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"

_includes/sections/teamchat.html

@@ -1,17 +1,22 @@
-<h1 id="teamchat" class="anchor"><a href="#teamchat"><i class="fas fa-link anchor-icon"></i></a> Team Chat Platforms</h1>
+<h1 id="teamchat" class="anchor">
+  <a href="#teamchat">
+    <i class="fas fa-link anchor-icon"></i>
+  </a> Team Chat Platforms
+</h1>
 
 <div class="alert alert-warning" role="alert">
-        <strong>If your project or organization currently uses a platform like <a href="https://tosdr.org/#discord">Discord</a> or <a href="https://drewdevault.com/2015/11/01/Please-stop-using-slack.html">Slack</a> you should pick an alternative here.</strong>
+  <strong>If your project or organization currently uses a platform like <a href="https://tosdr.org/#discord">Discord</a> or <a href="https://drewdevault.com/2015/11/01/Please-stop-using-slack.html">Slack</a> you should pick an alternative here.</strong>
 </div>
 
 {%
   include cardv2.html
-  title="Matrix"
-  image="/assets/img/svg/3rd-party/matrix.svg"
-  image-dark="/assets/img/svg/3rd-party/matrix-dark.svg"
-  description='<a href="https://matrix.org/docs/guides/introduction">Matrix</a> is an open-source project that publishes the <a href="https://matrix.org/docs/spec">Matrix open standard</a> for secure, decentralized, real-time communication.<br />
-  <a href="https://en.wikipedia.org/wiki/Riot.im">Riot.im</a> is the popular reference client produced by the Matrix.org team. It offers optional E2EE for 1:1 and group conversations that <strong>must</strong> be turned on by the user. (This can be done by clicking on the toggle switch which is accessed by clicking the room name or user name of the chat → Security &amp; Privacy → Encrypted). In the future it will be <a href="https://github.com/vector-im/riot-web/issues/6779">on by default.</a>'
+  title="Riot"
+  image="/assets/img/svg/3rd-party/riotim.svg"
+  description='<a href="//about.riot.im">Riot.im</a> is the reference client for the <a href="//matrix.org/docs/guides/introduction">Matrix</a> network. The <a href="//matrix.org/docs/spec">Matrix open standard</a> is an open-source standard for secure, decentralized, real-time communication.<br />'
+  labels="warning:<a href=//github.com/vector-im/riot-web/issues/6779>Warning</a>:Riot offers optional E2EE for 1&#x3a;1 and group conversations that must be turned on by the user.
+  (This can be done by clicking on the toggle switch which is accessed by clicking the room name or user name of the chat → Security &amp; Privacy → Encrypted).|success:VoIP"
   website="https://about.riot.im/"
+  privacy-policy="https://riot.im/privacy"
   forum="https://forum.privacytools.io/t/discussion-riot-im/665/"
   github="https://github.com/vector-im/riot-web/"
   windows="https://riot.im/download/desktop/"
@@ -28,8 +33,9 @@
   title="Rocket.chat"
   image="/assets/img/svg/3rd-party/rocketchat.svg"
   description="Rocket.chat is an self-hostable open source platform for team communication. It has optional federation and experimental E2EE."
-  labels="warning:<a href=//rocket.chat/docs/user-guides/end-to-end-encryption/>Experimental E2EE</a>:Regarding E2EE their documentation states 'This feature is currently in alpha. It's also not yet supported on mobile'. There is no forward secrecy so compromised decryption password would leak all messages. Federation was also added afterwards, potentially causing room for mistakes."
+  labels="warning:<a href=//rocket.chat/docs/user-guides/end-to-end-encryption/>Experimental E2EE</a>:Regarding E2EE their documentation states 'This feature is currently in alpha. It's also not yet supported on mobile'. There is no forward secrecy so compromised decryption password would leak all messages. Federation was also added afterwards, potentially causing room for mistakes.|success:VoIP"
   website="https://rocket.chat/"
+  privacy-policy="https://rocket.chat/privacy"
   forum="https://forum.privacytools.io/t/discussion-rocket-chat/1223"
   github="https://github.com/rocketchat/"
   windows="https://rocket.chat/install"
@@ -44,9 +50,10 @@
   include cardv2.html
   title="Keybase"
   image="/assets/img/svg/3rd-party/keybase.svg"
-  description='Keybase provides a hosted team chat with E2EE. Its protocol has also been <a href="https://keybase.io/docs-assets/blog/NCC_Group_Keybase_KB2018_Public_Report_2019-02-27_v1.3.pdf">indepedently audited (PDF)</a>. Keybase can help you prove you own social media accounts though the use of cryptographic signing of "<a href="https://en.wikipedia.org/wiki/Keybase#Identity_proofs">identity proofs</a>".'
+  description='Keybase provides a hosted team chat with E2EE. Its protocol has also been <a href="https://keybase.io/docs-assets/blog/NCC_Group_Keybase_KB2018_Public_Report_2019-02-27_v1.3.pdf">indepedently audited (PDF)</a>. Keybase can help you prove you own social media accounts through the use of cryptographic signing of "<a href="https://en.wikipedia.org/wiki/Keybase#Identity_proofs">identity proofs</a>".'
   labels="warning:<a href=github.com/keybase/client/issues/6374>Warning</a>:This software relies on a closed-source central server."
   website="https://keybase.io/"
+  privacy-policy="https://keybase.io/docs/privacypolicy"
   forum="https://forum.privacytools.io/t/discussion-keybase/1224"
   tor="http://keybase5wmilwokqirssclfnsqrjdsi7jdir5wy7y7iu3tanwmtp6oid.onion/"
   github="https://github.com/Keybase"

_includes/sections/voice-video-messenger.html

@@ -1,13 +1,14 @@
 <h1 id="voip" class="anchor"><a href="#voip"><i class="fas fa-link anchor-icon"></i></a> Video/Voice Calling</h1>
 
 <div class="alert alert-warning" role="alert">
-  <strong>If you are currently using a Video/Voice Calling app like Skype, Viber or Google Hangouts, you should pick an alternative here.</strong> Please note that many of the above instant messengers also support <span class="badge badge-success">VoIP</span>. The software listed below are <em>primarily</em> Voice/Video focused.
+  <strong>If you are currently using a Video/Voice Calling app like Google Hangouts, Skype, Viber or <a href="https://blog.privacytools.io/protecting-your-privacy-while-using-zoom-at-home/">Zoom</a>, you should pick an alternative here.</strong> Please note that many of the above instant messengers also support <span class="badge badge-success">VoIP</span>. The software listed below are <em>primarily</em> Voice/Video focused.
 </div>
 
 {% include cardv2.html
 title="Linphone"
 image="/assets/img/svg/3rd-party/linphone.svg"
 website="https://www.linphone.org/"
+privacy-policy="https://www.linphone.org/terms-and-privacy"
 description="Linphone is an open-source SIP Phone and a free voice over IP service, available on mobile and desktop environments and on web browsers. It supports ZRTP for end-to-end encrypted voice and video communication."
 forum="https://forum.privacytools.io/t/discussion-linphone/751"
 github="https://github.com/BelledonneCommunications"
@@ -36,7 +37,7 @@ ios="https://apps.apple.com/us/app/mumble/id443472808?ls=1"
 <h3>Worth Mentioning</h3>
 
 <ul>
-  <li><a href="https://jitsi.org/">Jitsi Meet</a> - Jitsi Meet is a free and open-source multiplatform voice (VoIP), video conferencing, and instant messaging application. <span class="badge badge-warning" data-toggle="tooltip" title="Our Firefox tweaks recommend disabling WebRTC as it can be used to leak your IP address even behind a VPN, which is why Tor Browser disables it.">Requires WebRTC</span></li>
+  <li><a href="https://jitsi.org/jitsi-meet/">Jitsi Meet</a> - Jitsi Meet is a free and open-source multiplatform voice (VoIP), video conferencing, and instant messaging application. <span class="badge badge-warning" data-toggle="tooltip" title="Our Firefox tweaks recommend disabling WebRTC as it can be used to leak your IP address even behind a VPN, which is why Tor Browser disables it.">Requires WebRTC</span> <a href="https://github.com/jitsi/jitsi-meet/blob/master/README.md#security"<span class="badge badge-warning" >Jitsi Meet streams are decrypted on the server.</span></a> See also <a href="https://github.com/jitsi/jitsi-meet/wiki/Jitsi-Meet-Instances">list of public Jitsi Meet instances</a>.</li>
 </ul>
 
 <h3>Related Information</h3>

_includes/sections/vpn.html

@@ -1,7 +1,7 @@
-<h1 id="vpn" class="anchor"><a href="#vpn"><i class="fas fa-link anchor-icon"></i></a> Recommended VPN Service</h1>
+<h1 id="vpn" class="anchor"><a href="#vpn"><i class="fas fa-link anchor-icon"></i></a> Recommended VPN Services</h1>
 
 <div class="alert alert-success" role="alert">
-  <strong>Our recommended provider is outside the US, uses encryption, accepts Bitcoin, supports OpenVPN, and has a no logging policy. <a href="/providers/vpn/#criteria">Read our full list of criteria for more information</a>.</strong>
+  <strong>Our recommended providers are outside the US, use encryption, accept Bitcoin, support OpenVPN, and have a no logging policy. <a href="/providers/vpn/#criteria">Read our full list of criteria for more information</a>.</strong>
 </div>
 
 <div class="container-fluid">
@@ -17,89 +17,96 @@
         alt="Mullvad">
     </div>
     <div class="col">
-    <h2>Mullvad <span class="badge badge-info">EUR €60/Year</span></h2>
-    <p><strong>Mullvad</strong> is a fast and inexpensive VPN with a serious focus on transparency and security. They have been in operation since <strong>2009</strong>. It is the only VPN provider that currently meets our criteria for recommendation. Mullvad is based in <span class="flag-icon flag-icon-se"></span> Sweden and does not have a free trial. Visit <a href="https://mullvad.net/">mullvad.net</a> to create an account.</p>
-    <h5><span class="badge badge-success">406+ Servers</span></h5>
-    <p>Mullvad has 409 servers in 39 countries at the time of writing this page. Typically the more servers a provider offers, the better: With hundreds of servers in operation, you are far more likely to find a fast connection and a server geographically closest to you.</p>
-    <h5><span class="badge badge-success">WireGuard Support</span></h5>
-    <p>In addition to standard OpenVPN connections, Mullvad supports WireGuard. WireGuard is an experimental protocol with theoretically better security and higher reliability, although it is not currently recommended for production use.</p>
+    <h2 id="mullvad" class="anchor">
+      <a href="#mullvad"><i class="fas fa-link anchor-icon"></i></a> Mullvad
+      <span class="badge badge-info">EUR €60/y</span>
+    </h2>
+    <p><strong><a href="https://mullvad.net/">Mullvad.net</a> </strong> is a fast and inexpensive VPN with a serious focus on transparency and security. They have been in operation since <strong>2009</strong>. Mullvad is based in <span class="flag-icon flag-icon-se"></span> Sweden and does not have a free trial.</p>
+    <h5><span class="badge badge-success">35 Countries</span></h5>
+    <p>Mullvad has <a href="https://mullvad.net/en/servers/">servers in 35 countries</a> at the time of writing this page. Picking a VPN provider with a server nearest to you will reduce latency of the network traffic you send. This is because of a shorter route (less hops) to the destination.</p>
+    <p>We also think it's better for the security of the VPN provider's private keys if they use <a href="https://en.wikipedia.org/wiki/Dedicated_hosting_service">dedicated servers</a>, instead of cheaper shared solutions (with other customers) such as <a href="https://en.wikipedia.org/wiki/Virtual_private_server">virtual private servers</a>.</p>
     <h5><span class="badge badge-success">Independently Audited</span></h5>
     <p>Mullvad's VPN clients have been audited by Cure53 and Assured AB in a pentest report <a href="https://cure53.de/pentest-report_mullvad_v2.pdf">published at cure53.de</a>. The security researchers concluded:</p>
     <blockquote class="blockquote">
       <p class="mb-0">...Cure53 and Assured AB are happy with the results of the audit and the software leaves an overall positive impression. With security dedication of the in-house team at the Mullvad VPN compound, the testers have no doubts about the project being on the right track from a security standpoint.</p>
     </blockquote>
-    <h5><span class="badge badge-success">IPv6 Support</span></h5>
-    <p>Mullvad supports the future of networking <a href="https://en.wikipedia.org/wiki/IPv6">IPv6</a>. Their network allows users to <a href="https://mullvad.net/en/blog/2014/9/15/ipv6-support/">access services hosted on IPv6</a> as opposed to other providers who block IPv6 connections.</p>
-    <h5><span class="badge badge-success">Remote port forwarding</span></h5>
-    <p>Remote <a href="https://en.wikipedia.org/wiki/Port_forwarding">port forwarding</a> is allowed on Mullvad, see <a href="https://mullvad.net/help/port-forwarding-and-mullvad/">Port forwarding with Mullvad VPN</a>.</p>
+    <h5><span class="badge badge-success">Open Source Clients</span></h5>
+    <p>Mullvad provides the source code for their desktop and mobile clients in their <a href="https://github.com/mullvad/mullvadvpn-app">GitHub organization</a>.</p>
     <h5><span class="badge badge-success">Accepts Bitcoin</span></h5>
     <p>Mullvad in addition to accepting credit/debit cards and PayPal, accepts <strong>Bitcoin</strong>, <strong>Bitcoin Cash</strong>, and <strong>cash/local currency</strong> as anonymous forms of payment. They also accept Swish and bank wire transfers.</p>
-    <h5><span class="badge badge-warning">No Mobile Clients</span></h5>
-    <p>While iOS and Android clients are reportedly in the works, mobile users will need to use a traditional OpenVPN client and configuration files, which are a bit more difficult to configure.</p>
+    <h5><span class="badge badge-success">WireGuard Support</span></h5>
+    <p>In addition to standard OpenVPN connections, Mullvad supports WireGuard. WireGuard is an experimental protocol with theoretically better security and higher reliability, although it is not currently recommended for production use.</p>
+    <h5><span class="badge badge-success">IPv6 Support</span></h5>
+    <p>Mullvad supports the future of networking <a href="https://en.wikipedia.org/wiki/IPv6">IPv6</a>. Their network allows users to <a href="https://mullvad.net/en/blog/2014/9/15/ipv6-support/">access services hosted on IPv6</a> as opposed to other providers who block IPv6 connections.</p>
+    <h5><span class="badge badge-success">Remote Port Forwarding</span></h5>
+    <p>Remote <a href="https://en.wikipedia.org/wiki/Port_forwarding">port forwarding</a> is allowed on Mullvad, see <a href="https://mullvad.net/help/port-forwarding-and-mullvad/">Port forwarding with Mullvad VPN</a>.</p>
+    <h5><span class="badge badge-success">Mobile Clients</span></h5>
+    <p>Mullvad has published <a href ="https://apps.apple.com/app/mullvad-vpn/id1488466513">iOS</a> and <a href="https://play.google.com/store/apps/details?id=net.mullvad.mullvadvpn">Android</a> clients, both supporting an easy-to use interface as opposed to requiring users to manual configure their WireGuard connections.</p>
     <h5><span class="badge badge-info">Extra Functionality</span></h5>
     <p>The Mullvad VPN clients have a built-in killswitch to block internet connections outside of the VPN. They also are able to automatically start on boot. The Mullvad website is also accessible via Tor at <a href="http://xcln5hkbriyklr6n.onion/">xcln5hkbriyklr6n.onion</a>.</p>
     </div>
   </div>
-
-</div>
-
-<div class="alert alert-warning" role="alert">
-  <strong>Note: Using a VPN provider will not make you anonymous, but it will give you better privacy in certain situations. A VPN is not a tool for illegal activities. Don't rely on a "no log" policy.</strong>
-</div>
-
-<h1 id="vpn" class="anchor"><a href="#worth-mentioning"><i class="fas fa-link anchor-icon"></i></a> Other Providers Worth Mentioning</h1>
-
-<div class="container-fluid">
-
   <div class="row mb-2">
     <div class="col-lg-3 col-sm-12 pt-lg-5">
       <img src="/assets/img/svg/3rd-party/protonvpn.svg" height="70" width="200" class="img-fluid d-block mr-auto ml-auto align-middle" alt="ProtonVPN">
     </div>
     <div class="col">
-    <h2>ProtonVPN <span class="badge badge-info">Free</span> <span class="badge badge-info">USD $96/year</span></h2>
-    <p><strong>ProtonVPN</strong> is a strong contender in the VPN space, and they have been in operation since <strong>2016</strong>. ProtonVPN is based in <span class="flag-icon flag-icon-ch"></span> Switzerland and offers a limited free pricing tier, as well as premium options. Unfortunately due to its lack of an independent security audit it does not meet the complete criteria for recommendation, see our notes below.</p>
-    <h5><span class="badge badge-danger">Not Audited</span></h5>
-    <p>ProtonVPN has not undergone a security audit by an independent third party, and therefore cannot be strongly recommended at this time. We have still chosen to list it on this page with the assumption that an audit will be published soon:</p>
-    <blockquote class="blockquote">
-      <p class="mb-0">We are currently undergoing a complete security audit of our VPN applications by a reputable Swiss security company. The results of the audit will be summarized in a public report for cases like this.</p>
-      <footer class="blockquote-footer">Marc Loebekken, ProtonVPN AG Legal counsel</footer>
-    </blockquote>
-    <p>We will reevaluate this listing at the end of Q1 2020 or when the aforementioned report has been published, whichever is sooner.
-    <h5><span class="badge badge-success">526+ Servers</span></h5>
-    <p>ProtonVPN has 526 servers in 42 countries at the time of writing this page. Typically the more servers a provider offers, the better: With hundreds of servers in operation, you are far more likely to find a fast connection and a server geographically closest to you.</p>
+    <h2 id="protonvpn" class="anchor">
+      <a href="#protonvpn"><i class="fas fa-link anchor-icon"></i></a> ProtonVPN
+      <span class="badge badge-info">Free</span>
+      <span class="badge badge-info">Basic USD $48/y</span>
+      <span class="badge badge-secondary">Plus USD $96/y</span>
+    </h2>
+    <p><strong><a href="https://protonvpn.com/">ProtonVPN.com</a></strong> is a strong contender in the VPN space, and they have been in operation since <strong>2016</strong>. ProtonVPN is based in <span class="flag-icon flag-icon-ch"></span> Switzerland and offers a limited free pricing tier, as well as premium options. They offer a further 14% discount for buying a 2 year subscription.</p>
+    <h5><span class="badge badge-success">44 Countries</span></h5>
+    <p>ProtonVPN has <a href="https://protonvpn.com/vpn-servers">servers in 44 countries</a> at the time of writing this page. Picking a VPN provider with a server nearest to you will reduce latency of the network traffic you send. This is because of a shorter route (less hops) to the destination.</p>
+    <p>We also think it's better for the security of the VPN provider's private keys if they use <a href="https://en.wikipedia.org/wiki/Dedicated_hosting_service">dedicated servers</a>, instead of cheaper shared solutions (with other customers) such as <a href="https://en.wikipedia.org/wiki/Virtual_private_server">virtual private servers</a>.</p>
+    <h5><span class="badge badge-success">Independently Audited</span></h5>
+    <p>As of January 2020 ProtonVPN has undergone an independent audit by SEC Consult. SEC Consult found some medium and low risk vulnerabilities in ProtonVPN's Windows, Android, and iOS applications, all of which were "properly fixed" by ProtonVPN before the reports were published. None of the issues identified would have provided an attacker remote access to a user's device or traffic. You can view individual reports for each platform at <a href="https://protonvpn.com/blog/open-source/">protonvpn.com</a>.
+    <h5><span class="badge badge-success">Open Source Clients</span></h5>
+    <p>ProtonVPN provides the source code for their desktop and mobile clients in their <a href="https://github.com/ProtonVPN">GitHub organization</a>.</p>
     <h5><span class="badge badge-success">Accepts Bitcoin</span></h5>
     <p>ProtonVPN does technically accept Bitcoin payments; however, you either need to have an existing account, or contact their support team in advance to register with Bitcoin.</p>
     <h5><span class="badge badge-success">Mobile Clients</span></h5>
-    <p>In addition to providing standard OpenVPN configuration files, ProtonVPN has mobile clients for iOS or Android allowing for easy connections to their servers.</p>
+    <p>In addition to providing standard OpenVPN configuration files, ProtonVPN has mobile clients for <a href="https://apps.apple.com/us/app/protonvpn-fast-secure-vpn/id1437005085">iOS</a> and <a href="https://play.google.com/store/apps/details?id=ch.protonvpn.android&hl=en_US">Android</a> allowing for easy connections to their servers.</p>
+    <h5><span class="badge badge-warning">No Port Forwarding</span></h5>
+    <p>ProtonVPN does not currently support remote port forwarding, which may impact some applications. Especially Peer-to-Peer applications like Torrent clients.</p>
     <h5><span class="badge badge-info">Extra Functionality</span></h5>
-    <p>The ProtonVPN clients have a built-in killswitch to block internet connections outside of the VPN. They also are able to automatically start on boot. ProtonVPN also offers "Tor" servers allowing you to easily connect to onion sites, but we still strongly recommend using the official Tor Browser for this purpose.</p>
+    <p>The ProtonVPN clients have a built-in killswitch to block internet connections outside of the VPN. They also are able to automatically start on boot. ProtonVPN also offers "Tor" servers allowing you to easily connect to onion sites, but we still strongly recommend using <a href="https://www.torproject.org/">the official Tor Browser</a> for this purpose.</p>
     </div>
   </div>
-
   <div class="row mb-2">
     <div class="col-lg-3 col-sm-12 pt-lg-5">
       <img src="/assets/img/svg/3rd-party/ivpn.svg" height="70" width="200" class="img-fluid d-block mr-auto ml-auto align-middle" alt="IVPN">
     </div>
     <div class="col">
-    <h2>
-      IVPN
-      <span class="badge badge-info">Standard USD $60/Year</span>
-      <span class="badge badge-secondary">Pro USD $100/Year</span>
+    <h2 id="ivpn" class="anchor">
+      <a href="#ivpn"><i class="fas fa-link anchor-icon"></i></a> IVPN
+      <span class="badge badge-info">Standard USD $60/y</span>
+      <span class="badge badge-secondary">Pro USD $100/y</span>
     </h2>
-    <p><strong>IVPN</strong> is another strong premium VPN provider, and they have been in operation since <strong>2009</strong>. IVPN is based in <span class="flag-icon flag-icon-gi"></span> Gibraltar and offers a 3 day free trial. Unfortunately, due to its lack of an independent security audit, it does not meet the complete criteria for recommendation, see our notes below.</p>
-    <h5><span class="badge badge-danger">No Security Audit</span></h5>
-    <p>IVPN has undergone a <a href="https://cure53.de/audit-report_ivpn.pdf">no-logging audit from Cure53</a> which concluded in agreement with IVPN's no-logging claim. However, IVPN has not undergone a more comprehensive security audit by an independent third party, and therefore cannot be strongly recommended at this time.</p><p>We have still chosen to list it on this page with the assumption that an audit will be published soon. <a href="https://nitter.net/ivpnnet/status/1181954975687163905">IVPN has hired Cure53</a> to undertake a comprehensive audit covering the IVPN website, public and internal server infrastucture. They expect the audit to begin in November 2019 and be completed by the 6 auditors in January 2020.</p>
-    <h5><span class="badge badge-success">77+ Servers</span></h5>
-    <p>IVPN has 77 servers in 31 countries at the time of writing this page. Typically the more servers a provider offers, the better. IVPN has a decent (but not exceptional) server count that will most likely provide adequate coverage to most users.</p>
-    <h5><span class="badge badge-success">Remote port forwarding</span></h5>
-    <p>Remote <a href="https://en.wikipedia.org/wiki/Port_forwarding">port forwarding</a> is possible with a Pro plan. Port forwarding <a href="https://www.ivpn.net/knowledgebase/81/How-do-I-activate-port-forwarding.html">can be activated</a> via the client area. Port forwarding is only available on IVPN when <a href="https://www.ivpn.net/knowledgebase/116/Port-forwarding-is-not-working-why.html">using OpenVPN and is disabled on US servers</a>.</p>
+    <p><strong><a href="https://www.ivpn.net">IVPN.net</a></strong> is another premium VPN provider, and they have been in operation since <strong>2009</strong>. IVPN is based in <span class="flag-icon flag-icon-gi"></span> Gibraltar and offers a 3 day free trial.</p>
+    <h5><span class="badge badge-success">32 Countries</span></h5>
+    <p>IVPN has <a href="https://www.ivpn.net/server-locations">servers in 32 countries</a> at the time of writing this page. Picking a VPN provider with a server nearest to you will reduce latency of the network traffic you send. This is because of a shorter route (less hops) to the destination.</p>
+    <p>We also think it's better for the security of the VPN provider's private keys if they use <a href="https://en.wikipedia.org/wiki/Dedicated_hosting_service">dedicated servers</a>, instead of cheaper shared solutions (with other customers) such as <a href="https://en.wikipedia.org/wiki/Virtual_private_server">virtual private servers</a>.</p>
+    <h5><span class="badge badge-success">Independently Audited</span></h5>
+    <p>IVPN has undergone a <a href="https://cure53.de/audit-report_ivpn.pdf">no-logging audit from Cure53</a> which concluded in agreement with IVPN's no-logging claim. IVPN has also completed a <a href="https://cure53.de/summary-report_ivpn_2019.pdf">comprehensive pentest report Cure53</a> in January 2020. IVPN has also said they plan to have <a href="https://www.ivpn.net/blog/independent-security-audit-concluded">annual reports</a> in the future.</p>
+    <h5><span class="badge badge-success">Open Source Clients</span></h5>
+    <p>As of Feburary 2020 <a href="https://www.ivpn.net/blog/ivpn-applications-are-now-open-source">IVPN applications are now open source</a>. Source code can be obtained from their <a href="https://github.com/ivpn">GitHub organization</a>.</p>
     <h5><span class="badge badge-success">Accepts Bitcoin</span></h5>
     <p>In addition to accepting credit/debit cards and PayPal, IVPN accepts <strong>Bitcoin</strong> and <strong>cash/local currency</strong> (on annual plans) as anonymous forms of payment.</p>
+    <h5><span class="badge badge-success">WireGuard Support</span></h5>
+    <p>In addition to standard OpenVPN connections, IVPN supports WireGuard. WireGuard is an experimental protocol with theoretically better security and higher reliability, although it is not currently recommended for production use.</p>
+    <h5><span class="badge badge-success">Remote Port Forwarding</span></h5>
+    <p>Remote <a href="https://en.wikipedia.org/wiki/Port_forwarding">port forwarding</a> is possible with a Pro plan. Port forwarding <a href="https://www.ivpn.net/knowledgebase/81/How-do-I-activate-port-forwarding.html">can be activated</a> via the client area. Port forwarding is only available on IVPN when <a href="https://www.ivpn.net/knowledgebase/116/Port-forwarding-is-not-working-why.html">using OpenVPN and is disabled on US servers</a>.</p>
     <h5><span class="badge badge-success">Mobile Clients</span></h5>
-    <p>In addition to providing standard OpenVPN configuration files, IVPN has mobile clients for iOS or Android allowing for easy connections to their servers.</p>
+    <p>In addition to providing standard OpenVPN configuration files, IVPN has mobile clients for <a href="https://apps.apple.com/us/app/ivpn-serious-privacy-protection/id1193122683">iOS</a> and <a href="https://play.google.com/store/apps/details?id=net.ivpn.client">Android</a> allowing for easy connections to their servers.</p>
     <h5><span class="badge badge-info">Extra Functionality</span></h5>
-    <p>The IVPN clients have a built-in killswitch to block internet connections outside of the VPN. They also are able to automatically start on boot. IVPN also provides "AntiTracker" functionality, which blocks advertising networks and trackers from the network level.</p>
+    <p>The IVPN clients have a built-in killswitch to block internet connections outside of the VPN. They also are able to automatically start on boot. IVPN also provides "<a href="https://www.ivpn.net/antitracker">AntiTracker</a>" functionality, which blocks advertising networks and trackers from the network level.</p>
     </div>
   </div>
-
+</div>
+
+<div class="alert alert-warning" role="alert">
+  <strong>Note: Using a VPN provider will not make you anonymous, but it will give you better privacy in certain situations. A VPN is not a tool for illegal activities. Don't rely on a "no log" policy.</strong>
 </div>

_includes/sponsors/gold.html

@@ -0,0 +1,10 @@
+<div class="d-flex flex-wrap justify-content-center">
+  <a class="m-3" href="https://safing.io" target="_blank" rel="noreferrer">
+    <img
+      src="/assets/img/svg/3rd-party/sponsors/safing.svg"
+      data-theme-src="/assets/img/svg/3rd-party/sponsors/safing-dark.svg"
+      width="210rem"
+      title="Safing Privacy Network - Launching on Kickstarter January 2nd, 2020"
+      alt="Safing Privacy Network - Safing.io Logo" />
+  </a>
+</div>

_includes/team.html

@@ -1,6 +1,6 @@
-<div class="col-12 col-sm-6 col-lg-4 col-xl-3">
-  <div class="card mb-3 mx-4 mx-sm-0" itemscope itemtype="http://schema.org/Person">
-    <img src="{{ site.baseurl }}/assets/img/png/team/{{ include.avatar }}" class="card-img-top" itemprop="image" alt="{% if include.nick %}{{ include.nick }}{% else %}{{ include.name }}{% endif %}">
+<div class="col-12 col-sm-6 col-lg-4 {% unless include.emeritus %}col-xl-3{% endunless %}">
+  <div class="card mb-3 mx-4 mx-sm-0" itemprop="member" itemscope itemtype="http://schema.org/Person">
+    {% if include.avatar %}<img src="{{ site.baseurl }}/assets/img/{{ include.avatar | split: "." | last }}/team/{{ include.avatar }}" class="card-img-top" itemprop="image" alt="{% if include.nick %}{{ include.nick }}{% else %}{{ include.name }}{% endif %}">{% endif %}
     <div class="card-body">
 
       <h5 class="card-title mt-0" itemprop="name">
@@ -11,12 +11,11 @@
         {{ include.name }}</h5>
       {% endif %}
 
-      <meta itemprop="affiliation" content="PrivacyTools" />
-      <h6 class="card-subtitle mb-2 text-muted" itemprop="jobTitle">{{ include.role | default: "Contributor" }}</h6>
-      <p class="card-text" {% if include.bio %}itemprop="description"{% endif %}>{{ include.bio | default: "<i>Hmm, this user hasn't written a bio quite yet :(</i>" }}</p>
+      <h6 class="card-subtitle mb-2 text-muted" itemprop="jobTitle">{% if include.role %}{{ include.role }}{% elsif include.emeritus %}Former Contributor{% else %}Contributor{% endif %}</h6>
+      {% if include.bio %}<p class="card-text" itemprop="description">{{ include.bio | default: "<i>Hmm, this user hasn't written a bio quite yet :(</i>" }}</p>{% endif %}
       <div class="mx-n2">
         {% if include.email %}
-        <a href="mailto:{{ include.email }}" aria-label="Email" class="mx-2 text-decoration-none" itemprop="email">
+        <a href="{{ include.email }}" aria-label="Email" class="mx-2 text-decoration-none" itemprop="email">
           <i class="fas fa-envelope" aria-hidden="true" title="{{ include.email }}"></i>
         </a>
         {% endif %}

assets/css/style.scss

@@ -219,7 +219,13 @@ h2, h3:not(.h5), h4, h5 {
   background: darken($tor, 5%);
 }
 
+.icon-btn {
+  padding: 0px;
+}
 
+.flow-root {
+  display: flow-root;
+}
 
 /*
  * Bootstrap 4.2+ features

assets/img/svg/3rd-party/7zip.svg

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="128mm" height="128mm" version="1.1" viewBox="0 0 128 128" xmlns="http://www.w3.org/2000/svg"><defs><clipPath id="clipPath"><path d="m49.912 52.756h168.59v51.021c-43.95 52.893-71.726 113.87-74.314 187.45h-57.676c2.2698-63.394 8.8358-125.71 57.676-177.47h-94.278z" fill="#fff" fill-rule="evenodd"/></clipPath><filter id="filter" x="-.5" y="-.5" width="4" height="2"><feGaussianBlur stdDeviation="4.0"/></filter><clipPath id="clipPatho"><path d="m0-0.0625v345.62h603.38v-268.84h-334.53v-76.781z"/></clipPath><filter id="filterH" x="-.5" y="-.5" width="4" height="2"><feGaussianBlur stdDeviation="4.0"/></filter><clipPath id="clipPathN"><path d="m415.94 112.66v175.25h36.594v-175.25zm-130.88 1.0938v39.938h56.562l-58.781 96.5v38.812h107.59v-38.812h-68.781l71-100.94v-35.5zm200.72 0.0625v176.22h39.938v-62.062h26.594c42.589-0.14551 43.72-115.5-2.25-114.16zm37.719 37.719h15.594c17.348-0.59446 17.713 38.937 0 36.5l-14.406 1.2188z" fill-rule="evenodd"/></clipPath><filter id="filterI" x="-.5" y="-.5" width="4" height="2"><feGaussianBlur stdDeviation="4.0"/></filter><clipPath id="clipPathk"><path transform="rotate(90)" d="m80.591-598.41h261.11v335.68h-261.11z" fill="#fff"/></clipPath><filter id="filterHr" x="-.5" y="-.5" width="2" height="2"><feGaussianBlur stdDeviation="4.0"/></filter></defs><g transform="translate(0,-169)"><g transform="matrix(.21214 0 0 .21145 -1.3344e-6 196.47)"><path d="m0-0.0625v345.62h603.38v-268.84h-334.53v-76.781z"/><path d="m49.912 52.756h168.59v51.021c-43.95 52.893-71.726 113.87-74.314 187.45h-57.676c2.2698-63.394 8.8358-125.71 57.676-177.47h-94.278z" fill="#fff" fill-rule="evenodd"/><g clip-path="url(#clipPath)"><g fill="none" stroke-width="10"><path d="m49.912 52.756h168.59v51.021c-43.95 52.893-71.726 113.87-74.314 187.45" filter="url(#filter)" stroke="#fff"/><path d="m144.19 291.22h-57.676c2.2698-63.394 8.8358-125.71 57.676-177.47h-94.278v-61.004" filter="url(#filter)" stroke="#000"/></g></g><g clip-path="url(#clipPatho)"><g fill="none" stroke-width="10"><path d="m603.38 345.56v-268.84h-334.53v-76.781h-268.84" filter="url(#filterH)" stroke="#fff"/><path d="m0-0.0625v345.62h603.38" filter="url(#filterH)" stroke="#000"/></g></g><g transform="matrix(.99424 0 0 .98519 1.5138 5.0623)"><path transform="rotate(90)" d="m80.591-598.41h261.11v335.68h-261.11z" fill="#fff"/><path d="m415.94 112.66v175.25h36.594v-175.25zm-130.88 1.0938v39.938h56.562l-58.781 96.5v38.812h107.59v-38.812h-68.781l71-100.94v-35.5zm200.72 0.0625v176.22h39.938v-62.062h26.594c42.589-0.14551 43.72-115.5-2.25-114.16zm37.719 37.719h15.594c17.348-0.59446 17.713 38.937 0 36.5l-14.406 1.2188z" fill-rule="evenodd"/><g clip-path="url(#clipPathN)"><g fill="none" stroke-width="10"><path d="m452.53 287.91v-175.25h-36.594m-25.5 176.34v-38.812h-68.781l71-100.94v-35.5h-107.59m240.66 176.28v-62.062m26.594 0c42.589-0.14551 43.72-115.5-2.25-114.16h-64.281m53.312 74.219-14.406 1.2188-1.1875-37.719" filter="url(#filterI)" stroke="#fff"/><path d="m415.94 112.66v175.25h36.594m-167.47-174.16v39.938h56.562l-58.781 96.5v38.812h107.59m95.344-175.19v176.22h39.938m0-62.062h26.594m-28.812-76.438h15.594c17.348-0.59446 17.713 38.937 0 36.5" filter="url(#filterI)" stroke="#000"/></g></g><g clip-path="url(#clipPathk)"><g fill="none" stroke-width="10"><path transform="rotate(90)" d="m80.591-598.41h261.11m-261.11 335.68v-335.68" filter="url(#filterHr)" stroke="#fff"/><path transform="rotate(90)" d="m341.71-598.41v335.68h-261.11" filter="url(#filterHr)" stroke="#000"/></g></g></g></g></g></svg>

assets/img/svg/3rd-party/anonaddy-dark.svg

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="384" height="128" version="1.1" viewBox="0 0 101.6 33.867" xmlns="http://www.w3.org/2000/svg"><g transform="matrix(.05357 0 0 .05357 -2.7694 6.1687)"><path class="st0" d="m107.8 179.5c-4.6 0.7-9.5-1-12.6-5-4.5-5.8-3.5-14.1 2.3-18.7l37-28.9c5.8-4.5 14.1-3.5 18.7 2.3 4.5 5.8 3.5 14.1-2.3 18.7l-37 28.9c-1.8 1.5-3.9 2.4-6.1 2.7z" fill="#3ae7e1"/><path class="st1" d="m71.9 207.7c-4.6 0.7-9.5-1-12.6-4.9-4.5-5.8-3.5-14.1 2.3-18.7l3.5-2.7c5.8-4.5 14.1-3.5 18.7 2.3 4.5 5.8 3.5 14.1-2.3 18.7l-3.5 2.7c-1.8 1.4-3.9 2.3-6.1 2.6z" fill="#f5f7fa"/><path class="st0" d="m67.1 283.6c-4.6 0.7-9.5-1-12.6-5-4.5-5.8-3.5-14.1 2.3-18.7l81.2-63.4c5.8-4.5 14.2-3.5 18.7 2.3s3.5 14.1-2.3 18.7l-81.2 63.5c-1.9 1.4-4 2.3-6.1 2.6z" fill="#3ae7e1"/><path class="st1" d="m182.8 193.6c-4.6 0.7-9.5-1-12.6-5-4.5-5.8-3.5-14.1 2.3-18.7l12.9-10.1c5.8-4.5 14.1-3.5 18.7 2.3 4.5 5.8 3.5 14.1-2.3 18.7l-12.9 10.1c-1.9 1.4-4 2.3-6.1 2.7z" fill="#f5f7fa"/><path class="st0" d="m175.7 271.1c-4.6 0.7-9.5-1-12.6-5-4.5-5.8-3.5-14.1 2.3-18.7l66.6-52c5.8-4.5 14.2-3.5 18.7 2.3s3.5 14.1-2.3 18.7l-66.6 52c-1.8 1.5-3.9 2.4-6.1 2.7z" fill="#3ae7e1"/><path class="st1" d="m139.3 300c-4.6 0.7-9.5-1-12.6-5-4.5-5.8-3.5-14.2 2.3-18.7l4.7-3.7c5.8-4.5 14.2-3.5 18.7 2.3s3.5 14.2-2.3 18.7l-4.7 3.7c-1.9 1.5-4 2.4-6.1 2.7z" fill="#f5f7fa"/><path class="st0" d="m475 40.4h-308.8c-11.5 0-22.2 7.1-25.6 18.1-1.6 5.1-1.5 10.3 0 15 1.5 4.8 4.5 9.2 8.7 12.5 0 0 118.3 91.9 147.3 111.9 10.4 6.7 20.5 4.4 26.5-0.2l150.1-116.8v201.9c0 19.7-16 35.7-35.7 35.7h-283.7c-7.3 0-13.2 5.9-13.2 13.2 0 7.4 6 13.4 13.4 13.4h283.4c34.4 0 62.3-27.9 62.3-62.3v-217.7c0.1-13.6-11-24.7-24.7-24.7zm-213.6 110.1 0.1-0.7 0.4 0.6zm48.3 24-137.5-107.5h275.5z" fill="#3ae7e1"/><g fill="#3ae7e1"><path class="st0" d="m791.7 281.8c2.4 6.5 0 9.8-6.8 9.8h-15.5c-12.2 0-16.1-1.8-18.4-8.9l-13.7-38.4h-82.1l-14 38.4c-2.4 7.1-6.2 8.9-18.4 8.9h-13.7c-6.8 0-9.2-3.3-6.8-9.8l74.3-193.3c2.7-6.8 5.4-8.3 12.5-8.3h15.8c7.1 0 10.1 1.8 12.5 8zm-87.4-130.8c-3.6-10.7-5.9-24.4-6.8-31.2l-0.3-5.1h-2.1c0 11.3-2.1 23.2-6.5 36l-22.9 63h61.3z"/><path class="st0" d="m881.8 133.2c41.6 0 61.8 21.4 61.8 59.8v89.5c0 6.8-2.4 9.2-9.2 9.2h-16.4c-6.8 0-8.9-2.4-8.9-9.2v-88.6c0-19.3-10.7-29.1-32.4-29.1-9.5 0-19 1.2-28.5 3.9-1.5 0.6-2.1 1.5-2.1 3v110.9c0 6.8-2.1 9.2-8.9 9.2h-16.4c-6.8 0-9.2-2.4-9.2-9.2v-122.4c0-9.5 2.1-13.1 11.6-16.9 17-6.9 36.3-10.1 58.6-10.1z"/><path class="st0" d="m971.6 192.6c0-37.2 24.7-59.5 68.4-59.5 44 0 68.7 22.3 68.7 59.5v44c0 37.2-24.7 59.5-68.7 59.5-43.7 0-68.4-22.3-68.4-59.5zm102.6 0c0-18.1-12.5-28.2-34.2-28.2s-33.9 10.1-33.9 28.2v44c0 17.8 12.2 28.2 33.9 28.2s34.2-10.4 34.2-28.2z"/><path class="st0" d="m1207.7 133.2c41.6 0 61.8 21.4 61.8 59.8v89.5c0 6.8-2.4 9.2-9.2 9.2h-16.4c-6.8 0-8.9-2.4-8.9-9.2v-88.6c0-19.3-10.7-29.1-32.4-29.1-9.5 0-19 1.2-28.5 3.9-1.5 0.6-2.1 1.5-2.1 3v110.9c0 6.8-2.1 9.2-8.9 9.2h-16.4c-6.8 0-9.2-2.4-9.2-9.2v-122.4c0-9.5 2.1-13.1 11.6-16.9 16.9-6.9 36.3-10.1 58.6-10.1z"/></g><g fill="#f5f7fa"><path class="st1" d="m1477.7 281.8c2.4 6.5 0 9.8-6.8 9.8h-15.5c-12.2 0-16.1-1.8-18.4-8.9l-13.7-38.4h-82.1l-14 38.4c-2.4 7.1-6.2 8.9-18.4 8.9h-13.7c-6.8 0-9.2-3.3-6.8-9.8l74.3-193.3c2.7-6.8 5.4-8.3 12.5-8.3h15.8c7.1 0 10.1 1.8 12.5 8zm-87.5-130.8c-3.6-10.7-5.9-24.4-6.8-31.2l-0.3-5.1h-2.1c0 11.3-2.1 23.2-6.5 36l-22.9 63h61.3z"/><path class="st1" d="m1490.7 195.3c0-40.4 20.8-62.1 62.1-62.1 9.2 0 20.8 1.2 35.4 3.9v-56.3c0-6.8 2.1-9.2 8.9-9.2h16.4c6.8 0 9.2 2.4 9.2 9.2v189.4c0 9.5-2.4 12.5-11.9 16.4-16.9 6.2-35.4 9.5-55.6 9.5-43.1 0-64.5-19.9-64.5-60.1zm97.6-26.7c-11.9-2.7-21.4-3.9-28.8-3.9-22.9 0-34.2 10.4-34.2 31.5v38.7c0 19.9 11 29.7 33.3 29.7 10.4 0 19.6-1.2 27.4-3.3 1.5-0.6 2.4-1.8 2.4-3.3v-89.4z"/><path class="st1" d="m1651.9 195.3c0-40.4 20.8-62.1 62.1-62.1 9.2 0 20.8 1.2 35.4 3.9v-56.3c0-6.8 2.1-9.2 8.9-9.2h16.4c6.8 0 9.2 2.4 9.2 9.2v189.4c0 9.5-2.4 12.5-11.9 16.4-16.9 6.2-35.4 9.5-55.6 9.5-43.1 0-64.5-19.9-64.5-60.1zm97.5-26.7c-11.9-2.7-21.4-3.9-28.8-3.9-22.9 0-34.2 10.4-34.2 31.5v38.7c0 19.9 11 29.7 33.3 29.7 10.4 0 19.6-1.2 27.4-3.3 1.5-0.6 2.4-1.8 2.4-3.3v-89.4z"/><path class="st1" d="m1939.1 137.6c6.8 0 9.2 2.1 9.2 8.9v150.2c0 40.7-20.5 64.8-65.4 64.8-29.4 0-50.3-9.5-61.8-28.5-4.2-6.5-3-11.6 3.9-14.9l11.3-6.2c7.1-3.6 10.4-2.7 14.9 3.6 6.2 10.1 16.6 15.2 31.2 15.2 21.1 0 31.5-10.7 31.5-32.1v-14c-12.2 2.7-24.1 4.2-35.4 4.2-41.6 0-62.1-21.4-62.1-59.8v-82.4c0-6.8 2.4-8.9 9.2-8.9h16.4c6.8 0 8.9 2.1 8.9 8.9v81.2c0 19.6 10.7 29.4 32.4 29.4 9.8 0 19.9-1.5 30.6-4.2v-106.5c0-6.8 2.4-8.9 9.2-8.9z"/></g></g></svg>

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

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="384" height="128" version="1.1" viewBox="0 0 101.6 33.867" xmlns="http://www.w3.org/2000/svg"><g id="XMLID_1_" transform="matrix(.05357 0 0 .05357 -2.7694 6.1687)"><g id="XMLID_29_"><path id="XMLID_41_" class="st0" d="m107.8 179.5c-4.6 0.7-9.5-1-12.6-5-4.5-5.8-3.5-14.1 2.3-18.7l37-28.9c5.8-4.5 14.1-3.5 18.7 2.3 4.5 5.8 3.5 14.1-2.3 18.7l-37 28.9c-1.8 1.5-3.9 2.4-6.1 2.7z" fill="#3ae7e1"/></g><g id="XMLID_30_"><path id="XMLID_40_" class="st1" d="m71.9 207.7c-4.6 0.7-9.5-1-12.6-4.9-4.5-5.8-3.5-14.1 2.3-18.7l3.5-2.7c5.8-4.5 14.1-3.5 18.7 2.3 4.5 5.8 3.5 14.1-2.3 18.7l-3.5 2.7c-1.8 1.4-3.9 2.3-6.1 2.6z" fill="#7b8794"/></g><g id="XMLID_31_"><path id="XMLID_39_" class="st0" d="m67.1 283.6c-4.6 0.7-9.5-1-12.6-5-4.5-5.8-3.5-14.1 2.3-18.7l81.2-63.4c5.8-4.5 14.2-3.5 18.7 2.3s3.5 14.1-2.3 18.7l-81.2 63.5c-1.9 1.4-4 2.3-6.1 2.6z" fill="#3ae7e1"/></g><g id="XMLID_34_"><path id="XMLID_38_" class="st1" d="m182.8 193.6c-4.6 0.7-9.5-1-12.6-5-4.5-5.8-3.5-14.1 2.3-18.7l12.9-10.1c5.8-4.5 14.1-3.5 18.7 2.3 4.5 5.8 3.5 14.1-2.3 18.7l-12.9 10.1c-1.9 1.4-4 2.3-6.1 2.7z" fill="#7b8794"/></g><g id="XMLID_32_"><path id="XMLID_37_" class="st0" d="m175.7 271.1c-4.6 0.7-9.5-1-12.6-5-4.5-5.8-3.5-14.1 2.3-18.7l66.6-52c5.8-4.5 14.2-3.5 18.7 2.3s3.5 14.1-2.3 18.7l-66.6 52c-1.8 1.5-3.9 2.4-6.1 2.7z" fill="#3ae7e1"/></g><path id="XMLID_36_" class="st1" d="m139.3 300c-4.6 0.7-9.5-1-12.6-5-4.5-5.8-3.5-14.2 2.3-18.7l4.7-3.7c5.8-4.5 14.2-3.5 18.7 2.3s3.5 14.2-2.3 18.7l-4.7 3.7c-1.9 1.5-4 2.4-6.1 2.7z" fill="#7b8794"/><path id="XMLID_44_" class="st0" d="m475 40.4h-308.8c-11.5 0-22.2 7.1-25.6 18.1-1.6 5.1-1.5 10.3 0 15 1.5 4.8 4.5 9.2 8.7 12.5 0 0 118.3 91.9 147.3 111.9 10.4 6.7 20.5 4.4 26.5-0.2l150.1-116.8v201.9c0 19.7-16 35.7-35.7 35.7h-283.7c-7.3 0-13.2 5.9-13.2 13.2 0 7.4 6 13.4 13.4 13.4h283.4c34.4 0 62.3-27.9 62.3-62.3v-217.7c0.1-13.6-11-24.7-24.7-24.7zm-213.6 110.1 0.1-0.7 0.4 0.6zm48.3 24-137.5-107.5h275.5z" fill="#3ae7e1"/><g id="XMLID_81_"><g id="XMLID_4_" fill="#3ae7e1"><path id="XMLID_25_" class="st0" d="m791.7 281.8c2.4 6.5 0 9.8-6.8 9.8h-15.5c-12.2 0-16.1-1.8-18.4-8.9l-13.7-38.4h-82.1l-14 38.4c-2.4 7.1-6.2 8.9-18.4 8.9h-13.7c-6.8 0-9.2-3.3-6.8-9.8l74.3-193.3c2.7-6.8 5.4-8.3 12.5-8.3h15.8c7.1 0 10.1 1.8 12.5 8zm-87.4-130.8c-3.6-10.7-5.9-24.4-6.8-31.2l-0.3-5.1h-2.1c0 11.3-2.1 23.2-6.5 36l-22.9 63h61.3z"/><path id="XMLID_28_" class="st0" d="m881.8 133.2c41.6 0 61.8 21.4 61.8 59.8v89.5c0 6.8-2.4 9.2-9.2 9.2h-16.4c-6.8 0-8.9-2.4-8.9-9.2v-88.6c0-19.3-10.7-29.1-32.4-29.1-9.5 0-19 1.2-28.5 3.9-1.5 0.6-2.1 1.5-2.1 3v110.9c0 6.8-2.1 9.2-8.9 9.2h-16.4c-6.8 0-9.2-2.4-9.2-9.2v-122.4c0-9.5 2.1-13.1 11.6-16.9 17-6.9 36.3-10.1 58.6-10.1z"/><path id="XMLID_65_" class="st0" d="m971.6 192.6c0-37.2 24.7-59.5 68.4-59.5 44 0 68.7 22.3 68.7 59.5v44c0 37.2-24.7 59.5-68.7 59.5-43.7 0-68.4-22.3-68.4-59.5zm102.6 0c0-18.1-12.5-28.2-34.2-28.2s-33.9 10.1-33.9 28.2v44c0 17.8 12.2 28.2 33.9 28.2s34.2-10.4 34.2-28.2z"/><path id="XMLID_68_" class="st0" d="m1207.7 133.2c41.6 0 61.8 21.4 61.8 59.8v89.5c0 6.8-2.4 9.2-9.2 9.2h-16.4c-6.8 0-8.9-2.4-8.9-9.2v-88.6c0-19.3-10.7-29.1-32.4-29.1-9.5 0-19 1.2-28.5 3.9-1.5 0.6-2.1 1.5-2.1 3v110.9c0 6.8-2.1 9.2-8.9 9.2h-16.4c-6.8 0-9.2-2.4-9.2-9.2v-122.4c0-9.5 2.1-13.1 11.6-16.9 16.9-6.9 36.3-10.1 58.6-10.1z"/></g><g id="XMLID_24_" fill="#7b8794"><path id="XMLID_70_" class="st1" d="m1477.7 281.8c2.4 6.5 0 9.8-6.8 9.8h-15.5c-12.2 0-16.1-1.8-18.4-8.9l-13.7-38.4h-82.1l-14 38.4c-2.4 7.1-6.2 8.9-18.4 8.9h-13.7c-6.8 0-9.2-3.3-6.8-9.8l74.3-193.3c2.7-6.8 5.4-8.3 12.5-8.3h15.8c7.1 0 10.1 1.8 12.5 8zm-87.5-130.8c-3.6-10.7-5.9-24.4-6.8-31.2l-0.3-5.1h-2.1c0 11.3-2.1 23.2-6.5 36l-22.9 63h61.3z"/><path id="XMLID_73_" class="st1" d="m1490.7 195.3c0-40.4 20.8-62.1 62.1-62.1 9.2 0 20.8 1.2 35.4 3.9v-56.3c0-6.8 2.1-9.2 8.9-9.2h16.4c6.8 0 9.2 2.4 9.2 9.2v189.4c0 9.5-2.4 12.5-11.9 16.4-16.9 6.2-35.4 9.5-55.6 9.5-43.1 0-64.5-19.9-64.5-60.1zm97.6-26.7c-11.9-2.7-21.4-3.9-28.8-3.9-22.9 0-34.2 10.4-34.2 31.5v38.7c0 19.9 11 29.7 33.3 29.7 10.4 0 19.6-1.2 27.4-3.3 1.5-0.6 2.4-1.8 2.4-3.3v-89.4z"/><path id="XMLID_76_" class="st1" d="m1651.9 195.3c0-40.4 20.8-62.1 62.1-62.1 9.2 0 20.8 1.2 35.4 3.9v-56.3c0-6.8 2.1-9.2 8.9-9.2h16.4c6.8 0 9.2 2.4 9.2 9.2v189.4c0 9.5-2.4 12.5-11.9 16.4-16.9 6.2-35.4 9.5-55.6 9.5-43.1 0-64.5-19.9-64.5-60.1zm97.5-26.7c-11.9-2.7-21.4-3.9-28.8-3.9-22.9 0-34.2 10.4-34.2 31.5v38.7c0 19.9 11 29.7 33.3 29.7 10.4 0 19.6-1.2 27.4-3.3 1.5-0.6 2.4-1.8 2.4-3.3v-89.4z"/><path id="XMLID_79_" class="st1" d="m1939.1 137.6c6.8 0 9.2 2.1 9.2 8.9v150.2c0 40.7-20.5 64.8-65.4 64.8-29.4 0-50.3-9.5-61.8-28.5-4.2-6.5-3-11.6 3.9-14.9l11.3-6.2c7.1-3.6 10.4-2.7 14.9 3.6 6.2 10.1 16.6 15.2 31.2 15.2 21.1 0 31.5-10.7 31.5-32.1v-14c-12.2 2.7-24.1 4.2-35.4 4.2-41.6 0-62.1-21.4-62.1-59.8v-82.4c0-6.8 2.4-8.9 9.2-8.9h16.4c6.8 0 8.9 2.1 8.9 8.9v81.2c0 19.6 10.7 29.4 32.4 29.4 9.8 0 19.9-1.5 30.6-4.2v-106.5c0-6.8 2.4-8.9 9.2-8.9z"/></g></g></g></svg>

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

@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="128" height="128" version="1.1" viewBox="0 0 33.866 33.866" xmlns="http://www.w3.org/2000/svg"><g transform="matrix(.043931 0 0 .043931 -.034709 -1.092)"><path d="m55.393 532.82 286.97-491.31c96.403-72.992 403.62 137.03 376.36 224.4l-264.75 505.47c59.224-106.03-313.56-331.49-398.58-238.56z" fill="#e6e6e6" fill-rule="evenodd" stroke="#241c1c" stroke-width="3"/><g stroke="#000"><path d="m395.55 28.063-283.02 480.54" fill="#808080" stroke-opacity=".1195" stroke-width="1.6468px"/><path d="m193.27 521.67 273.63-478.51" fill="none" stroke-opacity=".069182" stroke-width="1.6578px"/><path d="m283.67 559.55 266.09-481.82" fill="#b3b3b3" stroke-opacity=".075472" stroke-width="1.6507px"/><path d="m442.34 696.99 259.36-486.94" fill="none" stroke-opacity=".21384" stroke-width="1.6507px"/></g><g fill-rule="evenodd"><path d="m393.67 26.59c-19.648 0.192-36.822 4.5488-50.18 14.061l-287.65 491.55c12.787-13.406 31.767-19.932 54.652-20.971l285.37-484.63c-0.73275-0.0042-1.4673-0.013-2.1934-0.0059z" fill="#e6e6e6"/><path d="m395.86 26.596-285.37 484.63c23.701-1.076 51.577 3.7251 81.08 12.856l276.08-483.72c-25.631-8.6186-50.148-13.645-71.791-13.77z" fill="#ececec"/><path d="m467.65 40.363-276.08 483.72c29.573 9.1522 60.771 22.657 91.027 38.934l267.15-485.29c-27.233-15.378-55.27-28.34-82.098-37.361z" fill="#e6e6e6"/><path d="m549.75 77.723-267.16 485.3c47.653 25.635 92.959 58.148 125.85 91.445l262.54-485.38c-31.608-32.535-75.256-65.399-121.24-91.365z" fill="#e6e6e6"/><path d="m670.99 169.09-262.55 485.38c13.999 14.171 25.744 28.479 34.471 42.457l260.31-488.34c-8.2409-12.768-19.229-26.1-32.238-39.49z" fill="#ccc"/><path d="m703.23 208.58-260.31 488.34c14.528 23.271 20.674 45.62 14.856 64.869l260.85-496.58c4.4659-15.775-1.7012-35.425-15.393-56.637z" fill="#b3b3b3"/></g><ellipse transform="matrix(.85943 .51126 -.48882 .87238 0 0)" cx="541.96" cy="429.54" rx="232.96" ry="92.651" stroke-width="1.651"/></g></svg>

assets/img/svg/3rd-party/exifcleaner.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="translate(0 -263.13)"><g transform="matrix(.25 0 0 .25 -75.421 228.27)"><circle cx="369.42" cy="207.2" r="67.733" fill="#521737" stroke-width=".71866"/><path transform="matrix(.26458 0 0 .26458 301.69 139.47)" d="m265.99 65.18v0.0078c1.8901 2.438 3.0273 5.5806 3.0273 9.0215v195.24c19.426 3.3884 50.314 16.138 55.404 62.422l0.26367 2.377 1.9512 17.611h-2e-3l10.252 92.566h-161.81l64.785 67.07c5.4118 0.44356 10.702 0.40924 16.131 0.50781 6.0422 3e-4 12.082-0.21339 18.109-0.64062 8.5134-0.60344 16.992-1.6336 25.402-3.084 8.4107-1.4512 16.743-3.3219 24.967-5.6055 8.2243-2.2825 16.33-4.9742 24.285-8.0664 7.9553-3.0931 15.751-6.5833 23.357-10.455 7.6063-3.8716 15.013-8.1208 22.195-12.732 7.1823-4.6114 14.13-9.5793 20.816-14.885 6.6858-5.3055 13.102-10.942 19.225-16.889 6.1225-5.9464 11.945-12.195 17.443-18.723 5.4986-6.528 10.667-13.327 15.486-20.371 4.8192-7.0443 9.2831-14.324 13.375-21.814 4.0921-7.4904 7.8071-15.181 11.131-23.043 3.3233-7.8616 6.2497-15.885 8.7715-24.039 2.5223-8.154 4.6364-16.428 6.332-24.793 0.0435-0.28271 0.12174-0.53757 0.16407-0.82032zm-119.28 111.21c-3e-3 20.217 16.387 36.607 36.604 36.605zm36.604 36.605c-20.216-1e-3 -36.605 16.387-36.604 36.604 9.4e-4 -4.2e-4 50.205 51.017 50.205 51.017 12.099-18.158 28.866-28.067 41.949-30.349zm-36.604 36.604c1e-3 -20.216-16.387-36.605-36.604-36.604z" fill="#351228" stroke-width=".98462"/><g transform="matrix(.98462 0 0 .98462 4.6413 4.2297)" fill="#fff"><path d="m370.47 153.51c-1.9408 0-3.5026 1.6846-3.5026 3.777v54.445c0 2.0925 1.5618 3.777 3.5026 3.777s3.5026-1.6846 3.5026-3.777v-54.445c0-2.0924-1.5618-3.777-3.5026-3.777z" stroke-width=".62166"/><path d="m341.11 184.75a9.8353 9.8353 0 0 1-9.836 9.836 9.8353 9.8353 0 0 1 9.836 9.836 9.8353 9.8353 0 0 1 9.836-9.836 9.8353 9.8353 0 0 1-9.836-9.836z" fill="#fff" stroke-width=".63312"/><path d="m401.71 203.66a8.3455 8.3455 0 0 1-8.3461 8.3461 8.3455 8.3455 0 0 1 8.3461 8.3461 8.3455 8.3455 0 0 1 8.3461-8.3461 8.3455 8.3455 0 0 1-8.3461-8.3461z" fill="#fff" stroke-width=".53722"/><path d="m370.47 153.51v62c-1.9408 0-3.5026-1.6846-3.5026-3.777v-54.445c0-2.0924 1.5618-3.777 3.5026-3.777z" stroke-width=".62166"/></g><path d="m369.42 155.38v61.046c1.911 0 3.4488-1.6587 3.4488-3.7189v-53.608c0-2.0602-1.5378-3.7189-3.4488-3.7189z" fill="#dfdfe0" stroke-width=".61209"/><path d="m369.42 210.44c-3.3202 0-16.374 1.0601-18.108 16.828l-3.2974 29.78h42.811l-3.2974-29.78c-1.7341-15.768-14.788-16.828-18.108-16.828z" fill="#f8d057" stroke-width=".56531"/><path d="m351.31 227.27c1.7341-15.768 14.788-16.828 18.108-16.828v46.608h-21.406z" fill="#f8d057" stroke-width=".56531"/><path d="m351.24 227.9 18.178-3e-5 1e-5 4.6596h-18.694z" fill="#e97043" stroke-width=".25734"/><path d="m387.52 227.27c-1.7341-15.768-14.788-16.828-18.108-16.828v46.608h21.406z" fill="#f2b55a" stroke-width=".56531"/><path d="m387.59 227.9h-18.178v4.6596h18.694z" fill="#a15439" stroke-width=".25734"/></g></g></svg>

assets/img/svg/3rd-party/gnu_social.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 transform="translate(0 -263.13)"><g transform="matrix(.072143 0 0 .072143 -44.234 303.31)"><g transform="matrix(4.78 0 0 4.78 504.61 -4406)"><path d="m96.926 881.56c-3.7355 21.79-38.393 21.902-38.393 21.902s21.203-6.5697 19.751-22.342c-1.3271-14.408 18.642 0.44023 18.642 0.44023z" fill="#a22430"/><rect x="27.053" y="805.25" width="89.521" height="77.451" ry="12.913" fill="#a22430"/><g fill="#fff"><path d="m75.036 851.19h18.05v0c0 8.6579-3.6686 22.158-20.838 21.278-17.169-0.88046-20.984-14.381-21.131-23.479-0.14674-9.0981 2.6474-20.325 22.892-19.81 17.316 0.44023 18.93 16.289 18.93 16.289l-8.3644-0.14674s-1.9077-8.6579-12.033-8.2177c-10.125 0.44023-11.446 2.2012-11.446 12.913 0 10.712 4.6953 14.394 11.886 14.674 11.299 0.44023 10.272-5.8698 10.272-5.8698l-5.2828 0.29349z"/><path d="m84.147 815.75c1.3715-1.2233 7.2638 5.9431 7.4106 8.7313 0.21596 4.1032 0.32474 11.56-11.886 11.446-7.8508-0.0734-8.2177-5.4295-8.2177-5.4295s-0.22012-4.6224 4.0355-4.6224c4.2556 0 2.8583 3.0082 6.2366 3.0082 5.0627 0 4.2734-2.0535 4.4023-4.6958 0.29349-6.0165-3.3526-7.2145-1.981-8.4378z"/><path d="m59.2 815.75c-1.3715-1.2233-7.4106 4.6224-7.4106 8.7313s-0.32474 11.56 11.886 11.446c7.8508-0.0734 8.2177-5.4295 8.2177-5.4295s0.22012-4.6224-4.0355-4.6224c-4.2556 0-2.8583 3.0082-6.2366 3.0082-5.0627 0-4.2734-2.0535-4.4023-4.6958-0.29349-6.0165 3.3526-7.2145 1.981-8.4378z"/></g></g></g></g></svg>

assets/img/svg/3rd-party/peazip.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 transform="scale(.2655 .2655)"><g id="Warstwa_1_1_"><g clip-rule="evenodd" fill-rule="evenodd"><path d="m110.48 63.783c10.859 18.761 17.079 40.542 17.079 63.774h-127.56c47.204 0 88.423-25.654 110.48-63.774z" fill="#78e600"/><path d="M 0.001,0 H 127.56 C 104.328,0 82.542,6.216 63.779,17.075 45.014,6.216 23.235,0 0.001,0 Z" fill="#ffab00"/><path d="m127.56 0v127.56c0-23.232-6.216-45.019-17.074-63.781 10.858-18.764 17.074-40.544 17.074-63.777z" fill="#91bf00"/><path d="m127.56 0c-1e-3 23.232-6.216 45.014-17.074 63.777-3.459-5.976-7.387-11.649-11.737-16.963 0.405 0.025 0.813 0.041 1.226 0.041 10.64 0 19.268-8.626 19.268-19.267 0-10.642-8.628-19.27-19.268-19.27-10.642 0-19.269 8.628-19.269 19.27 0 0.41 0.015 0.82 0.041 1.226-5.315-4.351-10.985-8.28-16.964-11.738 18.764-10.86 40.543-17.076 63.777-17.076z" fill="#6c8300"/><path d="m1e-3 127.56c1e-3 -47.2 25.658-88.418 63.778-110.48 5.979 3.46 11.65 7.393 16.966 11.745 0.612 9.654 8.335 17.375 17.988 17.988 4.354 5.316 8.288 10.986 11.749 16.967-22.06 38.121-63.278 63.776-110.48 63.776zm63.779-91.366c15.234 0 27.586 12.354 27.586 27.588 0 15.23-12.352 27.584-27.586 27.584s-27.586-12.353-27.586-27.583c0-15.235 12.352-27.589 27.586-27.589zm-36.193 44.512c10.641 0 19.269 8.629 19.269 19.267 0 10.642-8.628 19.27-19.269 19.27-10.638 0-19.268-8.628-19.268-19.27 0-10.638 8.63-19.267 19.268-19.267z" fill="#6e9600"/><path d="m27.588 89.818c5.606 0 10.152 4.548 10.152 10.154s-4.546 10.151-10.152 10.151-10.153-4.545-10.153-10.151 4.546-10.154 10.153-10.154zm36.192-40.576c8.027 0 14.537 6.511 14.537 14.537s-6.51 14.537-14.537 14.537-14.537-6.511-14.537-14.537 6.51-14.537 14.537-14.537zm36.193-31.807c5.607 0 10.153 4.545 10.153 10.151 0 5.608-4.546 10.153-10.153 10.153-5.606 0-10.153-4.545-10.153-10.153-1e-3 -5.607 4.546-10.151 10.153-10.151zm-99.972 110.12v-127.56c23.232 0 45.014 6.22 63.777 17.078-38.123 22.059-63.777 63.276-63.777 110.48z" fill="#ffe600"/><path d="m99.973 8.318c10.64 0 19.269 8.629 19.269 19.269s-8.629 19.268-19.269 19.268c-0.413 0-0.823-0.015-1.23-0.04-5.387-6.58-11.417-12.61-17.997-17.998-0.025-0.407-0.04-0.816-0.04-1.229-1e-3 -10.641 8.627-19.27 19.267-19.27zm0 9.116c5.606 0 10.153 4.546 10.153 10.153 0 5.606-4.547 10.152-10.153 10.152s-10.153-4.546-10.153-10.152c-1e-3 -5.608 4.546-10.153 10.153-10.153z" fill="#32a000"/><path d="m98.742 46.814c-9.658-0.609-17.388-8.339-17.997-17.998 6.58 5.388 12.61 11.418 17.997 17.998zm-71.154 43.004c5.606 0 10.153 4.547 10.153 10.153s-4.547 10.153-10.153 10.153-10.153-4.547-10.153-10.153 4.546-10.153 10.153-10.153zm36.192-40.576c8.027 0 14.537 6.51 14.537 14.537s-6.51 14.536-14.537 14.536-14.537-6.509-14.537-14.536 6.51-14.537 14.537-14.537zm0-13.05c15.233 0 27.586 12.354 27.586 27.586s-12.353 27.586-27.586 27.586-27.586-12.353-27.586-27.585c0-15.233 12.353-27.587 27.586-27.587zm-36.192 44.511c10.64 0 19.269 8.629 19.269 19.269s-8.629 19.268-19.269 19.268-19.269-8.629-19.269-19.269 8.629-19.268 19.269-19.268z" fill="#32be00"/></g></g></g></svg>

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

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="128" height="128" version="1.1" viewBox="0 0 33.866 33.866" xmlns="http://www.w3.org/2000/svg"><g transform="matrix(.1014 0 0 .1014 -9.0749 -9.0242)"><g fill="#fba457" stroke-width="0"><path transform="matrix(2.6094 0 0 2.6094 89.5 89)" d="m33.916 0a9.9641 9.9641 0 0 0-9.9648 9.9648v118.04h31.809v-128h-21.844z"/><path transform="matrix(2.6094 0 0 2.6094 89.5 89)" d="m71.855 0v64h22.229a9.9641 9.9641 0 0 0 9.9648-9.9648v-54.035h-32.193z"/><path transform="matrix(2.6094 0 0 2.6094 89.5 89)" d="m71.855 96.191v31.809h22.229a9.9641 9.9641 0 0 0 9.9648-9.9648v-21.844h-32.193z"/></g></g></svg>

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

@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg width="128" height="128" version="1.1" viewBox="0 0 33.866 33.866" xmlns="http://www.w3.org/2000/svg"><g transform="matrix(.090361 0 0 .090361 -5.5773 -.077823)"><g transform="matrix(5.856 0 0 5.856 61.722 -1135.2)"><path d="m0 194h64v64h-64z" fill="#1a91eb" stroke-width=".17441"/><g transform="matrix(.2825 0 0 .2825 -1.667 94.059)" stroke-width=".64895"><path d="m67.017 539.86 4.0966-1.3174 2.2541 7.0782 6.7774-2.9584 1.7142 3.9598-8.9635 3.9103c-0.27185 0.11803-0.56258 0.17895-0.84953 0.17895-0.30584 0-0.60789-0.0609-0.8873-0.19038-0.5588-0.25129-0.9779-0.72723-1.1629-1.3098zm40.468-155.72c3.8399-0.51019 7.7666-0.76528 11.682-0.76528 2.711 0 5.4181 0.12182 8.0913 0.36548l-0.39267 4.3026c-6.2224-0.56737-12.637-0.43784-18.822 0.38078zm26.849 4.927 0.77779-4.2492c6.5244 1.1955 12.898 3.1373 18.935 5.7722l-1.7066 3.9637c-5.7391-2.5016-11.792-4.3483-18.006-5.4866zm-53.343 3.027c5.9241-2.89 12.211-5.0983 18.686-6.5642l0.9477 4.2188c-6.1582 1.3897-12.131 3.4839-17.757 6.2291zm78.112 5.7951 2.0692-3.7809c5.8335 3.225 11.255 7.1277 16.1 11.594l-2.9073 3.187c-4.5912-4.2378-9.73-7.9388-15.261-11zm-100.68 10.311c4.6479-4.6832 9.8961-8.8182 15.594-12.298l2.2314 3.6933c-5.4068 3.2973-10.379 7.2228-14.778 11.655zm121.23 6.0653 3.2018-2.8784c4.4666 5.0144 8.25 10.543 11.244 16.422l-3.821 1.9761c-2.8318-5.5553-6.4074-10.775-10.625-15.52zm-137.03 16.799c2.7147-6.0235 6.2412-11.72 10.478-16.94l3.3264 2.7376c-3.9947 4.927-7.3249 10.307-9.8886 15.988zm150.72 5.6047 4.0098-1.5535c2.39 6.2558 3.9267 12.797 4.5573 19.441l-4.2741 0.41503c-0.60023-6.2596-2.0464-12.416-4.2929-18.303zm-157.22 21.486c0.30583-6.6784 1.5216-13.288 3.602-19.635l4.0815 1.3517c-1.9558 5.9778-3.0961 12.195-3.3944 18.485zm159.07 22.94c1.7482-6.0349 2.6733-12.287 2.7487-18.596l4.2968 0.0533c-0.0793 6.6974-1.0648 13.342-2.9186 19.75zm-159.09-14.994 4.2967-0.13707c0.21899 7.0287 0.98168 13.189 2.3296 18.824l-4.1797 1.009c-1.4159-5.9207-2.2201-12.367-2.4467-19.696zm147.25 38.418c3.8399-5.0564 6.9812-10.543 9.3524-16.308l3.972 1.641c-2.5146 6.1149-5.8448 11.933-9.9112 17.282zm-142.51-11.038 4.0362-1.4887c2.2163 6.0806 5.2331 11.35 9.2165 16.125l-3.2924 2.7719c-4.3081-5.1516-7.5627-10.855-9.9603-17.408zm123.24 28.914c5.3048-3.4686 10.149-7.5389 14.408-12.112l3.1376 2.9508c-4.4968 4.8317-9.6091 9.1304-15.205 12.782zm-107.72-5.6998 2.8884-3.1983c1.4574 1.3326 3.0319 2.6272 4.6781 3.857 0.35869 0.27033 0.62677 0.64727 0.76268 1.0775l3.9871 12.523-4.0928 1.3212-3.7757-11.872c-1.5594-1.1841-3.0508-2.4292-4.4478-3.7085zm83.651 16.277c6.1129-1.5687 12.018-3.8418 17.565-6.7583l1.9898 3.8342c-5.841 3.0612-12.056 5.4562-18.49 7.1086zm-39.15 0.63205c0.27185-0.11804 0.56258-0.17896 0.85331-0.17896 0.19255 0 0.38512 0.0267 0.57389 0.08 1.7444 0.48736 3.0885 0.83004 4.2363 1.0928l-0.95147 4.2149c-1.0459-0.23607-2.2314-0.54066-3.6964-0.94425l-12.939 5.6542-1.7142-3.9674zm18.263 1.9951c4.5308 0 9.0768-0.36171 13.506-1.0851l0.68718 4.272c-4.6554 0.75008-9.4317 1.1346-14.193 1.1346-2.2579 0-3.9683-0.0114-5.505-0.0647l0.15859-4.3215c1.4687 0.0533 3.1338 0.0647 5.3464 0.0647z" fill="#9bdbf4"/><path d="m80.411 531.09c-0.34249 0-0.68498-0.0835-0.99736-0.2505-0.6511-0.34536-1.0802-0.99816-1.1366-1.7382l-1.6485-21.295c-6.989-5.3248-12.424-12.194-16.161-20.438-3.6883-8.122-5.5588-17.189-5.5588-26.931 0-33.266 29.258-60.334 65.219-60.334 35.957 0 65.219 27.068 65.219 60.334 0 33.27-29.262 60.338-65.219 60.338-5.9804 0-11.9-0.74767-17.617-2.2316l-21.023 12.255c-0.33496 0.19355-0.70379 0.29224-1.0764 0.29224" fill="#f2f2f2"/></g></g></g></svg>
+<svg width="128" height="128" version="1.1" viewBox="0 0 33.867 33.867" xmlns="http://www.w3.org/2000/svg"><g transform="translate(-88.068 -131.57)"><path d="m100.94 132.06 0.38097 1.5398a15.302 15.302 0 0 0-4.2542 1.7593l-0.81485-1.3598a16.869 16.869 0 0 1 4.6881-1.9392zm8.1274 0-0.38097 1.5398a15.302 15.302 0 0 1 4.2542 1.7593l0.82014-1.3598a16.869 16.869 0 0 0-4.6933-1.9392zm-18.562 7.6856a16.869 16.869 0 0 0-1.9392 4.688l1.5398 0.38097a15.302 15.302 0 0 1 1.7593-4.2542zm-0.8466 8.7517a15.318 15.318 0 0 1 0.17197-2.299l-1.5689-0.2381a16.993 16.993 0 0 0 0 5.0743l1.5689-0.2381a15.318 15.318 0 0 1-0.17197-2.2991zm24.096 14.498-0.81485-1.3598a15.302 15.302 0 0 1-4.2489 1.7594l0.38097 1.5398a16.869 16.869 0 0 0 4.6828-1.9392zm6.5929-14.498a15.318 15.318 0 0 1-0.17196 2.2991l1.5689 0.2381a16.993 16.993 0 0 0 0-5.0743l-1.5689 0.2381a15.318 15.318 0 0 1 0.17196 2.299zm1.0926 4.0637-1.5398-0.38097a15.302 15.302 0 0 1-1.7593 4.2542l1.3598 0.82014a16.869 16.869 0 0 0 1.9392-4.6933zm-14.138 11.112a15.453 15.453 0 0 1-4.5981 0l-0.2381 1.5688a16.993 16.993 0 0 0 5.0743 0zm10.053-6.0717a15.4 15.4 0 0 1-3.2515 3.2488l0.94184 1.2778a16.958 16.958 0 0 0 3.5875-3.5769zm-3.2515-21.456a15.4 15.4 0 0 1 3.2515 3.2515l1.2778-0.95242a16.958 16.958 0 0 0-3.5769-3.5769zm-21.453 3.2515a15.4 15.4 0 0 1 3.2515-3.2515l-0.95243-1.2778a16.958 16.958 0 0 0-3.5769 3.5769zm26.85 0.34923-1.3598 0.81485a15.302 15.302 0 0 1 1.7593 4.2489l1.5398-0.38097a16.869 16.869 0 0 0-1.9392-4.6828zm-16.797-6.4209a15.453 15.453 0 0 1 4.5981 0l0.23811-1.5689a16.993 16.993 0 0 0-5.0743 0zm-9.2385 29.224-3.2779 0.76459 0.76459-3.2779-1.545-0.36245-0.76459 3.2779a1.5874 1.5874 0 0 0 1.9075 1.9075l3.2753-0.75136zm-3.7277-4.2912 1.545 0.3598 0.52913-2.2726a15.279 15.279 0 0 1-1.7064-4.1642l-1.5398 0.38097a16.805 16.805 0 0 0 1.5609 4.024zm7.4078 3.4393-2.2726 0.52913 0.35981 1.545 1.672-0.3889a16.805 16.805 0 0 0 4.024 1.5609l0.38097-1.5398a15.279 15.279 0 0 1-4.1536-1.717zm7.8575-26.956a13.757 13.757 0 0 0-11.641 21.078l-1.3228 5.6431 5.6431-1.3228a13.757 13.757 0 1 0 7.3204-25.398z" fill="#3a76f0" stroke-width=".26456"/></g></svg>

assets/img/svg/3rd-party/tox-dark.svg

@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="128" height="128" version="1.1" viewBox="0 0 33.866 33.866" xmlns="http://www.w3.org/2000/svg"><g transform="matrix(.31143 0 0 .31143 2.9966 4.9564e-5)" fill="#fff"><path d="m71.574 41.851c0-4.685 0.074-10.553-0.033-15.237-0.047-2.018-0.268-4.076-0.746-6.034-3.421-13.999-16.972-22.705-31.201-20.13-12.596 2.279-21.973 13.518-21.973 26.336v15.035c-0.475 0-0.794-1e-3 -1.116 0h-11.482c-2.773 0-5.023 2.249-5.023 5.023v56.875c0 2.773 2.25 5.023 5.023 5.023h79.451c2.775 0 5.024-2.25 5.024-5.023v-56.875c0-2.774-2.249-5.023-5.024-5.023zm-19.467 53.267h-14.775c-2.322 0-4.203-1.914-4.203-4.274 0-0.063 7e-3 -0.127 9e-3 -0.19-5e-3 0-6e-3 -1.021-8e-3 -2.041-1e-3 -1.129 0.511-4.289 2.061-6.574 1.641-2.418 3.855-3.99 6.257-4.697-3.166-1.291-5.396-4.398-5.396-8.025 0-4.789 3.88-8.668 8.667-8.668 4.789 0 8.667 3.879 8.667 8.668 0 3.719-2.344 6.891-5.637 8.12 2.332 0.753 4.537 2.313 6.273 4.707 1.621 2.235 2.285 5.343 2.285 6.47v2.043c-6e-3 0.062 0 0.125 0 0.189 1e-3 2.358-1.88 4.272-4.2 4.272m9.672-62.014c-1.562 4.611-4.52 8.305-7.61 11.912-2.386 2.783-5.19 5.125-8.176 7.247-0.144 0.103-0.298 0.188-0.685 0.427 1.781-3.076 3.217-5.998 3.633-9.404-4.234 1.002-8.227 0.564-12.093-1.14-6.862-3.023-10.963-9.618-10.263-17.063 0.573-6.127 3.94-10.543 9.321-13.395 8.667-4.593 19.734-1.655 24.689 6.516 2.887 4.758 2.932 9.741 1.184 14.9" fill="#fff"/></g></svg>

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

@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="128" height="128" version="1.1" viewBox="0 0 33.866 33.866" xmlns="http://www.w3.org/2000/svg"><g transform="matrix(.31143 0 0 .31143 2.9966 4.9564e-5)" fill="#414141"><path d="m71.574 41.851c0-4.685 0.074-10.553-0.033-15.237-0.047-2.018-0.268-4.076-0.746-6.034-3.421-13.999-16.972-22.705-31.201-20.13-12.596 2.279-21.973 13.518-21.973 26.336v15.035c-0.475 0-0.794-1e-3 -1.116 0h-11.482c-2.773 0-5.023 2.249-5.023 5.023v56.875c0 2.773 2.25 5.023 5.023 5.023h79.451c2.775 0 5.024-2.25 5.024-5.023v-56.875c0-2.774-2.249-5.023-5.024-5.023zm-19.467 53.267h-14.775c-2.322 0-4.203-1.914-4.203-4.274 0-0.063 7e-3 -0.127 9e-3 -0.19-5e-3 0-6e-3 -1.021-8e-3 -2.041-1e-3 -1.129 0.511-4.289 2.061-6.574 1.641-2.418 3.855-3.99 6.257-4.697-3.166-1.291-5.396-4.398-5.396-8.025 0-4.789 3.88-8.668 8.667-8.668 4.789 0 8.667 3.879 8.667 8.668 0 3.719-2.344 6.891-5.637 8.12 2.332 0.753 4.537 2.313 6.273 4.707 1.621 2.235 2.285 5.343 2.285 6.47v2.043c-6e-3 0.062 0 0.125 0 0.189 1e-3 2.358-1.88 4.272-4.2 4.272m9.672-62.014c-1.562 4.611-4.52 8.305-7.61 11.912-2.386 2.783-5.19 5.125-8.176 7.247-0.144 0.103-0.298 0.188-0.685 0.427 1.781-3.076 3.217-5.998 3.633-9.404-4.234 1.002-8.227 0.564-12.093-1.14-6.862-3.023-10.963-9.618-10.263-17.063 0.573-6.127 3.94-10.543 9.321-13.395 8.667-4.593 19.734-1.655 24.689 6.516 2.887 4.758 2.932 9.741 1.184 14.9" fill="#414141"/></g></svg>

assets/img/svg/team/dawid.svg

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" viewBox="0 0 512 512" xmlns="http://www.w3.org/2000/svg"><g transform="matrix(.87897 0 0 .87897 -5.196 483.74)"><rect transform="scale(-1,1)" x="-588.41144" y="-550.34869" width="582.5" height="582.5" ry="0" fill="#966bab" stroke-width="15.61100006"/><g transform="matrix(9.8600256,0,0,9.8681904,1.607183,-428.03719)"><g fill="#fff" stroke-width=".99958003"><path d="m21.975 29.955c-2.58 0-5.631 2.4639-6.586 3.4111-0.571 0.57152-1.433 0.74237-2.179 0.43264-0.748-0.30874-1.235-1.0371-1.235-1.8454 0-3.4561 1.672-9.9916 8-9.9916 0.757 0 1.45 0.42764 1.789 1.1051l2 3.9966c0.31 0.61948 0.277 1.3549-0.088 1.9444-0.364 0.5885-1.008 0.9472-1.701 0.9472zm24.766 3.8438c-0.75 0.31074-1.607 0.13888-2.18-0.43364-0.886-0.88425-3.997-3.4101-6.586-3.4101-0.693 0-1.337-0.3587-1.701-0.9482-0.364-0.5885-0.397-1.3249-0.088-1.9444l2-3.9966c0.339-0.67643 1.031-1.1041 1.789-1.1041 6.328 0 8 6.5355 8 9.9916 0 0.80832-0.487 1.5367-1.234 1.8454z"/><path d="m29.975-2.0185c-9.941 0-18 8.0522-18 17.985 0 9.9327 8.059 17.985 18 17.985s18-8.0522 18-17.985c0-9.9327-8.059-17.985-18-17.985zm0 6.9942c6.212 0 9.3 5.0248 9.429 5.2386 0.123 0.20383 0.08296 0.46754-0.09405 0.6274-0.178 0.15887-0.4439 0.17088-0.6349 0.029-0.038-0.02897-3.9341-2.8976-8.7001-2.8976-4.778 0-8.6611 2.8686-8.7001 2.8976-0.191 0.14188-0.4569 0.13187-0.6349-0.029-0.178-0.15986-0.21704-0.42257-0.09405-0.6274 0.128-0.21482 3.217-5.2386 9.429-5.2386zm-6.5 10.991a2.5 3.4971 0 0 1 2.5 3.4971 2.5 3.4971 0 0 1-2.5 3.4971 2.5 3.4971 0 0 1-2.5-3.4971 2.5 3.4971 0 0 1 2.5-3.4971zm13 0a2.5 3.4971 0 0 1 2.5 3.4971 2.5 3.4971 0 0 1-2.5 3.4971 2.5 3.4971 0 0 1-2.5-3.4971 2.5 3.4971 0 0 1 2.5-3.4971z"/></g></g></g></svg>

index.html

@@ -5,11 +5,16 @@ layout: default
 <script src="/assets/js/redirects.js"></script>
 {% include sections/header.html %}
 {% include sections/resources.html %}
+
 <h1 id="sponsors" class="anchor"><a href="#sponsors"><i class="fas fa-link anchor-icon"></i></a> Sponsors</h1>
 
 <div class="alert alert-success" role="alert">
-  <strong>New!</strong> Showcase your brand as a sponsor of PrivacyTools here and support our mission of creating a world free of mass surveillance! <a href="/sponsors/" class="alert-link">Learn more...</a>
+  <strong>New!</strong> Showcase your brand as a sponsor of PrivacyTools and support our mission of creating a world free of mass surveillance! <a href="/sponsors/" class="alert-link">Learn more...</a>
 </div>
+<div class="mt-4">
+  {% include sponsors/gold.html %}
+</div>
+
 {% include sections/quotes.html %}
 {% include sections/privacy-resources.html %}
 {% include sections/participate.html %}

nginx/010-headers.conf

@@ -3,7 +3,7 @@ add_header X-XSS-Protection "1; mode=block" always;
 add_header X-Content-Type-Options nosniff always;
 add_header Content-Security-Policy "default-src 'none'; script-src 'self' https://stats.privacytools.io; style-src 'self'; img-src 'self' data: https://*.privacytools.io; object-src 'none'; frame-src https://stats.privacytools.io; font-src 'self'; base-uri 'none'; form-action 'self' https://search.privacytools.io; frame-ancestors 'none'; manifest-src 'self';" always;
 add_header Strict-Transport-Security "max-age=31557600; includeSubDomains; preload";
-add_header 'Access-Control-Allow-Origin' '*';
 add_header Alt-Svc 'h2="privacy2zbidut4m4jyj3ksdqidzkw3uoip2vhvhbvwxbqux5xy5obyd.onion:443"; ma=86400; persist=1';
 add_header Expect-CT 'max-age=86400, enforce';
 add_header Referrer-Policy "strict-origin";
+add_header Feature-Policy "geolocation none;midi none;notifications none;push none;sync-xhr none;microphone none;camera none;magnetometer none;gyroscope none;speaker self;vibrate none;fullscreen self;payment none;";

pages/about.html

@@ -5,12 +5,16 @@ title: "About PrivacyTools"
 description: "About the PrivacyTools organization, and contributors to the PrivacyTools website, communities, and services."
 hidedesc: true
 ---
-
+<div itemscope itemtype="http://schema.org/Organization">
+<meta itemprop="alternateName" content="privacytoolsIO">
+<meta itemprop="alternateName" content="Privacy Tools">
+<meta itemprop="alternateName" content="privacytools.io">
+<link itemprop="logo" href="{{ site.production_url }}/assets/img/svg/layout/brand/square-transparent.svg">
 <div class="row">
   <div class="col">
-    <p><em>You are being watched. Private and state-sponsored organizations are monitoring and recording your online activities.</em></p>
-    <p>At <strong>PrivacyTools</strong>, we provide services, tools, and knowledge to protect your privacy against global mass surveillance, and moderate a thriving community of privacy-minded individuals like yourself to discuss and learn about new advances in protecting your online data. This website serves as the centerpiece of our organization, where we research and recommend various software solutions for our community.</p>
-    <p><strong>Transparency</strong> is our strongest value, and it's what sets us apart from the rest of the "privacy recommendations" community. Editorial changes to this website and the products we recommend are always discussed on our extensive <a href="https://github.com/privacytoolsIO/privacytools.io/issues">issue tracker</a>, drafted in a public <a href="https://github.com/privacytoolsIO/privacytools.io/pulls">pull request</a> open for further discussion, and logged in a comprehensive <a href="https://github.com/privacytoolsIO/privacytools.io/commits/master">commit log</a> dating back to our original founding date in 2015. The <em>core</em> team members listed below are responsible for most of the edits and final decisions to changes on this website and across our services, but this website is truly the work of hundreds <a href="https://github.com/privacytoolsIO/privacytools.io/graphs/contributors">contributors and fact checkers</a> working to make sure our recommendations are solid and trustworthy.</p>
+    <p itemprop="description"><em>You are being watched. Private and state-sponsored organizations are monitoring and recording your online activities.</em></p>
+    <p>At <strong itemprop="name">PrivacyTools</strong>, we provide services, tools, and knowledge to protect your <span itemprop="knowsAbout">privacy</span> against <span itemprop="knowsAbout">global mass surveillance</span>, and moderate a thriving community of privacy-minded individuals like yourself to discuss and learn about new advances in protecting your online data. <a itemprop="url" href="{{ site.production_url }}">This website</a> serves as the centerpiece of our organization, where we research and recommend various software solutions for our community.</p>
+    <p><strong>Transparency</strong> is our strongest value, and it's what sets us apart from the rest of the "privacy recommendations" community. Editorial changes to this website and the products we recommend are always discussed on our extensive <a href="https://github.com/privacytoolsIO/privacytools.io/issues">issue tracker</a>, drafted in a public <a href="https://github.com/privacytoolsIO/privacytools.io/pulls">pull request</a> open for further discussion, and logged in a comprehensive <a href="https://github.com/privacytoolsIO/privacytools.io/commits/master">commit log</a> dating back to our original founding date in <span itemprop="foundingDate">2015</span>. The <em>core</em> team members listed below are responsible for most of the edits and final decisions to changes on this website and across our services, but this website is truly the work of hundreds <a href="https://github.com/privacytoolsIO/privacytools.io/graphs/contributors">contributors and fact checkers</a> working to make sure our recommendations are solid and trustworthy.</p>
     <p>Additionally, we are a not-for-profit organization. We do not utilize paid recommendations or affiliate programs to make the recommendations on this website. Unfortunately this practice is very common elsewhere online, which makes it difficult to trust other review sites. We are unique in this area, in that all of our research is conducted independently, and we will never accept payments to modify, add, or remove any of our reviews or recommendations. Our finances are provided entirely by our community <a href="https://opencollective.com/privacytoolsio">donors</a> and <a href="/sponsors/">sponsors</a>, and are handled by the Open Collective Foundation 501(c)(3). Because we are operating as a charity in the United States, we are legally obligated to only use our funding to further our mission of spreading privacy education and promoting online services like Mastodon, Matrix, and WriteFreely. This website is a public resource, not a profit generator. To that regard, all our financial transactions (incoming and outgoing) are logged and made available to the public via our page at <a href="https://opencollective.com/privacytoolsio">opencollective.com/privacytoolsio</a>.</p>
     <p>We take the operation of our various <a href="/services/">services</a> very seriously, and require all participants to adhere to our <a href="https://github.com/privacytoolsIO/.github/blob/master/CODE_OF_CONDUCT.md">Code of Conduct</a>. For any questions or to report abuse, please see our CoC’s <a href="https://github.com/privacytoolsIO/.github/blob/master/CODE_OF_CONDUCT.md#enforcement">Enforcement section</a>.</p>
   </div>
@@ -18,30 +22,17 @@ hidedesc: true
 
 <div class="row">
   <div class="col">
-    <h2>Core Contributors</h2>
+    <h2>Team Members</h2>
   </div>
 </div>
 
 <div class="row">
-
-{% include team.html
-avatar="burung.png"
-name="Burung Hantu"
-role="Founder"
-bio="I founded PrivacyTools in 2015 to share resources and tools, allowing users to avoid international mass-surveillance programs."
-email="dude@privacytools.io"
-keys="https://keybase.io/privacytools"
-mastodon="https://social.privacytools.io/@BurungHantu"
-twitter="privacytoolsIO"
-%}
-
 {% include team.html
 avatar="jonah.png"
 name="Jonah Aragon"
-nick="Jonah"
 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="jonah@privacytools.io"
+email="mailto:jonah@privacytools.io"
 website="https://www.jonaharagon.com"
 keys="https://keybase.io/jonaharagon"
 mastodon="https://social.privacytools.io/@jonah"
@@ -49,13 +40,24 @@ twitter="JonahAragon"
 blog="jonah"
 %}
 
+{% include team.html
+avatar="burung.png"
+name="Burung Hantu"
+role="Founder"
+bio="I founded PrivacyTools in 2015 to share resources and tools, allowing users to avoid international mass-surveillance programs."
+keys="https://keybase.io/privacytools"
+mastodon="https://social.privacytools.io/@BurungHantu"
+twitter="privacytoolsIO"
+%}
+
 {% include team.html
 avatar="blacklight447.png"
-name="blacklight447"
+name="Niek de Wilde"
 bio="I research new privacy recommendations and moderate our communities. My expertise is endpoint security and networking."
-role="Community Manager"
-email="blacklight447@privacytools.io"
+role="Editor-in-chief"
+email="mailto:blacklight447@privacytools.io"
 mastodon="https://social.privacytools.io/@blacklight447"
+blog="blacklight447"
 %}
 
 {% include team.html
@@ -64,7 +66,7 @@ name="Dan Arel"
 role="Blogging & Education"
 bio="I'm an author, columnist, and privacy advocate whose work has appeared in Time, Huff Post, OpenSource, and more."
 website="https://danarel.com"
-email="dan@privacytools.io"
+email="mailto:dan@privacytools.io"
 keys="https://keybase.io/dan_arel"
 twitter="danarel"
 mastodon="https://mastodon.technology/@danarel"
@@ -72,14 +74,15 @@ blog="danarel"
 %}
 
 {% include team.html
-avatar="dawid.png"
+avatar="dawid.svg"
 name="Dawid Potocki"
 role="Developer"
 bio="I'm a student interested in software development. I help improve PrivacyTools and promote using free libre software."
 website="https://dawidpotocki.com"
-email="dawidpotocki@privacytools.io"
+email="https://dawidpotocki.com/accounts/#email"
 keys="https://dawidpotocki.com/accounts/#pgp"
 mastodon="https://social.privacytools.io/@dawidpotocki"
+blog="dawidpotocki"
 %}
 
 {% include team.html
@@ -87,20 +90,12 @@ avatar="dngray.png"
 name="dngray"
 nick="Daniel Gray"
 bio="I liaise with and research privacy-focused services to refine our recommendations. My background is infosec and network security."
-email="dngray@privacytools.io"
+website="https://dngray.netlify.com"
+email="https://dngray.netlify.com/email"
 keys="https://keybase.io/dngray"
 mastodon="https://social.privacytools.io/@dngray"
 %}
 
-{% include team.html
-avatar="mikaela.png"
-name="Mikaela Suomalainen"
-nick="Mikaela"
-bio="I am interested in instant messengers. I review privacy tools, and participate in our forum, Matrix room, and issue tracker."
-website="https://mikaela.info/"
-keys="https://gitea.blesmrt.net/mikaela/shell-things/src/branch/master/.mikaela/keys"
-%}
-
 {% include team.html
 avatar="nitrohorse.png"
 name="Andreas Basurto"
@@ -118,11 +113,11 @@ avatar="trai_dep.png"
 name="trai_dep"
 role="Subreddit Mod"
 bio="I'm the moderator at r/Privacy and r/privacytoolsIO. Day to day, I am also – <i>irony alert</i> – an (ethical) digital marketer."
-email="trai_dep@privacytools.io"
+email="mailto:trai_dep@privacytools.io"
 website="https://www.reddit.com/user/trai_dep"
 %}
-
 </div>
+
 <div class="row mt-4 mb-4">
   <div class="col">
     <div class="card">
@@ -135,6 +130,22 @@ website="https://www.reddit.com/user/trai_dep"
   </div>
 </div>
 
+<div class="row">
+  <div class="col">
+    <h2>Emeritus</h2>
+    <p>Emeriti are honorary PrivacyTools team members who have formerly contributed to the project in a central way but are no longer currently active.</p>
+  </div>
+</div>
+
+<div class="row">
+{% include team.html
+name="Mikaela Suomalainen"
+website="https://mikaela.info/"
+keys="https://gitea.blesmrt.net/mikaela/shell-things/src/branch/master/.mikaela/keys"
+emeritus=true
+%}
+</div>
+
 <div class="row">
   <div class="col">
     <h2>Contact Us</h2>
@@ -144,5 +155,10 @@ website="https://www.reddit.com/user/trai_dep"
     <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> or join the <a href="https://keybase.io/team/privacytools_io">privacytools_io Keybase team</a> 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>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">
+    <link itemprop="sameAs" href="https://github.com/privacytoolsIO">
   </div>
 </div>
+</div>

pages/providers/email.html

@@ -1,27 +1,263 @@
 ---
 layout: page
 permalink: /providers/email/
-title: "Best Secure Email Providers for Privacy"
+title: "Private Email Providers"
 description: "Find a secure email provider that will keep your privacy in mind. Don't settle for ad-supported platforms. Never trust any company with your privacy, always encrypt."
 ---
 
-<div class="card border-danger">
-  <div class="card-header text-danger"><i class="fas fa-exclamation-circle fa-fw"></i> Warning</div>
-  <div class="card-body">
-    <p class="card-text text-danger">Even when using end-to-end encryption technology like GPG, email is inherently insecure and should not be trusted for sensitive communications. Metadata is always communicated in plaintext, and even when encryption is used correctly it is very easy for either party to accidentally respond to or forward a previously encrypted message in plaintext in many clients. GPG also does not easily support modern crypto functionality such as key rotation and forward secrecy.</p>
-    <p class="card-text text-secondary">We recommend the following email providers for routine notifications and messages from other services that require an email address. For communications that <strong>need</strong> to be safe and secure, you should use a dedicated instant messaging tool, such as Signal.</p>
-    <a href="/software/real-time-communication/" class="btn btn-outline-secondary">Recommended Instant Messengers</a>
-  </div>
-</div>
+{% include sections/email-warning.html %}
 
 {% include sections/email-providers.html %}
 
-<h3>Related Information</h3>
+<hr>
+<h1 id="criteria" class="anchor"><a href="#criteria"><i class="fas fa-link anchor-icon"></i></a> Our Email Provider Criteria</h1>
 
-<ul>
-  <li><a href="https://www.wired.com/2011/10/ecpa-turns-twenty-five/">Aging 'Privacy' Law Leaves Cloud E-Mail Open to Cops</a> - Data stored in the cloud for longer than 6 months is considered abandoned and may be accessed by intelligence agencies without
-    a warrant. Learning: Use an external email client like Thunderbird or Enigmail, download your emails and store them locally. Never leave them on the server.</li>
-  <li><a href="https://www.eff.org/deeplinks/2012/04/may-firstriseup-server-seizure-fbi-overreaches-yet-again">With May First/Riseup Server Seizure, FBI Overreaches Yet Again</a></li>
-  <li><a href="https://www.autistici.org/ai/crackdown/">Autistici/Inventati server compromised</a> - The cryptographic services offered by the Autistici/Inventati server have been compromised on 15th June 2004. It was discovered on 21st June 2005. One year
-    later. During an enquiry on a single mailbox, the Postal Police may have tapped for a whole year every user's private communication going through the server autistici.org/inventati.org.</li>
-</ul>
+<p><strong>Please note we are not affiliated with any of the providers we recommend. This allows us to provide completely objective recommendations.</strong> We have developed a clear set of requirements for any Email provider wishing to be recommended, including implementing industry best practices, modern technology and more. We suggest you familiarize yourself with this list before choosing an Email provider, and conduct your own research to ensure the Email provider you choose is the right choice for you.</p>
+
+<div class="container">
+  <div class="row">
+    <div class="col-12">
+      <h3><span class="badge badge-info">Jurisdiction</span></h3>
+      <p>Operating outside the five/nine/fourteen-eyes countries is not necessarily a guarantee of privacy, and there are other factors to consider. However, we believe that avoiding these countries is important if you wish to avoid mass government dragnet surveillance, especially from the United States. Read our page on <a href="/providers/#ukusa">global mass surveillance and avoiding the US and UK</a> to learn more about why we feel this is important.</p>
+    </div>
+    <div class="col-md-6">
+      <p><strong>Minimum to Qualify:</strong></p>
+      <ul>
+        <li>Operating outside the USA or other Five Eyes countries.</li>
+      </ul>
+    </div>
+    <div class="col-md-6">
+      <p><strong>Best Case:</strong></p>
+      <ul>
+        <li>Operating outside the USA or other Fourteen Eyes countries.</li>
+        <li>Operating inside a country with strong consumer protection laws.</li>
+      </ul>
+    </div>
+
+    <div class="col-12">
+      <h3><span class="badge badge-info">Technology</span></h3>
+      <p>We regard these features as important in order to provide a safe and optimal service to users. Users should consider the provider which has the features they require.</p>
+    </div>
+    <div class="col-md-6">
+      <p><strong>Minimum to Qualify:</strong></p>
+      <ul>
+        <li>Encrypts account data at rest.</li>
+        <li>Integrated webmail encryption provides convenience to users who want improve on having no <a href="https://en.wikipedia.org/wiki/End-to-end_encryption">E2EE</a> encryption.</li>
+      </ul>
+    </div>
+    <div class="col-md-6">
+      <p><strong>Best Case:</strong></p>
+      <ul>
+        <li>Encrypts account data at rest with zero-access encryption.</li>
+        <li>Allow users to use their own <a href="https://en.wikipedia.org/wiki/Domain_name">domain name</a>. Custom domain names are important to users because it allows them to maintain their agency from the service, should it turn bad, be acquired by another company which doesn't prioritize privacy etc.</li>
+        <li>Support for <a href="https://wiki.gnupg.org/WKD">WKD</a> to allow improved discovery of public OpenPGP keys via HTTP. <br> GnuPG users can get a key by typing: <code>gpg --locate-key example_user@example.com</code></li>
+        <li>Support for a temporary mailbox for external users. This is useful when you want to send an encrypted email, without sending an actual copy to your recipient. These emails usually have a limited lifespan and then are automatically deleted. They also don't require the recipient to configure any cryptography like OpenPGP.</li>
+        <li>Availability of the email provider's services via an <a href="https://en.wikipedia.org/wiki/.onion">onion service</a>.</li>
+        <li><a href="https://en.wikipedia.org/wiki/Email_address#Subaddressing">Subaddressing</a> support.</li>
+        <li><a href="https://en.wikipedia.org/wiki/Email_filtering">Catch all</a> or <a href="https://en.wikipedia.org/wiki/Email_alias">aliases</a> for users who own their own domains.</li>
+        <li>Use of standard email access protocols such as <a href="https://en.wikipedia.org/wiki/Internet_Message_Access_Protocol">IMAP</a>, <a href="https://en.wikipedia.org/wiki/Simple_Mail_Transfer_Protocol">SMTP</a> or <a href="https://en.wikipedia.org/wiki/JSON_Meta_Application_Protocol">JMAP</a>. Standard access protocols ensure customers can easily download all of their email, should they want to switch to another provider.</li>
+      </ul>
+    </div>
+
+    <div class="col-12">
+      <h3><span class="badge badge-info">Privacy</span></h3>
+      <p>We prefer our recommended providers to collect as little data as possible.</p>
+    </div>
+    <div class="col-md-6">
+      <p><strong>Minimum to Qualify:</strong></p>
+      <ul>
+        <li>Protect sender's IP address. Filter it from showing in the <code>Received</code> header field.</li>
+        <li>Don't require personally identifiable information (PII) besides username and password.</li>
+        <li>Privacy policy that meets the requirements defined by the GDPR</li>
+      </ul>
+    </div>
+    <div class="col-md-6">
+      <p><strong>Best Case:</strong></p>
+      <ul>
+        <li>Accepts Bitcoin, cash, and other forms of cryptocurrency and/or anonymous payment options (gift cards, etc.)</li>
+      </ul>
+    </div>
+
+    <div class="col-12">
+      <h3><span class="badge badge-info">Security</span></h3>
+      <p>Email servers deal with a lot of very sensitive data. We expect that providers will adopt best industry practices in order to protect their users.</p>
+    </div>
+    <div class="col-md-6">
+      <p><strong>Minimum to Qualify:</strong></p>
+      <ul>
+        <li>Protection of webmail with <a href="https://en.wikipedia.org/wiki/Multi-factor_authentication">two-factor authentication (2FA)</a>, such as <a href="https://en.wikipedia.org/wiki/Time-based_One-time_Password_algorithm">TOTP</a>.</li>
+        <li>Encryption at rest, (e.g. <a href="https://en.wikipedia.org/wiki/dm-crypt">dm-crypt</a>) this protects the contents of the servers in case of unlawful seizure.</li>
+        <li><a href="https://en.wikipedia.org/wiki/Domain_Name_System_Security_Extensions">DNSSEC</a> support.</li>
+        <li>No <a href="https://en.wikipedia.org/wiki/Opportunistic_TLS">TLS</a> errors/vulnerabilities when being profiled by tools such as <a href="https://www.hardenize.com">Hardenize</a>, <a href="https://testssl.sh">testssl.sh</a> or <a href="https://www.ssllabs.com/ssltest">Qualys SSL Labs</a>, this includes certificate related errors, poor or weak ciphers suites, weak DH parameters such as those that led to <a href="https://en.wikipedia.org/wiki/Logjam_(computer_security)">Logjam</a>.</li>
+        <li>A valid <a href="https://tools.ietf.org/html/rfc8461">MTA-STS</a> and <a href="https://tools.ietf.org/html/rfc8460">TLS-RPT</a> policy.</li>
+        <li>Valid <a href="https://en.wikipedia.org/wiki/DNS-based_Authentication_of_Named_Entities">DANE</a> records.</li>
+        <li>Registration on the EFF's <a href="https://starttls-everywhere.org">STARTTLS-Everywhere</a> list.</li>
+        <li>Valid <a href="https://en.wikipedia.org/wiki/Sender_Policy_Framework">SPF</a>, <a href="https://en.wikipedia.org/wiki/DomainKeys_Identified_Mail">DKIM</a> and <a href="https://en.wikipedia.org/wiki/DMARC">DMARC</a>, with the policy <code>p</code> value set to either <code>none</code>, <code>quarantine</code> or <code>reject</code>.</li>
+        <li>A server suite preference of TLS 1.2 or later and a plan for <a href="https://datatracker.ietf.org/doc/draft-ietf-tls-oldversions-deprecate/">Deprecating TLSv1.0 and TLSv1.1</a>.</li>
+        <li><a href="https://en.wikipedia.org/wiki/SMTPS">SMTPS</a> submission, assuming SMTP is used.</li>
+        <li>Website security standards such as:</li>
+          <ul>
+            <li><a href="https://en.wikipedia.org/wiki/HTTP_Strict_Transport_Security">HTTP Strict Transport Security</a></li>
+            <li><a href="https://en.wikipedia.org/wiki/Subresource_Integrity">Subresource Integrity</a> if loading things from external domains.</li>
+          </ul>
+      </ul>
+    </div>
+    <div class="col-md-6">
+      <p><strong>Best Case:</strong></p>
+      <ul>
+        <li>Support for hardware authentication, ie <a href="https://en.wikipedia.org/wiki/Universal_2nd_Factor">U2F</a> and <a href="https://en.wikipedia.org/wiki/WebAuthn">WebAuthn</a>. U2F and WebAuthn are more secure as they use a private key stored on a client-side hardware device to authenticate users, as opposed to a shared secret that is stored on the web server and on the client side when using TOTP. Furthermore, U2F and WebAuthn are more resistant to phishing as their authentication response is based on the authenticated <a href="https://en.wikipedia.org/wiki/Domain_name">domain name</a>.</li>
+        <li>Zero access encryption, builds on encryption at rest. The difference being the provider does not have the decryption keys to the data they hold. This prevents a rogue employee leaking data they have access to or remote adversary from releasing data they have stolen by gaining unauthorized access to the server.</li>
+        <li><a href="https://tools.ietf.org/html/rfc6844">DNS Certification Authority Authorization (CAA) Resource Record</a> in addition to DANE support.</li>
+        <li>Implementation of <a href="https://en.wikipedia.org/wiki/Authenticated_Received_Chain">Authenticated Received Chain (ARC)</a>, this is useful for users who post to mailing lists <a href="https://tools.ietf.org/html/rfc8617">RFC8617</a>.</li>
+        <li>Bug-bounty programs and/or a coordinated vulnerability-disclosure process.</li>
+        <li>Website security standards such as:</li>
+          <ul>
+            <li><a href="https://en.wikipedia.org/wiki/Content_Security_Policy">Content Security Policy (CSP)</a></li>
+            <li><a href="https://datatracker.ietf.org/doc/draft-ietf-httpbis-expect-ct">Expect-CT</a></li>
+          </ul>
+      </ul>
+    </div>
+
+    <div class="col-12">
+      <h3><span class="badge badge-info">Trust</span></h3>
+      <p>You wouldn't trust your finances to someone with a fake identity, so why trust them with your email? We require our recommended providers to be public about their ownership or leadership. We also would like to see frequent transparency reports, especially in regard to how government requests are handled.</p>
+    </div>
+    <div class="col-md-6">
+      <p><strong>Minimum to Qualify:</strong></p>
+      <ul>
+        <li>Public-facing leadership or ownership.</li>
+      </ul>
+    </div>
+    <div class="col-md-6">
+      <p><strong>Best Case:</strong></p>
+      <ul>
+        <li>Public-facing leadership.</li>
+        <li>Frequent transparency reports.</li>
+      </ul>
+    </div>
+
+    <div class="col-12">
+      <h3><span class="badge badge-info">Marketing</span></h3>
+      <p>With the email providers we recommend we like to see responsible marketing.</p>
+    </div>
+    <div class="col-md-6">
+      <p><strong>Minimum to Qualify:</strong></p>
+      <ul>
+          <li>Must self host analytics (no Google Analytics etc). The provider's site must also comply with <a href="https://en.wikipedia.org/wiki/Do_Not_Track">DNT (Do Not Track)</a> for those users who want to opt-out.</li>
+      </ul>
+      <p>Must not have any marketing which is irresponsible:</p>
+        <ul>
+          <li>Claims of "unbreakable encryption". Encryption should be used with the intention that it may not be secret in the future when the technology exists to crack it.</li>
+          <li>Making guarantees of protecting anonymity 100%. When someone makes a claim that something is 100% it means there is no certainty for failure. We know users can quite easily deanonymize themselves in a number of ways, e.g.:</li>
+          <ul>
+            <li>Reusing personal information e.g. (email accounts, unique pseudonyms etc) that they accessed without anonymity software (Tor, VPN etc)</li>
+            <li><a href="/browsers/#fingerprint">Browser fingerprinting</a></li>
+          </ul>
+        </ul>
+    </div>
+    <div class="col-md-6">
+      <p><strong>Best Case:</strong></p>
+      <ul>
+        <li>Clear and easy to read documentation. This includes things like, setting up 2FA, email clients, OpenPGP, etc.</li>
+      </ul>
+    </div>
+
+    <div class="col-12">
+      <h3><span class="badge badge-info">Additional Functionality</span></h3>
+      <p>While not strictly requirements, there are some factors we looked into when determining which providers to recommend.</p>
+    </div>
+  </div>
+</div>
+<hr>
+
+<h1 id="email-encryption" class="anchor"><a href="#email-encryption"><i class="fas fa-link anchor-icon"></i></a> Email encryption</h1>
+<div class="container">
+  <div class="row">
+    <div class="col-md-6">
+      <h3>What is end-to-end encryption (E2EE) encryption in email?</h3>
+      <p><a href="https://en.wikipedia.org/wiki/End-to-end_encryption">End-to-end encryption (E2EE)</a> is a way of encrypting email contents so that nobody but the recipient(s) can read the email message.</p>
+      <h3>How can I encrypt my email?</h3>
+      <p>The standard way to do email E2EE and have it work between different email providers is with <a href="https://en.wikipedia.org/wiki/Pretty_Good_Privacy#OpenPGP">OpenPGP</a>. There are different implementations of the OpenPGP standard, the most common being <a href="https://en.wikipedia.org/wiki/GNU_Privacy_Guard">GnuPG</a> and <a href=https://openpgpjs.org>OpenPGP.js</a>.</p>
+      <p>There is another standard that was popular with business called <a href="https://en.wikipedia.org/wiki/S/MIME">S/MIME</a>, however it requires a certificate issued from a <a href="https://en.wikipedia.org/wiki/Certificate_authority">Certificate Authority</a> (not all of them issue S/MIME certificates). It has support in <a href="https://support.google.com/a/topic/9061730?hl=en&ref_topic=9061731">G Suite Enterprise/Education</a> and <a href="https://support.office.com/en-us/article/encrypt-messages-by-using-s-mime-in-outlook-on-the-web-878c79fc-7088-4b39-966f-14512658f480">Office 365 Business or Exchange Server 2016, 2019</a>.</p>
+      <h3>What software can I use to get E2EE?</h3>
+      <p>Email providers which allow you to use standard access protocols like <a href="https://en.wikipedia.org/wiki/Internet_Message_Access_Protocol">IMAP</a> and <a href="https://en.wikipedia.org/wiki/Simple_Mail_Transfer_Protocol">SMTP</a> can be used with any of the <a href="/software/email/">email clients we recommend</a>. This can be less secure as you are now relying on email providers to ensure that their encryption implementation works and has not been compromised in anyway.</p>
+    </div>
+    <div class="col-md-6">
+      <h3>How do I protect my private keys?</h3>
+      <p>A smartcard (such as a <a href="https://support.yubico.com/support/solutions/articles/15000006420-using-your-yubikey-with-openpgp">Yubikey</a> or <a href="https://www.nitrokey.com">Nitrokey</a>) works by receiving an encrypted email message from a device (phone, tablet, computer etc) running an email/webmail client. The message is then decrypted by the smartcard and the decrypted content is sent back to the device.</p>
+      <p>It is advantageous for the decryption to occur on the smartcard so as to avoid possibly exposing your private key to a compromised device.</p>
+    </div>
+  </div>
+</div>
+
+<h1 id="metadata" class="anchor"><a href="#metadata"><i class="fas fa-link anchor-icon"></i></a> Email metadata</h1>
+<div class="container">
+  <div class="row">
+    <div class="col-md-6">
+      <h3>Who can see the email metadata?</h3>
+      <p>Email metadata is able to be seen by your email client software (or webmail) and any servers relaying the message from you to any recipients. Sometimes email servers will also use external parties to protect against spam.</p>
+      <h3>What is email metadata?</h3>
+      <p>Email software will often show some visible headers that you may have seen such as: <code>To</code>, <code>From</code>, <code>Cc</code>, <code>Date</code>, <code>Subject</code>.
+      </p>
+      <h3>When is email metadata used?</h3>
+      <p>Client software may use it to show who a message is from and what time it was received. Servers may use it to determine where an email message must be sent, among <a href="https://en.wikipedia.org/wiki/Email#Message_header">other purposes</a> not transparent to the user.</p>
+    </div>
+    <div class="col-md-6">
+      <h3>Where is the email metadata?</h3>
+      <p>Email metadata is stored in the <a href="https://en.wikipedia.org/wiki/Email#Message_header">message header</a> of the email message.</p>
+      <h3>Why can't email metadata be E2EE?</h3>
+      <p>Email metadata is is cruicial to the most basic functionality of email (where it came from, and where it has to go). E2EE was not built into the email protocols originally and is also optional, therefore, only the message content is protected.</p>
+      <h3>How is my metadata protected?</h3>
+      <p>When emails travel between email providers an encrypted connection is negotiated using <a href="https://en.wikipedia.org/wiki/Opportunistic_TLS">Opportunistic TLS</a>. This protects the metadata from outside observers, but as it is not E2EE, server administrators can snoop on the metadata of an email.</p>
+    </div>
+  </div>
+</div>
+
+<hr>
+
+<h1 id="cloaking" class="anchor"><a href="#cloaking"><i class="fas fa-link anchor-icon"></i></a> Email cloaking services</h1>
+<div class="container">
+  <a href="https://anonaddy.com">
+    <img src="/assets/img/svg/3rd-party/anonaddy.svg"
+        data-theme-src="/assets/img/svg/3rd-party/anonaddy-dark.svg"
+         width="180rem" class="img-fluid float-left mr-3"
+         alt="AnonAddy">
+  </a>
+  <p><strong><a href="https://anonaddy.com">AnonAddy</a></strong> lets users create aliases that forward to their email address. Can be self-hosted. <a href="https://github.com/anonaddy/anonaddy">Source code on GitHub</a>.</p>
+</div>
+
+<h1 id="selfhosting" class="anchor"><a href="#selfhosting"><i class="fas fa-link anchor-icon"></i></a> Self-hosting Email</h1>
+<div class="container">
+  <p>Advanced users may consider setting up their own email server. Mailservers require attention and continuous maintenance in order to keep things secure and mail delivery reliable.</p>
+  <h3>Combined software solutions</h3>
+  <a href="https://mailinabox.email/">
+    <img src="/assets/img/svg/3rd-party/mail-in-a-box.svg"
+         width="80rem" class="img-fluid float-left mr-3"
+         alt="Mail-in-a-Box">
+  </a>
+  <br>
+  <p><strong><a href="https://mailinabox.email">Mail-in-a-Box</a></strong> is an automated setup script for deploying a mail server on Ubuntu. Its goal is to make it easier for users to set up their own mail server.</p>
+  <a href="https://mailcow.email/">
+    <img src="/assets/img/svg/3rd-party/mailcow.svg"
+         width="80rem" class="img-fluid float-left mr-3"
+         alt="Mailcow">
+  </a>
+  <p><strong><a href="https://mailcow.email">Mailcow</a></strong> is a more advanced mail server perfect for those with a bit more Linux experience. It has everything you need in a Docker container: A mailserver with DKIM support, antivirus and spam monitoring, webmail and ActiveSync with SOGo, and web-based administration with 2FA support. <strong><a href="https://mailcow.github.io/mailcow-dockerized-docs/">Mailcow Dockerized docs</a></strong></p>
+
+  <p>For a more manual approach we've picked out these two articles.</p>
+    <ul>
+      <li><a href="https://poolp.org/posts/2019-09-14/setting-up-a-mail-server-with-opensmtpd-dovecot-and-rspamd/">Setting up a mail server with OpenSMTPD, Dovecot and Rspamd</a> (2019)</li>
+      <li><a href="https://www.c0ffee.net/blog/mail-server-guide/">How To Run Your Own Mail Server</a> (August 2017)</li>
+    </ul>
+</div>
+
+<h1 id="info" class="anchor"><a href="#info"><i class="fas fa-link anchor-icon"></i></a> Related Email Articles</h1>
+<div class="container">
+  <div class="row">
+    <ul>
+      <li><a href="https://www.grepular.com/An_NFC_PGP_SmartCard_For_Android">An NFC PGP SmartCard For Android</a></li>
+      <li><a href="https://www.wired.com/2011/10/ecpa-turns-twenty-five/">Aging 'Privacy' Law Leaves Cloud E-Mail Open to Cops (2011)</a></li>
+      <li><a href="https://thinkprogress.org/the-government-can-still-read-most-of-your-emails-without-a-warrant-322fe6defc7b/">The Government Can (Still) Read Most Of Your Emails Without A Warrant (2013)</a></li>
+    </ul>
+  </div>
+</div>

pages/providers/vpn.html

@@ -55,6 +55,7 @@ breadcrumb: "VPN"
       <ul>
         <li>OpenVPN support.</li>
         <li>Killswitch built in to clients.</li>
+        <li>If VPN cients are provided, they should be <a href="https://en.wikipedia.org/wiki/Open_source">open source</a>, like the VPN software they generally have built into them. We believe that <a href="https://en.wikipedia.org/wiki/Source_code">source code</a> availability provides greater transparency to the user about what their device is actually doing. Ideally we like to see these applications <a href="https://www.f-droid.org/en/2019/05/05/trust-privacy-and-free-software.html">available in F-Droid</a>.</li>
       </ul>
     </div>
     <div class="col-md-6">
@@ -62,7 +63,7 @@ breadcrumb: "VPN"
       <ul>
         <li>OpenVPN and WireGuard support.</li>
         <li>Killswitch with highly configurable options (enable/disable on certain networks, on boot, etc.)</li>
-        <li>Easy-to-use VPN clients, especially open-source. Even better if the Android version is also <a href="https://www.f-droid.org/en/2019/05/05/trust-privacy-and-free-software.html">available in F-Droid</a>.</li>
+        <li>Easy-to-use VPN clients</li>
         <li>Supports <a href="https://en.wikipedia.org/wiki/IPv6">IPv6</a>. We expect that servers will allow incoming connections via IPv6 and allow users to access services hosted on IPv6 addresses.</li>
         <li>Capability of <a href="https://en.wikipedia.org/wiki/Port_forwarding#Remote_port_forwarding">remote port forwarding</a> assists in creating connections when using P2P (<a href="https://en.wikipedia.org/wiki/Peer-to-peer">Peer-to-Peer</a>) filesharing software, Freenet, or hosting a server (e.g., Mumble).</li>
       </ul>
@@ -229,7 +230,6 @@ breadcrumb: "VPN"
 
         <ul>
           <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://www.goldenfrog.com/take-back-your-internet/articles/7-myths-about-vpn-logging-and-anonymity">I am Anonymous When I Use a VPN - 7 Myths Debunked</a><br />(<strong>Note:</strong> While this is a good read, they also use the article for self-promotion)</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>
           <li><a href="https://proxy.sh/panel/knowledgebase.php?action=displayarticle&id=5">Ethical policy - All of the reasons why Proxy.sh might enable logging</a></li>
           <li><a href="https://www.ivpn.net/privacy">IVPN.net will collect your email and IP address after sign up</a><br />Read the <a data-toggle="tooltip" data-placement="top" data-original-title="The IP collected at signup is only used for a few seconds by our fraud module and then discarded, it is not stored. Storing them would significantly increase our own liability and certainly would not be in our interest. You're absolutely welcome to signup using Tor or a VPN.">Email statement</a> from IVPN.</li>

pages/services.html

@@ -9,7 +9,7 @@ description: "The PrivacyTools team is proud to introduce a suite of privacy-cen
 
 <div class="card card-list">
   <ul class="list-group list-group-flush">
-  	<li class="list-group-item"><a href="https://search.privacytools.io/"><i class="fas fa-search fa-lg fa-fw"></i> Searx - Privacy Friendly Search at search.privacytools.io</a></li>
+    <li class="list-group-item"><a href="https://search.privacytools.io/"><i class="fas fa-search fa-lg fa-fw"></i> Searx - Privacy Friendly Search at search.privacytools.io</a></li>
     <li class="list-group-item"><a href="https://social.privacytools.io/"><i class="fas fa-retweet fa-lg fa-fw"></i> Mastodon - Tracker Free Social Networking at social.privacytools.io</a></li>
     <li class="list-group-item"><a href="https://chat.privacytools.io/"><i class="fas fa-comment fa-lg fa-fw"></i> Matrix - Federated private chat at chat.privacytools.io</a></li>
     <li class="list-group-item"><a href="https://forum.privacytools.io/"><i class="fab fa-discourse fa-lg fa-fw"></i> Discourse - Forum at forum.privacytools.io</a></li>
@@ -20,3 +20,24 @@ description: "The PrivacyTools team is proud to introduce a suite of privacy-cen
 </div>
 
 <p>More services are on the way. If there's something that would be super beneficial for us to run, don't hesitate to reach out and ask. And of course, if you like our services, please consider <a href="/donate/">donating to support our server costs</a>, <em>any donation helps!</em></p>
+
+<div class="card card-list">
+  <ul class="list-group list-group-flush">
+    <li class="list-group-item"><a href="https://status.privacytools.io/" class="text-success"><i class="fas fa-check-circle fa-lg fa-fw"></i> Statuspage - Check the status of our services for any outages or scheduled maintenance</a></li>
+  </ul>
+</div>
+
+<h3>A brief note</h3>
+
+<p>We are providing these services because we believe in decentralized and federated networks, and free and open source software. The tools we host are a great and convenient entry-point to these services like Matrix, Mastodon, and WriteFreely. We hope that we are able to spur the adoption of these alternative networks, and we strongly believe all of our services are far better than traditional providers, such as Twitter, Facebook, and Google.</p>
+<p>However, as with <em>any</em> hosted, online service, remember that using our services involves risks that may or may not be acceptable to you. Using online services requires trust in the service provider. We don't know of any surefire way to evaluate a provider for privacy, or provide a service that we can guarantee is operating in a privacy-respecting way. Of course we strive to provide the best services possible for our community, but at the end of the day this involves you trusting us and the system administrators that host our services.</p>
+<p>As always, <strong>never</strong> trust a service provider with sensitive information, even if they are trustworthy.</p>
+<p>We also recommend you don't centralize all your online activity around a single provider's services (such as ours). This is because it is not a good idea to give a single party control over everything you do online.</p>
+<p>We highly recommend hosting your own services whenever possible. Not only is it a fantastic learning experience, but it allows you to have services entirely in your control. There are a number of great resources available, including...</p>
+<ul>
+  <li><a href="https://talk.libreho.st/">The libreho.st forum</a></li>
+  <li><a href="https://homebrewserver.club/">homebrewserver.club</a></li>
+  <li><a href="https://www.reddit.com/r/selfhosted/">r/selfhosted</a></li>
+</ul>
+<p>You can also join us on Matrix at <code>#general:privacytools.io</code> and ask around! We are always happy to help you start hosting your own services.</p>
+<p>The services we provide here are for the benefit of our community, and we collect as little data as possible. But it is a convenience more than a recommendation. You should always avoid trusting others with your information, and always encrypt.</p>

pages/software/email.html

@@ -5,14 +5,7 @@ title: "Email Clients"
 description: "Discover free, open-source, and secure email clients, along with some email alternatives you may not have considered."
 ---
 
-<div class="card border-danger">
-  <div class="card-header text-danger"><i class="fas fa-exclamation-circle fa-fw"></i> Warning</div>
-  <div class="card-body">
-    <p class="card-text text-danger">Even when using end-to-end encryption technology like GPG, email is inherently insecure and should not be trusted for sensitive communications. Metadata is always communicated in plaintext, and even when encryption is used correctly it is very easy for either party to accidentally respond to or forward a previously encrypted message in plaintext in many clients. GPG also does not easily support modern crypto functionality such as key rotation and forward secrecy.</p>
-    <p class="card-text text-secondary">We recommend the following email providers for routine notifications and messages from other services that require an email address. For communications that <strong>need</strong> to be safe and secure, you should use a dedicated instant messaging tool, such as Signal.</p>
-    <a href="/software/real-time-communication/" class="btn btn-outline-secondary">Recommended Instant Messengers</a>
-  </div>
-</div>
+{% include sections/email-warning.html %}
 
 {% include sections/email-clients.html %}
 

pages/software/real-time-communication.html

@@ -8,63 +8,73 @@ description: "Discover secure and private ways to communicate with others online
 {% include sections/instant-messenger.html %}
 
 <h3 id="exploiting-centralized-networks" class="anchor">
-    <a href="#exploiting-centralized-networks">
-        <i class="fas fa-link anchor-icon"></i>
+  <a href="#exploiting-centralized-networks">
+    <i class="fas fa-link anchor-icon"></i>
 </a>
-    Recent news about breaking E2EE on centralized instant messengers
+  Recent news about breaking E2EE on centralized instant messengers
 </h3>
 
+<h5>March 2020</h5>
+<ul>
+  <li><a href="https://www.eff.org/deeplinks/2020/03/graham-blumenthal-bill-new-path-doj-finally-break-encryption">The Graham-Blumenthal Bill: A New Path for DOJ to Finally Break Encryption (EFF)</a></li>
+</ul>
+
+<h5>January 2020</h5>
+<ul>
+  <li><a href="https://cyberlaw.stanford.edu/blog/2020/01/earn-it-act-how-ban-end-end-encryption-without-actually-banning-it">The EARN IT Act: How to Ban End-to-End Encryption Without Actually Banning It (Stanford)</a></li>
+</ul>
+
 <h5>November 2019</h5>
 <ul>
-    <li><a href="https://www.reuters.com/article/us-interpol-encryption-exclusive-idUSKBN1XR0S7">Exclusive: Interpol plans to condemn encryption spread, citing predators, sources say (Reuters)</a></li>
-    <li><a href="https://arstechnica.com/tech-policy/2019/11/think-of-the-children-fbi-sought-interpol-statement-against-end-to-end-crypto/">Think of the children: FBI sought Interpol statement against end-to-end crypto (ArsTechnica)</a></li>
+  <li><a href="https://www.reuters.com/article/us-interpol-encryption-exclusive-idUSKBN1XR0S7">Exclusive: Interpol plans to condemn encryption spread, citing predators, sources say (Reuters)</a></li>
+  <li><a href="https://arstechnica.com/tech-policy/2019/11/think-of-the-children-fbi-sought-interpol-statement-against-end-to-end-crypto/">Think of the children: FBI sought Interpol statement against end-to-end crypto (ArsTechnica)</a></li>
 </ul>
 
 <h5>October 2019</h5>
 <ul>
-    <li><a href="https://www.eff.org/deeplinks/2019/10/open-letter-governments-us-uk-and-australia-facebook-all-out-attack-encryption">The Open Letter from the Governments of US, UK, and Australia to Facebook is An All-Out Attack on Encryption (EFF)</a></li>
-    <li><a href="https://arstechnica.com/tech-policy/2019/10/the-broken-record-why-barrs-call-against-end-to-end-encryption-is-nuts/">The broken record: Why Barr’s call against end-to-end encryption is nuts (ArsTechnica)</a></li>
-    <li><a href="https://arstechnica.com/information-technology/2019/10/ag-barr-is-pushing-facebook-to-backdoor-whatsapp-and-halt-encryption-plans">US wants Facebook to backdoor WhatsApp and halt encryption plans (ArsTechnica)</a></li>
+  <li><a href="https://www.eff.org/deeplinks/2019/10/open-letter-governments-us-uk-and-australia-facebook-all-out-attack-encryption">The Open Letter from the Governments of US, UK, and Australia to Facebook is An All-Out Attack on Encryption (EFF)</a></li>
+  <li><a href="https://arstechnica.com/tech-policy/2019/10/the-broken-record-why-barrs-call-against-end-to-end-encryption-is-nuts/">The broken record: Why Barr’s call against end-to-end encryption is nuts (ArsTechnica)</a></li>
+  <li><a href="https://arstechnica.com/information-technology/2019/10/ag-barr-is-pushing-facebook-to-backdoor-whatsapp-and-halt-encryption-plans">US wants Facebook to backdoor WhatsApp and halt encryption plans (ArsTechnica)</a></li>
 </ul>
 
 <h5>August 2019</h5>
 <ul>
-    <li><a href="https://arstechnica.com/tech-policy/2019/08/post-snowden-tech-became-more-secure-but-is-govt-really-at-risk-of-going-dark">Post Snowden tech became more secure, but is government really at risk of going dark? (ArsTechnica)</a></li>
+  <li><a href="https://arstechnica.com/tech-policy/2019/08/post-snowden-tech-became-more-secure-but-is-govt-really-at-risk-of-going-dark">Post Snowden tech became more secure, but is government really at risk of going dark? (ArsTechnica)</a></li>
 </ul>
 
 <h5>July 2019</h5>
 <ul>
-    <li><a href="https://techcrunch.com/2019/07/23/william-barr-consumers-security-risks-backdoors/">US attorney general William Barr says Americans should accept security risks of encryption backdoors (TechCrunch)</a></li>
-    <li><a href="https://www.theregister.co.uk/2019/07/23/us_encryption_backdoor/">Low Barr: Don't give me that crap about security, just put the backdoors in the encryption, roars US Attorney General (The Register)</a></li>
+  <li><a href="https://techcrunch.com/2019/07/23/william-barr-consumers-security-risks-backdoors/">US attorney general William Barr says Americans should accept security risks of encryption backdoors (TechCrunch)</a></li>
+  <li><a href="https://www.theregister.co.uk/2019/07/23/us_encryption_backdoor/">Low Barr: Don't give me that crap about security, just put the backdoors in the encryption, roars US Attorney General (The Register)</a></li>
 </ul>
 
 <h5>May 2019</h5>
 <ul>
-    <li><a href="https://www.theguardian.com/uk-news/2019/may/30/apple-and-whatsapp-condemn-gchq-plans-to-eavesdrop-on-encrypted-chats">Apple and WhatsApp condemn GCHQ plans to eavesdrop on encrypted chats (The Guardian)</a></li>
+  <li><a href="https://www.theguardian.com/uk-news/2019/may/30/apple-and-whatsapp-condemn-gchq-plans-to-eavesdrop-on-encrypted-chats">Apple and WhatsApp condemn GCHQ plans to eavesdrop on encrypted chats (The Guardian)</a></li>
 </ul>
 
 <h5>January 2019</h5>
 <ul>
-    <li><a href="https://www.justsecurity.org/62114/give-ghost-backdoor/">Give Up the Ghost: A Backdoor by Another Name (Just Security)</a></li>
+  <li><a href="https://www.justsecurity.org/62114/give-ghost-backdoor/">Give Up the Ghost: A Backdoor by Another Name (Just Security)</a></li>
 </ul>
 
 <h5>December 2018</h5>
 <ul>
-    <li><a href="https://www.zdnet.com/article/whats-actually-in-australias-encryption-laws-everything-you-need-to-know/">What's actually in Australia's encryption laws? Everything you need to know (ZDnet)</a></li>
+  <li><a href="https://www.zdnet.com/article/whats-actually-in-australias-encryption-laws-everything-you-need-to-know/">What's actually in Australia's encryption laws? Everything you need to know (ZDnet)</a></li>
 </ul>
 
 <h3>Complete Comparison</h3>
 <ul>
-    <li><a href="https://securechatguide.org/effguide.html">securechatguide.org</a> - Guide to Choosing a Messenger.</li>
-    <li><a href="https://www.securemessagingapps.com/">securemessagingapps.com</a> - Secure Messaging Apps Comparison.</li>
+  <li><a href="https://securechatguide.org/effguide.html">securechatguide.org</a> - Guide to Choosing a Messenger.</li>
+  <li><a href="https://www.securemessagingapps.com/">securemessagingapps.com</a> - Secure Messaging Apps Comparison.</li>
 </ul>
 
 <h3 id="#rtc-independent-security-audits">Independent security audits</h3>
 <ul>
-    <li><a href="https://eprint.iacr.org/2016/1013.pdf">A Formal Security Analysis of the Signal Messaging Protocol (2019)</a> by Katriel Cohn-Gordon, Cas Cremers, Benjamin Dowling, Luke Garratt and Douglas Stebila</li>
-    <li><a href="https://keybase.io/docs-assets/blog/NCC_Group_Keybase_KB2018_Public_Report_2019-02-27_v1.3.pdf">Keybase's Protocol Security Review (2019)</a> by <a href="https://www.nccgroup.trust/">NCC Group</a></li>
-    <li><a href="https://www.nccgroup.trust/us/our-research/matrix-olm-cryptographic-review/">Matrix Olm Cryptographic Review</a></li>
-    <li><a href="https://briarproject.org/news/2017-beta-released-security-audit">Briar - Darknet Messenger Releases Beta, Passes Security Audit</a></li>
+  <li><a href="https://eprint.iacr.org/2016/1013.pdf">A Formal Security Analysis of the Signal Messaging Protocol (2019)</a> by Katriel Cohn-Gordon, Cas Cremers, Benjamin Dowling, Luke Garratt and Douglas Stebila</li>
+  <li><a href="https://keybase.io/docs-assets/blog/NCC_Group_Keybase_KB2018_Public_Report_2019-02-27_v1.3.pdf">Keybase's Protocol Security Review (2019)</a> by <a href="https://www.nccgroup.trust/">NCC Group</a></li>
+  <li><a href="https://www.nccgroup.trust/us/our-research/matrix-olm-cryptographic-review/">Matrix Olm Cryptographic Review</a></li>
+  <li><a href="https://briarproject.org/news/2017-beta-released-security-audit">Briar - Darknet Messenger Releases Beta, Passes Security Audit</a></li>
 </ul>
 
 <hr/>

pages/sponsors.html

@@ -7,21 +7,32 @@ permalink: /sponsors/
 <div class="col-12">
   <div class="row">
     <div class="mx-auto text-center">
-      <div class="mt-4 mb-4">
+      <div class="my-4">
         <h1>Sponsors of {{ site.name }}</h1>
       </div>
+      <div class="mt-4 mb-3">
+        {% include sponsors/gold.html %}
+      </div>
       <div class="mb-4">
         <p>The {{ site.name }} website and services are a community project. There is no advertising, affiliate links, or other forms of monetization.<br><strong>Your donations here directly support hosting this website and compensating contributors to this project.</strong></p>
         <p>
-          <a href="https://opencollective.com/privacytoolsio#section-contribute" class="btn btn-success mb-5">Become a Sponsor</a>
-          <a href="/donate/" class="btn btn-outline-danger mb-5"><span class="fas fa-heart fa-fw"></span> Donate Directly</a>
+          <a href="https://opencollective.com/privacytoolsio#section-contribute" class="btn btn-success">Become a Sponsor</a>
+          <a href="/donate/" class="btn btn-outline-danger"><span class="fas fa-heart fa-fw"></span> Donate Directly</a>
         </p>
       </div>
     </div>
   </div>
+
   <h3>Why sponsor {{ site.name }}?</h3>
   <p>This sponsorship program is designed to allow companies, organizations, and individuals partner with the {{ site.name }} team to support our vision of a more privacy-respecting internet and the greater online community.</p>
   <p>With this exposure and sponsorship, your customers will recognize your intrinsic understanding and commitment to user privacy. Moreover, you'll directly contribute to our mission of spreading privacy-respecting tools and knowledge worldwide!</p>
+  <p>At PrivacyTools, we believe in...</p>
+  <ul>
+    <li><strong>Privacy</strong>, of course. Privacy gives you as a user control over how your information is used and spread online. Trustworthy and secure products and services are the key to that future.</li>
+    <li><strong>Security</strong>. We believe services cannot provide privacy at all without being secure. Strong encryption is the only way to prevent malicious actors from snooping in on our communications.</li>
+    <li><strong>Freedom</strong>. The right to express your opinion online without interference or surveillance is the only way we can grow as a society, and privacy-respecting tools should foster that growth.</li>
+  </ul>
+  <p>We reserve the right or deny all sponsors from receiving the benefits detailed below if we believe that your organization or product is not aligned with our key values. Therefore, if you are interested in sponsoring our project, please first email <a href="mailto:sponsors@privacytools.io">sponsors@privacytools.io</a> so we may discuss further.</p>
   <p>As a sponsor of {{ site.name }}, your company will be widely recognized in a variety of ways, some of which we've detailed below.</p>
   <h5>General Information</h5>
   <p>This website receives well over 250,000 pageviews on a monthly basis and is highly ranked for privacy-related keywords. In addition to the benefits below your contribution will be featured on our OpenCollective page and we will thank you via social media for your contribution.</p>
@@ -44,6 +55,6 @@ permalink: /sponsors/
   <h5>More Information</h5>
   <p>If you are interested and have further questions, you are welcome to reach out to us directly at <a href="mailto:sponsors@privacytools.io">sponsors@privacytools.io</a>.</p>
   <div class="mt-5 text-center">
-    <a href="https://opencollective.com/privacytoolsio#section-contribute" class="btn btn-success mb-5">Become a Sponsor</a>
+    <a href="https://opencollective.com/privacytoolsio#section-contribute" class="btn btn-success mb-5">Contribute to PrivacyTools</a>
   </div>
 </div>