Use SRI

https://github.com/privacytoolsIO/privacytools.io/issues/1869#issuecomment-622996340

.github/CODEOWNERS

@@ -1,23 +1,32 @@
 # Editorial Team
-*.md @privacytoolsIO/editorial
-/assets/ @privacytoolsIO/editorial
-/pages/ @privacytoolsIO/editorial
-/_includes/ @JonahAragon @privacytoolsIO/editorial
-/_includes/sections/ @privacytoolsIO/editorial
+*.md @privacytools/editorial
+/assets/ @privacytools/editorial
+/pages/ @privacytools/editorial
+/_includes/sections/ @privacytools/editorial
+/index.html @privacytools/editorial
 /font/ @dawidpotocki
 
 # Administration Related Files
-/index.html @JonahAragon @privacytoolsIO/editorial
-/_includes/sections/header.html @JonahAragon @privacytoolsIO/editorial
-/_includes/sections/participate.html @JonahAragon @privacytoolsIO/editorial
-/pages/sponsors.html @JonahAragon
 /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
 /404.html @JonahAragon
-/.github/CODEOWNERS @JonahAragon
+/.github/CODEOWNERS @JonahAragon @BurungHantu1605
 /.github/FUNDING.yml @JonahAragon @BurungHantu1605
-/LICENSE.txt @JonahAragon
+/LICENSE.txt @JonahAragon @BurungHantu1605
 /.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

@@ -25,7 +25,7 @@ Please read this document in full before contributing.
 - Be constructive.
 - Please feel free to *review changes* in the *files changed* tab of any
   pull request at any time.
-- See also our [Code of Conduct](https://github.com/privacytoolsIO/.github/blob/master/CODE_OF_CONDUCT.md)
+- See also our [Code of Conduct](https://github.com/privacytools/.github/blob/master/CODE_OF_CONDUCT.md)
 
 ## Quality over Quantity
 
@@ -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/privacytools/privacytools.io/blob/master/assets/img/svg/3rd-party/mullvad.svg))
+- Tool logo dimensions are 120px x 120px ([SVG example](https://github.com/privacytools/privacytools.io/blob/master/assets/img/svg/3rd-party/firefox_browser.svg), [PNG example](https://github.com/privacytools/privacytools.io/blob/master/assets/img/png/3rd-party/claws_mail.png))
 
 ## Licensing
 
@@ -110,4 +111,4 @@ If you do not have a GitHub account, you may submit software recommendations or
 
 This repository uses [@fire-bot](https://github.com/fire-bot), [a service](https://fire.fundersclub.com) from FundersClub that converts incoming emails to GitHub issues. By sending a message to the email address above, you will be sharing your email address and message content with FundersClub. FundersClub has a privacy policy at [https://fundersclub.com/catalyst-privacy-policy/](https://fundersclub.com/catalyst-privacy-policy/) you should review before using this service. Any attachments you send via this service may be stored indefinitely by FundersClub for the purpose of making them available within the submitted GitHub issue.
 
-You can view an example of the created issues' format at [#1444](https://github.com/privacytoolsIO/privacytools.io/issues/1444).
+You can view an example of the created issues' format at [#1444](https://github.com/privacytools/privacytools.io/issues/1444).

.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/privacytools/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/privacytools/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/privacytools/privacytools.io/blob/master/.github/CONTRIBUTING.md) BEFORE SUBMITTING -->
 
 ## Description
 
@@ -6,7 +6,9 @@ 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 have read and understand [the contributing guidelines](https://github.com/privacytoolsIO/privacytools.io/blob/master/.github/CONTRIBUTING.md).
+- [ ] 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/privacytools/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

.travis.yml

@@ -1,11 +0,0 @@
-language: ruby
-rvm:
-  - 2.4.1
-
-# Assume bundler is being used, therefore
-# the `install` step will run `bundle install` by default.
-script: ./build.sh
-
-sudo: false # route your build to the container-based infrastructure for a faster build
-
-cache: bundler # caching bundler gem packages will speed up build

.well-known/security.txt

@@ -2,4 +2,4 @@ Contact: admin@privacytools.io
 Encryption: https://www.jonaharagon.com/keys/
 Preferred-Languages: en
 Canonical: https://www.privacytools.io/.well-known/security.txt
-Policy: https://github.com/privacytoolsIO/privacytools.io/security/policy
+Policy: https://github.com/privacytools/privacytools.io/security/policy

Gemfile

@@ -1,11 +1,26 @@
 source "https://rubygems.org"
 
-# Install github-pages gem (https://jekyllrb.com/docs/github-pages/)
-gem "github-pages", group: :jekyll_plugins
+# Hello! This is where you manage which Jekyll version is used to run.
+# When you want to use a different version, change it below, save the
+# file and run `bundle install`. Run Jekyll with `bundle exec`, like so:
+#
+#     bundle exec jekyll serve
+#
+# This will help ensure the proper Jekyll version is running.
+# Happy Jekylling!
+gem "jekyll", "~> 3.8.5"
 
-# Plugins
+# This is the default theme for new Jekyll sites. You may change this to anything you like.
+gem "minima", "~> 2.0"
+
+# If you want to use GitHub Pages, remove the "gem "jekyll"" above and
+# uncomment the line below. To upgrade, run `bundle update github-pages`.
+# gem "github-pages", group: :jekyll_plugins
+
+# If you have any plugins, put them here!
 group :jekyll_plugins do
-  # example: gem "jekyll-feed", "~> 0.6"
+  gem "jekyll-feed", "~> 0.6"
+  gem "jekyll-sitemap", "~> 1.4"
 end
 
 # Windows does not include zoneinfo files, so bundle the tzinfo-data gem
@@ -13,4 +28,3 @@ gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw, :jruby]
 
 # Performance-booster for watching directories on Windows
 gem "wdm", "~> 0.1.0" if Gem.win_platform?
-

Gemfile.lock

@@ -1,89 +1,16 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.2.11.1)
-      i18n (~> 0.7)
-      minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
-      tzinfo (~> 1.1)
     addressable (2.6.0)
       public_suffix (>= 2.0.2, < 4.0)
-    coffee-script (2.4.1)
-      coffee-script-source
-      execjs
-    coffee-script-source (1.11.1)
     colorator (1.1.0)
-    commonmarker (0.17.13)
-      ruby-enum (~> 0.5)
     concurrent-ruby (1.1.5)
-    dnsruby (1.61.3)
-      addressable (~> 2.5)
     em-websocket (0.5.1)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0.6.0)
-    ethon (0.12.0)
-      ffi (>= 1.3.0)
     eventmachine (1.2.7)
-    execjs (2.7.0)
-    faraday (0.15.4)
-      multipart-post (>= 1.2, < 3)
     ffi (1.11.1)
     forwardable-extended (2.6.0)
-    gemoji (3.0.1)
-    github-pages (198)
-      activesupport (= 4.2.11.1)
-      github-pages-health-check (= 1.16.1)
-      jekyll (= 3.8.5)
-      jekyll-avatar (= 0.6.0)
-      jekyll-coffeescript (= 1.1.1)
-      jekyll-commonmark-ghpages (= 0.1.5)
-      jekyll-default-layout (= 0.1.4)
-      jekyll-feed (= 0.11.0)
-      jekyll-gist (= 1.5.0)
-      jekyll-github-metadata (= 2.12.1)
-      jekyll-mentions (= 1.4.1)
-      jekyll-optional-front-matter (= 0.3.0)
-      jekyll-paginate (= 1.1.0)
-      jekyll-readme-index (= 0.2.0)
-      jekyll-redirect-from (= 0.14.0)
-      jekyll-relative-links (= 0.6.0)
-      jekyll-remote-theme (= 0.3.1)
-      jekyll-sass-converter (= 1.5.2)
-      jekyll-seo-tag (= 2.5.0)
-      jekyll-sitemap (= 1.2.0)
-      jekyll-swiss (= 0.4.0)
-      jekyll-theme-architect (= 0.1.1)
-      jekyll-theme-cayman (= 0.1.1)
-      jekyll-theme-dinky (= 0.1.1)
-      jekyll-theme-hacker (= 0.1.1)
-      jekyll-theme-leap-day (= 0.1.1)
-      jekyll-theme-merlot (= 0.1.1)
-      jekyll-theme-midnight (= 0.1.1)
-      jekyll-theme-minimal (= 0.1.1)
-      jekyll-theme-modernist (= 0.1.1)
-      jekyll-theme-primer (= 0.5.3)
-      jekyll-theme-slate (= 0.1.1)
-      jekyll-theme-tactile (= 0.1.1)
-      jekyll-theme-time-machine (= 0.1.1)
-      jekyll-titles-from-headings (= 0.5.1)
-      jemoji (= 0.10.2)
-      kramdown (= 1.17.0)
-      liquid (= 4.0.0)
-      listen (= 3.1.5)
-      mercenary (~> 0.3)
-      minima (= 2.5.0)
-      nokogiri (>= 1.8.5, < 2.0)
-      rouge (= 2.2.1)
-      terminal-table (~> 1.4)
-    github-pages-health-check (1.16.1)
-      addressable (~> 2.3)
-      dnsruby (~> 1.60)
-      octokit (~> 4.0)
-      public_suffix (~> 3.0)
-      typhoeus (~> 1.3)
-    html-pipeline (2.12.0)
-      activesupport (>= 2)
-      nokogiri (>= 1.4)
     http_parser.rb (0.6.0)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
@@ -100,97 +27,16 @@ GEM
       pathutil (~> 0.9)
       rouge (>= 1.7, < 4)
       safe_yaml (~> 1.0)
-    jekyll-avatar (0.6.0)
-      jekyll (~> 3.0)
-    jekyll-coffeescript (1.1.1)
-      coffee-script (~> 2.2)
-      coffee-script-source (~> 1.11.1)
-    jekyll-commonmark (1.3.1)
-      commonmarker (~> 0.14)
-      jekyll (>= 3.7, < 5.0)
-    jekyll-commonmark-ghpages (0.1.5)
-      commonmarker (~> 0.17.6)
-      jekyll-commonmark (~> 1)
-      rouge (~> 2)
-    jekyll-default-layout (0.1.4)
-      jekyll (~> 3.0)
     jekyll-feed (0.11.0)
       jekyll (~> 3.3)
-    jekyll-gist (1.5.0)
-      octokit (~> 4.2)
-    jekyll-github-metadata (2.12.1)
-      jekyll (~> 3.4)
-      octokit (~> 4.0, != 4.4.0)
-    jekyll-mentions (1.4.1)
-      html-pipeline (~> 2.3)
-      jekyll (~> 3.0)
-    jekyll-optional-front-matter (0.3.0)
-      jekyll (~> 3.0)
-    jekyll-paginate (1.1.0)
-    jekyll-readme-index (0.2.0)
-      jekyll (~> 3.0)
-    jekyll-redirect-from (0.14.0)
-      jekyll (~> 3.3)
-    jekyll-relative-links (0.6.0)
-      jekyll (~> 3.3)
-    jekyll-remote-theme (0.3.1)
-      jekyll (~> 3.5)
-      rubyzip (>= 1.2.1, < 3.0)
     jekyll-sass-converter (1.5.2)
       sass (~> 3.4)
     jekyll-seo-tag (2.5.0)
       jekyll (~> 3.3)
-    jekyll-sitemap (1.2.0)
-      jekyll (~> 3.3)
-    jekyll-swiss (0.4.0)
-    jekyll-theme-architect (0.1.1)
-      jekyll (~> 3.5)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-cayman (0.1.1)
-      jekyll (~> 3.5)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-dinky (0.1.1)
-      jekyll (~> 3.5)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-hacker (0.1.1)
-      jekyll (~> 3.5)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-leap-day (0.1.1)
-      jekyll (~> 3.5)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-merlot (0.1.1)
-      jekyll (~> 3.5)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-midnight (0.1.1)
-      jekyll (~> 3.5)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-minimal (0.1.1)
-      jekyll (~> 3.5)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-modernist (0.1.1)
-      jekyll (~> 3.5)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-primer (0.5.3)
-      jekyll (~> 3.5)
-      jekyll-github-metadata (~> 2.9)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-slate (0.1.1)
-      jekyll (~> 3.5)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-tactile (0.1.1)
-      jekyll (~> 3.5)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-time-machine (0.1.1)
-      jekyll (~> 3.5)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-titles-from-headings (0.5.1)
-      jekyll (~> 3.3)
+    jekyll-sitemap (1.4.0)
+      jekyll (>= 3.7, < 5.0)
     jekyll-watch (2.2.1)
       listen (~> 3.0)
-    jemoji (0.10.2)
-      gemoji (~> 3.0)
-      html-pipeline (~> 2.2)
-      jekyll (~> 3.0)
     kramdown (1.17.0)
     liquid (4.0.0)
     listen (3.1.5)
@@ -198,17 +44,10 @@ GEM
       rb-inotify (~> 0.9, >= 0.9.7)
       ruby_dep (~> 1.2)
     mercenary (0.3.6)
-    mini_portile2 (2.4.0)
     minima (2.5.0)
       jekyll (~> 3.5)
       jekyll-feed (~> 0.9)
       jekyll-seo-tag (~> 2.1)
-    minitest (5.11.3)
-    multipart-post (2.1.1)
-    nokogiri (1.10.4)
-      mini_portile2 (~> 2.4.0)
-    octokit (4.14.0)
-      sawyer (~> 0.8.0, >= 0.5.3)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
     public_suffix (3.1.1)
@@ -216,34 +55,23 @@ GEM
     rb-inotify (0.10.0)
       ffi (~> 1.0)
     rouge (2.2.1)
-    ruby-enum (0.7.2)
-      i18n
     ruby_dep (1.5.0)
-    rubyzip (1.2.3)
     safe_yaml (1.0.5)
     sass (3.7.4)
       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
-    sawyer (0.8.2)
-      addressable (>= 2.3.5)
-      faraday (> 0.8, < 2.0)
-    terminal-table (1.8.0)
-      unicode-display_width (~> 1.1, >= 1.1.1)
-    thread_safe (0.3.6)
-    typhoeus (1.3.1)
-      ethon (>= 0.9.0)
-    tzinfo (1.2.5)
-      thread_safe (~> 0.1)
-    unicode-display_width (1.6.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  github-pages
+  jekyll (~> 3.8.5)
+  jekyll-feed (~> 0.6)
+  jekyll-sitemap (~> 1.4)
+  minima (~> 2.0)
   tzinfo-data
 
 BUNDLED WITH
-   2.0.1
+   2.1.4

README.md

@@ -1,33 +1,43 @@
-[![privacytools](./assets/img/layout/logo.png)](https://www.privacytools.io/)
+<a href="https://www.privacytools.io">
+	<img src="assets/img/svg/layout/brand/horizontal.svg" width="500px" alt="PrivacyTools" />
+</a>
 
 _Encryption Against Global Mass Surveillance._
 
-[![Build Status](https://travis-ci.com/privacytoolsIO/privacytools.io.svg?branch=master)](https://travis-ci.com/privacytoolsIO/privacytools.io)
+[![Netlify Status](https://api.netlify.com/api/v1/badges/afd98777-c205-4928-a301-f57a1448113f/deploy-status)](https://app.netlify.com/sites/privacytools-io/deploys)
 
 # Contributing
 
 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/privacytools/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)
 - [Spread the word.](https://www.privacytools.io/#participate)
 - [Join our Discourse community.](https://forum.privacytools.io/)
 - [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)
@@ -38,6 +48,6 @@ You can submit your suggestions here on GitHub [(Issues)](https://github.com/pri
 - [Русский / Russian](https://privacytools.ru) - [GitHub](https://github.com/c0rdis/privacytools.ru)
 - [Português / Portuguese](https://www.privacidade.digital/) - [GitHub](https://github.com/PrivacidadeDigital/privacidade.digital)
 
-# License
+# License & Notices
 
-The content and original technology of this website is made available under the [Creative Commons Zero v1.0 Universal](https://www.privacytools.io/LICENSE.txt) license text. Some files or folders may include works from other projects with separate licenses, and will be marked as such. By contributing to this repository, contributors do not necessarily agree to sign a CLA or legally transfer their copyright to the project, but they do at a minimum agree to license their work under the current license of this repository: In this case, the Creative Commons Zero v1.0 Universal.
+Please visit [https://www.privacytools.io/notices/](https://www.privacytools.io/notices/) for license information and other disclaimers. PrivacyTools is provided on an "as-is" basis, without warranty, and disclaiming liability for damages. By contributing to this repository you agree to license your work under the terms of the [license](https://github.com/privacytools/privacytools.io/blob/master/LICENSE.txt) in this repository.

_config.yml

@@ -3,6 +3,7 @@ name: PrivacyTools
 description: You are being watched. PrivacyTools provides knowledge, encryption, and software recommendations to protect you against global mass surveillance.
 url: "https://www.privacytools.io"
 production_url: "https://www.privacytools.io"
+pull_cdn: "https://cdn.privacytools.io"
 sass:
   style: compressed
 plugins:

_includes/badge.html

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

_includes/breadcrumbs.html

@@ -8,7 +8,8 @@
     {% if forloop.last %}
     <li class="breadcrumb-item active" aria-current="page" itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem">
       <link href="{% assign crumb_limit = forloop.index | plus: 1 %}{% for crumb in crumbs limit: crumb_limit %}{{ crumb | append: '/' | replace:'without-plugin/','without-plugins/' }}{% endfor %}" itemprop="item"  />
-      <span itemprop="name">{{ crumb | replace:'-',' ' | remove:'.html' | capitalize }}</span>
+      <span itemprop="name">{% if page.breadcrumb %}{{ page.breadcrumb }}{% else %}{% assign words = crumb | replace:'-',' ' | remove:'.html' | split: ' ' %}{% capture titlecase %}{% for word in words %}{{ word | capitalize }} {% endfor %}{% endcapture %}{{ titlecase }}{% endif %}
+      </span>
       <meta itemprop="position" content="{{ forloop.index }}" />
     </li>
     {% else %}

_includes/card.html

@@ -56,7 +56,7 @@
                 </a>
                 {% endif %}
                 {% if include.tor %}
-                <a class="mb-1" data-toggle="tooltip" data-placement="bottom" data-original-title="{{include.tor}} Requires specific software to access: torproject.org" href="{{include.tor}}"><img alt="Tor" src="/assets/img/layout/tor.png" width="35" height="35"></a>
+                <a class="mb-1" data-toggle="tooltip" data-placement="bottom" data-original-title="{{include.tor}} Requires specific software to access: torproject.org" href="{{include.tor}}"><img alt="Tor" src="{% if jekyll.environment == "production" and site.pull_cdn %}{{site.pull_cdn}}{% endif %}/assets/img/layout/tor.png" width="35" height="35"></a>
                 {% endif %}
 
                 {% if include.git %}

_includes/cardv2.html

@@ -29,39 +29,51 @@
   <div class="card-body">
     <p class="card-text">
       <img
-        src="{{include.image}}"
+        src="{% if jekyll.environment == "production" and site.pull_cdn %}{{site.pull_cdn}}{% endif %}{{include.image}}"
         {% if include.image-dark %}
         data-theme-src="{{include.image-dark}}"
         {% endif %}
         height="120"
         width="120"
         class="panel-pic"
-        alt="{{include.title}}"
+        alt="{{include.title}} logo"
       >
       {{ include.description }}
       {% if include.labels %}
       {% assign labels = include.labels | split:"|" %}
-        {% for label in labels %}
-          {% assign label_data = label | split:":" %}
-          {% assign color = label_data[0] %}
-          {% assign text = label_data[1] %}
-          {% assign tooltip = label_data[2] | default: false %}
-          {% assign help_icon = '<i class="far fa-question-circle"></i>' %}
-          <span
-            class="badge badge-{{color}}"
-            {% if tooltip %}
-              data-toggle="tooltip"
-              title="{{ tooltip }}"
-              > {{text}} {{ help_icon }}
-            {% else %}
-              > {{text}}
+      {% for label in labels %}
+        {% assign label_data = label | split:"::" %}
+          {% for label_attr in label_data %}
+            {% assign attr = label_attr | split:"==" %}
+            {% if attr[0] == "color" %}
+              {% assign color = attr[1] %}
+            {% elsif attr[0] == "link" %}
+              {% assign link = attr[1] %}
+            {% elsif attr[0] == "text" %}
+              {% assign text = attr[1] %}
+            {% elsif attr[0] == "icon" %}
+              {% assign icon = attr[1] %}
+            {% elsif attr[0] == "tooltip" %}
+              {% assign tooltip = attr[1] %}
             {% endif %}
-          </span>
-        {% endfor %}
+          {% endfor %}
+        {% include badge.html
+          link=link
+          color=color
+          text=text
+          icon=icon
+          tooltip=tooltip
+        %}
+        {% assign color = nil %}
+        {% assign link = nil %}
+        {% assign text = nil %}
+        {% assign icon = nil %}
+        {% assign tooltip = nil %}
+      {% endfor %}
       {% 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 +81,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 +103,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 +114,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

@@ -7,36 +7,36 @@
   <div class="row mb-4">
     <div class="col-12 col-md-6 d-flex justify-content-between">
       <a href="mailto:?subject=privacytools.io%20-%20encryption%20against%20global%20mass%20surveillance&body={{ site.production_url }}/" class="share-btn email" title="Email">
-        <i class="fas fa-envelope pl-3"></i>
+        <i class="fas fa-envelope"></i>
       </a>
 
       <a href="https://www.facebook.com/sharer/sharer.php?u={{ site.production_url }}" class="share-btn facebook" title="Facebook">
-        <i class="fab fa-facebook-f pl-3"></i>
+        <i class="fab fa-facebook-f"></i>
       </a>
 
       <a href="https://twitter.com/share?text=Knowledge%20and%20tools%20to%20protect%20your%20privacy%20against%20global%20mass%20surveillance%20&amp;url={{ site.production_url }}/&amp;via=privacytoolsIO" class="share-btn twitter" title="Twitter">
-        <i class="fab fa-twitter pl-3"></i>
+        <i class="fab fa-twitter"></i>
       </a>
 
       <a href="https://sharetomastodon.github.io/?title=privacytools.io%20-%20encryption%20against%20global%20mass%20surveillance&url={{ site.production_url }}" class="share-btn mastodon" title="Mastodon">
-        <i class="fab fa-mastodon pl-3"></i>
+        <i class="fab fa-mastodon"></i>
       </a>
     </div>
     <div class="col-12 col-md-6 d-flex justify-content-between">
       <a href="https://reddit.com/submit?url={{ site.production_url }}&title=privacytools.io%20-%20encryption%20against%20global%20mass%20surveillance" class="share-btn reddit" title="reddit">
-        <i class="fab fa-reddit-alien pl-3"></i>
+        <i class="fab fa-reddit-alien"></i>
       </a>
 
       <a href="https://www.linkedin.com/shareArticle?url={{ site.production_url }}&title=privacytools.io%20-%20encryption%20against%20global%20mass%20surveillance" class="share-btn linkedin" title="LinkedIn">
-        <i class="fab fa-linkedin-in pl-3"></i>
+        <i class="fab fa-linkedin-in"></i>
       </a>
 
       <a href="https://mix.com/mixit?su=submit&url={{ site.production_url }}&title=privacytools.io%20-%20encryption%20against%20global%20mass%20surveillance" class="share-btn mix" title="Mix">
-        <i class="ptio-mix pl-3"></i>
+        <i class="ptio-mix"></i>
       </a>
 
       <a href="https://sharetodiaspora.github.io/?title=privacytools.io%20-%20encryption%20against%20global%20mass%20surveillance&url={{ site.production_url }}" class="share-btn diaspora" title="Diaspora*">
-        <i class="fas fa-asterisk pl-3"></i>
+        <i class="fas fa-asterisk"></i>
       </a>
     </div>
   </div>
@@ -44,24 +44,31 @@
   <h3>Copy URL and Description</h3>
 
   <p>
-  <input type="text" value="PrivacyTools - Encryption and tools to protect against global mass surveillance - {{ site.production_url }}" class="form-control input-lg onclick-select">
+  <input type="text" value="{{ site.name }} - Encryption and tools to protect against global mass surveillance - {{ site.production_url }}" class="form-control input-lg onclick-select">
   <span class="help-block">For easy copy and paste. Share this text snippet.</span>
   </p>
 
   <hr class="footer-divider" />
 
   <div class="row mt-3">
-    <div class="col-sm-4 mb-3 d-flex justify-content-center d-flex justify-content-center">
-      <a href="/LICENSE.txt" data-toggle="tooltip" data-placement="top" data-original-title="This work is free. You can redistribute it and/or modify it under the terms of the &quot;Creative Commons CC0 1.0 Universal Public Domain Dedication&quot;."><img alt="CC0" src="/assets/img/layout/zero.png" width="32" height="32">CC0</a>
+    <div class="col-sm-4 mb-3 d-flex justify-content-center align-items-center">
+      <span class="fab fa-creative-commons-zero fa-2x mr-2"></span>
+      <a
+        href="/LICENSE.txt"
+        title="This work is free. You can redistribute it and/or modify it under the terms of the &quot;Creative Commons CC0 1.0 Universal Public Domain Dedication&quot;."
+        data-toggle="tooltip"
+        data-placement="top">
+        CC0
+      </a>
     </div>
 
-    <div class="col-sm-4 mb-3 d-flex justify-content-center">
-      <i class="far fa-address-card fa-2x"></i>
+    <div class="col-sm-4 mb-3 d-flex justify-content-center align-items-center">
+      <span class="far fa-address-card fa-2x mr-2"></span>
       <a href="/about/">About Us &amp; Contact</a>
     </div>
 
-    <div class="col-sm-4 mb-3 d-flex justify-content-center">
-      <i class="fas fa-donate fa-2x"></i>
+    <div class="col-sm-4 mb-3 d-flex justify-content-center align-items-center">
+      <span class="fas fa-donate fa-2x mr-2"></span>
       <a href="/donate/" data-toggle="tooltip" data-placement="top" data-original-title="Please support this project by donating. We are ad-free and not affiliated with any providers. Your donation will cover our costs for servers and domains.">Support Us!</a>
     </div>
   </div>
@@ -73,13 +80,18 @@
     </a>
     <p class="mt-2">
       <strong>No Ads, No Google Analytics, No Affiliates, No Cross-Site Requests.</strong>
-      <em>PrivacyTools is a socially motivated website that provides information for protecting your data security and privacy. Never trust any company with your privacy, always encrypt.</em>
-      <a href="/privacy/">View our privacy statement</a>.
+      <em>{{ site.name }} is a socially motivated website that provides information for protecting your data security and privacy. Never trust any company with your privacy, always encrypt.</em>
     </p>
     <p class="text-left">
       Tor v3: <strong>privacy2zbidut4m4jyj3ksdqidzkw3uoip2vhvhbvwxbqux5xy5obyd.onion</strong>
       (<a href="https://write.privacytools.io/jonah/tor-on-privacytools-io">Learn More</a>)
     </p>
+    <small>
+      <a href="/privacy/">Privacy Statement</a> |
+      <a href="/notices/">Notices &amp; Disclaimers</a> |
+      <a href="https://github.com/privacytools/brand">Brand Assets &amp; Guidelines</a> |
+      <a href="https://status.privacytools.io">Status Page</a>
+    </small>
 
   </div>
 </footer>

_includes/head.html

@@ -5,11 +5,9 @@
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <meta name="keywords" content="privacy, anonymity, privacy tools, surveillance, encryption">
   <meta name="description" content="{% if page.description %}{{ page.description }}{% else %}{{ site.description }}{% endif %}">
-  <meta name="msapplication-TileColor" content="#da532c">
-  <meta name="msapplication-TileImage" content="/assets/img/favicons/mstile-144x144.png">
-  <meta name="msapplication-config" content="/assets/img/favicons/browserconfig.xml">
-  <meta name="theme-color" content="#ffffff">
   <link rel="canonical" href="{{ site.production_url }}{{ page.url | replace:'index.html',''}}">
+  <link rel="preconnect" href="https://cdn.privacytools.io/" crossorigin>
+  <link rel="dns-prefetch" href="https://cdn.privacytools.io/">
 
   <!-- title -->
   {% if page.title %}
@@ -21,12 +19,12 @@
   {% endif %}
   <meta property="og:type" content="website" />
   <meta property="og:url" content="{{ page.permalink | prepend: site.url }}" />
-  <meta property="og:image" content="{{ site.production_url }}/assets/img/layout/ogimage.jpg" />
+  <meta property="og:image" content="{{ site.production_url }}/assets/img/svg/layout/brand/square-transparent.svg" />
   <meta property="og:description" content="{% if page.description %}{{ page.description }}{% else %}{{ site.description }}{% endif %}"/>
   <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",
@@ -39,36 +37,31 @@
       "privacytoolsIO"
     ],
     "url": "{{ site.production_url }}",
-    "logo": "{{ site.production_url }}/assets/img/layout/shield.png",
+    "logo": "{{ site.production_url }}/assets/img/svg/layout/brand/square-transparent.svg",
     "sameAs": [
       "https://blog.privacytools.io",
       "https://twitter.com/privacytoolsIO",
       "https://social.privacytools.io/@privacytools",
       "https://www.youtube.com/channel/UCen3taxHtzByXV8Da73B1Vg",
-      "https://github.com/privacytoolsIO"
+      "https://github.com/privacytools"
     ]
   }
   </script>
   {% endif %}
 
   <!-- icons -->
-  <link rel="apple-touch-icon" sizes="57x57" href="/assets/img/favicons/apple-touch-icon-57x57.png">
-  <link rel="apple-touch-icon" sizes="60x60" href="/assets/img/favicons/apple-touch-icon-60x60.png">
-  <link rel="apple-touch-icon" sizes="72x72" href="/assets/img/favicons/apple-touch-icon-72x72.png">
-  <link rel="apple-touch-icon" sizes="76x76" href="/assets/img/favicons/apple-touch-icon-76x76.png">
-  <link rel="apple-touch-icon" sizes="114x114" href="/assets/img/favicons/apple-touch-icon-114x114.png">
-  <link rel="apple-touch-icon" sizes="120x120" href="/assets/img/favicons/apple-touch-icon-120x120.png">
-  <link rel="apple-touch-icon" sizes="144x144" href="/assets/img/favicons/apple-touch-icon-144x144.png">
-  <link rel="apple-touch-icon" sizes="152x152" href="/assets/img/favicons/apple-touch-icon-152x152.png">
-  <link rel="apple-touch-icon" sizes="180x180" href="/assets/img/favicons/apple-touch-icon-180x180.png">
-  <link rel="icon" type="image/png" href="/assets/img/favicons/favicon-32x32.png" sizes="32x32">
-  <link rel="icon" type="image/png" href="/assets/img/favicons/android-chrome-192x192.png" sizes="192x192">
-  <link rel="icon" type="image/png" href="/assets/img/favicons/favicon-96x96.png" sizes="96x96">
-  <link rel="icon" type="image/png" href="/assets/img/favicons/favicon-16x16.png" sizes="16x16">
-  <link rel="manifest" href="/assets/img/favicons/manifest.json">
-  <link rel="shortcut icon" href="/assets/img/favicons/favicon.ico">
+  <link rel="apple-touch-icon" sizes="180x180" href="{% if jekyll.environment == "production" and site.pull_cdn %}{{site.pull_cdn}}{% endif %}/assets/img/png/favicons/apple-touch-icon.png?v=2">
+  <link rel="icon" type="image/png" sizes="32x32" href="{% if jekyll.environment == "production" and site.pull_cdn %}{{site.pull_cdn}}{% endif %}/assets/img/png/favicons/favicon-32x32.png?v=2">
+  <link rel="icon" type="image/png" sizes="16x16" href="{% if jekyll.environment == "production" and site.pull_cdn %}{{site.pull_cdn}}{% endif %}/assets/img/png/favicons/favicon-16x16.png?v=2">
+  <link rel="manifest" href="{% if jekyll.environment == "production" and site.pull_cdn %}{{site.pull_cdn}}{% endif %}/assets/img/png/favicons/site.webmanifest?v=2">
+  <link rel="mask-icon" href="{% if jekyll.environment == "production" and site.pull_cdn %}{{site.pull_cdn}}{% endif %}/assets/img/png/favicons/safari-pinned-tab.svg?v=2" color="#3498db">
+  <link rel="shortcut icon" href="{% if jekyll.environment == "production" and site.pull_cdn %}{{site.pull_cdn}}{% endif %}/assets/img/png/favicons/favicon.ico?v=2">
+  <meta name="msapplication-TileColor" content="#3498db">
+  <meta name="msapplication-config" content="{% if jekyll.environment == "production" and site.pull_cdn %}{{site.pull_cdn}}{% endif %}/assets/img/png/favicons/browserconfig.xml?v=2">
+  <meta name="theme-color" content="#ffffff">
+
 
   <!-- CSS stylesheets -->
-  <link href="/assets/css/style.css?v=9" rel="stylesheet">
-  <link id="dark-css" href="/assets/css/dark.css?v=4" rel="stylesheet" media="(prefers-color-scheme: dark)">
+  <link href="{% if jekyll.environment == "production" and site.pull_cdn %}{{site.pull_cdn}}{% endif %}/assets/css/style.css?v=9" rel="stylesheet" integrity="sha384-qBP5Bbk7h5voX7+I9CM6Vy0HQpm+PWHRXZy2Ut/52+S3WmuBw3YWNyoeI/QRGWv4" crossorigin="anonymous">
+  <link id="dark-css" href="{% if jekyll.environment == "production" and site.pull_cdn %}{{site.pull_cdn}}{% endif %}/assets/css/dark.css?v=4" rel="stylesheet" media="(prefers-color-scheme: dark)" integrity="sha384-V2UIGW0+AbgQZL/bmWAM8pRXghNGm/IvTD/yeSAsMLpsz3D+0MnYvKZ7h6Udng9x" crossorigin="anonymous">
 </head>

_includes/nav.html

@@ -1,8 +1,8 @@
 <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">
-        <img src="/assets/img/layout/logo_smaller.png" width="150px" />
+      <a id="nav-home-mobile" class="nav-anchor" href="/">
+        <img src="{% if jekyll.environment == "production" and site.pull_cdn %}{{site.pull_cdn}}{% endif %}/assets/img/svg/layout/brand/horizontal.svg" width="150px" />
       </a>
     </div>
     <input type="checkbox" id="nav-toggle" checked />
@@ -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>
 
@@ -64,7 +64,6 @@
           <span class="nav-dropdown">
             <a class="dropdown-item" href="/software/calendar-contacts/"><span class="fas fa-calendar fa-fw"></span> Calendar/Contacts Sync Tools</a>
             <a class="dropdown-item" href="/software/notebooks/"><span class="far fa-sticky-note fa-fw"></span> Digital Notebook</a>
-            <a class="dropdown-item" href="/software/email/#messaging"><span class="fas fa-random fa-fw"></span> Email Alternatives</a>
             <a class="dropdown-item" href="/software/email/"><span class="fas fa-envelope fa-fw"></span> Email Clients</a>
             <a class="dropdown-item" href="/software/encryption-tools/"><span class="fas fa-lock fa-fw"></span> File Encryption</a>
             <a class="dropdown-item" href="/software/file-sharing/"><span class="fas fa-file-export fa-fw"></span> File Sharing</a>
@@ -88,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>
@@ -139,7 +138,6 @@
             <a href="https://privacytools.dreads-unlock.fr" rel="nofollow noopener" class="dropdown-item">Français</a>
           </span>
         </details>
-
       </div>
     </div>
   </div>

_includes/scripts.html

@@ -1,8 +1,8 @@
-<script src="/assets/js/jquery-3.3.1.min.js?v=4"></script>
-<script src="/assets/js/popper.min.js?v=4"></script>
-<script src="/assets/js/bootstrap.min.js?v=4"></script>
-<script src="/assets/js/sortable.min.js?v=4"></script>
-<script src="/assets/js/main.js?v=5"></script>
+<script src="{% if jekyll.environment == "production" and site.pull_cdn %}{{site.pull_cdn}}{% endif %}/assets/js/jquery-3.3.1.min.js?v=4" integrity="sha384-tsQFqpEReu7ZLhBV2VZlAu7zcOV+rXbYlF2cqB8txI/8aZajjp4Bqd+V6D5IgvKT" crossorigin="anonymous"></script>
+<script src="{% if jekyll.environment == "production" and site.pull_cdn %}{{site.pull_cdn}}{% endif %}/assets/js/popper.min.js?v=4" integrity="sha384-yipEjruz9xikSpiIi+F8+G+OvmOYvx/hY06pr3eA26265pJ8+Lbc3sZ2uBgBG7b7" crossorigin="anonymous"></script>
+<script src="{% if jekyll.environment == "production" and site.pull_cdn %}{{site.pull_cdn}}{% endif %}/assets/js/bootstrap.min.js?v=4" integrity="sha384-uz42m69OOLo5hnP147/k7qYaV16ebylNguXL8G7Z/iBMtapgaUSOwgo/9MopjS46" crossorigin="anonymous"></script>
+<script src="{% if jekyll.environment == "production" and site.pull_cdn %}{{site.pull_cdn}}{% endif %}/assets/js/sortable.min.js?v=4" integrity="sha384-tukxl0r6OP6AB7mHv3RINgYu4i6IvHr1bdnypIcYez2WQzZKq08BXyFEZCW//Juc" crossorigin="anonymous"></script>
+<script src="{% if jekyll.environment == "production" and site.pull_cdn %}{{site.pull_cdn}}{% endif %}/assets/js/main.js?v=5" integrity="sha384-7Cn7Co5qrN1jU/2wfO5Kn0M/FR/UtrkM1+rLAEIUteTqmzgMPLXjm9H2c5NsnSxp" crossorigin="anonymous"></script>
 
 <!--
   Matomo is the leading open-source analytics platform:

_includes/sections/android-addons.html

@@ -1,28 +1,24 @@
 <h1 id="aaddons" class="anchor"><a href="#aaddons"><i class="fas fa-link anchor-icon"></i></a> Android Privacy Add-ons</h1>
 
-<div class="alert alert-success" role="alert">
-  <strong>Improve your privacy with these add-ons for Android.</strong>
-</div>
-
 <div class="container-fluid">
 
   <div class="row mb-2">
     <div class="col-lg-3 col-sm-12 pt-lg-5">
-      <img src="/assets/img/addons/netguard.png" height="70" width="200" class="img-fluid d-block mr-auto ml-auto align-middle" alt="NetGuard">
+      <img src="{% if jekyll.environment == "production" and site.pull_cdn %}{{site.pull_cdn}}{% endif %}/assets/img/png/3rd-party/netguard.png" height="70" width="70" class="img-fluid d-block mr-auto ml-auto align-middle" alt="NetGuard">
     </div>
     <div class="col">
     <h3>Control your traffic with <a href="https://www.netguard.me/">NetGuard</a></h3>
-    <p><strong>NetGuard</strong> provides simple and advanced ways to block certain apps' access to the internet without the help of root privileges. Applications and addresses can individually be allowed or denied access to your Wi-Fi and/or mobile connection, allowing you to control which apps are able to call home or not.
+    <p><strong>NetGuard</strong> provides simple and advanced methods to block certain apps from accessing the internet, without requiring root privileges. Applications and addresses can be individually allowed or denied access to your Wi-Fi and/or mobile connections, allowing you to control exactly which apps are able to phone home or not.</p>
     </div>
   </div>
 
   <div class="row mb-2">
     <div class="col-lg-3 col-sm-12 pt-lg-5">
-      <img src="/assets/img/addons/Orbot.png" height="70" width="200" class="img-fluid d-block mr-auto ml-auto align-middle" alt="Orbot">
+      <img src="{% if jekyll.environment == "production" and site.pull_cdn %}{{site.pull_cdn}}{% endif %}/assets/img/svg/3rd-party/orbot.svg" height="70" width="70" class="img-fluid d-block mr-auto ml-auto align-middle" alt="Orbot">
     </div>
     <div class="col">
     <h3>Tor for Android with <a href="https://guardianproject.info/apps/orbot/">Orbot</a></h3>
-    <p><strong>Orbot</strong> is a free proxy app that empowers other apps to use the internet more securely. Orbot uses Tor to encrypt your Internet traffic and then hides it by bouncing through a series of computers around the world. <strong>Root Mode:</strong> Orbot can be configured to transparently proxy all of your Internet traffic through Tor. You can also choose which specific apps you want to use through Tor.
+    <p><strong>Orbot</strong> is a free proxy app that empowers other apps to use the internet more securely. Orbot uses Tor to encrypt your Internet traffic and then hides it by bouncing through a series of computers around the world. <strong>Root Mode:</strong> Orbot can be configured to transparently proxy all of your Internet traffic through Tor. You can also choose which specific apps you wish to use through Tor.</p>
     </div>
   </div>
 
@@ -32,6 +28,6 @@
 
 <ul>
   <li>
-    <a href="/providers/dns#clients">Our DNS page</a> which also has information on encrypting DNS on Android.
+    <a href="/providers/dns#clients">Our DNS client recommendations</a>, which have information on enabling encrypted DNS on Android.
   </li>
 </ul>

_includes/sections/browser-addons.html

@@ -1,117 +1,175 @@
 <h1 id="addons" class="anchor"><a href="#addons"><i class="fas fa-link anchor-icon"></i></a> Recommended Browser Add-ons</h1>
 
-<div class="alert alert-primary" role="alert">
-  <strong>Improve your privacy with these browser add-ons.</strong>
+<div class="alert alert-secondary" role="alert">
+  Not all of these add-ons are necessary, and many provide redundant functionality. Choose the ones you need, and <a class="alert-link" href="https://blog.privacytools.io/firefox-privacy-an-introduction-to-safe/">learn more with our guide to Firefox Privacy</a>.
 </div>
 
 {% include cardv2.html
-title="uBlock Origin: Block Ads and Trackers"
-image="/assets/img/addons/ublock-origin.png"
-description="<strong>uBlock Origin</strong> is an efficient <a href=https://github.com/gorhill/uBlock/wiki/Blocking-mode>wide-spectrum blocker</a> that's 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/"
-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/"
-chrome="https://chrome.google.com/webstore/detail/ublock-origin/cjpalhdlnbpafiamejdnhcphjbkeiagm"
-opera="https://addons.opera.com/en/extensions/details/ublock/"
-edge="https://www.microsoft.com/en-us/p/ublock-origin/9nblggh444l4"
+  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/firefox/addon/ublock-origin/"
+  chrome="https://chrome.google.com/webstore/detail/ublock-origin/cjpalhdlnbpafiamejdnhcphjbkeiagm"
+  opera="https://addons.opera.com/en/extensions/details/ublock/"
+  edge="https://www.microsoft.com/en-us/p/ublock-origin/9nblggh444l4"
 %}
 
 {% include cardv2.html
-title="Cookie AutoDelete: Automatically Delete Cookies"
-image="/assets/img/addons/cookie-autodelete.png"
-description="<strong>Cookie AutoDelete</strong> automatically removes cookies when they are no longer used by open browser tabs. With the cookies, lingering sessions, as well as information used to spy on you, will be expunged."
-website="https://addons.mozilla.org/firefox/addon/cookie-autodelete/"
-forum="https://forum.privacytools.io/t/discussion-cookie-autodelete/267"
-github="https://github.com/Cookie-AutoDelete/Cookie-AutoDelete"
-firefox="https://addons.mozilla.org/en-US/firefox/addon/cookie-autodelete"
-chrome="https://chrome.google.com/webstore/detail/cookie-autodelete/fhcgjolkccmbidfldomjliifgaodjagh"
+  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/firefox/addon/https-everywhere"
+  chrome="https://chrome.google.com/webstore/detail/https-everywhere/gcbommkclmclpchllfjekcdonpmejbdp"
+  opera="https://addons.opera.com/en/extensions/details/https-everywhere"
 %}
 
 {% include cardv2.html
-title="HTTPS Everywhere: Secure Connections"
-image="/assets/img/addons/https-everywhere.png"
-description="<strong>HTTPS Everywhere</strong> encrypts your communications with many major websites, making your browsing more secure. A collaboration between The Tor Project and the Electronic Frontier Foundation."
-website="https://www.eff.org/https-everywhere"
-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"
-chrome="https://chrome.google.com/webstore/detail/https-everywhere/gcbommkclmclpchllfjekcdonpmejbdp"
-opera="https://addons.opera.com/en/extensions/details/https-everywhere"
+  title="Decentraleyes: Block Content Delivery Networks"
+  image="/assets/img/svg/3rd-party/decentraleyes.svg"
+  description="<strong>Decentraleyes</strong> emulates Content Delivery Networks locally by intercepting requests, finding the required resource, and injecting it into the environment. This all happens instantaneously, automatically, and no prior configuration is required."
+  website="https://decentraleyes.org/"
+  privacy-policy="https://decentraleyes.org/privacy-policy/"
+  forum="https://forum.privacytools.io/t/discussion-decentraleyes/269"
+  gitlab="https://git.synz.io/Synzvato/decentraleyes"
+  firefox="https://addons.mozilla.org/firefox/addon/decentraleyes"
+  chrome="https://chrome.google.com/webstore/detail/decentraleyes/ldpochfccmkkmhdbclfhpagapcfdljkj"
+  opera="https://addons.opera.com/extensions/details/decentraleyes"
 %}
 
 {% include cardv2.html
-title="Decentraleyes: Block Content Delivery Networks"
-image="/assets/img/addons/decentraleyes.png"
-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/"
-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"
-chrome="https://chrome.google.com/webstore/detail/decentraleyes/ldpochfccmkkmhdbclfhpagapcfdljkj"
-opera="https://addons.opera.com/en/extensions/details/decentraleyes"
+  title="ClearURLs"
+  image="/assets/img/svg/3rd-party/clearurls.svg"
+  description="<strong>ClearURLs</strong> will automatically remove tracking elements from URLs to help protect your privacy when browse through the Internet."
+  website="https://gitlab.com/KevinRoebert/ClearUrls"
+  privacy-policy="https://gitlab.com/KevinRoebert/ClearUrls/-/blob/master/PRIVACY.md"
+  forum="https://forum.privacytools.io/t/discussion-clearurls/3353"
+  gitlab="https://gitlab.com/KevinRoebert/ClearUrls"
+  firefox="https://addons.mozilla.org/firefox/addon/clearurls/"
+  chrome="https://chrome.google.com/webstore/detail/clearurls/lckanjgmijmafbedllaakclkaicjfmnk"
+  edge="https://microsoftedge.microsoft.com/addons/detail/mdkdmaickkfdekbjdoojfalpbkgaddei"
+%}
+
+<h2>Additional Functionality</h2>
+
+<div class="alert alert-secondary" role="alert">
+  These add-ons don't necessarily add to your privacy when browsing the web, but add additional functionality to your browser you may find useful.
+</div>
+
+{% include cardv2.html
+  title="Terms of Service; Didn’t Read: Be Informed"
+  image="/assets/img/svg/3rd-party/terms_of_service_didnt_read.svg"
+  description='<strong>Terms of Service; Didn’t Read</strong> is an addon that believes "I have read and agree to the Terms of Service" is the biggest lie on the web, and wants to fix it by grading websites based on their terms of service agreements and privacy policies. It also gives short summaries of those agreements. The analysis and ratings are published transparently by a community of reviewers.'
+  website="https://tosdr.org/"
+  privacy-policy="https://addons.mozilla.org/firefox/addon/terms-of-service-didnt-read/privacy/"
+  forum="https://forum.privacytools.io/t/discussion-terms-of-service-didn-t-read/270"
+  github="https://github.com/tosdr/"
+  firefox="https://addons.mozilla.org/firefox/addon/terms-of-service-didnt-read/"
+  chrome="https://chrome.google.com/webstore/detail/terms-of-service-didn%E2%80%99t-r/hjdoplcnndgiblooccencgcggcoihigg"
+  opera="https://addons.opera.com/extensions/details/terms-of-service-didnt-read"
 %}
 
 {% include cardv2.html
-title="Terms of Service; Didn’t Read: Be Informed"
-image="/assets/img/addons/tosdr.png"
-description="<strong>Terms of Service; Didn’t Read</strong> is an addon that aims to fix how “I have read and agree to the Terms” is the biggest lie on the web 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 done transparently by a community of reviewers."
-website="https://tosdr.org/"
-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/"
-chrome="https://chrome.google.com/webstore/detail/terms-of-service-didn%E2%80%99t-r/hjdoplcnndgiblooccencgcggcoihigg"
-opera="https://addons.opera.com/en/extensions/details/terms-of-service-didnt-read"
+  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. <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"
+  firefox="https://addons.mozilla.org/firefox/addon/torproject-snowflake"
+  chrome="https://chrome.google.com/webstore/detail/snowflake/mafpmfcccpbjnhfhjnllmmalhifmlcie"
 %}
 
-{% include cardv2.html
-title="Snowflake"
-image="/assets/img/addons/snowflake.png"
-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."
-website="https://snowflake.torproject.org"
-forum="https://forum.privacytools.io/t/discussion-snowflake/1146"
-git="https://gitweb.torproject.org/pluggable-transports/snowflake.git"
-firefox="https://addons.mozilla.org/en-US/firefox/addon/torproject-snowflake"
-chrome="https://chrome.google.com/webstore/detail/snowflake/mafpmfcccpbjnhfhjnllmmalhifmlcie"
-%}
+<h2>Persistent storage management</h2>
 
-{% include cardv2.html
-title="Privacy Badger: Stop Tracking"
-image="/assets/img/addons/privacy-badger.png"
-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"
-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"
-chrome="https://chrome.google.com/webstore/detail/privacy-badger/pkehgijcmpdhfbdbbnkijodmdjhbjlgp"
-opera="https://addons.opera.com/en/extensions/details/privacy-badger/"
-%}
-
-<h2>For Power Users Only</h2>
+<h3>Desktop</h3>
 
 <div class="alert alert-warning" role="alert">
-  <strong>These addons require quite a lot of interaction from the user. Some sites will not work properly until you have configured the add-ons.</strong>
+  These add-ons are the preferred method for controlling persistent storage data that various websites and web-apps may create on your computer.
 </div>
 
 {% include cardv2.html
-title="uMatrix: Stop Cross-Site Requests"
-image="/assets/img/addons/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/"
-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"
-chrome="https://chrome.google.com/webstore/detail/umatrix/ogfcmafjalglgifnmanfmnieipoejdcf"
-opera="https://addons.opera.com/en/extensions/details/umatrix"
+  title="Temporary Containers"
+  image="/assets/img/svg/3rd-party/temporary_containers.svg"
+  image-dark="/assets/img/svg/3rd-party/temporary_containers-dark.svg"
+  description="<strong>Temporary Containers</strong> allow you to open tabs, websites, and links in automatically managed disposable containers. Containers isolate data websites store (cookies, storage, and more) from each other, enhancing your privacy and security while you browse: <a href=https://medium.com/@stoically/enhance-your-privacy-in-firefox-with-temporary-containers-33925cd6cd21>Enhance your privacy in Firefox with Temporary Containers.</a>"
+  website="https://addons.mozilla.org/firefox/addon/temporary-containers/"
+  privacy-policy="https://addons.mozilla.org/firefox/addon/temporary-containers/privacy/"
+  forum="https://forum.privacytools.io/t/discussion-temporary-containers-multi-account-containers/3354"
+  github="https://github.com/stoically/temporary-containers"
+  firefox="https://addons.mozilla.org/firefox/addon/temporary-containers/"
 %}
 
 {% include cardv2.html
-title="NoScript Security Suite: Be in total control"
-image="/assets/img/addons/noscript.png"
-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/"
-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"
-chrome="https://chrome.google.com/webstore/detail/noscript/doojmbjmlfjjnbmnoijecmcbfeoakpjm"
+  title="Firefox Multi-Account Containers"
+  image="/assets/img/svg/3rd-party/firefox_multi_account_containers.svg"
+  description="<strong>Firefox Multi-Account Containers</strong> allow you to create containers for specific websites. These containers are isolated from eachother. This add-on can be used in conjunctiuon with Temporary Containers to allow persistent logins to websites you specify."
+  website="https://support.mozilla.org/kb/containers"
+  forum="https://forum.privacytools.io/t/discussion-temporary-containers-multi-account-containers/3354"
+  github="https://github.com/mozilla/multi-account-containers"
+  firefox="https://addons.mozilla.org/firefox/addon/multi-account-containers/"
+%}
+
+<h3>Android</h3>
+
+<div class="alert alert-warning" role="alert">
+  Unfortunately the Android version of Firefox <a href="https://bugzilla.mozilla.org/show_bug.cgi?id=1398097">doesn't support managing tabs as containers</a>. The recommended extensions below are a substitute, however as APIs do not exist for clearing <a href="https://en.wikipedia.org/wiki/Indexed_Database_API">IndexedDB</a>, <a href="https://en.wikipedia.org/wiki/Progressive_web_application#Service_workers">Service Workers</a> cache, <a href="https://en.wikipedia.org/wiki/Progressive_web_application#AppCache_(obsolete)">appCache</a>, or cache by host. As a result they are not as good as the above Temporary Container suggestions.
+</div>
+
+{% include cardv2.html
+  title="ETag Stoppa"
+  image="/assets/img/svg/3rd-party/etag_stoppa.svg"
+  description="<strong>ETag Stoppa</strong> Prevents Firefox from storing entity tags by removing ETag response headers unconditionally and without exceptions."
+  website="https://addons.mozilla.org/firefox/addon/etag-stoppa/"
+  forum=""
+  github="https://github.com/claustromaniac/etag-stoppa"
+  firefox="https://addons.mozilla.org/firefox/addon/etag-stoppa/"
+%}
+
+{% include cardv2.html
+  title="Cookie AutoDelete: Automatically Delete Cookies"
+  image="/assets/img/png/3rd-party/cookie_autodelete.png"
+  description="<strong>Cookie AutoDelete</strong> automatically removes cookies, lingering sessions, and other information that can be used to spy on you when they are no longer used by open browser tabs."
+  website="https://addons.mozilla.org/firefox/addon/cookie-autodelete/"
+  forum="https://forum.privacytools.io/t/discussion-cookie-autodelete/267"
+  github="https://github.com/Cookie-AutoDelete/Cookie-AutoDelete"
+  firefox="https://addons.mozilla.org/firefox/addon/cookie-autodelete"
+  chrome="https://chrome.google.com/webstore/detail/cookie-autodelete/fhcgjolkccmbidfldomjliifgaodjagh"
+%}
+
+<h2>For Advanced Users</h2>
+
+<div class="alert alert-warning" role="alert">
+  These addons require quite a lot of interaction from the user, and some of them completely replace the add-ons we've recommended above. Some sites may not work properly without careful configuration.
+</div>
+
+{% include cardv2.html
+  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. uMatrix allows 1st party scripts in its default configuration. If you want the default functionality of NoScript consider <a href=https://github.com/gorhill/uMatrix/wiki/How-to-block-1st-party-scripts-everywhere-by-default>blocking 1st party scripts everywhere by default</a>."
+  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/firefox/addon/umatrix"
+  chrome="https://chrome.google.com/webstore/detail/umatrix/ogfcmafjalglgifnmanfmnieipoejdcf"
+  opera="https://addons.opera.com/extensions/details/umatrix"
+%}
+
+{% include cardv2.html
+  title="CanvasBlocker"
+  image="/assets/img/svg/3rd-party/canvasblocker.svg"
+  description="<strong>CanvasBlocker</strong> allows users to prevent websites from using some Javascript APIs to fingerprint them. Users can choose to block the APIs entirely on some or all websites (which may break some websites) or just block or fake its fingerprinting-friendly readout API."
+  website="https://github.com/kkapsner/CanvasBlocker/"
+  privacy-policy="https://addons.mozilla.org/firefox/addon/canvasblocker/privacy/"
+  forum="https://forum.privacytools.io/t/discussion-canvasblocker/3352"
+  github="https://github.com/kkapsner/CanvasBlocker/"
+  firefox="https://addons.mozilla.org/firefox/addon/canvasblocker/"
 %}

_includes/sections/browser-fingerprint.html

@@ -1,26 +1,20 @@
 <h1 id="fingerprint" class="anchor"><a href="#fingerprint"><i class="fas fa-link anchor-icon"></i></a> Browser Fingerprint - Is your browser configuration unique?</h1>
 
 <div class="alert alert-warning" role="alert">
-  <strong>Your Browser sends information that makes you unique amongst millions of users and therefore easy to identify.</strong>
+  Your Browser sends information that makes you unique amongst millions of users and therefore easy to identify.
 </div>
 
-<p>When you visit a web page, your browser voluntarily sends information about its configuration, such as available fonts, browser type, and add-ons. If this combination of information is unique, it may be possible to identify and track you without using cookies. EFF created a Tool called <a href="https://panopticlick.eff.org/">Panopticlick</a> to test your browser to see how unique it is.</p>
+<p>When you visit a web page, your browser voluntarily sends information about its configuration, such as available fonts, browser type, and add-ons. If this combination of information is unique, it may be possible to identify and track you without using cookies. EFF created a Tool called <a href="https://panopticlick.eff.org/" target="_blank">Panopticlick</a> to test your browser to see how unique it is.</p>
 
 <p>
-<a class="btn btn-warning" href="https://panopticlick.eff.org/">
+<a class="btn btn-warning" target="_blank" href="https://panopticlick.eff.org/">
   Test your Browser now
 </a>
 </p>
 
 <p>You need to find what <strong>most browsers</strong> are reporting, and then use those variables to bring your browser in the same population. This means having the same fonts, plugins, and extensions installed as the large installed base. You should have a <a href="https://addons.mozilla.org/firefox/addon/uaswitcher/">spoofed user-agent string</a> to match what the large userbase has. You need to have the same settings enabled and disabled, such as DNT and WebGL. You need your browser to look as common as everyone else. Disabling JavaScript, using Linux, or even using the Tor Browser Bundle, will make your browser stick out from the masses.</p>
 
-<p>Modern web browsers have not been architected to assure personal web privacy. Rather than worrying about being fingerprinted, it seems more practical to use <a href="#addons"><i class="fas fa-link"></i> free software plugins</a> like Privacy Badger and uBlock Origin. They not only respect your freedom, but your privacy also. You can get much further with these than trying to manipulate your browser's fingerprint.</p>
-
-
-<h3>Firefox Addon: CanvasBlocker</h3>
-<ul>
-	<li><a href="https://addons.mozilla.org/firefox/addon/canvasblocker/">addons.mozilla.org</a> - <strong>CanvasBlocker</strong> allows users to prevent websites from using some Javascript APIs to fingerprint them. Users can choose to block the APIs entirely on some or all websites (which may break some websites) or just block or fake its fingerprinting-friendly readout API.</li>
-</ul>
+<p>Modern web browsers have not been architected to assure personal web privacy. Rather than worrying about being fingerprinted, it seems more practical to use <a href="#addons"><i class="fas fa-link"></i> free software plugins</a> to regain control. They not only respect your freedom, but your privacy also. You can get much further with these than trying to manipulate your browser's fingerprint.</p>
 
 <h3>Related Information</h3>
 

_includes/sections/browser-recommendation.html

@@ -4,32 +4,34 @@
 </h1>
 
 {% include cardv2.html
-title="Firefox"
-image="/assets/img/tools/Firefox.png"
-description='Firefox is fast, reliable, open-source, and respects your privacy. Don\'t forget to adjust the settings according to our
-recommendations: <a href="#webrtc"><i class="fas fa-link"></i> WebRTC</a> and <a href="#about_config"><i class="fas fa-link"></i> about:config</a> and get the <a href="#addons"><i class="fas fa-link"></i> privacy add-ons</a>.'
-website="https://firefox.com"
-forum="https://forum.privacytools.io/t/discussion-firefox/279"
-source="https://hg.mozilla.org/mozilla-central/"
-windows="https://www.mozilla.org/firefox/windows/"
-mac="https://www.mozilla.org/firefox/mac/"
-linux="https://www.mozilla.org/firefox/linux/"
-freebsd="https://www.freshports.org/www/firefox"
-openbsd="http://openports.se/www/mozilla-firefox"
-netbsd="http://pkgsrc.se/www/firefox"
+  title="Firefox"
+  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/"
+  mac="https://www.mozilla.org/firefox/mac/"
+  linux="https://www.mozilla.org/firefox/linux/"
+  freebsd="https://www.freshports.org/www/firefox"
+  openbsd="http://openports.se/www/mozilla-firefox"
+  netbsd="http://pkgsrc.se/www/firefox"
 %}
 
 {% include cardv2.html
-title="Tor Browser - Provides Anonymity"
-image="/assets/img/tools/Tor-Browser.png"
-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/"
-tor="http://expyuzz4wqqyqhjn.onion/"
-forum="https://forum.privacytools.io/t/discussion-tor-browser/278"
-git="https://trac.torproject.org/projects/tor"
-windows="https://www.torproject.org/download/"
-mac="https://www.torproject.org/download/"
-linux="https://www.torproject.org/download/"
+  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"
+  windows="https://www.torproject.org/download/"
+  mac="https://www.torproject.org/download/"
+  linux="https://www.torproject.org/download/"
 %}
 
 <h1 id="browser-android" class="anchor">
@@ -38,40 +40,42 @@ linux="https://www.torproject.org/download/"
 </h1>
 
 {% include cardv2.html
-title="Firefox"
-image="/assets/img/tools/Firefox.png"
-description='Firefox is fast, reliable, open-source, and respects your privacy. Don\'t forget to adjust the settings according to our
-recommendations: <a href="#webrtc"><i class="fas fa-link"></i> WebRTC</a> and <a href="#about_config"><i class="fas fa-link"></i> about:config</a> and get the <a href="#addons"><i class="fas fa-link"></i> privacy add-ons</a>.'
-website="https://www.mozilla.org/en-US/firefox/mobile/"
-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/"
-googleplay="https://play.google.com/store/apps/details?id=org.mozilla.firefox"
-android="https://www.mozilla.org/firefox/all/#product-android-release"
+  title="Firefox"
+  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/"
+  googleplay="https://play.google.com/store/apps/details?id=org.mozilla.firefox"
+  android="https://www.mozilla.org/firefox/all/#product-android-release"
 %}
 
 {% include cardv2.html
-title="Tor Browser - Provides Anonymity"
-image="/assets/img/tools/Tor-Browser.png"
-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/"
-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/"
-android="https://www.torproject.org/download/#android"
-fdroid="https://guardianproject.info/fdroid/"
-googleplay="https://play.google.com/store/apps/details?id=org.torproject.torbrowser"
+  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/"
+  android="https://www.torproject.org/download/#android"
+  fdroid="https://guardianproject.info/fdroid/"
+  googleplay="https://play.google.com/store/apps/details?id=org.torproject.torbrowser"
 %}
 
 {% include cardv2.html
-title="Bromite"
-image="/assets/img/tools/bromite.png"
-description='Bromite is a Chromium-based browser with security enhancement patches from GrapheneOS and built-in adblocking and DNS over HTTPS support. More info can be found <a href="https://www.bromite.org/#main-features">here</a>.'
-website="https://www.bromite.org/"
-forum="https://forum.privacytools.io/t/discussion-bromite-browsers/1521"
-github="https://github.com/bromite/bromite"
-fdroid="https://www.bromite.org/fdroid"
-android="https://www.bromite.org/#download-bromite"
+  title="Bromite"
+  image="/assets/img/svg/3rd-party/bromite.svg"
+  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"
+  fdroid="https://www.bromite.org/fdroid"
+  android="https://www.bromite.org/#download-bromite"
 %}
 
 <h3>Worth Mentioning for Android</h3>
@@ -79,13 +83,14 @@ android="https://www.bromite.org/#download-bromite"
 <ul>
   <li>
     <a href="https://www.stoutner.com/privacy-browser/">Privacy Browser</a>
-   - An open-source web browser focused on user privacy. Features include integrated ad blocking with <a href="https://easylist.to/">EasyList</a>, <a href="https://www.stoutner.com/privacy-browser-2-5/">SSL certificate pinning</a>, and <a href='https://guardianproject.info/apps/orbot/'>Tor Orbot proxy support.</a>
-    <a href="https://play.google.com/store/apps/details?id=com.google.android.webview&hl=en_US">
-      <span class="badge badge-warning" data-toggle="tooltip" title="Privacy Browser relies on the Android System WebView which needs to be kept up to date to fix security issues. One can update WebView by either installing it from Google Play or Aurora Store which you can get from F-Droid.">
-        <span class="fas fa-exclamation-triangle"></span>
-        Keep Android WebView up-to-date
-      </span>
-    </a>
+    - An open-source web browser focused on user privacy. Features include integrated ad blocking with <a href="https://easylist.to/">EasyList</a>, <a href="https://www.stoutner.com/privacy-browser-2-5/">SSL certificate pinning</a>, and <a href='https://guardianproject.info/apps/orbot/'>Tor Orbot proxy support.</a>
+    {% include badge.html
+    color="warning"
+    icon="fas fa-exclamation-triangle"
+    link="https://play.google.com/store/apps/details?id=com.google.android.webview"
+    tooltip="Privacy Browser relies on the Android System WebView which needs to be kept up to date to fix security issues. One can update WebView by either installing it from Google Play or Aurora Store which you can get from F-Droid."
+    text="Keep WebView up-to-date"
+    %}
   </li>
 </ul>
 
@@ -93,36 +98,39 @@ android="https://www.bromite.org/#download-bromite"
 <h1 id="browser-ios" class="anchor"><a href="#browser-ios"><i class="fas fa-link anchor-icon"></i></a> Browser Recommendations For iOS</h1>
 
 {% include cardv2.html
-title="Firefox"
-image="/assets/img/tools/Firefox.png"
-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/"
-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"
+  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"
 %}
 
 
 {% include cardv2.html
-title="Onion Browser"
-image="/assets/img/tools/onionbrowser.png"
-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/"
-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"
+  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"
 %}
 
 
 {% include cardv2.html
-title="DuckDuckGo Privacy Browser"
-image="/assets/img/provider/DuckDuckGo.png"
-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"
-tor="https://3g2upl4pq6kufc4m.onion/app"
-forum="https://forum.privacytools.io/t/discussion-duckduckgo-privacy-browser-browsers/1524"
-github="https://github.com/duckduckgo/iOS"
-ios="https://apps.apple.com/us/app/duckduckgo-privacy-browser/id663592361"
+  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"
+  ios="https://apps.apple.com/us/app/duckduckgo-privacy-browser/id663592361"
 %}
 
 <h3>Worth Mentioning for iOS</h3>

_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

@@ -1,10 +1,10 @@
 <h1 id="webrtc" class="anchor"><a href="#webrtc"><i class="fas fa-link anchor-icon"></i></a> WebRTC IP Leak Test - Is your IP address leaking?</h1>
 
 <div class="alert alert-danger" role="alert">
-  <strong>WebRTC is a new communication protocol that relies on JavaScript that can leak your actual IP address from behind your VPN.</strong>
+  WebRTC is a new communication protocol that relies on JavaScript that can leak your actual IP address from behind your VPN.
 </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

@@ -7,9 +7,10 @@
 {%
   include cardv2.html
   title="Nextcloud"
-  image="/assets/img/provider/Nextcloud.png"
+  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/"
@@ -22,20 +23,13 @@
   ios="https://nextcloud.com/install/"
 %}
 
-{%
-  include cardv2.html
-  title="Email Providers"
-  image="/assets/img/misc/email.png"
-  description='Many email providers also offer calendar and or contacts sync services. Refer to the <a href="/providers/email">Email Providers section</a> to choose an email provider and check if they also offer calendar and/or contacts sync.'
-  website="/providers/email"
-%}
-
 {%
   include cardv2.html
   title="EteSync"
-  image="/assets/img/provider/etesync.png"
+  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/"
@@ -50,6 +44,14 @@
   ios="https://www.etesync.com/install/ios/"
 %}
 
+{%
+  include cardv2.html
+  title="Email Providers"
+  image="/assets/img/svg/layout/email.svg"
+  description='Many email providers also offer calendar and or contacts sync services. Refer to our <a href="/providers/email">Email Provider recommendations</a> to choose an email provider and see if they also offer calendar and/or contacts sync.'
+  website="/providers/email"
+%}
+
 <h3>Worth Mentioning</h3>
 
 <ul>
@@ -58,6 +60,10 @@
   </li>
 
   <li>
-    <a href="../cloud">cloud backups</a> - Consider regularly exporting your calendar and or contacts and backing them up on a separate storage drive or uploading them to cloud storage (ideally after <a href="../encryption-tools/">encrypting</a> them).
+    <a href="../cloud">Cloud backups</a> - Consider regularly exporting your calendar and or contacts and backing them up on a separate storage drive or uploading them to cloud storage (ideally after <a href="../encryption-tools/">encrypting</a> them).
+  </li>
+
+  <li>
+    <a href="https://github.com/39aldo39/DecSync">DecSync</a> - DecSync can be used to synchronize RSS, contacts, and calendars without a server by using file synchronization software such as <a href="https://syncthing.net/">Syncthing</a>.
   </li>
 </ul>

_includes/sections/cloud-storage.html

@@ -5,27 +5,48 @@
 </div>
 
 {% include cardv2.html
-title="Nextcloud - Choose your hoster"
-image="/assets/img/provider/Nextcloud.png"
-description="Nextcloud is similar in functionality to the widely-used Dropbox, with the difference being that Nextcloud is free and open-source, thereby allowing anyone to install and operate it without charge on a private server, with no limits on storage space or the number of connected clients."
-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="color==warning::link==https://github.com/nextcloud/end_to_end_encryption/issues/111::text==Experimental E2EE::tooltip==Regarding E2EE their description states 'End-to-end encryption is still in alpha state, don't use this in production and only with test data!'."
+  website="https://nextcloud.com/"
+  privacy-policy="https://nextcloud.com/privacy/"
+  forum="https://forum.privacytools.io/t/discussion-nextcloud/287"
+  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="Keybase KBFS"
+  image="/assets/img/svg/3rd-party/keybase.svg"
+  description='Keybase provides 250GB of E2EE cloud storage for free. 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 allows you to share files with any Keybase user, or social media user through the use of "<a href="https://en.wikipedia.org/wiki/Keybase#Identity_proofs">identity proofs</a>". They currently do not offer additional space above your quota.'
+  labels="color==warning::link==https://github.com/keybase/client/issues/6374::text==Warning::tooltip==This software relies on a closed-source central server.| color==info::link==https://github.com/privacytools/privacytools.io/issues/1894::text==Ownership change::tooltip==Keybase has recently been acquired by Zoom."
+  website="https://book.keybase.io/docs/files"
+  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/client/tree/master/go/kbfs"
+  windows="https://keybase.io/docs/the_app/install_windows"
+  mac="https://keybase.io/docs/the_app/install_macos"
+  linux="https://keybase.io/docs/the_app/install_linux"
+  freebsd="https://www.freshports.org/security/keybase/"
+  googleplay="https://play.google.com/store/apps/details?id=io.keybase.ossifrage"
+  ios="https://apps.apple.com/app/keybase-crypto-for-everyone/id1044461770"
 %}
 
 
 <h3>Worth Mentioning</h3>
 
 <ul>
-  <li><a href="https://cryptomator.org/">Cryptomator</a> - Free client-side AES encryption for your cloud files. Open source software: No backdoors, no registration. <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://cryptomator.org/">Cryptomator</a> - Free client-side AES encryption for your cloud files. Open source software: No backdoors, no registration. {% include badge.html color="warning" tooltip="Cryptomator's mobile apps are not open-source." link="https://github.com/cryptomator/cryptomator-android/issues/1#issuecomment-257979375" icon="fas fa-exclamation-triangle" %}</li>
   <li><a href="https://cryptpad.fr">CryptPad</a> - Free and end-to-end encrypted real time collaboration sharing folders, media, and documents.</li>
 </ul>

_includes/sections/dns.html

@@ -1,44 +1,14 @@
-<h1 id="dns" class="anchor"><a href="#dns"><i class="fas fa-link anchor-icon"></i></a> Domain Name System (DNS)</h1>
-
-{%
-  include cardv2.html
-  title="Njalla - Domain Registration"
-  image="/assets/img/provider/Njalla.png"
-  description="Njalla is a privacy-aware domain registration service based in Nevis that only needs your email or XMPP address in order to register a domain name for you. It is created by people from The Pirate Bay and IPredator VPN. Accepted payments: Bitcoin, Litecoin, Monero, DASH, Bitcoin Cash and PayPal."
-  website="https://njal.la/"
-  tor="http://njalladnspotetti.onion"
-  forum="https://forum.privacytools.io/t/discussion-njalla/339"
-%}
-
-{%
-  include cardv2.html
-  title="DNSCrypt-Proxy - Tool"
-  image="/assets/img/tools/DNSCrypt-Proxy.png"
-  description="DNSCrypt-Proxy is a command-line DNS proxy with support for the encrypted DNS protocols, DNS over HTTPS and DNSCrypt. Can cache results to improve speed, and allows filtering, forwarding, and cloaking."
-  website="https://github.com/jedisct1/dnscrypt-proxy/"
-  forum="https://forum.privacytools.io/t/discussion-dnscrypt-proxy/1498"
-  github="https://github.com/jedisct1/dnscrypt-proxy/"
-  windows="https://github.com/jedisct1/dnscrypt-proxy/releases"
-  linux=""
-  mac="https://github.com/jedisct1/dnscrypt-proxy/releases"
-  freebsd="https://www.freshports.org/dns/dnscrypt-proxy2/"
-  openbsd="http://openports.se/net/dnscrypt-proxy"
-  netbsd="http://pkgsrc.se/net/dnscrypt-proxy2"
-  android=""
-  ios=""
-%}
-
-<h1 id="icanndns" class="anchor"><a href="#icanndns"><i class="fas fa-link anchor-icon"></i></a> Encrypted ICANN DNS Providers</h1>
+<h1 id="dns" class="anchor"><a href="#dns"><i class="fas fa-link anchor-icon"></i></a> Encrypted Domain Name System (DNS) Resolvers</h1>
 
 <div class="alert alert-warning" role="alert">
-  <strong>Note: Using an encrypted DNS resolver will not make you anonymous, nor hide your internet traffic from your Internet Service Provider. But it will prevent DNS hijacking, and make your DNS requests harder for third parties to eavesdrop on and tamper with. If you are currently using Google's DNS resolver, you should pick an alternative here.</strong>
+  <strong>Note: Using an encrypted DNS resolver will not make you anonymous, nor hide your internet traffic from your Internet Service Provider. But, it will prevent DNS hijacking, and make your DNS requests harder for third parties to eavesdrop on and tamper with. If you are currently using Google's DNS resolver, you should pick an alternative here.</strong>
 </div>
 
 <div class="table-responsive">
   <table class="table sortable-theme-bootstrap" data-sortable>
     <thead>
       <tr>
-        <th data-sorted="true" data-sorted-direction="ascending">ICANN DNS Provider</th>
+        <th data-sorted="true" data-sorted-direction="ascending">DNS Provider</th>
         <th data-sortable="true">Server Locations</th>
         <th data-sortable="false">Privacy Policy</th>
         <th data-sortable="true">Type</th>
@@ -63,8 +33,10 @@
           </span>
         </td>
         <td>
-          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://adguard.com/en/privacy/dns.html" href="https://adguard.com/en/privacy/dns.html">
-            <img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35">
+          <a
+            class="btn-secondary btn-icon"
+            href="https://adguard.com/en/privacy/dns.html">
+            <span class="fas fa-globe"></span>
           </a>
         </td>
         <td>Commercial</td>
@@ -81,8 +53,10 @@
           </span>
         </td>
         <td>
-          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://github.com/AdguardTeam/AdGuardDNS/" href="https://github.com/AdguardTeam/AdGuardDNS/">
-            <img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35">
+          <a
+            class="btn-secondary btn-icon"
+            href="https://github.com/AdguardTeam/AdGuardDNS/">
+            <span class="fas fa-globe"></span>
           </a>
         </td>
         <td>
@@ -111,9 +85,13 @@
           </span>
         </td>
         <td>
-          <a data-toggle="tooltip" data-placement="bottom" data-original-title='"No logs."'>
-            <img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35">
-          </a>
+          <div
+            class="btn-secondary btn-icon"
+            title="&quot;No logs.&quot;"
+            data-toggle="tooltip"
+            data-placement="bottom">
+            <span class="fas fa-globe"></span>
+          </div>
         </td>
         <td>Hobby Project</td>
         <td>No</td>
@@ -134,12 +112,19 @@
           </span>
           <span class="no-text-wrap">
             malicious domains
-            <span class="badge badge-warning" data-toggle="tooltip" data-original-title="And some wildcard and IDN domains."><a href="https://github.com/ookangzheng/blahdns#default-blocked-wildcard-domain"><i class="fas fa-exclamation-triangle"></i></a></span>
+            {% include badge.html
+            link="https://github.com/ookangzheng/blahdns#default-blocked-wildcard-domain"
+            color="warning"
+            icon="fas fa-exclamation-triangle"
+            tooltip="And some wildcard and IDN domains."
+            %}
           </span>
         </td>
         <td>
-          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://github.com/ookangzheng/blahdns/" href="https://github.com/ookangzheng/blahdns/">
-            <img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35">
+          <a
+            class="btn-secondary btn-icon"
+            href="https://github.com/ookangzheng/blahdns/">
+            <span class="fas fa-globe"></span>
           </a>
         </td>
         <td>
@@ -157,7 +142,13 @@
 
       <tr>
         <td data-value="Cloudflare">
-          <a href="https://developers.cloudflare.com/1.1.1.1/setting-up-1.1.1.1/">Cloudflare</a> <span class="badge badge-warning" data-toggle="tooltip" title="Cloudflare is one of the world's largest networks, and a problem considering anonymity and decentralization."><a href="https://codeberg.org/crimeflare/cloudflare-tor/"><i class="fas fa-exclamation-triangle"></i></a></span>
+          <a href="https://developers.cloudflare.com/1.1.1.1/setting-up-1.1.1.1/">Cloudflare</a>
+          {% include badge.html
+          link="https://codeberg.org/crimeflare/cloudflare-tor/"
+          color="warning"
+          icon="fas fa-exclamation-triangle"
+          tooltip="Cloudflare is one of the world's largest networks, and a problem considering anonymity and decentralization."
+          %}
         </td>
         <td>Anycast (based in
           <span class="no-text-wrap">
@@ -166,13 +157,15 @@
           </span>
         </td>
         <td>
-          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://www.cloudflare.com/privacypolicy/" href="https://www.cloudflare.com/privacypolicy/">
-            <img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35">
+          <a
+            class="btn-secondary btn-icon"
+            href="https://www.cloudflare.com/privacypolicy/">
+            <span class="fas fa-globe"></span>
           </a>
         </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,8 +184,12 @@
           </span>
         </td>
         <td>
-          <a data-toggle="tooltip" data-placement="bottom" data-original-title='"CZ.NIC resolvers neither collect any personal data nor gather information on pages where your computer sends personal data."'>
-            <img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35">
+          <div
+            class="btn-secondary btn-icon"
+            title="&quot;CZ.NIC resolvers neither collect any personal data nor gather information on pages where your computer sends personal data.&quot;"
+            data-toggle="tooltip"
+            data-placement="bottom">
+            <span class="fas fa-globe"></span>
           </a>
         </td>
         <td><a data-toggle="tooltip" data-placement="bottom" data-original-title='"CZ.NIC is an interest association of legal entities, founded in 1998 by leading providers of Internet services."' href="https://www.nic.cz/page/351/about-association/">Association</a></td>
@@ -205,47 +202,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 data-toggle="tooltip" data-placement="bottom" data-original-title="https://github.com/bhanupratapys/dnswarden/blob/master/README.md#privacy-policy-and-tc" href="https://github.com/bhanupratapys/dnswarden/blob/master/README.md#privacy-policy-and-tc">
-            <img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35">
-          </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>
@@ -257,8 +213,10 @@
           </span>
         </td>
         <td>
-          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://appliedprivacy.net/privacy-policy" href="https://appliedprivacy.net/privacy-policy">
-            <img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35">
+          <a
+            class="btn-secondary btn-icon"
+            href="https://appliedprivacy.net/privacy-policy">
+            <span class="fas fa-globe"></span>
           </a>
         </td>
         <td>Non-Profit</td>
@@ -293,8 +251,10 @@
           </span>
         </td>
         <td>
-          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://www.nextdns.io/privacy" href="https://www.nextdns.io/privacy">
-            <img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35">
+          <a
+            class="btn-secondary btn-icon"
+            href="https://www.nextdns.io/privacy">
+            <span class="fas fa-globe"></span>
           </a>
         </td>
         <td>Commercial</td>
@@ -333,8 +293,10 @@
           </span>
         </td>
         <td>
-          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://nixnet.xyz/privacy/" href="https://nixnet.xyz/privacy/">
-            <img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35">
+          <a
+            class="btn-secondary btn-icon"
+            href="https://nixnet.xyz/privacy/">
+            <span class="fas fa-globe"></span>
           </a>
         </td>
         <td>
@@ -352,8 +314,10 @@
           </span>
         </td>
         <td>
-          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://git.nixnet.xyz/NixNet/dns" href="https://git.nixnet.xyz/NixNet/dns">
-            <img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35">
+          <a
+            class="btn-secondary btn-icon"
+            href="https://git.nixnet.xyz/NixNet/dns">
+            <span class="fas fa-globe"></span>
           </a>
         </td>
         <td>
@@ -374,8 +338,10 @@
           </span>
         </td>
         <td>
-          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://powerdns.org/doh/privacy.html" href="https://powerdns.org/doh/privacy.html">
-            <img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35">
+          <a
+            class="btn-secondary btn-icon"
+            href="https://powerdns.org/doh/privacy.html">
+            <span class="fas fa-globe"></span>
           </a>
         </td>
         <td>Hobby Project</td>
@@ -385,8 +351,10 @@
         <td>No</td>
         <td>No</td>
         <td>
-          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://github.com/PowerDNS/pdns" href="https://github.com/PowerDNS/pdns">
-            <img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35">
+          <a
+            class="btn-secondary btn-icon"
+            href="https://github.com/PowerDNS/pdns">
+            <span class="fas fa-globe"></span>
           </a>
         </td>
         <td>
@@ -398,7 +366,12 @@
 
       <tr>
         <td data-value="Quad9">
-          <a href="https://quad9.net/">Quad9</a> <span class="badge badge-warning" data-toggle="tooltip" title="Founders include the Global Cyber Alliance, composed of the City of London Police and Manhattan District Attorney's Office"><i class="fas fa-exclamation-triangle"></i></span>
+          <a href="https://quad9.net/">Quad9</a>
+          {% include badge.html
+          color="warning"
+          icon="fas fa-exclamation-triangle"
+          tooltip="Founders include the Global Cyber Alliance, composed of the City of London Police and Manhattan District Attorney's Office."
+          %}
         </td>
         <td>Anycast (based in
           <span class="no-text-wrap">
@@ -407,8 +380,10 @@
           </span>
         </td>
         <td>
-          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://quad9.net/policy/" href="https://quad9.net/policy/">
-            <img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35">
+          <a
+            class="btn-secondary btn-icon"
+            href="https://quad9.net/policy/">
+            <span class="fas fa-globe"></span>
           </a>
         </td>
         <td>Non-Profit</td>
@@ -430,39 +405,6 @@
         </td>
       </tr>
 
-      <tr>
-        <td data-value="SecureDNS">
-          <a href="https://securedns.eu/">SecureDNS</a>
-        </td>
-        <td>
-          <span class="no-text-wrap">
-            <span class="flag-icon flag-icon-nl"></span>
-            The Netherlands
-          </span>
-        </td>
-        <td>
-          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://securedns.eu/#privacy" href="https://securedns.eu/#privacy">
-            <img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35">
-          </a>
-        </td>
-        <td>Hobby Project</td>
-        <td>No</td>
-        <td>DoH, DoT, 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.digitalocean.com/">DigitalOcean, Inc.</a>
-          </span>
-        </td>
-      </tr>
-
       <tr>
         <td data-value="Snopyta">
           <a href="https://snopyta.org/service/dns/index.html">Snopyta</a>
@@ -474,12 +416,14 @@
           </span>
         </td>
         <td>
-          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://snopyta.org/privacy_policy/" href="https://snopyta.org/privacy_policy/">
-            <img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35">
+          <a
+            class="btn-secondary btn-icon"
+            href="https://snopyta.org/privacy_policy/">
+            <span class="fas fa-globe"></span>
           </a>
         </td>
         <td>
-          <a data-toggle="tooltip" data-placement="bottom" data-original-title='Part of LibreHosters, "a network of cooperation and solidarity that uses free software to encourage decentralisation through federation and distributed platforms."' href="https://libreho.st/">
+          <a data-toggle="tooltip" data-placement="bottom" data-original-title="Part of LibreHosters, &quot;a network of cooperation and solidarity that uses free software to encourage decentralisation through federation and distributed platforms.&quot;" href="https://libreho.st/">
             Informal collective
           </a>
         </td>
@@ -521,9 +465,13 @@
           </span>
         </td>
         <td>
-          <a data-toggle="tooltip" data-placement="bottom" data-original-title='"Absolutely nothing is being logged, neither about the users nor the usage of this service. I do keep graphs of the total number of queries, but no personally identifiable information is saved. The data that is saved will never be sold or used for anything except capacity planning of the service."'>
-            <img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35">
-          </a>
+          <div
+            class="btn-secondary btn-icon"
+            title="&quot;Absolutely nothing is being logged, neither about the users nor the usage of this service. I do keep graphs of the total number of queries, but no personally identifiable information is saved. The data that is saved will never be sold or used for anything except capacity planning of the service.&quot;"
+            data-toggle="tooltip"
+            data-placement="bottom">
+            <span class="fas fa-globe"></span>
+          </div>
         </td>
         <td>Hobby Project</td>
         <td>No</td>
@@ -542,82 +490,3 @@
     </tbody>
   </table>
 </div>
-
-<h4>Terms</h4>
-
-<ul>
-  <li>DNS-over-TLS (DoT) - A security protocol for encrypted DNS on a dedicated port 853. Some providers support port 443 which generally works everywhere while port 853 is often blocked by restrictive firewalls. DoT has two modes:</li>
-    <ul>
-        <li>Oppurtunistic mode: the client attempts to form a DNS-over-TLS connection to the server on port 853 without performing certificate validation. If it fails, it will use unencrypted DNS. <span class="badge badge-warning" data-toggle="tooltip" data-original-title="In other words automatic mode leaves your DNS traffic vulnerable to SSL strip and MITM attacks"><i class="fas fa-exclamation-triangle"></i></span></li>
-        <li>Strict mode: the client connects to a specific hostname and performs certificate validation for it. If it fails, no DNS queries are made until it succeeds.</li>
-    </ul>
-  <li>DNS-over-HTTPS (DoH) - Similar to DoT, but uses HTTPS instead, being indistinguishable from "normal" HTTPS traffic on port 443. <span class="badge badge-warning" data-toggle="tooltip" data-original-title="DoH contains metadata such as user-agent (which may include system information) that is sent to the DNS server."><a href="https://tools.ietf.org/html/rfc8484#section-8.2"><i class="fas fa-exclamation-triangle"></i></a></span></li>
-  <li>DNSCrypt - An older yet robust method of encrypting DNS.</li>
-</ul>
-
-<h4>How to verify DNS is encrypted</h4>
-
-<ul>
-  <li>DoH / DoT
-    <ul>
-      <li>Check <a href="https://www.dnsleaktest.com/">DNSLeakTest.com</a>. <span class="badge badge-warning" data-toggle="tooltip" data-placement="bottom" data-original-title="Your DNS provider may not appear with their own name, so compare the responses to what you know or can find about your DNS provider. Just ensure you don't see your ISP or old unencrypted DNS provider."><i class="fas fa-exclamation-triangle"></i></span></li>
-      <li>Check the website of your DNS provider. They may have a page for telling "you are using our DNS." Examples include <a href="https://adguard.com/en/adguard-dns/overview.html">AdGuard</a> and <a href="https://1.1.1.1/help">Cloudflare</a>.</li>
-      <li>If using Firefox's trusted recursive resolver (TRR), navigate to <code>about:networking#dns</code>. If the TRR column says "true" for some fields, you are using DoH. <span class="badge badge-warning" data-toggle="tooltip" data-placement="bottom" data-original-title='Some fields will say "false" depending on the the value of network.trr.mode in about:config'><a href="https://wiki.mozilla.org/Trusted_Recursive_Resolver"><i class="fas fa-exclamation-triangle"></i></a></span></li>
-    </ul>
-  </li>
-  <li>dnscrypt-proxy - Check <a href="https://github.com/jedisct1/dnscrypt-proxy/wiki/Checking">dnscrypt-proxy's wiki on how to verify that your DNS is encrypted</a>.</li>
-  <li>DNSSEC - Check <a href="https://dnssec.vs.uni-due.de/">DNSSEC Resolver Test by Matthäus Wander</a>.</li>
-  <li>QNAME Minimization - Run <code>dig +short txt qnamemintest.internet.nl</code> from the command-line (taken from <a href="https://nlnetlabs.nl/downloads/presentations/unbound_qnamemin_oarc24.pdf">this NLnet Labs presentation</a>). If you are on Windows 10, run <code>Resolve-DnsName -Type TXT -Name qnamemintest.internet.nl</code> from the PowerShell. You should see this display: <code>"HOORAY - QNAME minimisation is enabled on your resolver :)!"</code></li>
-</ul>
-
-<h3 id="clients">Worth Mentioning and Additional Information</h3>
-
-<ul>
-  <li><strong>Encrypted DNS clients for desktop:</strong>
-    <ul>
-      <li><em>Firefox</em> comes with built-in DoH support with Cloudflare set as the default resolver, but can be configured to use any DoH resolver. <span class="badge badge-warning" data-toggle="tooltip" data-placement="bottom" data-original-title='"Cloudflare has agreed to collect only a limited amount of data about the DNS requests that are sent to the Cloudflare Resolver for Firefox via the Firefox browser."'><a href="https://developers.cloudflare.com/1.1.1.1/commitment-to-privacy/privacy-policy/firefox/"><i class="fas fa-exclamation-triangle"></i></a></span> Currently Mozilla is <a href="https://blog.mozilla.org/futurereleases/2019/07/31/dns-over-https-doh-update-detecting-managed-networks-and-user-choice/">conducting studies</a> before enabling DoH by default for all US-based Firefox users.</li>
-          <ul>
-              <li>DNS over HTTPS can be enabled in Menu -> Preferences (<code>about:preferences</code>) -> Network Settings -> Enable DNS over HTTPS. Set "Use Provider" to "Custom", and enter your DoH provider's address.</li>
-              <li>Advanced users may enable it in <code>about:config</code> by setting <code>network.trr.custom_uri</code> and <code>network.trr.uri</code> as the address you find from the documentation of your DoH provider and <code>network.trr.mode</code> as <code>2</code>. It may also be desirable to set <code>network.security.esni.enabled</code> to <code>True</code> in order to enable encrypted SNI and make sites supporting ESNI a bit more difficult to track.</li>
-          </ul>
-    </ul>
-  </li>
-  <li><strong>Encrypted DNS clients for mobile:</strong>
-    <ul>
-      <li><em>Android 9</em> comes with a DoT client by <a href="https://support.google.com/android/answer/9089903">default</a>. <span class="badge badge-warning" data-toggle="tooltip" data-original-title="...but with some caveats"><a href="https://www.quad9.net/private-dns-quad9-android9/"><i class="fas fa-exclamation-triangle"></i></a></span></li>
-        <ul>
-          <li>We recommend selecting <em>Private DNS provider hostname</em> and entering the DoT address from documentation of your DoT provider to enable strict mode (see Terms above). <span class="badge badge-warning" data-toggle="tooltip" data-original-title="If you are on a network blocking access to port 853, Android will error about the network not having internet connectivity."><i class="fas fa-exclamation-triangle"></i></span></li>
-        </ul>
-      <li><em><a href="https://apps.apple.com/app/id1452162351">DNSCloak</a></em> - An <a href="https://github.com/s-s/dnscloak">open-source</a> DNSCrypt and DoH client for iOS by <td><a data-toggle="tooltip" data-placement="bottom" data-original-title='"A charitable non-profit host organization for international Free Software projects."' href="https://techcultivation.org/">the Center for the Cultivation of Technology gemeinnuetzige GmbH</a>.</li>
-      <li><em><a href="https://git.frostnerd.com/PublicAndroidApps/smokescreen/blob/master/README.md">Nebulo</a></em> - An open-source application for Android supporting DoH and DoT. It also supports caching DNS responses and locally logging DNS queries.</li>
-    </ul>
-  </li>
-  <li><strong>Local DNS servers:</strong>
-    <ul>
-      <li><em><a href="https://dnsprivacy.org/wiki/display/DP/DNS+Privacy+Daemon+-+Stubby">Stubby</a></em> - An open-source application for Linux, macOS, and Windows that acts as a local DNS Privacy stub resolver using DoT.</li>
-      <li><em><a href="https://nlnetlabs.nl/projects/unbound/about/">Unbound</a></em> - a validating, recursive, caching DNS resolver. It can also be ran network-wide and has supported DNS-over-TLS since version 1.7.3.</li>
-      <ul>
-          <li>See also <a href="https://www.ctrl.blog/entry/unbound-tls-forwarding.html">Actually secure DNS over TLS in Unbound on ctrl.blog</a>.</li>
-      </ul>
-    </ul>
-  </li>
-  <li><strong>Network wide DNS servers:</strong>
-    <ul>
-      <li><em><a href="https://pi-hole.net/">Pi-hole</a></em> - A network-wide DNS server mainly for the Raspberry Pi. Blocks ads, tracking, and malicious domains for all devices on your network.</li>
-      <li><em><a href="https://gitlab.com/quidsup/notrack">NoTrack</a></em> - A network-wide DNS server like Pi-hole for blocking ads, tracking, and malicious domains.</li>
-    </ul>
-  </li>
-  <li><strong>Further reading:</strong>
-    <ul>
-      <li>On Firefox, DoH and ESNI</li>
-          <ul>
-              <li><a href="https://wiki.mozilla.org/Trusted_Recursive_Resolver">Trusted Recursive Resolver (DoH) on MozillaWiki</a></li>
-              <li><a href="https://bugzilla.mozilla.org/show_bug.cgi?id=1500289">Firefox bug report requesting the ability to use ESNI without DoH</a></li>
-              <li><a href="https://bugzilla.mozilla.org/show_bug.cgi?id=1542754">Firefox bug report requesting the ability to use Android 9+'s Private DNS (DoT) and benefit from encrypted SNI without having to enable DoH</a></li>
-              <li><a href="https://blog.cloudflare.com/encrypted-sni/">Encrypt it or lose it: how encrypted SNI works on Cloudflare blog</a></li>
-          </ul>
-      <li><a href="https://www.isc.org/blogs/qname-minimization-and-privacy/">QNAME Minimization and Your Privacy</a> by the Internet Systems Consortium (ISC)</li>
-      <li><a href="https://www.isc.org/dnssec/">DNSSEC and BIND 9</a> by the ISC</li>
-    </ul>
-  </li>
-</ul>

_includes/sections/email-alternatives.html

@@ -1,34 +0,0 @@
-<h1 id="messaging" class="anchor"><a href="#messaging"><i class="fas fa-link anchor-icon"></i></a> Email Alternatives</h1>
-
-{% include cardv2.html
-title="Bitmessage"
-image="/assets/img/tools/Bitmessage.png"
-description="Bitmessage is a P2P communications protocol used to send encrypted messages to another person or to many subscribers. It is decentralized and trustless,
-meaning that you need not inherently trust any entities like root certificate authorities. It uses strong authentication which means that the sender of a message cannot be spoofed, and it aims to hide \"non-content\" data."
-website="https://bitmessage.org/"
-forum="https://forum.privacytools.io/t/discussion-bitmessage/661"
-github="https://github.com/Bitmessage/PyBitmessage"
-windows="https://github.com/Bitmessage/PyBitmessage/releases"
-mac="https://github.com/Bitmessage/PyBitmessage/releases"
-linux="https://repology.org/project/pybitmessage/versions"
-%}
-
-{% include cardv2.html
-title="RetroShare"
-image="/assets/img/tools/RetroShare.png"
-description="Retroshare creates encrypted connections to your friends. Nobody can spy on you. Retroshare is completely decentralized. This means there are no central servers. It is entirely open-source and free. There are no costs, no ads, and no Terms of Service."
-website="https://retroshare.cc/"
-forum="https://forum.privacytools.io/t/discussion-retroshare/662"
-github="https://github.com/RetroShare/RetroShare"
-windows="https://retroshare.cc/downloads.html#windows"
-mac="https://retroshare.cc/downloads.html#mac"
-linux="https://retroshare.cc/downloads.html#gnulinux"
-freebsd="https://retroshare.cc/downloads.html#freebsd"
-%}
-
-
-<h3>Worth Mentioning</h3>
-
-<ul>
-  <li><a href="https://i2pbote.xyz/">I2P-Bote</a> - End-to-end encrypted decentralized mail system within the I2P network.</li>
-</ul>

_includes/sections/email-clients.html

@@ -1,33 +1,34 @@
 <h1 id="clients" class="anchor"><a href="#clients"><i class="fas fa-link anchor-icon"></i></a> Email Clients</h1>
 
 {% include cardv2.html
-title="Thunderbird"
-image="/assets/img/tools/Thunderbird.png"
-description="Thunderbird is a free, open source, cross-platform email, newsgroup, news feed, and chat (XMPP, IRC, Twitter) client developed by community, previously by the Mozilla Foundation."
-website="https://www.thunderbird.net/"
-forum="https://forum.privacytools.io/t/discussion-thunderbird/659"
-source="https://hg.mozilla.org/comm-central/"
-windows="https://www.thunderbird.net/en-US/"
-mac="https://www.thunderbird.net/en-US/"
-linux="https://www.thunderbird.net/en-US/"
-freebsd="https://www.freshports.org/mail/thunderbird/"
-openbsd="http://openports.se/mail/mozilla-thunderbird"
-netbsd="http://pkgsrc.se/mail/thunderbird"
+  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/"
+  mac="https://www.thunderbird.net/en-US/"
+  linux="https://www.thunderbird.net/en-US/"
+  freebsd="https://www.freshports.org/mail/thunderbird/"
+  openbsd="http://openports.se/mail/mozilla-thunderbird"
+  netbsd="http://pkgsrc.se/mail/thunderbird"
 %}
 
 {% include cardv2.html
-title="Claws Mail"
-image="/assets/img/tools/Claws-Mail.png"
-description="Claws Mail is a free and open source, GTK-based email and news client. It offers easy configuration and an abundance of features. It is included with Gpg4win, an encryption suite for Windows."
-website="https://www.claws-mail.org/"
-forum="https://forum.privacytools.io/t/discussion-claws-mail/660"
-git="https://git.claws-mail.org/"
-windows="https://www.claws-mail.org/win32/"
-mac="https://www.claws-mail.org/faq/index.php/Installation_and_Configuration#What_do_I_need_to_compile_Claws_Mail.3F"
-linux="https://www.claws-mail.org/downloads.php?section=downloads"
-freebsd="https://www.freshports.org/mail/claws-mail/"
-openbsd="http://openports.se/mail/claws-mail"
-netbsd="http://pkgsrc.se/mail/claws-mail"
+  title="Claws Mail"
+  image="/assets/img/png/3rd-party/claws_mail.png"
+  description="Claws Mail is a free and open source, GTK-based email and news client. It offers easy configuration and an abundance of features. It is included with Gpg4win, an encryption suite for Windows."
+  website="https://www.claws-mail.org/"
+  forum="https://forum.privacytools.io/t/discussion-claws-mail/660"
+  git="https://git.claws-mail.org/"
+  windows="https://www.claws-mail.org/win32/"
+  mac="https://www.claws-mail.org/faq/index.php/Installation_and_Configuration#What_do_I_need_to_compile_Claws_Mail.3F"
+  linux="https://www.claws-mail.org/downloads.php?section=downloads"
+  freebsd="https://www.freshports.org/mail/claws-mail/"
+  openbsd="http://openports.se/mail/claws-mail"
+  netbsd="http://pkgsrc.se/mail/claws-mail"
 %}
 
 

_includes/sections/email-providers.html

@@ -1,270 +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="{% if jekyll.environment == "production" and site.pull_cdn %}{{site.pull_cdn}}{% endif %}/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 {% include badge.html color="info" text="Free" %}</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/provider/disroot.org.png" width="200" height="70">
-        </td>
-        <td>
-          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://disroot.org" href="https://disroot.org"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></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/provider/Kolab-Now.png" width="200" height="70">
-        </td>
-        <td>
-          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://kolabnow.com" href="https://kolabnow.com"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></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="0"><span class="label label-primary">No</span></td>
-        <td data-value="1"><span class="label label-success">Yes</span></td>
-      </tr>
+    <h5>{% include badge.html color="success" text="Domains and Aliases" %}</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/provider/mailbox.org.png" width="200" height="70">
+    <h5>{% include badge.html color="success" text="Payment Methods" %}</h5>
+    <p>ProtonMail accepts Bitcoin in addition to accepting credit/debit cards and PayPal.</p>
 
-        </td>
-        <td>
-          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://mailbox.org" href="https://mailbox.org"><img alt="WWW" src="/assets/img/layout/www.png" width="35 "height="35"></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="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>{% include badge.html color="success" text="Account Security" %}</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/provider/Mailfence.png" width="200" height="70">
-        </td>
-        <td>
-          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://mailfence.com" href="https://mailfence.com"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></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>{% include badge.html color="success" text="Data Security" %}</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="neomailbox">
-          <img alt="Neomailbox" src="/assets/img/provider/Neomailbox.png" width="200" height="70">
-        </td>
-        <td>
-          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://www.neomailbox.com" href="https://www.neomailbox.com"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
-        </td>
-        <td data-value="2003">2003</td>
-        <td>
-          <span class="no-text-wrap">
-            <span class="flag-icon flag-icon-ch"></span> Switzerland
-          </span>
-        </td>
-        <td data-value="1000">1 GB</td>
-        <td data-value="4995">$ 49.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>{% include badge.html color="success" text="Email Encryption" %}</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="posteo">
-          <img alt="Posteo" src="/assets/img/provider/Posteo.png" width="200" height="70">
-        </td>
-        <td>
-          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://posteo.de" href="https://posteo.de"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></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>{% include badge.html color="success" text=".onion Service" %}</h5>
+    <p>ProtonMail is accessible via Tor at <a href="https://protonirockerxow.onion/">protonirockerxow.onion</a>.</p>
 
-      <tr>
-        <td data-value="protonmail">
-          <img alt="Protonmail" src="/assets/img/provider/ProtonMail.ch.png" width="200" height="70">
-        </td>
-        <td>
-          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://protonmail.com" href="https://protonmail.com"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
-          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://protonirockerxow.onion. Requires specific software to access: torproject.org" href="https://protonirockerxow.onion"><img alt="Tor" src="/assets/img/layout/tor.png" width="35"></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>{% include badge.html color="info" text="Extra Functionality" %}</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="{% if jekyll.environment == "production" and site.pull_cdn %}{{site.pull_cdn}}{% endif %}/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 {% include badge.html color="info" text="€12/y" %}</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="runbox">
-          <img alt="Runbox" src="/assets/img/provider/runbox.png" width="200" height="70">
+    <h5>{% include badge.html color="success" text="Domains and Aliases" %}</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>
 
-        </td>
-        <td>
-          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://runbox.com" href="https://runbox.com"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></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>{% include badge.html color="warning" text="Payment Methods" %}</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="soverin">
-          <img alt="Soverin" src="/assets/img/provider/Soverin.png" width="200" height="70">
-        </td>
-        <td>
-          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://soverin.net/" href="https://soverin.net/"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></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>{% include badge.html color="success" text="Account Security" %}</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>
 
-      <tr>
-        <td data-value="startmail">
-          <img alt="StartMail" src="/assets/img/provider/StartMail.png" width="200" height="70">
-        </td>
-        <td>
-          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://www.startmail.com" href="https://www.startmail.com"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></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="0"><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>{% include badge.html color="warning" text="Data Security" %}</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>
 
-      <tr>
-        <td data-value="tutanota">
-          <img alt="Tutanota" src="/assets/img/provider/Tutanota.png" width="200" height="70">
-        </td>
-        <td>
-          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://www.tutanota.com" href="https://www.tutanota.com"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></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>{% include badge.html color="success" text="Email Encryption" %}</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>
 
-    </tbody>
-  </table>
+    <h5>{% include badge.html color="warning" text=".onion Service" %}</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>{% include badge.html color="info" text="Extra Functionality" %}</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="{% if jekyll.environment == "production" and site.pull_cdn %}{{site.pull_cdn}}{% endif %}/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 {% include badge.html color="info" text="€12/y" %}</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>{% include badge.html color="warning" text="Domains and Aliases" %}</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>{% include badge.html color="warning" text="Payment Methods" %}</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>{% include badge.html color="success" text="Account Security" %}</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>{% include badge.html color="warning" text="Data Security" %}</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>{% include badge.html color="success" text="Email Encryption" %}</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>{% include badge.html color="danger" text=".onion Service" %}</h5>
+    <p>Posteo does not operate a .onion service.</p>
+
+    <h5>{% include badge.html color="info" text="Extra Functionality" %}</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="{% if jekyll.environment == "production" and site.pull_cdn %}{{site.pull_cdn}}{% endif %}/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 {% include badge.html color="info" text="€29/y" %}</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>{% include badge.html color="success" text="Domains and Aliases" %}</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>{% include badge.html color="success" text="Payment Methods" %}</h5>
+    <p>Soverin accepts Bitcoin as payment. They also accept credit/debit cards, PayPal, and the Netherlands-specific payment gateway iDEAL.</p>
+
+    <h5>{% include badge.html color="success" text="Account Security" %}</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>{% include badge.html color="warning" text="Data Security" %}</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>{% include badge.html color="success" text="Email Encryption" %}</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>{% include badge.html color="danger" text=".onion Service" %}</h5>
+    <p>Soverin does not operate a .onion service.</p>
+
+    <h5>{% include badge.html color="info" text="Extra Functionality" %}</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="{% if jekyll.environment == "production" and site.pull_cdn %}{{site.pull_cdn}}{% endif %}/assets/img/svg/3rd-party/disroot.svg"
+        data-theme-src="{% if jekyll.environment == "production" and site.pull_cdn %}{{site.pull_cdn}}{% endif %}/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 {% include badge.html color="info" text="Free" %}</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>{% include badge.html color="success" text="Domains and Aliases" %}</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>{% include badge.html color="success" text="Payment Methods" %}</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>{% include badge.html color="success" text="Account Security" %}</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>{% include badge.html color="warning" text="Data Security" %}</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>{% include badge.html color="success" text="Email Encryption" %}</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>{% include badge.html color="danger" text=".onion Service" %}</h5>
+    <p>Disroot does not operate a .onion service.</p>
+
+    <h5>{% include badge.html color="info" text="Extra Functionality" %}</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="{% if jekyll.environment == "production" and site.pull_cdn %}{{site.pull_cdn}}{% endif %}/assets/img/svg/3rd-party/tutanota.svg"
+        data-theme-src="{% if jekyll.environment == "production" and site.pull_cdn %}{{site.pull_cdn}}{% endif %}/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 {% include badge.html color="info" text="Free" %}</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>{% include badge.html color="success" text="Domains and Aliases" %}</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>{% include badge.html color="danger" text="Payment Methods" %}</h5>
+    <p>Tutanota accepts only credit cards and PayPal.</p>
+
+    <h5>{% include badge.html color="success" text="Account Security" %}</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>{% include badge.html color="success" text="Data Security" %}</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>{% include badge.html color="warning" text="Email Encryption" %}</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>{% include badge.html color="danger" text=".onion Service" %}</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>{% include badge.html color="info" text="Extra Functionality" %}</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="{% if jekyll.environment == "production" and site.pull_cdn %}{{site.pull_cdn}}{% endif %}/assets/img/svg/3rd-party/startmail.svg"
+        data-theme-src="{% if jekyll.environment == "production" and site.pull_cdn %}{{site.pull_cdn}}{% endif %}/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 {% include badge.html color="info" text="Personal USD $59.95/y" %}</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>{% include badge.html color="success" text="Domains and Aliases" %}</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>{% include badge.html color="warning" text="Payment Methods" %}</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>{% include badge.html color="success" text="Account Security" %}</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>{% include badge.html color="warning" text="Data Security" %}</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>{% include badge.html color="success" text="Email Encryption" %}</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>{% include badge.html color="danger" text=".onion Service" %}</h5>
+    <p>StartMail does not operate a .onion service.</p>
+
+    <h5>{% include badge.html color="info" text="Extra Functionality" %}</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 with Mail-in-a-Box</h3>
-<a href="https://mailinabox.email/"><img src="/assets/img/provider/Mail-in-a-Box.png" width="200" height="70" class="img-fluid float-left mr-3" alt="Mail-in-a-Box"></a>
-<p>Take it a step further and get control of your email with this easy-to-deploy mail server in a box. Mail-in-a-Box 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>
-
-<h3>Related Information</h3>
-
-<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>

_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

@@ -7,7 +7,8 @@
 {%
   include cardv2.html
   title="VeraCrypt - Disk Encryption"
-  image="/assets/img/tools/VeraCrypt.png"
+  image="/assets/img/svg/3rd-party/veracrypt.svg"
+  image-dark="/assets/img/svg/3rd-party/veracrypt-dark.svg"
   description="<strong>VeraCrypt</strong> is a source-available freeware utility used for on-the-fly encryption. It can create a virtual encrypted disk within a file or encrypt a partition or the entire storage device with pre-boot authentication. VeraCrypt is a fork of the discontinued TrueCrypt project. It was initially released on June 22, 2013. According to its developers, security improvements have been implemented and issues raised by the initial TrueCrypt code audit have been addressed."
   website="https://veracrypt.fr/"
   forum="https://forum.privacytools.io/t/discussion-veracrypt-file-encryption/1532"
@@ -20,9 +21,10 @@
 {%
   include cardv2.html
   title="GNU Privacy Guard - Email Encryption"
-  image="/assets/img/tools/GnuPG.png"
+  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"
@@ -37,24 +39,37 @@
 
 {%
   include cardv2.html
-  title="PeaZip - File Archive Encryption"
-  image="/assets/img/tools/PeaZip.png"
-  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>
 
 <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>
+  <li><a href="https://cryptomator.org/">Cryptomator</a> - Free client-side AES encryption for your cloud files. Open source software: No backdoors, no registration.
+    {% include badge.html
+    color="warning"
+    icon="fas fa-exclamation-triangle"
+    link="https://github.com/cryptomator/cryptomator-android/issues/1#issuecomment-257979375"
+    tooltip="Cryptomator's mobile apps are not open-source."
+    %}</li>
   <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://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.</a></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.dyne.org/software/tomb/">Tomb</a> - A simple zsh script for making LUKS containers on the commandline.</li>
+  <li><a href="https://hat.sh/">Hat.sh</a> - A cross-platform, serverless JavaScript web application that provides secure file encryption using the AES-256-GCM algorithm in your browser. It can also be downloaded and run offline.</li>
+  <li><a href="https://www.keka.io/">Keka</a> - A macOS-only, file archiver with the ability to encrypt files.
+    {% include badge.html
+    color="warning"
+    icon="fas fa-exclamation-triangle"
+    link="https://github.com/aonez/Keka#so-where-is-the-source-code"
+    tooltip="This software is no longer open source."
+    %}</li>
 </ul>

_includes/sections/file-sharing.html

@@ -1,49 +1,59 @@
 <h1 id="filesharing" class="anchor"><a href="#filesharing"><i class="fas fa-link anchor-icon"></i></a> File Sharing</h1>
 
 {% include cardv2.html
-title="Firefox Send"
-image="/assets/img/tools/Firefox-Send.png"
-website="https://send.firefox.com/"
-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 to add an optional password for an extra layer of security."
-forum="https://forum.privacytools.io/t/discussion-firefox-send/755"
-github="https://github.com/mozilla/send"
-web="https://send.firefox.com/"
-googleplay="https://play.google.com/store/apps/details?id=org.mozilla.firefoxsend"
+  title="Firefox Send"
+  image="/assets/img/svg/3rd-party/firefox_send.svg"
+  labels="color==warning::link==https://send.firefox.com/legal::text==Warning::tooltip==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/"
+  googleplay="https://play.google.com/store/apps/details?id=org.mozilla.firefoxsend"
 %}
 
 {% include cardv2.html
-title="OnionShare"
-image="/assets/img/tools/OnionShare.png"
-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."
-forum="https://forum.privacytools.io/t/discussion-onionshare/754"
-github="https://github.com/micahflee/onionshare"
-windows="https://onionshare.org/#downloads"
-mac="https://onionshare.org/#downloads"
-linux="https://onionshare.org/#downloads"
-freebsd="https://www.freshports.org/www/onionshare/"
-openbsd="http://openports.se/net/onionshare"
+  title="OnionShare"
+  image="/assets/img/svg/3rd-party/onionshare.svg"
+  website="https://onionshare.org/"
+  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"
+  mac="https://onionshare.org/#downloads"
+  linux="https://onionshare.org/#downloads"
+  freebsd="https://www.freshports.org/www/onionshare/"
+  openbsd="http://openports.se/net/onionshare"
 %}
 
 {% include cardv2.html
-title="Magic Wormhole"
-image="/assets/img/tools/Magic-Wormhole.png"
-website="https://magic-wormhole.readthedocs.io"
-description="Magic Wormhole is a package that provides a library and a command-line tool named wormhole, which makes it possible to get arbitrary-sized files and directories (or short pieces of text) from one computer to another. Their motto: \"Get things from one computer to another, safely.\""
-forum="https://forum.privacytools.io/t/discussion-magic-wormhole/756"
-github="https://github.com/warner/magic-wormhole"
-windows="https://magic-wormhole.readthedocs.io/en/latest/welcome.html#installation"
-mac="https://magic-wormhole.readthedocs.io/en/latest/welcome.html#installation"
-linux="https://magic-wormhole.readthedocs.io/en/latest/welcome.html#installation"
-freebsd="https://www.freshports.org/net/py-magic-wormhole/"
-openbsd="https://pypi.org/project/magic-wormhole/"
-netbsd="https://pypi.org/project/magic-wormhole/"
+  title="Magic Wormhole"
+  image="/assets/img/png/3rd-party/magic_wormhole.png"
+  website="https://magic-wormhole.readthedocs.io"
+  description="Magic Wormhole is a package that provides a library and a command-line tool named wormhole, which makes it possible to get arbitrary-sized files and directories (or short pieces of text) from one computer to another. Their motto: \"Get things from one computer to another, safely.\""
+  forum="https://forum.privacytools.io/t/discussion-magic-wormhole/756"
+  github="https://github.com/warner/magic-wormhole"
+  windows="https://magic-wormhole.readthedocs.io/en/latest/welcome.html#installation"
+  mac="https://magic-wormhole.readthedocs.io/en/latest/welcome.html#installation"
+  linux="https://magic-wormhole.readthedocs.io/en/latest/welcome.html#installation"
+  freebsd="https://www.freshports.org/net/py-magic-wormhole/"
+  openbsd="https://pypi.org/project/magic-wormhole/"
+  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>.
+    {% include badge.html
+    color="warning"
+    icon="fas fa-exclamation-triangle"
+    link="https://framasoft.org/en/cgu/"
+    tooltip="FramaDrop logs IP addresses and fingerprints the browser for an unclear amount of time."
+    %}
+  </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

@@ -8,8 +8,8 @@
 {%
   include cardv2.html
   title="Syncthing"
-  image="/assets/img/tools/Syncthing.png"
-  description="<strong>Syncthing</strong> replaces proprietary sync and cloud services with something open, trustworthy and decentralized. Your data is your data alone and you deserve to choose where it is stored, if it is shared with some third-party and how it's transmitted over the Internet."
+  image="/assets/img/svg/3rd-party/syncthing.svg"
+  description="<strong>Syncthing</strong> replaces proprietary sync and cloud services with something open, trustworthy and decentralized. Your data is your data alone and you deserve to choose where it is stored, if it is shared with some third-party, and how it is transmitted over the Internet."
   website="https://syncthing.net/"
   forum="https://forum.privacytools.io/t/discussion-syncthing/1627/2"
   github="https://github.com/syncthing?type=source"
@@ -20,23 +20,10 @@
   googleplay="https://play.google.com/store/apps/details?id=com.github.catfriend1.syncthingandroid"
 %}
 
-{%
-  include cardv2.html
-  title="SparkleShare"
-  image="/assets/img/tools/SparkleShare.png"
-  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>
   <li>
-    <a href="https://git-annex.branchable.com/">git-annex</a> - Allows managing files with git, without checking the file contents into git. While that may seem paradoxical, it is useful when dealing with files larger than git can currently easily handle,
-    whether due to limitations in memory, time, or disk space.
+    <a href="https://git-annex.branchable.com/">git-annex</a> - Allows managing files with git, without checking the file contents into git. While that may seem paradoxical, it is useful when dealing with files larger than git can currently easily handle, whether due to limitations in memory, time, or disk space.
   </li>
 </ul>

_includes/sections/fourteen-eyes.html

@@ -1,6 +1,6 @@
 <h1 id="ukusa" class="anchor"><a href="#ukusa"><i class="fas fa-link anchor-icon"></i></a> Global Mass Surveillance - The Fourteen Eyes</h1>
 
-<img src="/assets/img/layout/UKUSA.png" width="260" height="115" class="img-fluid float-right ml-2" alt="UKUSA Agreement">
+<img src="{% if jekyll.environment == "production" and site.pull_cdn %}{{site.pull_cdn}}{% endif %}/assets/img/svg/layout/ukusa.svg" width="260" height="115" class="img-fluid float-right ml-2" alt="UKUSA Agreement">
 
 <p>The UKUSA Agreement is an agreement between the United Kingdom, United States, Australia, Canada, and New Zealand to cooperatively collect, analyze, and share intelligence. Members of this group, known as the <a href="https://www.giswatch.org/en/communications-surveillance/unmasking-five-eyes-global-surveillance-practices">Five Eyes</a>, focus on gathering and analyzing intelligence from different parts of the world. While Five Eyes countries have agreed to <a href="https://www.pbs.org/newshour/world/an-exclusive-club-the-five-countries-that-dont-spy-on-each-other">not spy on each other</a> as adversaries, leaks by Snowden have revealed that some Five Eyes members monitor each other's citizens and <a href="https://www.theguardian.com/uk/2013/jun/21/gchq-cables-secret-world-communications-nsa">share intelligence</a> to <a href="https://www.theguardian.com/politics/2013/jun/10/nsa-offers-intelligence-british-counterparts-blunkett">avoid breaking domestic laws</a> that prohibit them from spying on their own citizens. The Five Eyes alliance also cooperates with groups of third-party countries to share intelligence (forming the Nine Eyes and Fourteen Eyes); however, Five Eyes and third-party countries can and do spy on each other.</p>
 

_includes/sections/header.html

@@ -1,15 +1,22 @@
 <div class="alert alert-success" role="alert">
-  <strong>New!</strong> Financial <a href="https://opencollective.com/privacytoolsio" class="alert-link">contributions</a> to PrivacyTools are now tax deductible in the US! <a href="https://blog.privacytools.io/privacytools-io-joins-the-open-collective-foundation" class="alert-link">Learn more...</a>
+  <strong>New!</strong> Financial <a href="https://opencollective.com/privacytools" class="alert-link">contributions</a> to {{ site.name }} are now tax deductible in the US! <a href="https://blog.privacytools.io/privacytools-io-joins-the-open-collective-foundation" class="alert-link">Learn more...</a>
 </div>
 
 <div class="jumbotron p-5">
-  <h1 class="display-4"><a href="{{ site.production_url }}" title="PrivacyTools"><img src="/assets/img/layout/logo.png" width="600" height="88" class="img-fluid" alt="PrivacyTools"></a></h1>
-  <p class="lead">You are being watched. Private and state-sponsored organizations are monitoring and recording your online activities. PrivacyTools provides services, tools and knowledge to protect your privacy against global mass surveillance.</p>
+  <h1 class="display-4">
+    <a href="{{ site.production_url }}" title="{{ site.name }}">
+      <img class="img-fluid d-none d-sm-block" src="{% if jekyll.environment == "production" and site.pull_cdn %}{{site.pull_cdn}}{% endif %}/assets/img/svg/layout/brand/horizontal.svg" width="500px" alt="{{ site.name }}">
+      <div class="text-center">
+        <img class="img-fluid d-sm-none" src="{% if jekyll.environment == "production" and site.pull_cdn %}{{site.pull_cdn}}{% endif %}/assets/img/svg/layout/brand/vertical.svg" width="300px" alt="{{ site.name }}">
+      </div>
+    </a>
+  </h1>
+  <p class="lead">You are being watched. Private and state-sponsored organizations are monitoring and recording your online activities. {{ site.name }} provides services, tools and knowledge to protect your privacy against global mass surveillance.</p>
 </div>
 
 <form method="POST" action="https://search.privacytools.io/" id="search_form" role="search">
 <div class="input-group col-12 col-md-8 offset-md-2">
-<input type="search" name="q" class="form-control input-lg" id="q" placeholder="Try PrivacyTools Search, a Privacy-Respecting Search Engine" autocomplete="off" value="">
+<input type="search" name="q" class="form-control input-lg" id="q" placeholder="Try {{ site.name }} Search, a Privacy-Respecting Search Engine" autocomplete="off" value="">
 <span class="input-group-btn">
 <button type="submit" class="btn btn-primary input-lg"><span class="hide_if_nojs"><i class="fas fa-search"></i> </span><span class="hidden active_if_nojs">start search</span></button>
 </span>

_includes/sections/hosting-provider.html

@@ -1,34 +1,39 @@
 <h1 id="host" class="anchor"><a href="#host"><i class="fas fa-link anchor-icon"></i></a> Secure Hosting Provider</h1>
 
 {% include cardv2.html
-title="Data Center: Bahnhof"
-image="/assets/img/provider/bahnhof.png"
-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/"
-forum="https://forum.privacytools.io/t/discussion-bahnhof-net/341"
+  title="Data Center: Bahnhof"
+  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"
 %}
 
 {% include cardv2.html
-title="VPS & Domain: Njalla"
-image="/assets/img/provider/Njalla.png"
-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."
-website="https://njal.la/"
-tor="http://njalladnspotetti.onion"
-forum="https://forum.privacytools.io/t/discussion-njalla/339"
+  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, Zcash, DASH, Bitcoin Cash and PayPal."
+  website="https://njal.la/"
+  tor="http://njalladnspotetti.onion"
+  forum="https://forum.privacytools.io/t/discussion-njalla/339"
 %}
 
 {% include cardv2.html
-title="Colocation: DataCell"
-image="/assets/img/provider/datacell.png"
-description="DataCell is a data center providing secure colocating in Switzerland and Iceland."
-website="https://datacell.is/"
-forum="https://forum.privacytools.io/t/discussion-datacell-is/342"
+  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"
 %}
 
 {% include cardv2.html
-title="VPS, Hosting, & Domain: Orange Website"
-image="/assets/img/provider/orange_hosting.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/"
-forum="https://forum.privacytools.io/t/discussion-orange-website/343"
+  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,64 +1,203 @@
-<h1 id="im" class="anchor"><a href="#im"><i class="fas fa-link anchor-icon"></i></a> Encrypted Instant Messenger</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>
+  <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>
 
-{% include cardv2.html
-title="Signal"
-image="/assets/img/tools/Signal.png"
-description="Signal is a mobile app developed by Open Whisper Systems. The app provides instant messaging, as well as voice and video calling.
-All communications are end-to-end encrypted. Signal is free and open source."
-labels="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/us/app/signal-private-messenger/id874139669"
+<p>All the client programs/apps we chose are <a href="https://en.wikipedia.org/wiki/Free_and_open-source_software">free and open-source software</a> unless otherwise mentioned. This to ensure that the code can be independently verified by experts now and in the future.</p>
+
+<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>
+
+<p>Centralized messengers are those where every participant is on the same server or network of servers controlled by the same organization.</p>
+
+{%
+  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="color==warning::link==https://github.com/nextcloud/end_to_end_encryption/issues/111::text==Requires phone number::tooltip==Signal requires your phone number as an personal identifier which means anyone you communicate with will see it.|text==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"
 %}
 
-<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://www.thinkprivacy.io/messengers.html">thinkprivacy.io</a> - Simple Secure Messaging Apps Comparison.</li>
-</ul>
+{%
+  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>".'
+  labels="color==warning::link==https://github.com/keybase/client/issues/6374::text==Warning::tooltip==This software relies on a closed-source central server.| color==info::link==https://github.com/privacytools/privacytools.io/issues/1894::text==Ownership change::tooltip==Keybase has recently been acquired by Zoom."
+  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"
+  windows="https://keybase.io/docs/the_app/install_windows"
+  mac="https://keybase.io/docs/the_app/install_macos"
+  linux="https://keybase.io/docs/the_app/install_linux"
+  freebsd="https://www.freshports.org/security/keybase/"
+  googleplay="https://play.google.com/store/apps/details?id=io.keybase.ossifrage"
+  ios="https://apps.apple.com/app/keybase-crypto-for-everyone/id1044461770"
+  firefox="https://addons.mozilla.org/firefox/addon/keybase-for-firefox/"
+  chrome="https://chrome.google.com/webstore/detail/keybase-for-reddit/ognfafcpbkogffpmmdglhbjboeojlefj"
+%}
 
+<div class="container">
+  <div class="row">
+    <div class="col-md-6">
+    <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>
+    </div>
+  <div class="col-md-6">
+    <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>
+  </div>
+</div>
 
-<h3>Worth Mentioning</h3>
+<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="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.'
+  labels="text==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/"
+  mac="https://riot.im/download/desktop/"
+  linux="https://riot.im/download/desktop/"
+  fdroid="https://f-droid.org/repository/browse/?fdid=im.vector.alpha"
+  googleplay="https://play.google.com/store/apps/details?id=im.vector.app"
+  ios="https://itunes.apple.com/app/vector.im/id1083446067"
+  web="https://riot.im/app/"
+%}
+
+<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://briarproject.org/">Briar</a> - An ultra-secure peer-to-peer instant messenger that connects to contacts via Direct Wi-Fi, Bluetooth, or Tor over the internet, keeping its users protected from surveillance and censorship.</li>
-  <li><a href="https://about.riot.im/">Riot</a> - An open-source, federated messenger that utilizes the Matrix protocol. This application is primarily recommended as a large group/team chat solution. While Riot has the ability to perform 1-on-1 communications we believe there are better solutions for direct communications.</li>
-  <li><a href="https://retroshare.cc/">RetroShare</a> - An end-to-end encrypted instant messaging and voice/video call client. RetroShare supports both TOR and I2P. </li>
-  <li><a href="https://xmpp.org/">XMPP</a> - Federated instant messaging protocol with <a href="https://conversations.im/omemo/">OMEMO</a>, OTR, or OpenPGP end-to-end encryption:</li>
   <ul>
-    <li><a href="https://conversations.im/">Conversations</a> (Android) - An open-source Jabber/XMPP client for Android 4.4+ smartphones. <span class="badge badge-success">OMEMO</span></li>
-    <li><a href="https://gajim.org/">Gajim</a> (FreeBSD, Linux, Windows) - An open-source fully featured XMPP client. <span class="badge badge-success">OMEMO</span></li>
-    <li><a href="https://monal.im/">Monal</a> (iOS, MacOS) - An XMPP client in active development. <span class="badge badge-success">OMEMO</span> <span class="badge badge-success">VoIP</span></li>
-    <li><a href="https://omemo.top/">Other OMEMO-ready clients</a>.</li>
+    <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>
-  <li><a href="https://www.kontalk.org/">Kontalk</a> - A community-driven instant messaging network. Supports end-to-end encryption. Both client-to-server and server-to-server channels are fully encrypted.</li>
-  <li><a href="https://keybase.io/">Keybase</a> - <span class="badge badge-warning" data-toggle="tooltip" title="This software relies on a closed-source central server.">Warning</span> End-to-end encrypted messaging with social verification.</li>
-  <li><a href="https://status.im/">Status</a> - <span class="badge badge-warning">Experimental</span> A free and open-source, peer-to-peer, encrypted instant messanger with support for DAPPs.</li>
-  <li> <a href="https://tox.chat/">Tox</a> - <span class="badge badge-warning">Experimental</span> A free and open-source, peer-to-peer, encrypted instant messaging, and video calling software. <span class="badge badge-success">VoIP</span></li>
-  <li><a href="https://jami.net/">Jami (formerly Ring/SFLphone)</a> - Gives you full control over your communications and an unmatched level of privacy. Jami has text messaging, video and audio calls, file transfer, and video conferencing. <span class="badge badge-success">VoIP</span></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>
 
-<h3>Related Information</h3>
+  <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>
 
-<ul>
-  <li><a href="https://firstlook.org/theintercept/2015/07/14/communicating-secret-watched/">Chatting in Secret While We're All Being Watched - firstlook.org</a></li>
-  <li><a href="https://signal.org/android/apk/">Advanced users with special needs can download the Signal APK directly. Most users should not do this under normal circumstances.</a></li>
-  <li>Independent security audits</li>
-  <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>
-  </ul>
-</ul>
+{%
+  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/"
+  googleplay="https://play.google.com/store/apps/details?id=org.briarproject.briar.android"
+%}
+
+{%
+  include cardv2.html
+  title="Jami"
+  image="/assets/img/svg/3rd-party/jami.svg"
+  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="color==warning::link==https://git.jami.net/savoirfairelinux/ring-project/issues/765::text==Warning::tooltip==This software is partially centralized but can be self-hosted.|text==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"
+  mac="https://jami.net/download-jami-macos"
+  linux="https://jami.net/download-jami-linux"
+  fdroid="https://f-droid.org/packages/cx.ring/"
+  googleplay="https://play.google.com/store/apps/details?id=cx.ring"
+  ios="https://itunes.apple.com/app/ring-a-gnu-package/id1306951055?mt=8"
+%}
+
+<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>
@@ -67,7 +67,7 @@
 
 <h3 id="usa" class="anchor">Why is it not recommended to choose a US-based service?</h3>
 
-<img src="/assets/img/layout/USA.png" width="200" height="200" class="img-fluid float-right ml-3" alt="USA">
+<img src="{% if jekyll.environment == "production" and site.pull_cdn %}{{site.pull_cdn}}{% endif %}/assets/img/svg/layout/great_seal_of_the_united_states_obverse.svg" width="200" height="200" class="img-fluid float-right ml-3" alt="USA">
 
 <p>Services based in the United States are not recommended because of the country's surveillance programs and use of <a href="https://www.eff.org/issues/national-security-letters/faq">National Security Letters</a> (NSLs) with accompanying gag orders, which forbid the recipient from talking about the request. This combination allows the government to <a href="https://www.schneier.com/blog/archives/2013/08/more_on_the_nsa.html">secretly force</a> companies to grant complete access to customer data and transform the service into a tool of mass surveillance.</p>
 

_includes/sections/live-operating-systems.html

@@ -1,38 +1,33 @@
-<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"
-image="/assets/img/tools/Tails.png"
-description='Tails is a live operating system that starts on almost any computer from a DVD, USB stick, or SD card. It aims at preserving privacy and anonymity, and circumventing censorship by forcing Internet connections through the Tor network; leaving no trace on the computer; and using state-of-the-art cryptographic tools to encrypt files, emails, and instant messages.'
-badges="info:GNU/Linux"
-labels="warning:contrib:This software may depend on or recommend non-free software."
-website="https://tails.boum.org/"
-git="https://git-tails.immerda.ch/tails/"
-%}
-
-{% include cardv2.html
-title="KNOPPIX"
-image="/assets/img/tools/KNOPPIX.png"
-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/tools/Puppy-Linux.png"
-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/"
+  title="Tails"
+  image="/assets/img/svg/3rd-party/tails.svg"
+  description='Tails is a live operating system that can boot on almost any computer from a DVD, USB stick, or SD card you control. It aims at preserving privacy and anonymity, and circumventing censorship by forcing Internet connections through the Tor network; leaving no trace on the computer; and using state-of-the-art cryptographic tools to encrypt files, emails, and instant messages.'
+  badges="info:GNU/Linux"
+  labels="color==warning::text==contrib::tooltip==This software may depend on or recommend non-free software."
+  website="https://tails.boum.org/"
+  git="https://git-tails.immerda.ch/tails/"
 %}
 
 <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>
+    {% include badge.html
+    color="info"
+    text="GNU/Linux"
+    %}
+    - 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>
+    {% include badge.html
+    color="info"
+    text="GNU/Linux"
+    %}
+    - 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

@@ -1,44 +1,80 @@
 <h1 id="mobile_os" class="anchor"><a href="#mobile_os"><i class="fas fa-link anchor-icon"></i></a> Mobile Operating Systems</h1>
 
 <div class="alert alert-warning" role="alert">
-  <strong>Even though the source code of the following OS is provided, installing Google Apps may compromise your setup.</strong>
+  <strong>Even though the source code of the following operating systems is provided, installing Google Apps may compromise your setup.</strong>
 </div>
 
 {% include cardv2.html
-title="GrapheneOS"
-image="/assets/img/tools/GrapheneOS.png"
-image-dark="/assets/img/tools/GrapheneOS-dark.png"
-description='GrapheneOS (formerly known as CopperheadOS) is a free and open-source security- and privacy-focused mobile operating system built on top of the Android Open Source Project. It currently specifically targets devices offering strong hardware security.'
-badges="info:AOSP"
-labels="warning:contrib:This software may depend on or recommend non-free software."
-website="https://grapheneos.org/"
-github="https://github.com/GrapheneOS/"
+  title="GrapheneOS"
+  image="/assets/img/svg/3rd-party/grapheneos.svg"
+  image-dark="/assets/img/svg/3rd-party/grapheneos-dark.svg"
+  description='GrapheneOS (formerly known as CopperheadOS) is a free and open-source security- and privacy-focused mobile operating system built on top of the Android Open Source Project. It currently specifically targets devices offering strong hardware security.'
+  badges="info:AOSP"
+  labels="color==warning::text==contrib::tooltip==This software may depend on or recommend non-free software."
+  website="https://grapheneos.org/"
+  github="https://github.com/GrapheneOS/"
 %}
 
 {% include cardv2.html
-title="LineageOS"
-image="/assets/img/tools/LineageOS.png"
-description='LineageOS is a free and open-source operating system for smartphones and tablets, based on the official releases of the Android Open Source Project. It is the continuation of the CyanogenMod project.'
-badges="info:AOSP"
-labels="warning:contrib:This software may depend on or recommend non-free software."
-website="https://www.lineageos.org/"
-github="https://github.com/LineageOS"
+  title="LineageOS"
+  image="/assets/img/svg/3rd-party/lineageos.svg"
+  description='LineageOS is a free and open-source operating system for smartphones and tablets, based on the official releases of the Android Open Source Project. It is the continuation of the CyanogenMod project.'
+  badges="info:AOSP"
+  labels="color==warning::text==contrib::tooltip==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"
 %}
 
 {% include cardv2.html
-title="Ubuntu Touch"
-image="/assets/img/tools/Ubuntu-Touch.png"
-description="Ubuntu Touch is a free and open-source operating system for smartphones and tablets. It's an alternative to the current popular mobile operating systems on the market. Only a few devices are <a href=https://devices.ubuntu-touch.io/>supported.</a>"
-badges="info:GNU/Linux"
-labels="warning:contrib:This software may depend on or recommend non-free software."
-website="https://ubuntu-touch.io/"
-github="https://github.com/ubports"
+  title="Ubuntu Touch"
+  image="/assets/img/svg/3rd-party/ubuntu.svg"
+  description="Ubuntu Touch is a free and open-source operating system for smartphones and tablets. It's an alternative to the current popular mobile operating systems on the market. Only a few devices are <a href=https://devices.ubuntu-touch.io/>supported.</a>"
+  badges="info:GNU/Linux"
+  labels="color==warning::text==contrib::tooltip==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"
 %}
 
 <h3>Worth Mentioning</h3>
 
 <ul>
-  <li><a href="https://www.replicant.us/">Replicant</a> <span class="badge badge-info">AOSP</span> - An open-source operating system based on Android, aiming to replace all proprietary components with free software.</li>
-  <li><a href="https://www.omnirom.org/">OmniROM</a> <span class="badge badge-info">AOSP</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 free-software operating system for smartphones and tablet computers, based on the Android mobile platform.</li>
-  <li><a href="https://microg.org/">MicroG</a> <span class="badge badge-info">Add-on Package</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 project that aims to reimplement the proprietary Google Play Services in the Android operating system with a FLOSS replacement. The microG project also maintains a fork of LineageOS with microG and F-Droid preinstalled at <a href="https://lineage.microg.org/">Lineage for microG</a>.</li>
+  <li><a href="https://www.replicant.us/">Replicant</a>
+    {% include badge.html
+    color="info"
+    text="AOSP"
+    %}
+    - An open-source operating system based on Android, aiming to replace all proprietary components with free software.
+  </li>
+
+  <li>
+    <a href="https://www.omnirom.org/">OmniROM</a>
+    {% include badge.html
+    color="info"
+    text="AOSP"
+    %}
+    {% include badge.html
+    color="warning"
+    icon="far fa-question-circle"
+    text="contrib"
+    tooltip="This software may depend on or recommend non-free software."
+    %}
+    - A free-software operating system for smartphones and tablet computers, based on the Android mobile platform.
+  </li>
+
+  <li>
+    <a href="https://microg.org/">MicroG</a>
+    {% include badge.html
+    color="info"
+    text="Add-on Package"
+    %}
+    {% include badge.html
+    color="warning"
+    icon="far fa-question-circle"
+    text="contrib"
+    tooltip="This software may depend on or recommend non-free software."
+    %}
+    - A project that aims to reimplement the proprietary Google Play Services in the Android operating system with a FLOSS replacement. The microG project also maintains a fork of LineageOS with microG and F-Droid preinstalled at <a href="https://lineage.microg.org/">Lineage for microG</a>.
+  </li>
 </ul>

_includes/sections/notebooks.html

@@ -5,50 +5,53 @@
 </div>
 
 {% include cardv2.html
-title="Joplin"
-image="/assets/img/tools/Joplin.png"
-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/"
-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"
-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/"
-chrome="https://chrome.google.com/webstore/detail/joplin-web-clipper/alofnhikmmkdbbbgpnglcpdollgjjfek"
+  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://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/"
+  chrome="https://chrome.google.com/webstore/detail/joplin-web-clipper/alofnhikmmkdbbbgpnglcpdollgjjfek"
 %}
 
 {% include cardv2.html
-title="Standard Notes"
-image="/assets/img/tools/StandardNotes.png"
-description="Standard Notes is a simple and private notes app that makes your notes easy and available everywhere you are. Features end-to-end encryption on every platform, and a powerful desktop experience with themes and custom editors."
-website="https://standardnotes.org/"
-github="https://github.com/standardnotes"
-windows="https://standardnotes.org/#get-started"
-mac="https://standardnotes.org/#get-started"
-linux="https://standardnotes.org/#get-started"
-ios="https://itunes.apple.com/us/app/standard-notes/id1285392450"
-fdroid="https://f-droid.org/packages/com.standardnotes/"
-googleplay="https://play.google.com/store/apps/details?id=com.standardnotes"
-web="https://app.standardnotes.org/"
+  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"
+  linux="https://standardnotes.org/#get-started"
+  ios="https://itunes.apple.com/us/app/standard-notes/id1285392450"
+  fdroid="https://f-droid.org/packages/com.standardnotes/"
+  googleplay="https://play.google.com/store/apps/details?id=com.standardnotes"
+  web="https://app.standardnotes.org/"
 %}
 
 {% include cardv2.html
-title="Turtl"
-image="/assets/img/tools/Turtl.png"
-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/"
-github="https://github.com/turtl"
-windows="https://turtlapp.com/download/"
-mac="https://turtlapp.com/download/"
-linux="https://turtlapp.com/download/"
-googleplay="https://play.google.com/store/apps/details?id=com.lyonbros.turtl"
-android="https://turtlapp.com/download/"
-firefox="https://addons.mozilla.org/en-US/firefox/addon/turtl-bookmarking/"
-chrome="https://chrome.google.com/webstore/detail/turtl/dgcojenhfdjhieoglmiaheihjadlpcml"
+  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/"
+  linux="https://turtlapp.com/download/"
+  googleplay="https://play.google.com/store/apps/details?id=com.lyonbros.turtl"
+  android="https://turtlapp.com/download/"
+  firefox="https://addons.mozilla.org/en-US/firefox/addon/turtl-bookmarking/"
+  chrome="https://chrome.google.com/webstore/detail/turtl/dgcojenhfdjhieoglmiaheihjadlpcml"
 %}
 
 <h3>Warning</h3>
@@ -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

@@ -1,82 +1,86 @@
 <h1 id="os" class="anchor"><a href="#os"><i class="fas fa-link anchor-icon"></i></a> PC Operating Systems</h1>
 
 <div class="alert alert-warning" role="alert">
-  <strong>If you are currently using a operating system like Windows 10, you should pick an alternative here.</strong>
+  <strong>If you are currently using an operating system like Windows 10, you should pick an alternative here.</strong>
 </div>
 
 {% include cardv2.html
-title="Qubes OS"
-image="/assets/img/tools/Qubes-OS.png"
-description='Qubes is an open-source operating system designed to provide strong security for desktop computing. Qubes is based on Xen, the X Window System, and Linux, and can run most Linux applications and utilize most of the Linux drivers.'
-badges="info:Xen"
-labels="warning:contrib:This software may depend on or recommend non-free software."
-website="https://www.qubes-os.org/"
-github="https://github.com/QubesOS"
-tor="http://qubesosfasa4zl44o4tws22di6kepyzfeqv3tg4e3ztknltfxqrymdad.onion/"
+  title="Qubes OS"
+  image="/assets/img/svg/3rd-party/qubes_os.svg"
+  description='Qubes is an open-source operating system designed to provide strong security for desktop computing. Qubes is based on Xen, the X Window System, and Linux, and can run most Linux applications and utilize most of the Linux drivers.'
+  badges="info:Xen"
+  labels="color==warning::text==contrib::tooltip==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/"
 %}
 
 {% include cardv2.html
-title="Fedora Workstation"
-image="/assets/img/tools/Fedora.png"
-description='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.'
-badges="info:GNU/Linux"
-labels="warning:contrib:This software may depend on or recommend non-free software."
-website="https://getfedora.org/"
-git="https://src.fedoraproject.org/"
+  title="Fedora Workstation"
+  image="/assets/img/svg/3rd-party/fedora.svg"
+  description='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.'
+  badges="info:GNU/Linux"
+  labels="color==warning::text==contrib::tooltip==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/"
 %}
 
 {% include cardv2.html
-title="Debian"
-image="/assets/img/tools/Debian.png"
-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/"
-tor="http://sejnfjrq6szgca7v.onion"
-gitlab="https://salsa.debian.org/qa/debsources"
+  title="Debian"
+  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"
 %}
 
 <h3>Worth Mentioning</h3>
 
 <ul>
-  <li><a href="https://www.openbsd.org/">OpenBSD</a> <span class="badge badge-info">BSD</span> - A project that produces a free, multi-platform 4.4BSD-based UNIX-like operating system. Emphasizes portability, standardization, correctness, proactive security and integrated cryptography.</li>
-  <li><a href="https://www.archlinux.org/">Arch 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 simple, lightweight Linux distribution. It is composed predominantly of free and open-source software, and supports community involvement. <a href="https://www.parabola.nu/">Parabola</a> is a
-    completely open source version of Arch Linux.</li>
-  <li><a href="https://trisquel.info/">Trisquel</a> <span class="badge badge-info">GNU/Linux</span> - Derived from Ubuntu, this project aims for a fully free software system without proprietary software or firmware and uses Linux-libre, a version of the Linux kernel with the non-free code (binary blobs) removed.</li>
-  <li><a href="https://www.whonix.org/">Whonix</a> <span class="badge badge-info">GNU/Linux</span> - A Debian-based security-focused Linux distribution. It aims to provide privacy, security and anonymity on the internet. The operating system consists of two virtual machines, a "Workstation"
-    and a Tor "Gateway". All communication are forced through the Tor network to accomplish this.</li>
-</ul>
-
-<h3>Warning</h3>
-
-<ul>
-  <li><a href="#win10"><i class="fas fa-link"></i> Don't use Windows 10 - It's a privacy nightmare</a></li>
-</ul>
-
-<h4 id="cpuvulns">Remember to check CPU vulnerability mitigations</h4>
-
-<p><em><a href="https://support.microsoft.com/en-us/help/4073757/protect-windows-devices-from-speculative-execution-side-channel-attack">This also affects Windows 10</a>, but it doesn't expose this information or mitigation instructions as easily. MacOS users check <a href="https://support.apple.com/en-us/HT210108">How to enable full mitigation for Microarchitectural Data Sampling (MDS) vulnerabilities on Apple Support</a>.</em></p>
-
-<p>When running a enough recent Linux kernel, you can check the CPU vulnerabilities it detects by <code>tail -n +1 /sys/devices/system/cpu/vulnerabilities/*</code>. By using <code>tail -n +1</code> instead of <code>cat</code>, the file names are also visible.</p>
-
-<p>
-    In case you have an Intel CPU, you may notice "SMT vulnerable" display after running the <code>tail</code> command. To mitigate this, disable <a href="https://en.wikipedia.org/wiki/Hyper-threading">hyper-threading</a> from the UEFI/BIOS. You can also take the following mitigation steps below if your system/distribution uses GRUB and supports <code>/etc/default/grub.d/</code>:
-</p>
-
-<ol>
-  <li><code>sudo mkdir /etc/default/grub.d/</code> to create a directory for additional grub configuration</li>
-  <li><code>echo GRUB_CMDLINE_LINUX_DEFAULT="$GRUB_CMDLINE_LINUX_DEFAULT l1tf=full,force mds=full,nosmt mitigations=auto,nosmt nosmt=force" | sudo tee /etc/default/grub.d/mitigations.cfg</code> to create a new grub config file source with the echoed content</li>
-  <li><code>sudo grub-mkconfig -o /boot/grub/grub.cfg</code> to generate a new grub config file including these new kernel boot flags</li>
-  <li><code>sudo reboot</code> to reboot</li>
-  <li>after the reboot, check <code>tail -n +1 /sys/devices/system/cpu/vulnerabilities/*</code> again to see that everything referring to SMT now says "SMT disabled."</li>
-</ol>
-
-<h5>Further reading</h5>
-
-<ul>
-  <li><a href="https://cpu.fail/">CPU.fail</a></li>
-  <li><a href="https://www.kernel.org/doc/html/latest/admin-guide/hw-vuln/">Hardware vulnerabilities index on The Linux kernel user's and administrator's guide</a></li>
-  <li><a href="https://www.cyberciti.biz/faq/install-update-intel-microcode-firmware-linux/">How to install/update CPU microcode firmware on Linux</a> - Regardless of your CPU manufacturer, you should always install the latest microcode packages available to be protected from CPU vulnerabilities, especially if the command above reports <strong>no microcode</strong> in its output.</li>
-  <li><a href="https://www.kernel.org/doc/html/latest/admin-guide/hw-vuln/mds.html">MDS - Microarchitectural Data Sampling on The Linux kernel user's and administrator's guide</a></li>
-  <li><a href="https://mdsattacks.com/">RIDL and Fallout: MDS attacks on mdsattacks.com</a></li>
-  <li><a href="https://en.wikipedia.org/wiki/Simultaneous_multithreading">Simultaneous multithreading on Wikipedia</a></li>
+  <li><a href="https://www.openbsd.org/">OpenBSD</a>
+    {% include badge.html
+    color="info"
+    text="BSD"
+    %}
+    - A project that produces a free, multi-platform 4.4BSD-based UNIX-like operating system. Emphasizes portability, standardization, correctness, proactive security and integrated cryptography.
+  </li>
+
+  <li>
+    <a href="https://www.archlinux.org/">Arch Linux</a>
+    {% include badge.html
+    color="info"
+    text="GNU/Linux"
+    %}
+    {% include badge.html
+    color="warning"
+    icon="far fa-question-circle"
+    text="contrib"
+    tooltip="This software may depend on or recommend non-free software."
+    %}
+    - A simple, lightweight Linux distribution. It is composed predominantly of free and open-source software, and supports community involvement. <a href="https://www.parabola.nu/">Parabola</a> is a
+    completely open source version of Arch Linux.
+  </li>
+
+  <li>
+    <a href="https://trisquel.info/">Trisquel</a>
+    {% include badge.html
+    color="info"
+    text="GNU/Linux"
+    %}
+    - Derived from Ubuntu, this project aims for a fully free software system without proprietary software or firmware and uses Linux-libre, a version of the Linux kernel with the non-free code (binary blobs) removed.
+  </li>
+
+  <li>
+    <a href="https://www.whonix.org/">Whonix</a>
+    {% include badge.html
+    color="info"
+    text="GNU/Linux"
+    %}
+    - A Debian-based security-focused Linux distribution. It aims to provide privacy, security and anonymity on the internet. The operating system consists of two virtual machines, a "Workstation"
+    and a Tor "Gateway". All communication are forced through the Tor network to accomplish this.
+  </li>
 </ul>

_includes/sections/participate.html

@@ -2,13 +2,13 @@
   <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 PrivacyTools 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">
 
   {% include card.html color="success"
   title="Discourse & Reddit"
-  image="/assets/img/icons/discourse.png"
+  image="/assets/img/svg/3rd-party/discourse.svg"
   url="https://forum.privacytools.io/"
   website="Discourse"
   extra_button='<a class="btn btn-success mb-1" href="https://www.reddit.com/r/privacytoolsIO/">Reddit</a>'
@@ -17,8 +17,8 @@
 
   {% include card.html color="primary"
   title="Follow on Mastodon & Twitter"
-  image="/assets/img/icons/mastodon.png"
-  url="https://social.privacytools.io/"
+  image="/assets/img/svg/3rd-party/mastodon.svg"
+  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!"
@@ -27,10 +27,10 @@
   {% include card.html color="warning"
   title="Develop on GitHub"
   font="fab fa-github"
-  url="https://github.com/privacytoolsIO/privacytools.io"
+  url="https://github.com/privacytools/privacytools.io"
   website="GitHub"
   description="The complete website source code is available on GitHub. Join our developer team!"
-  extra_button='<a class="btn btn-warning mb-1" href="https://github.com/privacytoolsIO/privacytools.io/graphs/contributors">Contributor List</a>'
+  extra_button='<a class="btn btn-warning mb-1" href="https://github.com/privacytools/privacytools.io/graphs/contributors">Contributor List</a>'
   %}
 
 </div>

_includes/sections/password-managers.html

@@ -7,9 +7,10 @@
 {%
   include cardv2.html
   title="Bitwarden - Cloud/Self-host"
-  image="/assets/img/tools/bitwarden.png"
+  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/#/"
@@ -32,9 +33,10 @@
 {%
   include cardv2.html
   title="KeePassXC - Local"
-  image="/assets/img/tools/keepassxc.png"
+  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"
@@ -52,9 +54,10 @@
 {%
   include cardv2.html
   title="LessPass - Browser"
-  image="/assets/img/tools/LessPass.png"
+  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,10 +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>
-</ul>
-
-<h3>Related Information</h3>
-
-<ul>
-  <li><a href="https://peertube.mastodon.host/videos/watch/4cdedd90-a5b4-4022-b93d-828e85ed58cd">Edward Snowden on Passwords on Peertube</a></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

@@ -2,7 +2,7 @@
 
 {% include cardv2.html
 title="PrivateBin"
-image="/assets/img/tools/PrivateBin.png"
+image="/assets/img/svg/3rd-party/privatebin.svg"
 description="PrivateBin is a minimalist, open-source online pastebin where the server has zero knowledge of pasted data. Data is encrypted/decrypted in the browser using 256-bit AES. It is the improved version of ZeroBin."
 website="https://privatebin.info/"
 forum="https://forum.privacytools.io/t/discussion-privatebin/296"
@@ -12,9 +12,10 @@ github="https://github.com/PrivateBin/PrivateBin"
 
 {% include cardv2.html
 title="CryptPad"
-image="/assets/img/provider/CryptPad.png"
+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

@@ -3,9 +3,10 @@
 {%
   include cardv2.html
   title="CryptPad"
-  image="/assets/img/provider/CryptPad.png"
+  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/"
@@ -14,8 +15,7 @@
 {%
   include cardv2.html
   title="Etherpad"
-  image="/assets/img/tools/Etherpad.png"
-  image-dark="/assets/img/tools/Etherpad-dark.png"
+  image="/assets/img/svg/3rd-party/etherpad.svg"
   description="<strong>Etherpad</strong> is a highly customizable open-source online editor providing collaborative editing in real time. <a href=https://github.com/ether/etherpad-lite/wiki/Sites-that-run-Etherpad>Here are a list of sites that run Etherpad</a>."
   website="https://etherpad.org/"
   forum="https://forum.privacytools.io/t/discussion-etherpad-productivity-tools/1538"
@@ -32,10 +32,11 @@
 {%
   include cardv2.html
   title="Write.as"
-  image="/assets/img/tools/WriteAs.png"
-  image-dark="/assets/img/tools/WriteAs-dark.png"
+  image="/assets/img/svg/3rd-party/writeas.svg"
+  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"
@@ -57,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">
@@ -66,11 +67,10 @@
   </a> Metadata Removal Tools
 </h1>
 
-<div class="row mb-2">
 {%
   include cardv2.html
   title="MAT2"
-  image="/assets/img/tools/MAT2.png"
+  image="/assets/img/svg/3rd-party/mat2.svg"
   description="<strong>MAT2</strong> is free software, which allows the removal of metadata of image, audio, torrent, and document file types. It provides both a command line tool and a graphical user interface via an extension for Nautilus, the default file manager of GNOME."
   website="https://0xacab.org/jvoisin/mat2"
   forum="https://forum.privacytools.io/t/discussion-mat/1559"
@@ -82,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

@@ -2,7 +2,7 @@
   <h1>Privacy? I don't have anything to hide.</h1>
 </div>
 <blockquote class="blockquote">
-  <p><a href="https://www.ted.com/talks/glenn_greenwald_why_privacy_matters" title="Glenn Greenwald - Why privacy matters - TED Talk"><img src="/assets/img/layout/Glenn-Greenwald-Why-privacy-matters.jpg" width="177" height="200" class="img-fluid float-right ml-2" alt="Glenn Greenwald: Why privacy matters"></a>
+  <p><a href="https://www.ted.com/talks/glenn_greenwald_why_privacy_matters" title="Glenn Greenwald - Why privacy matters - TED Talk"><img src="{% if jekyll.environment == "production" and site.pull_cdn %}{{site.pull_cdn}}{% endif %}/assets/img/png/layout/glenn_greenwald.png" width="170px" class="img-fluid float-right ml-2" alt="Glenn Greenwald: Why privacy matters"></a>
   Over the last 16 months, as I've debated this issue around the world, every single time somebody has said to me, "I don't really worry about invasions of privacy because I don't have anything to hide." I always say the same thing to them. I get out a
   pen, I write down my email address. I say, "Here's my email address. What I want you to do when you get home is email me the passwords to all of your email accounts, not just the nice, respectable work one in your name, but all of them, because I
   want to be able to just troll through what it is you're doing online, read what I want to read and publish whatever I find interesting. After all, if you're not a bad person, if you're doing nothing wrong, you should have nothing to hide." <strong>Not a single person has taken me up on that offer.</strong></p>
@@ -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

@@ -1,37 +1,62 @@
 <h1 id="firmware" class="anchor"><a href="#firmware"><i class="fas fa-link anchor-icon"></i></a> Open Source Router Firmware</h1>
 
 {% include cardv2.html
-title="OpenWrt"
-image="/assets/img/tools/OpenWrt.png"
-description="OpenWrt is an operating system (in particular, an embedded operating system) based on the Linux kernel, primarily used on embedded devices to route network traffic. The main components are the Linux kernel, util-linux, uClibc and BusyBox. All components have been optimized for size, to be small enough for fitting into the limited storage and memory available in home routers."
-badges="info:Linux"
-labels="warning:contrib:This software may depend on or recommend non-free software."
-website="https://openwrt.org/"
-git="https://git.openwrt.org/"
+  title="OpenWrt"
+  image="/assets/img/svg/3rd-party/openwrt.svg"
+  image-dark="/assets/img/svg/3rd-party/openwrt-dark.svg"
+  description="OpenWrt is an operating system (in particular, an embedded operating system) based on the Linux kernel, primarily used on embedded devices to route network traffic. The main components are the Linux kernel, util-linux, uClibc and BusyBox. All components have been optimized for size, to be small enough for fitting into the limited storage and memory available in home routers."
+  badges="info:Linux"
+  labels="color==warning::text==contrib::tooltip==This software may depend on or recommend non-free software."
+  website="https://openwrt.org/"
+  git="https://git.openwrt.org/"
 %}
 
 {% include cardv2.html
-title="pfSense"
-image="/assets/img/tools/pfSense.png"
-description="pfSense is an open source firewall/router computer software distribution based on FreeBSD. It is installed on a computer to make a dedicated firewall/router for a network and is noted for its reliability and offering features often only found in expensive commercial firewalls. pfSense is commonly deployed as a perimeter firewall, router, wireless access point, DHCP server, DNS server, and as a VPN endpoint."
-badges="info:BSD"
-labels="warning:contrib:This software may depend on or recommend non-free software."
-website="https://www.pfsense.org/"
-github="https://github.com/pfsense/"
+  title="pfSense"
+  image="/assets/img/svg/3rd-party/pfsense.svg"
+  image-dark="/assets/img/svg/3rd-party/pfsense-dark.svg"
+  description="pfSense is an open source firewall/router computer software distribution based on FreeBSD. It is installed on a computer to make a dedicated firewall/router for a network and is noted for its reliability and offering features often only found in expensive commercial firewalls. pfSense is commonly deployed as a perimeter firewall, router, wireless access point, DHCP server, DNS server, and as a VPN endpoint."
+  badges="info:BSD"
+  labels="color==warning::text==contrib::tooltip==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/"
 %}
 
 {% include cardv2.html
-title="LibreCMC"
-image="/assets/img/tools/LibreCMC.png"
-description="LibreCMC is a GNU/Linux-libre distribution for computers with minimal resources, such as the Ben Nanonote, ath9k-based Wi-Fi routers, and other hardware with emphasis on free software. The project's current goal is to aim for compliance with the GNU Free System Distribution Guidelines (GNU FSDG) and ensure that the project continues to meet these requirements set forth by the Free Software Foundation (FSF)."
-badges="info:GNU/Linux"
-website="https://librecmc.org"
-git="https://gogs.librecmc.org/libreCMC/libreCMC"
+  title="LibreCMC"
+  image="/assets/img/svg/3rd-party/librecmc.svg"
+  image-dark="/assets/img/svg/3rd-party/librecmc-dark.svg"
+  description="LibreCMC is a GNU/Linux-libre distribution for computers with minimal resources, such as the Ben Nanonote, ath9k-based Wi-Fi routers, and other hardware with emphasis on free software. The project's current goal is to aim for compliance with the GNU Free System Distribution Guidelines (GNU FSDG) and ensure that the project continues to meet these requirements set forth by the Free Software Foundation (FSF)."
+  badges="info:GNU/Linux"
+  website="https://librecmc.org"
+  git="https://gogs.librecmc.org/libreCMC/libreCMC"
 %}
 
 <h3>Worth Mentioning</h3>
 
 <ul>
-  <li><a href="https://www.openbsd.org/">OpenBSD</a> <span class="badge badge-info">BSD</span> - A project that produces a free, multi-platform 4.4BSD-based UNIX-like operating system. Emphasizes portability, standardization, correctness, proactive security and integrated cryptography.</li>
-  <li><a href="https://dd-wrt.com/">DD-WRT</a> <span class="badge badge-info">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 Linux-based open-source firmware compatible with several models of routers and access points.</li>
+  <li>
+    <a href="https://www.openbsd.org/">OpenBSD</a>
+    {% include badge.html
+    color="info"
+    text="BSD"
+    %}
+    - A project that produces a free, multi-platform 4.4BSD-based UNIX-like operating system. Emphasizes portability, standardization, correctness, proactive security and integrated cryptography.
+  </li>
+
+  <li>
+    <a href="https://dd-wrt.com/">DD-WRT</a>
+    {% include badge.html
+    color="info"
+    text="GNU/Linux"
+    %}
+    {% include badge.html
+    color="warning"
+    icon="far fa-question-circle"
+    text="contrib"
+    tooltip="This software may depend on or recommend non-free software."
+    %}
+    - A Linux-based open-source firmware compatible with several models of routers and access points.
+  </li>
 </ul>

_includes/sections/search-engines.html

@@ -1,53 +1,57 @@
 <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"
-image="/assets/img/provider/searx.png"
-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>'
-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="Searx"
+  image="/assets/img/svg/3rd-party/searx.svg"
+  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"
+  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>'
+  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"
+  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/"
 %}
 
 {% include cardv2.html
-title="DuckDuckGo - USA"
-image="/assets/img/provider/DuckDuckGo.png"
-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/"
-tor="http://3g2upl4pq6kufc4m.onion"
-forum="https://forum.privacytools.io/t/discussion-duckduckgo/285"
-github="https://github.com/duckduckgo"
+  title="Startpage.com"
+  image="/assets/img/svg/3rd-party/startpage.svg"
+  description='Startpage.com is a search engine that provides Google search results with complete privacy protection. <span class="flag-icon flag-icon-nl"></span> Startpage BV is a Netherlands-based company that has been dedicated to privacy-respecting search since 2006.'
+  labels="color==warning::link==https://support.startpage.com/index.php?/Knowledgebase/Article/View/1277/0/startpage-ceo-robert-beens-discusses-the-investment-from-privacy-one--system1::text==Warning::tooltip==Startpage.com was recently acquired by United States-based System1."
+  website="https://www.startpage.com/"
+  privacy-policy="https://www.startpage.com/en/privacy-policy/"
+  forum="https://forum.privacytools.io/t/delisted-discussion-startpage/284"
 %}
 
-{% include cardv2.html
-title="Qwant - France"
-image="/assets/img/provider/Qwant.png"
-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/"
-%}
-
-
-<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>
-
 <h3>Worth Mentioning</h3>
 
 <ul>
-  <li><a href="https://yacy.net/">YaCy</a> - A free-software P2P search engine powered by its users.</a></li>
-  <li><a href="https://jivesearch.com/">Jive Search</a> - A free-software search engine with a similar look and feel to Google.</a></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/self-contained-networks.html

@@ -5,76 +5,99 @@
 </div>
 
 {% include cardv2.html
-title="Tor"
-image="/assets/img/tools/Tor-Project.png"
-description="The Tor network is a group of volunteer-operated servers that allows people to improve their privacy and security on the Internet. Tor's users employ this network by connecting through a series of virtual tunnels rather than making a direct connection, thus allowing both organizations and individuals to share information over public networks without compromising their privacy. Tor is an effective censorship circumvention tool."
-website="https://www.torproject.org/"
-tor="http://expyuzz4wqqyqhjn.onion"
-forum="https://forum.privacytools.io/t/discussion-tor/1589"
-windows="https://www.torproject.org/download/"
-mac="https://www.torproject.org/download/"
-linux="https://www.torproject.org/download/"
-freebsd="https://www.freshports.org/security/tor"
-openbsd="http://openports.se/net/tor"
-netbsd="http://pkgsrc.se/net/tor"
-fdroid="https://support.torproject.org/tormobile/tormobile-7/"
-googleplay="https://play.google.com/store/apps/details?id=org.torproject.torbrowser"
-android="https://www.torproject.org/download/#android"
-git="https://gitweb.torproject.org/tor.git"
+  title="Tor"
+  image="/assets/img/svg/3rd-party/tor.svg"
+  description="The Tor network is a group of volunteer-operated servers that allows people to improve their privacy and security on the Internet. Tor's users employ this network by connecting through a series of virtual tunnels rather than making a direct connection, thus allowing both organizations and individuals to share information over public networks without compromising their privacy. Tor is an effective censorship circumvention tool."
+  website="https://www.torproject.org/"
+  tor="http://expyuzz4wqqyqhjn.onion"
+  forum="https://forum.privacytools.io/t/discussion-tor/1589"
+  windows="https://www.torproject.org/download/"
+  mac="https://www.torproject.org/download/"
+  linux="https://www.torproject.org/download/"
+  freebsd="https://www.freshports.org/security/tor"
+  openbsd="http://openports.se/net/tor"
+  netbsd="http://pkgsrc.se/net/tor"
+  fdroid="https://support.torproject.org/tormobile/tormobile-7/"
+  googleplay="https://play.google.com/store/apps/details?id=org.torproject.torbrowser"
+  android="https://www.torproject.org/download/#android"
+  git="https://gitweb.torproject.org/tor.git"
 %}
 
 {% include cardv2.html
-title="I2P Anonymous Network"
-image="/assets/img/tools/I2P.png"
-image-dark="/assets/img/tools/I2P-dark.png"
-description="The Invisible Internet Project (I2P) is a computer network layer that allows applications to send messages to each other pseudonymously and securely. Uses include anonymous Web surfing, chatting, blogging, and file transfers. The software that implements this layer is called an I2P router and a computer running I2P is called an I2P node. The software is free and open-source and is published under multiple licenses."
-website="https://geti2p.net/"
-forum="https://forum.privacytools.io/t/discussion-i2p/1590"
-i2p="http://i2p-projekt.i2p/"
-windows="https://geti2p.net/en/download#windows"
-mac="https://geti2p.net/en/download#mac"
-linux="https://geti2p.net/en/download#unix"
-freebsd="https://www.freshports.org/security/i2p/"
-openbsd="http://openports.se/net/i2pd"
-netbsd="http://pkgsrc.se/wip/i2pd"
-fdroid="https://f-droid.org/app/net.i2p.android.router"
-googleplay="https://play.google.com/store/apps/details?id=net.i2p.android"
-android="https://download.i2p2.de/android/current/"
-source="https://geti2p.net/en/get-involved/guides/new-developers#getting-the-i2p-code"
+  title="I2P Anonymous Network"
+  image="/assets/img/svg/3rd-party/i2p.svg"
+  image-dark="/assets/img/svg/3rd-party/i2p-dark.svg"
+  description="The Invisible Internet Project (I2P) is a computer network layer that allows applications to send messages to each other pseudonymously and securely. Uses include anonymous Web surfing, chatting, blogging, and file transfers. The software that implements this layer is called an I2P router and a computer running I2P is called an I2P node. The software is free and open-source and is published under multiple licenses."
+  website="https://geti2p.net/"
+  forum="https://forum.privacytools.io/t/discussion-i2p/1590"
+  i2p="http://i2p-projekt.i2p/"
+  windows="https://geti2p.net/en/download#windows"
+  mac="https://geti2p.net/en/download#mac"
+  linux="https://geti2p.net/en/download#unix"
+  freebsd="https://www.freshports.org/security/i2p/"
+  openbsd="http://openports.se/net/i2pd"
+  netbsd="http://pkgsrc.se/wip/i2pd"
+  fdroid="https://f-droid.org/app/net.i2p.android.router"
+  googleplay="https://play.google.com/store/apps/details?id=net.i2p.android"
+  android="https://download.i2p2.de/android/current/"
+  source="https://geti2p.net/en/get-involved/guides/new-developers#getting-the-i2p-code"
 %}
 
 {% include cardv2.html
-title="The Freenet Project"
-image="/assets/img/tools/Freenet.png"
-description="Freenet is a peer-to-peer platform for censorship-resistant communication. It uses a decentralized distributed data store to keep and deliver information, and has a suite of free software for publishing and communicating on the Web without fear of censorship. Both Freenet and some of its associated tools were originally designed by Ian Clarke, who defined Freenet's goal as providing freedom of speech on the Internet with strong anonymity protection."
-website="https://freenetproject.org/"
-forum="https://forum.privacytools.io/t/discussion-freenet/1591"
-windows="https://freenetproject.org/pages/download.html#windows"
-mac="https://freenetproject.org/pages/download.html#os-x"
-linux="https://freenetproject.org/pages/download.html#gnulinux-posix"
-freebsd="https://freenetproject.org/pages/download.html#gnulinux-posix"
-openbsd="https://freenetproject.org/pages/download.html#gnulinux-posix"
-netbsd="https://freenetproject.org/pages/download.html#gnulinux-posix"
-github="https://github.com/freenet/"
+  title="The Freenet Project"
+  image="/assets/img/svg/3rd-party/freenet.svg"
+  description="Freenet is a peer-to-peer platform for censorship-resistant communication. It uses a decentralized distributed data store to keep and deliver information, and has a suite of free software for publishing and communicating on the Web without fear of censorship. Both Freenet and some of its associated tools were originally designed by Ian Clarke, who defined Freenet's goal as providing freedom of speech on the Internet with strong anonymity protection."
+  website="https://freenetproject.org/"
+  forum="https://forum.privacytools.io/t/discussion-freenet/1591"
+  windows="https://freenetproject.org/pages/download.html#windows"
+  mac="https://freenetproject.org/pages/download.html#os-x"
+  linux="https://freenetproject.org/pages/download.html#gnulinux-posix"
+  freebsd="https://freenetproject.org/pages/download.html#gnulinux-posix"
+  openbsd="https://freenetproject.org/pages/download.html#gnulinux-posix"
+  netbsd="https://freenetproject.org/pages/download.html#gnulinux-posix"
+  github="https://github.com/freenet/"
 %}
 
-<h3>Related Information</h3>
-
-<ul>
-  <li><a href="https://darknetdiaries.com/">darknetdiaries.com</a> - True stories from the dark side of the Internet.</li>
-</ul>
-
 <h3>Worth Mentioning</h3>
 
 <ul>
-  <li><a href="https://zeronet.io/">ZeroNet</a> - Open, free, and uncensorable websites, using Bitcoin cryptography and BitTorrent network. <span class="badge badge-danger" data-toggle="tooltip" title="Your IP address isn't hidden by default and won't be, unless you enforce Tor usage.">privacy warning <span class="far fa-question-circle"></span></span></li>
+  <li>
+    <a href="https://zeronet.io/">ZeroNet</a> - Open, free, and uncensorable websites, using Bitcoin cryptography and BitTorrent network.
+    {% include badge.html
+    color="danger"
+    icon="fas fa-exclamation-triangle"
+    tooltip="Your IP address isn't hidden by default and won't be, unless you enforce Tor usage."
+    text="Not anonymous"
+    %}
+  </li>
   <li><a href="https://retroshare.cc/">RetroShare</a> - An open source, cross-platform, friend-to-friend, secure, and decentralized communication platform.</li>
+  <li><a href="https://i2pbote.xyz/">I2P-Bote</a> - End-to-end encrypted decentralized mail system within the I2P network.</li>
   <li><a href="https://gnunet.org/">GNUnet</a> - GNUnet provides a strong foundation of free software for a global, distributed network that provides security and privacy.</li>
-  <li><a href="https://ipfs.io/">IPFS</a> <em>and</em> <a href="https://github.com/ipfs-shipyard/ipfs-companion">IPFS Companion</a>- A peer-to-peer hypermedia protocol to make the web faster, safer, and more open. IPFS Companion is a browser extension for redirecting queries to a gateway of your choice (generally local). <a href="https://github.com/privacytoolsIO/privacytools.io/pull/361#issuecomment-344414022">
-    <span class="badge badge-danger" data-toggle="tooltip" title="">
-    <span class="fas fa-exclamation-triangle"></span>
-        Important privacy warning
-      </span>
-          </a></li>
-  <li><a href="https://yggdrasil-network.github.io/">Yggdrasil</a> - An early-stage implementation of a fully end-to-end encrypted IPv6 network. It is lightweight, self-arranging, supported on multiple platforms, and allows pretty much any IPv6-capable application to communicate securely with other Yggdrasil nodes. Yggdrasil does not require you to have IPv6 Internet connectivity - it also works over IPv4. <span class="badge badge-warning" data-toggle="tooltip" title="The project is currently in early stages but it is being actively developed.">experimental <i class=\"far fa-question-circle\"></i></span> <span class="badge badge-danger" data-toggle="tooltip" title="Yggdrasil doesn't have a goal of providing anonymity and your peers know your IP address unless you are only using Tor/I2P peers.">privacy warning <i class="far fa-question-circle"></i></span></li>
+  <li>
+    <a href="https://ipfs.io/">IPFS</a> <em>and</em> <a href="https://github.com/ipfs-shipyard/ipfs-companion">IPFS Companion</a>- A peer-to-peer hypermedia protocol to make the web faster, safer, and more open. IPFS Companion is a browser extension for redirecting queries to a gateway of your choice (generally local).
+    {% include badge.html
+    color="warning"
+    icon="fas fa-exclamation-triangle"
+    link="https://github.com/privacytools/privacytools.io/pull/361#issuecomment-344414022"
+    text="Supercookie warning"
+    %}
+  </li>
+  <li>
+    <a href="https://yggdrasil-network.github.io/">Yggdrasil</a>
+    - An early-stage implementation of a fully end-to-end encrypted IPv6 network. It is lightweight, self-arranging, supported on multiple platforms, and allows pretty much any IPv6-capable application to communicate securely with other Yggdrasil nodes. Yggdrasil does not require you to have IPv6 Internet connectivity - it also works over IPv4.
+
+    {% include badge.html
+    color="warning"
+    icon="far fa-question-circle"
+    tooltip="The project is currently in early stages but it is being actively developed."
+    text="Experimental"
+    %}
+    {% include badge.html
+    color="danger"
+    icon="fas fa-exclamation-triangle"
+    link=""
+    tooltip="Yggdrasil doesn't provide anonymity by default. Your peers know your IP address unless you configure it to only use Tor/I2P peers."
+    text="Not anonymous by default"
+    %}
+  </li>
 </ul>

_includes/sections/selfhosted-cloud.html

@@ -5,35 +5,37 @@
 </div>
 
 {% include cardv2.html
-title="Nextcloud"
-image="/assets/img/provider/Nextcloud.png"
-description="Nextcloud is similar in functionality to the widely used Dropbox, with the difference being that Nextcloud is free and open-source, thereby allowing anyone to install and operate it without charge on a private server with no limits on storage space or the number of connected clients."
-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="color==warning::link==https://github.com/nextcloud/end_to_end_encryption/issues/111::text==Experimental E2EE::tooltip==Regarding E2EE their description states 'End-to-end encryption is still in alpha state, don't use this in production and only with test data!'."
+  website="https://nextcloud.com/"
+  privacy-policy="https://nextcloud.com/privacy/"
+  forum="https://forum.privacytools.io/t/discussion-nextcloud/287"
+  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/tools/Tahoe-LAFS.png"
-image-dark="/assets/img/tools/Tahoe-LAFS-dark.png"
-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

@@ -1,90 +1,81 @@
 <h1 id="social" class="anchor"><a href="#social"><i class="fas fa-link anchor-icon"></i></a> Decentralized Social Networks</h1>
 
 <div class="alert alert-warning" role="alert">
-  <strong> If you are currently using Social Networks like Facebook or Twitter, you should pick an alternative here. </strong>
+  <strong> If you are currently using Social Networks like Facebook or Twitter, you should pick an alternative here.</strong>
 </div>
 
 {% include cardv2.html
-title="Mastodon - Twitter Alternative"
-image="/assets/img/tools/Mastodon.png"
-description='Mastodon is a social network based on open web protocols and free, open-source software. It is decentralized like email. It also has the most users, and the most diverse (in terms of interests) users; looks good; and is easy to setup. Feel welcome to join our hosted instance: <a href="https://social.privacytools.io/">social.privacytools.io</a>'
-website="https://joinmastodon.org/"
-forum="https://forum.privacytools.io/t/discussion-mastodon/289"
-github="https://github.com/tootsuite/mastodon"
-windows="https://joinmastodon.org/apps"
-mac="https://joinmastodon.org/apps"
-linux="https://joinmastodon.org/apps"
-freebsd="https://joinmastodon.org/apps"
-openbsd="https://joinmastodon.org/apps"
-netbsd="https://joinmastodon.org/apps"
-android="https://joinmastodon.org/apps"
-sailfish="https://joinmastodon.org/apps"
-ios="https://joinmastodon.org/apps"
-web="https://joinmastodon.org/#getting-started"
+  title="Mastodon - Twitter Alternative"
+  image="/assets/img/svg/3rd-party/mastodon.svg"
+  description='Mastodon is a social network based on open web protocols and free, open-source software. It is decentralized like email, users can exist on different servers or even different platforms but still communicate with each other. It also has the most users, and the most diverse (in terms of interests) users, it looks good, and it is easy to setup yourself. If you are looking for a server to join, you are welcome to join our hosted instance: <a href="https://social.privacytools.io/">social.privacytools.io</a>'
+  website="https://joinmastodon.org/"
+  forum="https://forum.privacytools.io/t/discussion-mastodon/289"
+  github="https://github.com/tootsuite/mastodon"
+  windows="https://joinmastodon.org/apps"
+  mac="https://joinmastodon.org/apps"
+  linux="https://joinmastodon.org/apps"
+  freebsd="https://joinmastodon.org/apps"
+  openbsd="https://joinmastodon.org/apps"
+  netbsd="https://joinmastodon.org/apps"
+  android="https://joinmastodon.org/apps"
+  sailfish="https://joinmastodon.org/apps"
+  ios="https://joinmastodon.org/apps"
+  web="https://joinmastodon.org/#getting-started"
 %}
 
 {% include cardv2.html
-title="diaspora* - Google+ Alternative"
-image="/assets/img/tools/diaspora.png"
-description="diaspora* is based on three key philosophies: Decentralization, freedom and privacy. It is intended to address privacy concerns related to centralized social networks by allowing users set up their own server (or \"pod\") to host content; pods can then interact to share status updates, photographs, and other social data."
-website="https://diasporafoundation.org/"
-forum="https://forum.privacytools.io/t/discussion-diaspora/290"
-github="https://github.com/diaspora/diaspora"
-android="https://wiki.diasporafoundation.org/Tools_to_use_with_Diaspora#Android"
-web="https://diasporafoundation.org/"
+  title="diaspora* - Google+ Alternative"
+  image="/assets/img/svg/3rd-party/diaspora.svg"
+  description="diaspora* is based on three key philosophies: Decentralization, Freedom, and Privacy. It is intended to address privacy concerns related to centralized social networks by allowing users set up their own server (or \"pod\") to host content. Pods can then interact to share status updates, photographs, and other social data."
+  website="https://diasporafoundation.org/"
+  forum="https://forum.privacytools.io/t/discussion-diaspora/290"
+  github="https://github.com/diaspora/diaspora"
+  android="https://wiki.diasporafoundation.org/Tools_to_use_with_Diaspora#Android"
+  web="https://diasporafoundation.org/"
 %}
 
 {% include cardv2.html
-title="Friendica - Facebook Alternative"
-image="/assets/img/tools/Friendica.png"
-description="Friendica has an emphasis on extensive privacy settings and easy server installation. It aims to federate with as many other social networks as possible. Currently, Friendica users can integrate contacts from Facebook, Twitter, Diaspora, GNU social, App.net, Pump.io and other services in their social streams."
-website="https://friendi.ca/"
-forum="https://forum.privacytools.io/t/discussion-friendica/291"
-github="https://github.com/friendica/friendica"
-windows="https://friendi.ca/resources/mobile-clients/"
-linux="https://friendi.ca/resources/mobile-clients/"
-android="https://friendi.ca/resources/mobile-clients/"
-sailfish="https://friendi.ca/resources/mobile-clients/"
-web="https://friendi.ca/"
+  title="Friendica - Facebook Alternative"
+  image="/assets/img/svg/3rd-party/friendica.svg"
+  description="Friendica has an emphasis on extensive privacy settings and easy server installation. It aims to federate with as many other social networks as possible. Currently, Friendica users can integrate contacts from Facebook, Twitter, Diaspora, GNU social, App.net, Pump.io and other services in their social streams."
+  website="https://friendi.ca/"
+  forum="https://forum.privacytools.io/t/discussion-friendica/291"
+  github="https://github.com/friendica/friendica"
+  windows="https://friendi.ca/resources/mobile-clients/"
+  linux="https://friendi.ca/resources/mobile-clients/"
+  android="https://friendi.ca/resources/mobile-clients/"
+  sailfish="https://friendi.ca/resources/mobile-clients/"
+  web="https://friendi.ca/"
 %}
 
 {% include cardv2.html
-title="PixelFed - Instagram Alternative"
-image="/assets/img/provider/pixelfed.png"
-description='PixelFed is a free and ethical photo sharing platform, powered by ActivityPub federation. Pixelfed is an open-source, federated platform. You can run your own instance or <a href="https://fediverse.party/en/pixelfed/">join one.</a>'
-website="https://pixelfed.org/"
-forum="https://forum.privacytools.io/t/discussion-pixelfed/293"
-github="https://github.com/pixelfed"
-web="https://pixelfed.org/"
+  title="PixelFed - Instagram Alternative"
+  image="/assets/img/svg/3rd-party/pixelfed.svg"
+  description='PixelFed is a free and ethical photo sharing platform, powered by ActivityPub federation. Pixelfed is an open-source, federated platform. You can run your own instance or <a href="https://fediverse.party/en/pixelfed/">join an existing one.</a>'
+  website="https://pixelfed.org/"
+  forum="https://forum.privacytools.io/t/discussion-pixelfed/293"
+  github="https://github.com/pixelfed"
+  web="https://pixelfed.org/"
 %}
 
 {% include cardv2.html
-title="GNU social - Twitter Alternative"
-image="/assets/img/provider/gnu-social.png"
-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>
-
-<h3>Related Information</h3>
-<ul>
-  <li><a href="https://addons.mozilla.org/firefox/addon/mastodon-simplified-federation/">Mastodon: Simplified Federation</a> - Firefox Extension to improve usability for remote Mastodon instances.</li>
-  <li><a href="https://justdeleteme.xyz/">JustDeleteMe</a> - A directory of direct links to delete your account from web services.</li>
-  <li><a href="https://forget.codl.fr/">Forget</a> - A service that automatically deletes your old posts on Twitter and Mastodon that everyone has forgotten about.</li>
-</ul>
-
-<h3>Facebook Related</h3>
-<ul>
-  <li><a href="https://www.facebook.com/help/delete_account">Delete your Facebook account</a> - Direct link to delete your Facebook account without being able to reactivate it again.</li>
-  <li><a href="https://deletefacebook.com/">How To Permanently Delete A Facebook Account</a> - This guide will take you through a smooth and successful Facebook account deletion.</li>
-  <li><a href="https://addons.mozilla.org/firefox/addon/facebook-container/">Facebook Container by Mozilla</a> - Prevent Facebook from tracking you around the web.</li>
-  <li><a href="https://www.stopusingfacebook.co/">Stop using Facebook</a> - A curated list of reasons to stop using Facebook and how to do it.</li>
-</ul>

_includes/sections/social-news-aggregator.html

@@ -6,9 +6,10 @@
 
 {% include cardv2.html
 title="Aether"
-image="/assets/img/tools/aether.png"
+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/"
@@ -18,9 +19,10 @@ linux="https://getaether.net/download/"
 
 {% include cardv2.html
 title="Tildes"
-image="/assets/img/tools/tildes.png"
+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"
@@ -28,9 +30,10 @@ web="https://tildes.net"
 
 {% include cardv2.html
 title="Raddle"
-image="/assets/img/tools/raddle.png"
+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,16 +1,21 @@
-<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="Riot.im (Matrix)"
-  image="/assets/img/tools/Riot.png"
-  description="Riot.im is a federated free-software messaging application based on the <a href\"https://matrix.org/\">Matrix</a> protocol, a recent open protocol for real-time communication offering optional E2E encryption. It also has bridging functionality, allowing you to connect to other chat protocols such as IRC or Telegram."
-  labels="warning:<a href=//github.com/vector-im/riot-web/issues/6779>Experimental E2EE</a>:The end-to-end encryption is currently in beta, and the mobile client states 'End-to-end encryption is in beta and may not be reliable. You should not yet trust it to secure data.'"
+  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="text==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/"
@@ -18,17 +23,18 @@
   linux="https://riot.im/download/desktop/"
   fdroid="https://f-droid.org/repository/browse/?fdid=im.vector.alpha"
   googleplay="https://play.google.com/store/apps/details?id=im.vector.app"
-  ios="https://itunes.apple.com/us/app/vector.im/id1083446067"
+  ios="https://itunes.apple.com/app/vector.im/id1083446067"
   web="https://riot.im/app/"
 %}
 
 {%
   include cardv2.html
   title="Rocket.chat"
-  image="/assets/img/tools/rocket.chat.png"
+  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="color==warning::link==https://rocket.chat/docs/user-guides/end-to-end-encryption/::text==Experimental E2EE::tooltip==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.|text==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"
@@ -42,10 +48,11 @@
 {%
   include cardv2.html
   title="Keybase"
-  image="/assets/img/tools/keybase.png"
-  description='Keybase provides a hosted team chat with end-to-end encryption. It 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>.'
-  labels="warning:<a href=//github.com/keybase/client/issues/6374>Warning</a>:The server side of Keybase runs on proprietary code and is centralized."
+  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 through the use of cryptographic signing of "<a href="https://en.wikipedia.org/wiki/Keybase#Identity_proofs">identity proofs</a>".'
+  labels="color==warning::link==https://github.com/keybase/client/issues/6374::text==Warning::tooltip==This software relies on a closed-source central server.| color==info::link==https://github.com/privacytools/privacytools.io/issues/1894::text==Ownership change::tooltip==Keybase has recently been acquired by Zoom."
   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"
@@ -53,8 +60,8 @@
   mac="https://keybase.io/docs/the_app/install_macos"
   linux="https://keybase.io/docs/the_app/install_linux"
   freebsd="https://www.freshports.org/security/keybase/"
-  googleplay="https://play.google.com/store/apps/details?id=io.keybase.ossifrage&hl=en_US"
-  ios="https://keybase.io/_/download/keybase-for-ios"
-  firefox="https://addons.mozilla.org/en-US/firefox/addon/keybase-for-firefox/"
+  googleplay="https://play.google.com/store/apps/details?id=io.keybase.ossifrage"
+  ios="https://apps.apple.com/app/keybase-crypto-for-everyone/id1044461770"
+  firefox="https://addons.mozilla.org/firefox/addon/keybase-for-firefox/"
   chrome="https://chrome.google.com/webstore/detail/keybase-for-reddit/ognfafcpbkogffpmmdglhbjboeojlefj"
 %}

_includes/sections/voice-video-messenger.html

@@ -1,44 +1,62 @@
 <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 {% include badge.html color="info" text="VoIP" %}. The software listed below are <em>primarily</em> Voice/Video focused.
 </div>
 
 {% include cardv2.html
-title="Linphone"
-image="/assets/img/tools/Linphone.png"
-website="https://www.linphone.org/"
-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"
-windows="https://www.linphone.org/technical-corner/linphone?qt-technical_corner=2#qt-technical_corner"
-linux="https://www.linphone.org/technical-corner/linphone?qt-technical_corner=2#qt-technical_corner"
-mac="https://www.linphone.org/technical-corner/linphone?qt-technical_corner=2#qt-technical_corner"
-fdroid="https://f-droid.org/packages/org.linphone"
-googleplay="https://play.google.com/store/apps/details?id=org.linphone"
-ios="https://itunes.apple.com/us/app/linphone/id360065638?mt=8"
+  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"
+  windows="https://www.linphone.org/technical-corner/linphone?qt-technical_corner=2#qt-technical_corner"
+  linux="https://www.linphone.org/technical-corner/linphone?qt-technical_corner=2#qt-technical_corner"
+  mac="https://www.linphone.org/technical-corner/linphone?qt-technical_corner=2#qt-technical_corner"
+  fdroid="https://f-droid.org/packages/org.linphone"
+  googleplay="https://play.google.com/store/apps/details?id=org.linphone"
+  ios="https://itunes.apple.com/us/app/linphone/id360065638?mt=8"
 %}
 
 {% include cardv2.html
-title="Mumble"
-image="/assets/img/tools/Mumble.png"
-website="https://mumble.info/"
-description="Mumble is an open-source, low-latency, and high quality voice chat application primarily intended for use while gaming. Note that while Mumble doesn't log messages or record by default, <a href=\"https://github.com/mumble-voip/mumble/issues/1813\">it's missing end-to-end encryption</a>, so self-hosting is recommended."
-forum="https://forum.privacytools.io/t/discussion-mumble/1289"
-github="https://github.com/mumble-voip/"
-windows="https://www.mumble.info/downloads"
-linux="https://www.mumble.info/downloads"
-mac="https://www.mumble.info/downloads"
-android="https://www.mumble.info/downloads/#third-party-clients"
-ios="https://apps.apple.com/us/app/mumble/id443472808?ls=1"
+  title="Mumble"
+  image="/assets/img/svg/3rd-party/mumble.svg"
+  website="https://mumble.info/"
+  description="Mumble is an open-source, low-latency, and high quality voice chat application primarily intended for use while gaming. Note that while Mumble doesn't log messages or record by default, <a href=\"https://github.com/mumble-voip/mumble/issues/1813\">it's missing end-to-end encryption</a>, so self-hosting is recommended."
+  forum="https://forum.privacytools.io/t/discussion-mumble/1289"
+  github="https://github.com/mumble-voip/"
+  windows="https://www.mumble.info/downloads"
+  linux="https://www.mumble.info/downloads"
+  mac="https://www.mumble.info/downloads"
+  android="https://www.mumble.info/downloads/#third-party-clients"
+  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>
-</ul>
+  <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.
 
+    {% include badge.html
+    color="warning"
+    icon="fas fa-exclamation-triangle"
+    text="Requires WebRTC"
+    tooltip="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."
+    %}
+
+    {% include badge.html
+    color="warning"
+    icon="fas fa-exclamation-triangle"
+    link="https://jitsi.org/security"
+    text="Multiparty meetings are not E2EE"
+    %}
+
+    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>
 
 <ul>

_includes/sections/vpn.html

@@ -1,90 +1,112 @@
-<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">
 
   <div class="row mb-2">
     <div class="col-lg-3 col-sm-12 pt-lg-5">
-      <img src="/assets/img/provider/Mullvad.png" height="70" width="200" class="img-fluid d-block mr-auto ml-auto align-middle" alt="Mullvad">
+      <img
+        src="{% if jekyll.environment == "production" and site.pull_cdn %}{{site.pull_cdn}}{% endif %}/assets/img/svg/3rd-party/mullvad.svg"
+        data-theme-src="{% if jekyll.environment == "production" and site.pull_cdn %}{{site.pull_cdn}}{% endif %}/assets/img/svg/3rd-party/mullvad-dark.svg"
+        height="70"
+        width="200"
+        class="img-fluid d-block mr-auto ml-auto align-middle"
+        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>
-    <h5><span class="badge badge-success">Independently Audited</span></h5>
+    <h2 id="mullvad" class="anchor">
+      <a href="#mullvad"><i class="fas fa-link anchor-icon"></i></a> Mullvad
+      {% include badge.html color="info" text="EUR €60/y" %}
+    </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>{% include badge.html color="success" text="35 Countries" %}</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>{% include badge.html color="success" text="Independently Audited" %}</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">Accepts Bitcoin</span></h5>
+    <h5>{% include badge.html color="success" text="Open Source Clients" %}</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>{% include badge.html color="success" text="Accepts Bitcoin" %}</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-info">Extra Functionality</span></h5>
+    <h5>{% include badge.html color="success" text="WireGuard Support" %}</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>{% include badge.html color="success" text="IPv6 Support" %}</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>{% include badge.html color="success" text="Remote Port Forwarding" %}</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>{% include badge.html color="success" text="Mobile Clients" %}</h5>
+    <p>Mullvad has published <a href ="https://apps.apple.com/app/mullvad-vpn/id1488466513">App Store</a> and <a href="https://play.google.com/store/apps/details?id=net.mullvad.mullvadvpn">Google Play</a> clients, both supporting an easy-to use interface as opposed to requiring users to manual configure their WireGuard connections.</p>
+    <h5>{% include badge.html color="info" text="Extra Functionality" %}</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 class="row mb-2">
+    <div class="col-lg-3 col-sm-12 pt-lg-5">
+      <img src="{% if jekyll.environment == "production" and site.pull_cdn %}{{site.pull_cdn}}{% endif %}/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 id="protonvpn" class="anchor">
+      <a href="#protonvpn"><i class="fas fa-link anchor-icon"></i></a> ProtonVPN
+      {% include badge.html color="info" text="Free" %}
+      {% include badge.html color="info" text="Basic USD $48/y" %}
+      {% include badge.html color="secondary" text="Plus USD $96/y" %}
+    </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>{% include badge.html color="success" text="44 Countries" %}</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>{% include badge.html color="success" text="Independently Audited" %}</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>{% include badge.html color="success" text="Open Source Clients" %}</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>{% include badge.html color="success" text="Accepts Bitcoin" %}</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>{% include badge.html color="success" text="Mobile Clients" %}</h5>
+    <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">App Store</a> and <a href="https://play.google.com/store/apps/details?id=ch.protonvpn.android&hl=en_US">Google Play</a> allowing for easy connections to their servers. The mobile client on Android is also available in <a href="https://f-droid.org/en/packages/ch.protonvpn.android">F-Droid</a>, which ensures that it is compiled with <a href="https://www.f-droid.org/en/2019/05/05/trust-privacy-and-free-software.html">reproducable builds</a>.</p>
+    <h5>{% include badge.html color="warning" text="No Port Forwarding" %}</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>{% include badge.html color="info" text="Extra Functionality" %}</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 <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="{% if jekyll.environment == "production" and site.pull_cdn %}{{site.pull_cdn}}{% endif %}/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 id="ivpn" class="anchor">
+      <a href="#ivpn"><i class="fas fa-link anchor-icon"></i></a> IVPN
+      {% include badge.html color="info" text="Standard USD $60/y" %}
+      {% include badge.html color="secondary" text="Pro USD $100/y" %}
+    </h2>
+    <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>{% include badge.html color="success" text="32 Countries" %}</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>{% include badge.html color="success" text="Independently Audited" %}</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>{% include badge.html color="success" text="Open Source Clients" %}</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>{% include badge.html color="success" text="Accepts Bitcoin" %}</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>{% include badge.html color="success" text="WireGuard Support" %}</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>{% include badge.html color="success" text="Remote Port Forwarding" %}</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>{% include badge.html color="success" text="Mobile Clients" %}</h5>
+    <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">App Store</a> and <a href="https://play.google.com/store/apps/details?id=net.ivpn.client">Google Play</a> allowing for easy connections to their servers. The mobile client on Android is also available in <a href="https://f-droid.org/en/packages/net.ivpn.client">F-Droid</a>, which ensures that it is compiled with <a href="https://www.f-droid.org/en/2019/05/05/trust-privacy-and-free-software.html">reproducable builds</a>.</p>
+    <h5>{% include badge.html color="info" text="Extra Functionality" %}</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 "<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>
-
-<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/provider/ProtonVPN.png" 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 2019 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>
-    <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>
-    <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>
-    </div>
-  </div>
-
-  <div class="row mb-2">
-    <div class="col-lg-3 col-sm-12 pt-lg-5">
-      <img src="/assets/img/provider/IVPN.png" 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">USD $100/Year</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. We have still chosen to list it on this page with the assumption that an audit will be published soon: The IVPN team <a href="https://twitter.com/yaelwrites/status/1161796418220089344">reportedly plans to begin the process in September</a>.</p>
-    <p>We will reevaluate this listing at the end of 2019 or when the aforementioned report has been published, whichever is sooner.
-    <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">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">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>
-    <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>
-    </div>
-  </div>
-
-</div>

_includes/sections/warrant-canary.html

@@ -1,6 +1,6 @@
 <h1 id="wc" class="anchor"><a href="#wc"><i class="fas fa-link anchor-icon"></i></a> What is a warrant canary?</h1>
 
-<img src="/assets/img/layout/warrant-canary.jpg" width="450" height="236" class="img-fluid float-right ml-3" alt="Warrant Canary Example">
+<img src="{% if jekyll.environment == "production" and site.pull_cdn %}{{site.pull_cdn}}{% endif %}/assets/img/svg/layout/warrant_canary_example.svg" width="450px" class="img-fluid float-right ml-3" alt="Warrant Canary Example">
 
 <p>A warrant canary is a posted document stating that an organization has not received any secret subpoenas during a specific period of time. If this document fails to be updated during the specified time then the user is to assume that the service has received such a subpoena and should stop using the service.</p>
 

_includes/sections/windows10.html

@@ -4,7 +4,7 @@
   <strong>Microsoft introduced a lot of new features in Windows 10 such as Cortana. However, most of them are violating your privacy.</strong>
 </div>
 
-<img src="/assets/img/layout/Windows-10-Privacy.png" width="367" height="369" class="img-fluid float-right ml-3" alt="Windows 10 Privacy">
+<img src="{% if jekyll.environment == "production" and site.pull_cdn %}{{site.pull_cdn}}{% endif %}/assets/img/svg/layout/windows_privacy.svg" width="367" height="369" class="img-fluid float-right ml-3" alt="Windows 10 Privacy">
 
 <ol>
   <li><strong>Data syncing is by default enabled.</strong>

_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="{% if jekyll.environment == "production" and site.pull_cdn %}{{site.pull_cdn}}{% endif %}/assets/img/svg/3rd-party/sponsors/safing.svg"
+      data-theme-src="{% if jekyll.environment == "production" and site.pull_cdn %}{{site.pull_cdn}}{% endif %}/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/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 %}

_layouts/minimal.html

@@ -2,7 +2,7 @@
 <html lang="en">
 {% include head.html %}
 <body data-spy="scroll" data-target="#navbar">
-  <script src="/assets/js/applytheme.js?v=1"></script>
+  <script src="{% if jekyll.environment == "production" and site.pull_cdn %}{{site.pull_cdn}}{% endif %}/assets/js/applytheme.js?v=1"></script>
   <header>
   {% include nav.html %}
   <div id="top" class="py-4"></div>

assets/css/style.scss

@@ -186,13 +186,6 @@ h2, h3:not(.h5), h4, h5 {
   white-space: nowrap;
 }
 
-footer {
-  img,
-  i {
-    margin-right: 1rem;
-  }
-}
-
 .hover-text-decoration-none:hover {
   text-decoration: none;
   -webkit-text-decoration-skip: object;
@@ -204,12 +197,19 @@ footer {
 
 
 .btn-icon {
+  display: flex;
+  justify-content: center;
   font-size: 1.5rem;
   padding: 0.5rem;
   border-radius: 0.25rem;
   display: flex;
   height: 2.4rem;
-  color: #ddd;
+  width: 2.4rem;
+  color: #eee;
+}
+.btn-icon:hover {
+  text-decoration: none;
+  color: #fff;
 }
 
 .btn-tor {
@@ -219,7 +219,13 @@ footer {
   background: darken($tor, 5%);
 }
 
+.icon-btn {
+  padding: 0px;
+}
 
+.flow-root {
+  display: flow-root;
+}
 
 /*
  * Bootstrap 4.2+ features