Use SRI

Use cdn.privacytools.io for static resources
Update other old badges and fix indenting (#1924 )
2020-05-26 23:57:47 -05:00 · 2020-05-26 00:01:45 -05:00 · 2020-05-21 02:50:05 +00:00 · 2020-05-17 16:05:31 +00:00 · 2020-05-16 09:03:50 +00:00 · 2020-05-16 09:03:22 +00:00
99 changed files with 1617 additions and 1312 deletions
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@ -1,9 +1,9 @@
 # Editorial Team
-*.md @privacytoolsIO/editorial
-/assets/ @privacytoolsIO/editorial
-/pages/ @privacytoolsIO/editorial
-/_includes/sections/ @privacytoolsIO/editorial
-/index.html @privacytoolsIO/editorial
+*.md @privacytools/editorial
+/assets/ @privacytools/editorial
+/pages/ @privacytools/editorial
+/_includes/sections/ @privacytools/editorial
+/index.html @privacytools/editorial
 /font/ @dawidpotocki

 # Administration Related Files
--- a/.github/CONTRIBUTING.md
+++ b/.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

@ -96,8 +96,8 @@ See https://www.privacytools.io/providers/vpn/#criteria for more details.
 ## Images

 - SVG file format is strongly preferred. PNG files can be used as a fallback if images are too complex or otherwise unsuitable as a vector format.
- Provider logo dimensions are 384px x 128px ([example](https://github.com/privacytoolsIO/privacytools.io/blob/master/assets/img/svg/3rd-party/mullvad.svg))
- Tool logo dimensions are 120px x 120px ([SVG example](https://github.com/privacytoolsIO/privacytools.io/blob/master/assets/img/svg/3rd-party/firefox_browser.svg), [PNG example](https://github.com/privacytoolsIO/privacytools.io/blob/master/assets/img/png/3rd-party/claws_mail.png))
+- 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

@ -111,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).
--- a/.github/ISSUE_TEMPLATE/5_Website_Issues.md
+++ b/.github/ISSUE_TEMPLATE/5_Website_Issues.md
@ -9,7 +9,7 @@ labels: 🌐 website issue

 READ ME FIRST:
 This is NOT the place to request changes to the content of the website.
-This is NOT the place to report issues with our services. (That is https://github.com/privacytoolsIO/services/issues/new)
+This is 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.

 -->
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@ -1,6 +1,6 @@
 contact_links:
  - name: Services issues
-    url: https://github.com/privacytoolsIO/services/issues/new/choose
+    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/
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@ -1,4 +1,4 @@
-<!-- PLEASE READ OUR CODE OF CONDUCT (https://wiki.privacytools.io/view/PrivacyTools:Code_of_Conduct) AND CONTRIBUTING GUIDELINES (https://github.com/privacytoolsIO/privacytools.io/blob/master/.github/CONTRIBUTING.md) BEFORE SUBMITTING -->
+<!-- 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

@ -8,7 +8,7 @@ Resolves: #none <!-- A link to the (discussion) issue resolved by this pull requ

 - [ ] I understand that by not opening an issue about a software/service/similar addition/removal, this pull request will be closed without merging.

- [ ] I have read and understand [the contributing guidelines](https://github.com/privacytoolsIO/privacytools.io/blob/master/.github/CONTRIBUTING.md).
+- [ ] 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

--- a/.github/stale.yml
+++ b/.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
--- a/.gitignore
+++ b/.gitignore
@ -6,3 +6,5 @@ font/assets/
 font/_sass/
 font/.fontcustom-manifest.json
 assets/webfonts/ptio-font-preview.html
+vendor
+.bundle
--- a/.well-known/security.txt
+++ b/.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
--- a/24
+++ b/24
@ -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?
-
--- a/Gemfile.lock
+++ b/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 (2.0.0)
    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
--- a/README.md
+++ b/README.md
@ -10,7 +10,7 @@ _Encryption Against Global Mass Surveillance._

 It's important for a website like PrivacyTools to be up-to-date. Keep an eye on software updates of the applications listed here. Follow recent news about providers that are recommended. We try our best to keep up but we're not perfect and the internet is changing fast. So if you find an error, or you think a provider should not be listed here, or a qualified service provider is missing or a browser plugin is not the best choice anymore or anything else...

-**Talk to us!** If you want to help make privacytools.io the best website it can be, join our Matrix discussion chat at [`#dev:privacytools.io`](https://matrix.to/#/#dev:privacytools.io), where we talk about open issues and PRs in this repo, and changes to the site. You may submit any website suggestions here on GitHub [Issues](https://github.com/privacytoolsIO/privacytools.io/issues). Please refer to the [contribution guidelines](.github/CONTRIBUTING.md) and consider stopping by our chat room before submitting. Thank you.
+**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.

 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.

@ -29,7 +29,6 @@ If you want to discuss privacy in general, a new tool, or just something else, f
 # 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/)
@ -51,4 +50,4 @@ If you want to discuss privacy in general, a new tool, or just something else, f

 # License & Notices

-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/privacytoolsIO/privacytools.io/blob/master/LICENSE.txt) in this repository.
+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.
--- a/_config.yml
+++ b/_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:
--- a/_includes/badge.html
+++ b/_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 %}
--- a/_includes/card.html
+++ b/_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 %}
--- a/_includes/cardv2.html
+++ b/_includes/cardv2.html
@ -29,7 +29,7 @@
  <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 %}
@ -41,27 +41,39 @@
      {{ 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">
--- a/_includes/footer.html
+++ b/_includes/footer.html
@ -89,7 +89,8 @@
    <small>
      <a href="/privacy/">Privacy Statement</a> |
      <a href="/notices/">Notices &amp; Disclaimers</a> |
-      <a href="https://github.com/privacytoolsIO/brand">Brand Assets &amp; Guidelines</a>
+      <a href="https://github.com/privacytools/brand">Brand Assets &amp; Guidelines</a> |
+      <a href="https://status.privacytools.io">Status Page</a>
    </small>

  </div>
--- a/_includes/head.html
+++ b/_includes/head.html
@ -6,6 +6,8 @@
  <meta name="keywords" content="privacy, anonymity, privacy tools, surveillance, encryption">
  <meta name="description" content="{% if page.description %}{{ page.description }}{% else %}{{ site.description }}{% endif %}">
  <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 %}
@ -22,7 +24,7 @@
  <meta property="og:locale" content="en_GB" />
  <meta property="og:site_name" content="{{ site.name }}" />

-  {% if page.url == "/" or page.url == "/about/" %}
+  {% if page.url == "/" %}
  <script type="application/ld+json">
  {
    "@context": "https://schema.org",
@ -41,25 +43,25 @@
      "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="180x180" href="/assets/img/png/favicons/apple-touch-icon.png?v=2">
-  <link rel="icon" type="image/png" sizes="32x32" href="/assets/img/png/favicons/favicon-32x32.png?v=2">
-  <link rel="icon" type="image/png" sizes="16x16" href="/assets/img/png/favicons/favicon-16x16.png?v=2">
-  <link rel="manifest" href="/assets/img/png/favicons/site.webmanifest?v=2">
-  <link rel="mask-icon" href="/assets/img/png/favicons/safari-pinned-tab.svg?v=2" color="#3498db">
-  <link rel="shortcut icon" href="/assets/img/png/favicons/favicon.ico?v=2">
+  <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="/assets/img/png/favicons/browserconfig.xml?v=2">
+  <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>
--- a/_includes/nav.html
+++ b/_includes/nav.html
@ -2,7 +2,7 @@
  <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="/">
-        <img src="/assets/img/svg/layout/brand/horizontal.svg" width="150px" />
+        <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 />
--- a/_includes/scripts.html
+++ b/_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:
--- a/_includes/sections/android-addons.html
+++ b/_includes/sections/android-addons.html
@ -4,7 +4,7 @@

  <div class="row mb-2">
    <div class="col-lg-3 col-sm-12 pt-lg-5">
-      <img src="/assets/img/png/3rd-party/netguard.png" height="70" width="70" 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>
@ -14,7 +14,7 @@

  <div class="row mb-2">
    <div class="col-lg-3 col-sm-12 pt-lg-5">
-      <img src="/assets/img/svg/3rd-party/orbot.svg" height="70" width="70" 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>
--- a/_includes/sections/browser-addons.html
+++ b/_includes/sections/browser-addons.html
@ -5,113 +5,171 @@
 </div>

 {% include cardv2.html
-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/"
-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="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"
-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="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="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/"
-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="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="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/en-US/firefox/addon/cookie-autodelete"
-chrome="https://chrome.google.com/webstore/detail/cookie-autodelete/fhcgjolkccmbidfldomjliifgaodjagh"
+  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"
 %}

-{% 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/"
-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"
-%}
+<h2>Additional Functionality</h2>

-{% include cardv2.html
-title="Snowflake"
-image="/assets/img/svg/3rd-party/snowflake.svg"
-description="<strong>Snowflake</strong> is a new <a href=https://2019.www.torproject.org/docs/pluggable-transports.html.en>pluggable transport</a> from the Tor Project. If you have an uncensored connection, running this extension volunteers your connection to be used as a Snowflake proxy to help users unable to connect to the Tor network. Your IP will not be visible to the sites users visit using your proxy, as this extension will not make you an exit node. If your access to the Tor network is blocked, this extension will not assist you, and you should use the <a href=https://www.torproject.org>Tor Browser</a> instead. <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/en-US/firefox/addon/torproject-snowflake"
-chrome="https://chrome.google.com/webstore/detail/snowflake/mafpmfcccpbjnhfhjnllmmalhifmlcie"
-%}
-
-{% include cardv2.html
-title="Privacy Badger: Stop Tracking"
-image="/assets/img/svg/3rd-party/privacy_badger.svg"
-description="<strong>Privacy Badger</strong> is a browser add-on that stops advertisers and other third-party trackers from secretly tracking where you go and what pages you look at on the web. Privacy Badger learns about trackers as you browse."
-website="https://www.eff.org/privacybadger"
-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>
-
-<div class="alert alert-warning" role="alert">
-  <strong>These addons require quite a lot of interaction from the user. Some sites may not work properly without careful configuration.</strong>
+<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="uMatrix: Stop Cross-Site Requests"
-image="/assets/img/png/3rd-party/umatrix.png"
-description="<strong>uMatrix</strong> gives you control over the requests that websites make to other websites. Many websites integrate features which let other websites track you, such as Facebook Like Buttons or Google Analytics."
-website="https://addons.mozilla.org/firefox/addon/umatrix/"
-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="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="NoScript Security Suite: Be in total control"
-image="/assets/img/svg/3rd-party/noscript.svg"
-description="<strong>NoScript</strong> is a highly customizable plugin to selectively allow JavaScript, Java, and Flash to run only on websites you trust. Not for casual users, it requires technical knowledge to configure."
-website="https://addons.mozilla.org/firefox/addon/noscript/"
-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="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"
+%}
+
+<h2>Persistent storage management</h2>
+
+<h3>Desktop</h3>
+
+<div class="alert alert-warning" role="alert">
+  These add-ons are the preferred method for controlling persistent storage data that various websites and web-apps may create on your computer.
+</div>
+
+{% include cardv2.html
+  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="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/"
 %}
--- a/_includes/sections/browser-fingerprint.html
+++ b/_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>

--- a/_includes/sections/browser-recommendation.html
+++ b/_includes/sections/browser-recommendation.html
@ -4,32 +4,34 @@
 </h1>

 {% include cardv2.html
-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"
-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/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/"
-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/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/"
-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/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/"
-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/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"
+  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/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/"
-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/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/"
-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/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"
-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>
--- a/_includes/sections/browser-webrtc.html
+++ b/_includes/sections/browser-webrtc.html
@ -1,7 +1,7 @@
 <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. <b>Note:</b> This disables browser-based call functionality that is used for webapps like Discord, Hangouts, Jitsi, etc.</p>
--- a/_includes/sections/calendar-contacts-sync.html
+++ b/_includes/sections/calendar-contacts-sync.html
@ -10,6 +10,7 @@
  image="/assets/img/svg/3rd-party/nextcloud.svg"
  description="<strong>Nextcloud</strong> is a suite of client-server software for creating and using file hosting services. This includes calendar sync via CalDAV and contacts sync via CardDAV. Nextcloud is free and open-source, thereby allowing anyone to install and operate it without charge on a private server."
  website="https://nextcloud.com/"
+  privacy-policy="https://nextcloud.com/privacy/"
  forum="https://forum.privacytools.io/t/discussion-nextcloud-calender-contacts-sync-tools/1535"
  github="https://github.com/nextcloud"
  windows="https://nextcloud.com/install/"
@ -28,6 +29,7 @@
  image="/assets/img/svg/3rd-party/etesync.svg"
  description="<strong>EteSync</strong> is a secure, end-to-end encrypted, and privacy-respecting cloud backup and synchronization software for your personal information (e.g. contacts and calendars). There are native clients for Android, iOS, and the web, and an adapter layer for most desktop clients. It costs $24 per year to use, or you can host the server yourself for free."
  website="https://www.etesync.com/"
+  privacy-policy="https://www.etesync.com/tos/#privacy"
  forum="https://forum.privacytools.io/t/discussion-etesync-calender-contacts-sync-tools/1536"
  github="https://github.com/etesync"
  web="https://client.etesync.com/"
--- a/_includes/sections/cloud-storage.html
+++ b/_includes/sections/cloud-storage.html
@ -5,27 +5,48 @@
 </div>

 {% include cardv2.html
-title="Nextcloud - Choose your hoster"
-image="/assets/img/svg/3rd-party/nextcloud.svg"
-description="<strong>Nextcloud</strong> is a suite of client-server software for creating your own file hosting services on a private server you control. Nextcloud is free and open-source, and supports end-to-end encryption with many of its clients. The only limits on storage and bandwidth are the limits on the <a href=\"/providers/hosting\">server provider</a> you choose."
-website="https://nextcloud.com/"
-forum="https://forum.privacytools.io/t/discussion-nextcloud/287"
-github="https://github.com/nextcloud"
-windows="https://nextcloud.com/install/#install-clients"
-mac="https://nextcloud.com/install/#install-clients"
-linux="https://nextcloud.com/install/#install-clients"
-freebsd="https://www.freshports.org/www/nextcloud/"
-openbsd="http://openports.se/www/nextcloud"
-netbsd="http://pkgsrc.se/www/php-nextcloud"
-ios="https://itunes.apple.com/us/app/nextcloud/id1125420102?mt=8"
-fdroid="https://f-droid.org/packages/com.nextcloud.client/"
-googleplay="https://play.google.com/store/apps/details?id=com.nextcloud.client"
+  title="Nextcloud - Choose your hoster"
+  image="/assets/img/svg/3rd-party/nextcloud.svg"
+  description="<strong>Nextcloud</strong> is a suite of free and open-source client-server software for creating your own file hosting services on a private server you control. The only limits on storage and bandwidth are the limits on the <a href=\"/providers/hosting\">server provider</a> you choose."
+  labels="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>
--- a/_includes/sections/dns.html
+++ b/_includes/sections/dns.html
@ -112,7 +112,12 @@
          </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>
@ -137,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">
@ -355,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">
@ -389,41 +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
-            class="btn-secondary btn-icon"
-            href="https://securedns.eu/#privacy">
-            <span class="fas fa-globe"></span>
-          </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>
--- a/_includes/sections/email-clients.html
+++ b/_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/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/"
-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/png/3rd-party/claws_mail.png"
-description="Claws Mail is a free and open source, GTK-based email and news client. It offers easy configuration and an abundance of features. It is included with Gpg4win, an encryption suite for Windows."
-website="https://www.claws-mail.org/"
-forum="https://forum.privacytools.io/t/discussion-claws-mail/660"
-git="https://git.claws-mail.org/"
-windows="https://www.claws-mail.org/win32/"
-mac="https://www.claws-mail.org/faq/index.php/Installation_and_Configuration#What_do_I_need_to_compile_Claws_Mail.3F"
-linux="https://www.claws-mail.org/downloads.php?section=downloads"
-freebsd="https://www.freshports.org/mail/claws-mail/"
-openbsd="http://openports.se/mail/claws-mail"
-netbsd="http://pkgsrc.se/mail/claws-mail"
+  title="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"
 %}


--- a/_includes/sections/email-providers.html
+++ b/_includes/sections/email-providers.html
@ -9,262 +9,265 @@
  <div class="row mb-2">
    <div class="col-lg-3 col-sm-12 pt-lg-5">
      <img
-        src="/assets/img/svg/3rd-party/protonmail.svg"
+        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 <span class="badge badge-info">Free</span></h2>
+    <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>

-    <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/Year</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>
+    <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>

-    <h5><span class="badge badge-success">Domains and Aliases</span></h5>
+    <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>

-    <h5><span class="badge badge-success">Payment Methods</span></h5>
+    <h5>{% include badge.html color="success" text="Payment Methods" %}</h5>
    <p>ProtonMail accepts Bitcoin in addition to accepting credit/debit cards and PayPal.</p>

-    <h5><span class="badge badge-success">Account Security</span></h5>
+    <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>

-    <h5><span class="badge badge-success">Data Security</span></h5>
+    <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>

-    <h5><span class="badge badge-success">Email Encryption</span></h5>
+    <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>

-    <h5><span class="badge badge-success">.onion Service</span></h5>
+    <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>

-    <h5><span class="badge badge-info">Extra Functionality</span></h5>
+    <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="/assets/img/svg/3rd-party/mailboxorg.svg"
+        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 <span class="badge badge-info">€12/Year</span></h2>
+    <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>

-    <h5><span class="badge badge-success">Domains and Aliases</span></h5>
+    <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>

-    <h5><span class="badge badge-warning">Payment Methods</span></h5>
+    <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>

-    <h5><span class="badge badge-success">Account Security</span></h5>
+    <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>

-    <h5><span class="badge badge-warning">Data Security</span></h5>
+    <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>

-    <h5><span class="badge badge-success">Email Encryption</span></h5>
+    <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>

-    <h5><span class="badge badge-warning">.onion Service</span></h5>
+    <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><span class="badge badge-info">Extra Functionality</span></h5>
-    <p>All accounts come with limited cloud storage that <a href="https://kb.mailbox.org/display/MBOKBEN/Encrypt+files+on+your+Drive">can be encrypted</a>. Mailbox.org also offers the alias <a href="https://kb.mailbox.org/display/MBOKBEN/Ensuring+E-Mails+are+Sent+Securely">@secure.mailbox.org</a>, which enforces the TLS encryption on the connection between mail servers, otherwise the message will not be sent at all.</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="/assets/img/svg/3rd-party/posteo.svg"
+        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 <span class="badge badge-info">€12/Year</span></h2>
+    <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><span class="badge badge-warning">Domains and Aliases</span></h5>
+    <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><span class="badge badge-warning">Payment Methods</span></h5>
+    <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><span class="badge badge-success">Account Security</span></h5>
+    <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><span class="badge badge-warning">Data Security</span></h5>
-    <p>Posteo has <a href="https://posteo.de/en/site/encryption#cryptomailstorage">zero access encryption</a> for email storage. This means the messages stored in your account are only readable by you. </p>
+    <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><span class="badge badge-success">Email Encryption</span></h5>
+    <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><span class="badge badge-danger">.onion Service</span></h5>
+    <h5>{% include badge.html color="danger" text=".onion Service" %}</h5>
    <p>Posteo does not operate a .onion service.</p>

-    <h5><span class="badge badge-info">Extra Functionality</span></h5>
+    <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="/assets/img/svg/3rd-party/soverin.svg"
+        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 <span class="badge badge-info">€29/Year</span></h2>
+    <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><span class="badge badge-success">Domains and Aliases</span></h5>
+    <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><span class="badge badge-success">Payment Methods</span></h5>
+    <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><span class="badge badge-success">Account Security</span></h5>
+    <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><span class="badge badge-warning">Data Security</span></h5>
+    <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><span class="badge badge-success">Email Encryption</span></h5>
+    <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><span class="badge badge-danger">.onion Service</span></h5>
+    <h5>{% include badge.html color="danger" text=".onion Service" %}</h5>
    <p>Soverin does not operate a .onion service.</p>

-    <h5><span class="badge badge-info">Extra Functionality</span></h5>
+    <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="/assets/img/svg/3rd-party/disroot.svg"
-        data-theme-src="/assets/img/svg/3rd-party/disroot-dark.svg"
+        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 <span class="badge badge-info">Free</span></h2>
+    <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><span class="badge badge-success">Domains and Aliases</span></h5>
+    <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><span class="badge badge-success">Payment Methods</span></h5>
+    <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><span class="badge badge-success">Account Security</span></h5>
+    <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><span class="badge badge-warning">Data Security</span></h5>
+    <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><span class="badge badge-success">Email Encryption</span></h5>
+    <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><span class="badge badge-danger">.onion Service</span></h5>
+    <h5>{% include badge.html color="danger" text=".onion Service" %}</h5>
    <p>Disroot does not operate a .onion service.</p>

-    <h5><span class="badge badge-info">Extra Functionality</span></h5>
+    <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="/assets/img/svg/3rd-party/tutanota.svg"
-        data-theme-src="/assets/img/svg/3rd-party/tutanota-dark.svg"
+        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 <span class="badge badge-info">Free</span></h2>
+    <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><span class="badge badge-success">Domains and Aliases</span></h5>
+    <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><span class="badge badge-danger">Payment Methods</span></h5>
+    <h5>{% include badge.html color="danger" text="Payment Methods" %}</h5>
    <p>Tutanota accepts only credit cards and PayPal.</p>

-    <h5><span class="badge badge-success">Account Security</span></h5>
+    <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><span class="badge badge-success">Data Security</span></h5>
+    <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><span class="badge badge-warning">Email Encryption</span></h5>
+    <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><span class="badge badge-danger">.onion Service</span></h5>
+    <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><span class="badge badge-info">Extra Functionality</span></h5>
+    <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/year.</p>
+    <p>Tutanota also has a business feature called <a href="https://tutanota.com/secure-connect/">Secure Connect</a>. This ensures customer contact to the business uses E2EE. The feature costs €240/y.</p>
    </div>
  </div>
  <div class="row mb-2">
    <div class="col-lg-3 col-sm-12 pt-lg-5">
      <img
-        src="/assets/img/svg/3rd-party/mailfence.svg"
-        data-theme-src="/assets/img/svg/3rd-party/mailfence-dark.svg"
+        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="Mailbox">
+        alt="StartMail">
    </div>
    <div class="col">
-    <h2 id="mailfence" class="anchor"><a href="#mailfence"><i class="fas fa-link anchor-icon"></i></a> Mailfence <span class="badge badge-info">Free</span></h2>
-    <p><strong><a href="https://mailfence.com">Mailfence</a></strong> provides secure and private email services to individuals and businesses. They have been in operation since <strong>2013</strong>. Mailfence is based in Brussels, <span class="flag-icon flag-icon-be"></span> Belgium. Accounts start with 500 MB of storage for free accounts.</p>
+    <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><span class="badge badge-success">Domains and Aliases</span></h5>
-    <p>Paid accounts can use <a href="https://kb.mailfence.com/kb/custom-domain-based-addresses-in-mailfence-account/">custom domains</a>. They also support catch-all addresses. Mailfence users can also use <a href="https://will.koffel.org/post/2014/using-email-plus-addressing/">subaddressing</a>.</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><span class="badge badge-success">Payment Methods</span></h5>
-    <p>Mailfence customers can pay with Visa, Mastercard, Paypal, Bitcoin or Litecoin.</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><span class="badge badge-success">Account Security</span></h5>
-    <p>Mailfence supports <a href="https://blog.mailfence.com/two-factor-authentication-now-available/">two factor authentication</a> for their webmail only. They do not allow <a href="https://en.wikipedia.org/wiki/Universal_2nd_Factor">U2F</a> security key authentication.</p>
-    <h5><span class="badge badge-danger">Data Security</span></h5>
-    <p>None. No disk encryption or encryption at rest. Currently a work in progress as of 4th March 2020.</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><span class="badge badge-success">Email Encryption</span></h5>
-    <p>Mailfence allows for encrypted emails to be sent from their webmail application using OpenPGP. However, Mailfence 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="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>

-    <h5><span class="badge badge-danger">.onion Service</span></h5>
-    <p>Mailfence does not operate a .onion service.</p>
+    <p>StartMail supports importing <a href="https://support.startmail.com/hc/en-us/articles/360006495557-Import-contacts">contacts</a> however, they are only accessible in the webmail and not through protocols such as <a href="https://en.wikipedia.org/wiki/CalDAV">CalDAV</a>. Contacts are also not stored using zero knowledge encryption, so a <a href="/software/calendar-contacts/">standalone option</a> may be more appropriate.</p>

-    <h5><span class="badge badge-info">Extra Functionality</span></h5>
-    <p>Mailfence also supports <a href="https://en.wikipedia.org/wiki/Exchange_ActiveSync">Exchange ActiveSync</a> in addition to standard access protocols such as IMAP, POP3, SMTP for paid users.</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>
--- a/_includes/sections/file-encryption.html
+++ b/_includes/sections/file-encryption.html
@ -24,6 +24,7 @@
  image="/assets/img/svg/3rd-party/gnupg.svg"
  description="<strong>GnuPG</strong> is a GPL-licensed alternative to the PGP suite of cryptographic software. GnuPG is compliant with RFC 4880, which is the current IETF standards track specification of OpenPGP. Current versions of PGP (and Veridis' Filecrypt) are interoperable with GnuPG and other OpenPGP-compliant systems. GnuPG is a part of the Free Software Foundation's GNU software project, and has received major funding from the German government."
  website="https://gnupg.org/"
+  privacy-policy="https://gnupg.org/privacy-policy.html"
  forum="https://forum.privacytools.io/t/discussion-gnupg-file-encryption/1533"
  git="https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git"
  windows="https://gpg4win.org/download.html"
@ -38,24 +39,37 @@

 {%
  include cardv2.html
-  title="PeaZip - File Archive Encryption"
-  image="/assets/img/svg/3rd-party/peazip.svg"
-  description="<strong>PeaZip</strong> is a free and open-source file manager and file archiver made by Giorgio Tani. It supports its native PEA archive format (featuring compression, multi volume split and flexible authenticated encryption and integrity check schemes) and other mainstream formats, with special focus on handling open formats. It also supports 180+ archive formats."
-  website="http://www.peazip.org"
-  forum="https://forum.privacytools.io/t/discussion-peazip-file-encryption/1534"
-  source="https://osdn.net/projects/peazip"
-  windows="https://www.peazip.org/peazip-64bit.html"
-  linux="https://www.peazip.org/peazip-linux.html"
-  freebsd="https://www.freshports.org/archivers/peazip/"
-  openbsd="https://www.peazip.org/peazip-bsd.html"
-  netbsd="https://www.peazip.org/peazip-bsd.html"
+  title="7 Zip"
+  image="/assets/img/svg/3rd-party/7zip.svg"
+  description='<strong>7-Zip</strong> is a free and open-source file archiver, a utility used to place groups of files within compressed containers. On Linux, MacOS etc. the command-line tool <a href="http://p7zip.sourceforge.net/"><strong>p7zip</strong></a> is used and integrates into various interfaces such as <a href="https://wiki.gnome.org/Apps/FileRoller">FileRoller</a>, <a href="https://github.com/ib/xarchiver">Xarchiver</a>, <a href="https://kde.org/applications/utilities/ark">Ark</a>.'
+  website="https://7-zip.org"
+  forum="https://forum.privacytools.io/t/discussion-7-zip/3024"
+  source="https://sourceforge.net/projects/sevenzip/files/"
+  windows="https://7-zip.org/download.html"
+  linux="https://sourceforge.net/projects/p7zip/files"
+  freebsd="https://www.freshports.org/archivers/p7zip"
+  openbsd="https://sourceforge.net/projects/p7zip"
+  netbsd="https://sourceforge.net/projects/p7zip"
 %}

 <h3>Worth Mentioning</h3>

 <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"
+    icon="fas fa-exclamation-triangle"
+    link="https://github.com/cryptomator/cryptomator-android/issues/1#issuecomment-257979375"
+    tooltip="Cryptomator's mobile apps are not open-source."
+    %}</li>
  <li><a href="https://gitlab.com/cryptsetup/cryptsetup/">Linux Unified Key Setup (LUKS)</a> - A full disk encryption system for Linux using dm-crypt as the disk encryption backend. Included by default in Ubuntu. Available for Windows and Linux.</li>
+  <li><a href="https://www.dyne.org/software/tomb/">Tomb</a> - A simple zsh script for making LUKS containers on the commandline.</li>
  <li><a href="https://hat.sh/">Hat.sh</a> - A cross-platform, serverless JavaScript web application that provides secure file encryption using the AES-256-GCM algorithm in your browser. It can also be downloaded and run offline.</li>
-  <li><a href="https://www.keka.io/">Keka</a> - A macOS-only, open-source file archiver with the ability to encrypt files.</li>
+  <li><a href="https://www.keka.io/">Keka</a> - A macOS-only, file archiver with the ability to encrypt files.
+    {% 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>
--- a/_includes/sections/file-sharing.html
+++ b/_includes/sections/file-sharing.html
@ -1,51 +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/svg/3rd-party/firefox_send.svg"
-labels="warning:<a href=//send.firefox.com/legal>Warning</a>: IP addresses are retained in logs for 90 days."
-description="Firefox Send uses end-to-end encryption to keep your data secure from the moment you share to the moment your file is opened. It also offers security controls that you can set. You can choose when your file link expires, the number of downloads, and whether you would like to add a password for an extra layer of security."
-website="https://send.firefox.com/"
-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/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"
+  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/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/"
+  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://framadrop.org/">FramaDrop</a> - Stores a file of any size for 24h. Data is end-to-end encrypted from your browser, powered by <a href="https://framagit.org/fiat-tux/hat-softwares/lufi">LuFi</a>. <span class="badge badge-warning" data-toggle="tooltip" title="FramaDrop logs IP addresses and fingerprints the browser for an unclear amount of time."><a href="https://framasoft.org/en/cgu/"><i class="fas fa-exclamation-triangle"></i></a></span></li>
+  <li><a href="https://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>
--- a/_includes/sections/file-sync.html
+++ b/_includes/sections/file-sync.html
@ -20,18 +20,6 @@
  googleplay="https://play.google.com/store/apps/details?id=com.github.catfriend1.syncthingandroid"
 %}

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

 <ul>
--- a/_includes/sections/fourteen-eyes.html
+++ b/_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/svg/layout/ukusa.svg" 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>

--- a/_includes/sections/header.html
+++ b/_includes/sections/header.html
@ -1,13 +1,13 @@
 <div class="alert alert-success" role="alert">
-  <strong>New!</strong> Financial <a href="https://opencollective.com/privacytoolsio" 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>
+  <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="{{ site.name }}">
-      <img class="img-fluid d-none d-sm-block" src="/assets/img/svg/layout/brand/horizontal.svg" width="500px" alt="{{ 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="/assets/img/svg/layout/brand/vertical.svg" width="300px" alt="{{ site.name }}">
+        <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>
--- a/_includes/sections/hosting-provider.html
+++ b/_includes/sections/hosting-provider.html
@ -1,36 +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/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/"
-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/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"
+  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/png/3rd-party/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/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/"
-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"
 %}
--- a/_includes/sections/instant-messenger.html
+++ b/_includes/sections/instant-messenger.html
@ -1,4 +1,7 @@
-<h1 id="im" class="anchor"><a href="#im"><i class="fas fa-link anchor-icon"></i></a> Encrypted Instant Messengers</h1>
+<h1 id="im" class="anchor">
+  <a href="#im"><i class="fas fa-link anchor-icon"></i></a>
+  Encrypted Instant Messengers
+</h1>

 <div class="alert alert-warning" role="alert">
  <strong>If you are currently using an Instant Messenger like Telegram, LINE, Viber, <a href="https://www.eff.org/deeplinks/2016/10/where-whatsapp-went-wrong-effs-four-biggest-security-concerns">WhatsApp</a>, or plain SMS, you should pick an alternative here.</strong></div>
@ -9,42 +12,29 @@

 <p>We have described the three main types of messaging programs that exist: Centralized, Federated and Peer-to-Peer (P2P), with the advantages and disadvantages of each.</p>

-<h2 id="centralized" class="anchor"><a href="#centralized"><i class="fas fa-link anchor-icon"></i></a> Centralized</h2>
+<h2 id="centralized" class="anchor">
+  <a href="#centralized"><i class="fas fa-link anchor-icon"></i></a>
+  Centralized
+</h2>

 <p>Centralized messengers are those where every participant is on the same server or network of servers controlled by the same organization.</p>

-<h3>Advantages</h3>
-<ul>
-    <li>New features and changes can be implemented more quickly.</li>
-    <li>Easier to get started with and to find contacts.</li>
-</ul>
-
-<h3>Disadvantages</h3>
-<ul>
-    <li>Centralized services could be more susceptible to <a href="#exploiting-centralized-networks">legislation requiring backdoor access</a>.</li>
-    <li>Can include <a href="https://drewdevault.com/2018/08/08/Signal.html">restricted control or access</a>. This can include things like:</li>
-    <ul>
-        <li>Being <a href="https://github.com/LibreSignal/LibreSignal/issues/37#issuecomment-217211165">forbidden from connecting third-party clients</a> to the centralized network that might provide for greater customization or better user experience. Often defined in Terms and Conditions of usage.</li>
-        <li>Poor or no documentation for third-party developers.</li>
-    </ul>
-    <li>The <a href="https://blog.privacytools.io/delisting-wire">ownership</a>, privacy policy, and operations of the service can change easily when a single entity controls it, potentially compromising the service later on.</li>
-</ul>
-
 {%
-   include cardv2.html
-   title="Signal"
-   image="/assets/img/svg/3rd-party/signal.svg"
-   description='Signal is a mobile app developed by Signal Messenger LLC. The app provides instant messaging, as well as voice and video calling. All communications are E2EE unless you choose to send as SMS. Its protocol has also been <a href="https://eprint.iacr.org/2016/1013.pdf">indepedently audited (PDF)</a>'
-   labels="warning:<a>Requires phone number</a>:Signal requires your phone number as an personal identifier which means anyone you communicate with will see it.|success:VoIP"
-   website="https://signal.org/"
-   forum="https://forum.privacytools.io/t/discussion-signal/664"
-   github="https://github.com/signalapp"
-   windows="https://signal.org/download/"
-   mac="https://signal.org/download/"
-   linux="https://signal.org/download/"
-   googleplay="https://play.google.com/store/apps/details?id=org.thoughtcrime.securesms"
-   android="https://signal.org/android/apk/#apk-danger"
-   ios="https://apps.apple.com/app/signal-private-messenger/id874139669"
+  include cardv2.html
+  title="Signal"
+  image="/assets/img/svg/3rd-party/signal.svg"
+  description='Signal is a mobile app developed by Signal Messenger LLC. The app provides instant messaging, as well as voice and video calling. All communications are E2EE unless you choose to send as SMS. Its protocol has also been <a href="https://eprint.iacr.org/2016/1013.pdf">indepedently audited (PDF)</a>'
+  labels="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"
 %}

 {%
@ -52,8 +42,9 @@
  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="warning:<a href=//github.com/keybase/client/issues/6374>Warning</a>:This software relies on a closed-source central server."
+  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"
@ -67,38 +58,46 @@
  chrome="https://chrome.google.com/webstore/detail/keybase-for-reddit/ognfafcpbkogffpmmdglhbjboeojlefj"
 %}

-<div>
-    <h2 id="federated" class="anchor"><a href="#federated"><i class="fas fa-link anchor-icon"></i></a> Federated</h2>
-
-    <p>Federated messengers use multiple, independent servers that are able to talk to each other (email is one example of a federated service). Federation allows system administrators to control their own server and still be a part of the larger communications network.</p>
-
+<div class="container">
+  <div class="row">
+    <div class="col-md-6">
    <h3>Advantages</h3>
    <ul>
-        <li>Allows for greater control over your own data when running your own server.</li>
-        <li>Allows you to choose who to trust your data with by choosing between multiple "public" servers.</li>
-        <li>Often allows for third party clients which can provide a more native, customized, or accessible experience.</li>
-        <li>Generally a less juicy target for governments wanting <a href="#exploiting-centralized-networks">backdoor access to everything</a> as the trust is decentralized. The server may be hosted independently from the organization developing the software.</li>
-        <li>Server software can be verified that it matches public source code, assuming you have access to the server or you trust the person who does (e.g., a family member)</li>
-        <li>Third-party developers can contribute code and add new features, instead of waiting for a private development team to do so.</li>
+      <li>New features and changes can be implemented more quickly.</li>
+      <li>Easier to get started with and to find contacts.</li>
    </ul>
-
+    </div>
+  <div class="col-md-6">
    <h3>Disadvantages</h3>
    <ul>
-        <li>Adding new features is more complex, because these features need to be standardized and tested to ensure they work with all servers on the network.</li>
-        <li>Some metadata may be available (e.g., information like "who is talking to whom," but not actual message content if E2EE is used).</li>
-        <li>Federated servers generally require trusting your server's administrator. They may be a hobbyist or otherwise not a "security professional," and may not serve standard documents like a privacy policy or terms of service detailing how your data is utilized.</li>
-        <li>Server administrators sometimes choose to block other servers, which are a source of unmoderated abuse or break general rules of accepted behavior. This will hinder your ability to communicate with users on those servers.</li>
+      <li>Centralized services could be more susceptible to <a href="#exploiting-centralized-networks">legislation requiring backdoor access</a>.</li>
+      <li>Can include <a href="https://drewdevault.com/2018/08/08/Signal.html">restricted control or access</a>. This can include things like:</li>
+      <ul>
+        <li>Being <a href="https://github.com/LibreSignal/LibreSignal/issues/37#issuecomment-217211165">forbidden from connecting third-party clients</a> to the centralized network that might provide for greater customization or better user experience. Often defined in Terms and Conditions of usage.</li>
+        <li>Poor or no documentation for third-party developers.</li>
+      </ul>
+      <li>The <a href="https://blog.privacytools.io/delisting-wire">ownership</a>, privacy policy, and operations of the service can change easily when a single entity controls it, potentially compromising the service later on.</li>
    </ul>
+  </div>
+  </div>
 </div>

+<div>
+  <h2 id="federated" class="anchor">
+    <a href="#federated"><i class="fas fa-link anchor-icon"></i></a>
+    Federated
+  </h2>
+
+  <p>Federated messengers use multiple, independent servers that are able to talk to each other (email is one example of a federated service). Federation allows system administrators to control their own server and still be a part of the larger communications network.</p>
+
 {%
  include cardv2.html
-  title="Matrix"
-  image="/assets/img/svg/3rd-party/matrix.svg"
-  image-dark="/assets/img/svg/3rd-party/matrix-dark.svg"
-  description='<a href="https://matrix.org/docs/guides/introduction">Matrix</a> is an open-source project that publishes the <a href="https://matrix.org/docs/spec">Matrix open standard</a> for secure, decentralized, real-time communication.<br />
-  <a href="https://en.wikipedia.org/wiki/Riot.im">Riot.im</a> is the popular reference client produced by the Matrix.org team. It offers optional E2EE for 1:1 and group conversations that <strong>must</strong> be turned on by the user. (This can be done by clicking on the toggle switch which is accessed by clicking the room name or user name of the chat → Security &amp; Privacy → Encrypted). In the future it will be <a href="https://github.com/vector-im/riot-web/issues/6779">on by default.</a>'
+  title="Riot"
+  image="/assets/img/svg/3rd-party/riotim.svg"
+  description='<a href="//about.riot.im">Riot.im</a> is the reference client for the <a href="//matrix.org/docs/guides/introduction">Matrix</a> network. The <a href="//matrix.org/docs/spec">Matrix open standard</a> is an open-source standard for secure, decentralized, real-time communication.'
+  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/"
@ -110,49 +109,52 @@
  web="https://riot.im/app/"
 %}

-<div>
-    <h4>Worth Mentioning</h4>
-
-    <ul>
-        <li>Other <a href="https://matrix.org/clients">Matrix</a> clients, that may however be less feature complete than Riot.im.</li>
-        <li><a href="https://xmpp.org/about">XMPP</a> (Extensible Messaging and Presence Protocol) is an open-source communications protocol that began development in 1999. Since then, XMPP has been extended by the publishing of XEPs (XMPP Extension Protocols). <a href="https://conversations.im/omemo/">OMEMO</a> is the most popular XEP (XMPP extension) for E2EE. Clients are developed by the community and not by the XSF (XMPP Standards Foundation). <span class="badge badge-warning" data-toggle="tooltip" title="VoIP and file transfers/names may not be end-to-end encrypted.">Inconsistent E2EE</span></li>
-        <ul>
-            <li><a href="https://gajim.org/">Gajim</a></li>
-            <li><a href="https://conversations.im">Conversations</a></li>
-            <li><a href="https://siskin.im/">Siskin</a></li>
-            <li>Other <a href="https://omemo.top">OMEMO</a> capable clients for XMPP.</li>
-        </ul>
-        <li><a href="https://www.kontalk.org">Kontalk</a> is a community-driven instant messaging network based on XMPP.</li>
-    </ul>
-
-    <h2 id="peer-to-peer" class="anchor"><a href="#peer-to-peer"><i class="fas fa-link anchor-icon"></i></a> Peer to Peer (P2P)</h2>
-
-    <p>Peer-to-Peer instant messengers connect directly to each other without requiring third-party servers. Clients (peers) usually find each other through the use of a <a href="https://en.wikipedia.org/wiki/Distributed_computing">distributed computing</a> network. Examples of this include <a href="https://en.wikipedia.org/wiki/Distributed_hash_table">DHT (distributed hash table)</a> (used with technologies like <a href="https://en.wikipedia.org/wiki/BitTorrent_(protocol)">torrents</a> and <a href="https://en.wikipedia.org/wiki/InterPlanetary_File_System">IPFS</a>, for example), or <a href="https://en.wikipedia.org/wiki/Ethereum">Ethereum</a>'s <a href="https://github.com/ethereum/wiki/wiki/Whisper">Whisper</a> protocol (used with some newer DApps). Another approach is proximity based networks, where a connection is established over WiFi or Bluetooth (for example, Briar or the <a href="https://www.scuttlebutt.nz">Scuttlebutt</a> social networking protocol). Once a peer has found a route to its contact via any of these methods, a direct connection between them is made.</p>
-
-
-    <h3>Advantages</h3>
-    <ul>
-        <li>Minimal information is exposed to third parties.</li>
-        <li>Modern P2P platforms implement end-to-end encryption by default. There are no servers that could potentially intercept and decrypt your transmissions, unlike centralized and federated models.</li>
-    </ul>
-
-    <h3>Disadvantages</h3>
-    <ul>
-        <li>Reduced feature set:</li>
-        <ul>
-            <li>Messages can only be sent when both peers are online, however, your client may store messages locally to wait for the contact to return online.</li>
-            <li>Generally increases battery usage on mobile devices, because the client must stay connected to the distributed network to learn about who is online.</li>
-        </ul>
-        <li>Your <a href="https://en.wikipedia.org/wiki/IP_address">IP address</a> and that of the contacts you're communicating with may be visible if you do not use the software in conjunction with a <a href="/software/networks">self contained network</a>, such as <a href="https://www.torproject.org">Tor</a> or <a href="https://geti2p.net/">I2P</a>. Many countries have some form of mass surveillance and/or metadata retention.</li>
-    </ul>
+<div class="container">
+  <div class="row">
+    <div class="col-md-6">
+      <h3>Advantages</h3>
+      <ul>
+        <li>Allows for greater control over your own data when running your own server.</li>
+        <li>Allows you to choose who to trust your data with by choosing between multiple "public" servers.</li>
+        <li>Often allows for third party clients which can provide a more native, customized, or accessible experience.</li>
+        <li>Generally a less juicy target for governments wanting <a href="#exploiting-centralized-networks">backdoor access to everything</a> as the trust is decentralized. The server may be hosted independently from the organization developing the software.</li>
+        <li>Server software can be verified that it matches public source code, assuming you have access to the server or you trust the person who does (e.g., a family member)</li>
+        <li>Third-party developers can contribute code and add new features, instead of waiting for a private development team to do so.</li>
+      </ul>
+    </div>
+    <div class="col-md-6">
+      <h3>Disadvantages</h3>
+      <ul>
+        <li>Adding new features is more complex, because these features need to be standardized and tested to ensure they work with all servers on the network.</li>
+        <li>Some metadata may be available (e.g., information like "who is talking to whom," but not actual message content if E2EE is used).</li>
+        <li>Federated servers generally require trusting your server's administrator. They may be a hobbyist or otherwise not a "security professional," and may not serve standard documents like a privacy policy or terms of service detailing how your data is utilized.</li>
+        <li>Server administrators sometimes choose to block other servers, which are a source of unmoderated abuse or break general rules of accepted behavior. This will hinder your ability to communicate with users on those servers.</li>
+      </ul>
+    </div>
+  </div>
 </div>

+<div>
+  <h4>Worth Mentioning</h4>
+
+  <ul>
+    <li><a href="https://status.im">Status.im</a> - Encrypted instant messenger with an integrated <a href="https://en.wikipedia.org/wiki/Ethereum">Ethereum</a> wallet (cryptocurrency) that also includes support for <a href="https://our.status.im/tag/dapps">DApps (decentralized apps)</a> (web apps in a curated store). Uses the <a href="https://our.status.im/status-launches-private-peer-to-peer-messaging-protocol/">Waku protocol (a fork of Whisper)</a> for P2P communication. Only available for iOS and Android.</li>
+  </ul>
+
+  <h2 id="peer-to-peer" class="anchor">
+    <a href="#peer-to-peer"><i class="fas fa-link anchor-icon"></i></a>
+    Peer to Peer (P2P)
+  </h2>
+
+  <p>Peer-to-Peer instant messengers connect directly to each other without requiring third-party servers. Clients (peers) usually find each other through the use of a <a href="https://en.wikipedia.org/wiki/Distributed_computing">distributed computing</a> network. Examples of this include <a href="https://en.wikipedia.org/wiki/Distributed_hash_table">DHT (distributed hash table)</a> (used with technologies like <a href="https://en.wikipedia.org/wiki/BitTorrent_(protocol)">torrents</a> and <a href="https://en.wikipedia.org/wiki/InterPlanetary_File_System">IPFS</a>, for example). Another approach is proximity based networks, where a connection is established over WiFi or Bluetooth (for example, Briar or the <a href="https://www.scuttlebutt.nz">Scuttlebutt</a> social networking protocol). Once a peer has found a route to its contact via any of these methods, a direct connection between them is made.</p>
+
 {%
  include cardv2.html
  title="Briar"
  image="/assets/img/svg/3rd-party/briar.svg"
  description="Encrypted instant messenger that connects to contacts via Wi-Fi, Bluetooth, or Tor over the internet to synchronize messages. Technology such as this has proven to be useful when Internet availability is an issue, such as in times of crisis."
  website="https://briarproject.org"
+  privacy-policy="https://briarproject.org/privacy-policy/"
  forum="https://forum.privacytools.io/t/discussion-briar/2114"
  gitlab="https://code.briarproject.org/briar/briar"
  fdroid="https://f-droid.org/packages/org.briarproject.briar.android/"
@ -163,9 +165,10 @@
  include cardv2.html
  title="Jami"
  image="/assets/img/svg/3rd-party/jami.svg"
-  description="Encrypted instant messaging and video calling software. Uses <a href=//jami.net/improving-performance-and-security-with-tls-1-3/>TLS 1.3</a> for encryption."
-  labels="success:VoIP"
+  description="Encrypted instant messaging and video calling software. All communications are E2EE using <a href=//jami.net/improving-performance-and-security-with-tls-1-3/>TLS 1.3</a> and never stored elsewhere than on user's devices, even when <a href=//jami.net/why-is-jami-truly-distributed/>TURN servers are used</a>."
+  labels="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"
@ -176,30 +179,25 @@
  ios="https://itunes.apple.com/app/ring-a-gnu-package/id1306951055?mt=8"
 %}

-{%
-  include cardv2.html
-  title="Tox"
-  image="/assets/img/svg/3rd-party/tox.svg"
-  image-dark="/assets/img/svg/3rd-party/tox-dark.svg"
-  description='Encrypted instant messaging and video calling software. Uses its <a href="https://toktok.ltd/spec.html"> own encryption protocol</a> that has not yet been officially audited by cryptographers.'
-  labels="warning:<a href=//tox.chat/download.html#warning>Experimental</a>:Encryption has not been audited by professional cryptographers|success:VoIP"
-  website="https://tox.chat"
-  forum="https://forum.privacytools.io/t/discussion-tox/2115"
-  windows="https://tox.chat/download.html#oses"
-  mac="https://tox.chat/download.html#oses"
-  linux="https://tox.chat/download.html#oses"
-  freebsd="https://tox.chat/download.html#oses"
-  openbsd="http://openports.se/search.php?so=tox"
-  netbsd="http://pkgsrc.se/search.php?so=tox"
-  fdroid="https://tox.chat/download.html#oses"
-  googleplay="https://tox.chat/download.html#oses"
-  ios="https://tox.chat/download.html#oses"
-%}
-
-<h4>Worth Mentioning</h4>
-
-<ul>
-    <li><a href="https://status.im">Status.im</a> - Encrypted instant messenger with an integrated <a href="https://en.wikipedia.org/wiki/Ethereum">Ethereum</a> wallet (cryptocurrency) that also includes support for <a href="https://our.status.im/tag/dapps">DApps (decentralized apps)</a> (web apps in a curated store). Uses the <a href="https://blog.enuma.io/update/2018/08/08/decentralized-application-messaging-with-whisper.html">Whisper protocol</a> for P2P communication. <span class="badge badge-warning">Experimental</span></li>
-    <li><a href="https://retroshare.cc">Retroshare</a> - Encrypted instant messaging and voice/video call client. RetroShare supports both <a href="https://www.torproject.org/">Tor</a> and <a href="https://geti2p.net">I2P</a>.</li>
-    <li><a href="https://bitmessage.org">Bitmessage</a> is a decentralized, encrypted, peer-to-peer, trustless communications protocol that can be used by one person to send encrypted messages to another person, or to multiple subscribers.</li>
-</ul>
+<div class="container">
+  <div class="row">
+    <div class="col-md-6">
+    <h3>Advantages</h3>
+    <ul>
+      <li>Minimal information is exposed to third parties.</li>
+      <li>Modern P2P platforms implement end-to-end encryption by default. There are no servers that could potentially intercept and decrypt your transmissions, unlike centralized and federated models.</li>
+    </ul>
+    </div>
+    <div class="col-md-6">
+      <h3>Disadvantages</h3>
+      <ul>
+        <li>Reduced feature set:</li>
+        <ul>
+          <li>Messages can only be sent when both peers are online, however, your client may store messages locally to wait for the contact to return online.</li>
+          <li>Generally increases battery usage on mobile devices, because the client must stay connected to the distributed network to learn about who is online.</li>
+        </ul>
+        <li>Your <a href="https://en.wikipedia.org/wiki/IP_address">IP address</a> and that of the contacts you're communicating with may be visible if you do not use the software in conjunction with a <a href="/software/networks">self contained network</a>, such as <a href="https://www.torproject.org">Tor</a> or <a href="https://geti2p.net/">I2P</a>. Many countries have some form of mass surveillance and/or metadata retention.</li>
+      </ul>
+    </div>
+  </div>
+</div>
--- a/_includes/sections/key-disclosure-law.html
+++ b/_includes/sections/key-disclosure-law.html
@ -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/svg/layout/great_seal_of_the_united_states_obverse.svg" 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>

--- a/_includes/sections/live-operating-systems.html
+++ b/_includes/sections/live-operating-systems.html
@ -1,13 +1,13 @@
 <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/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="warning:contrib:This software may depend on or recommend non-free software."
-website="https://tails.boum.org/"
-git="https://git-tails.immerda.ch/tails/"
+  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>
@ -15,12 +15,19 @@ git="https://git-tails.immerda.ch/tails/"
 <ul>
  <li>
    <a href="https://getfedora.org/">Fedora Workstation</a>
-    <span class="badge badge-info">GNU/Linux</span>
+    {% 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>
-    <span class="badge badge-info">GNU/Linux</span>
+    {% 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>
--- a/_includes/sections/mobile-operating-systems.html
+++ b/_includes/sections/mobile-operating-systems.html
@ -5,40 +5,76 @@
 </div>

 {% include cardv2.html
-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="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/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="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/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="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>
--- a/_includes/sections/notebooks.html
+++ b/_includes/sections/notebooks.html
@ -5,50 +5,53 @@
 </div>

 {% include cardv2.html
-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/"
-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/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/"
-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/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/"
-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>
--- a/_includes/sections/operating-systems.html
+++ b/_includes/sections/operating-systems.html
@ -5,43 +5,82 @@
 </div>

 {% include cardv2.html
-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="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/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="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/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/"
-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>
+  <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>
--- a/_includes/sections/participate.html
+++ b/_includes/sections/participate.html
@ -2,7 +2,7 @@
  <h1 id="participate" class="anchor"><a href="#participate"><i class="fas fa-link anchor-icon"></i></a> Participate with suggestions and constructive criticism</h1>
 </div>

-<p>It's important for a website like {{ site.name }} to stay up-to-date. Keep an eye on software updates for the applications listed on our site. Follow recent news about providers that we recommend. We try our best to keep up, but we're not perfect and the internet is changing fast. If you find an error, or you think a provider should not be listed here, or a qualified service provider is missing, or a browser plugin is not the best choice anymore, or anything else... <strong>Talk to us please.</strong> You can also find us on <a href="https://chat.privacytools.io">Matrix</a> at <code class="highlighter-rouge">#general:privacytools.io</code>. When using our services, users should follow our <a href="https://wiki.privacytools.io/view/PrivacyTools:Code_of_Conduct">Code of Conduct</a>.</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">

@ -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>
--- a/_includes/sections/password-managers.html
+++ b/_includes/sections/password-managers.html
@ -10,6 +10,7 @@
  image="/assets/img/svg/3rd-party/bitwarden.svg"
  description="<strong>Bitwarden</strong> is a free and open-source password manager. It aims to solve password management problems for individuals, teams, and business organizations. Bitwarden is among the easiest and safest solutions to store all of your logins and passwords while conveniently keeping them synced between all of your devices. If you don't want to use the Bitwarden cloud, you can easily host your own Bitwarden server."
  website="https://bitwarden.com/"
+  privacy-policy="https://bitwarden.com/privacy/"
  forum="https://forum.privacytools.io/t/discussion-bitwarden/1343"
  github="https://github.com/bitwarden"
  web="https://vault.bitwarden.com/#/"
@ -35,6 +36,7 @@
  image="/assets/img/svg/3rd-party/keepassxc.svg"
  description="<strong>KeePassXC</strong> is a community fork of KeePassX, a native cross-platform port of KeePass Password Safe, with the goal to extend and improve it with new features and bugfixes to provide a feature-rich, fully cross-platform and modern open-source password manager."
  website="https://keepassxc.org/"
+  privacy-policy="https://keepassxc.org/privacy/"
  forum="https://forum.privacytools.io/t/discussion-keepassxc/1344/2"
  github="https://github.com/keepassxreboot/keepassxc"
  windows="https://keepassxc.org/download/#windows"
@ -55,6 +57,7 @@
  image="/assets/img/svg/3rd-party/lesspass.svg"
  description="<strong>LessPass</strong> is a free and open-source password manager that generates unique passwords for websites, email accounts, or anything else based on a master password and information you know. No sync needed. Uses PBKDF2 and SHA-256. It's advised to use the browser addons for more security."
  website="https://lesspass.com/"
+  privacy-policy="https://addons.mozilla.org/en-US/firefox/addon/lesspass/privacy/"
  forum="https://forum.privacytools.io/t/discussion-keepassxc/1344/2"
  github="https://github.com/lesspass/lesspass"
  windows="https://pypi.org/project/lesspass/"
--- a/_includes/sections/paste-services.html
+++ b/_includes/sections/paste-services.html
@ -15,6 +15,7 @@ title="CryptPad"
 image="/assets/img/svg/3rd-party/cryptpad.svg"
 description="CryptPad is an open-source, zero knowledge, and real-time collaborative editor. Data is encrypted/decrypted in the browser, using Salsa20 with Poly1305 to encrypt pads."
 website="https://cryptpad.fr/pad/"
+privacy-policy="https://cryptpad.fr/privacy.html"
 forum="https://forum.privacytools.io/t/discussion-cryptpad/1270"
 github="https://github.com/xwiki-labs/cryptpad"
 %}
--- a/_includes/sections/privacy-resources.html
+++ b/_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>
--- a/_includes/sections/productivity-tools.html
+++ b/_includes/sections/productivity-tools.html
@ -6,6 +6,7 @@
  image="/assets/img/svg/3rd-party/cryptpad.svg"
  description="<strong>CryptPad</strong> is a private-by-design alternative to popular office tools and cloud services. All content is end-to-end encrypted. It is free and open-source, enabling anyone to verify its security by auditing the code. The development team is supported by donations and grants. No registration is required, and it can be used anonymously via Tor Browser."
  website="https://cryptpad.fr/"
+  privacy-policy="https://cryptpad.fr/privacy.html"
  forum="https://forum.privacytools.io/t/discussion-cryptpad-productivity-tools/1537"
  github="https://github.com/xwiki-labs/cryptpad"
  web="https://cryptpad.fr/"
@ -35,6 +36,7 @@
  image-dark="/assets/img/svg/3rd-party/writeas-dark.svg"
  description="<strong>Write.as</strong> is a cross-platform, privacy-oriented blogging platform. It's anonymous by default, letting you publish without signing up. If you create an account, it doesn't require any personal information. No ads, distraction-free, and built on a sustainable business model."
  website="https://write.as/"
+  privacy-policy="https://write.as/privacy"
  forum="https://forum.privacytools.io/t/discussion-write-as-productivity-tools/1539"
  tor="http://writeas7pm7rcdqg.onion"
  git="https://code.as/writeas"
@ -56,7 +58,7 @@
  <li><a href="https://dudle.inf.tu-dresden.de/anonymous/">dudle</a> - An online scheduling application, free and open-source. Schedule meetings or make small online polls. No email collection or the need of registration.</li>
  <li><a href="https://framadate.org/">Framadate</a> - A free and open-source online service for planning an appointment or making a decision quickly and easily. No registration is required.</li>
  <li><a href="https://www.libreoffice.org/">LibreOffice</a> - Free and open-source office suite.</li>
-  <li><a href="https://vscodium.com/">VSCodium</a> - Fork of Microsoft's Visual Studio Code editor without branding or telemetry.</li>
+  <li><a href="https://vscodium.com/">VSCodium</a> - Scripts to automatically build Microsoft's Visual Studio Code editor without branding or telemetry.</li>
 </ul>

 <h1 id="metadata-removal-tools" class="anchor">
@ -65,7 +67,6 @@
  </a> Metadata Removal Tools
 </h1>

-<div class="row mb-2">
 {%
  include cardv2.html
  title="MAT2"
@ -81,4 +82,16 @@
  openbsd="https://pypi.org/project/mat2/"
  netbsd="https://pypi.org/project/mat2/"
 %}
-</div>
+
+{%
+  include cardv2.html
+  title="ExifCleaner"
+  image="/assets/img/svg/3rd-party/exifcleaner.svg"
+  description='<strong>ExifCleaner</strong> is a freeware, open source graphical app that uses <a href="https://exiftool.org/">ExifTool</a> to remove <a href="https://en.wikipedia.org/wiki/Exif">exif</a> metadata from images, videos, and PDF documents using a simple drag and drop interface. It supports multi-core batch processing and dark mode.'
+  website="https://exifcleaner.com"
+  forum="https://forum.privacytools.io/t/discussion-mat/TODOADDTHIS"
+  github="https://github.com/szTheory/exifcleaner"
+  windows="https://github.com/szTheory/exifcleaner/releases"
+  mac="https://github.com/szTheory/exifcleaner/releases"
+  linux="https://github.com/szTheory/exifcleaner/releases"
+%}
--- a/_includes/sections/quotes.html
+++ b/_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/png/layout/glenn_greenwald.png" width="170px" 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>
--- a/_includes/sections/router-firmware.html
+++ b/_includes/sections/router-firmware.html
@ -1,40 +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/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="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/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="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/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"
+  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>
--- a/_includes/sections/search-engines.html
+++ b/_includes/sections/search-engines.html
@ -1,52 +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/svg/3rd-party/searx.svg"
-description='searx is an <a href="https://github.com/asciimoo/searx">open-source</a> metasearch engine, aggregating the results of other search engines while not storing information about its users. No logs, no ads and no tracking. There is a <a href="https://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="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/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/"
-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/svg/3rd-party/qwant.svg"
-description='Qwant is a search engine with its philosophy based on two principles: no user tracking and no filter bubble. Qwant was launched in France in February 2013.'
-website="https://www.qwant.com/"
-forum="https://forum.privacytools.io/t/discussion-qwant/286"
-github="https://github.com/Qwant/"
-%}
-
-
-<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.</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>
--- a/_includes/sections/self-contained-networks.html
+++ b/_includes/sections/self-contained-networks.html
@ -5,71 +5,99 @@
 </div>

 {% include cardv2.html
-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"
+  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/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"
+  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/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/"
+  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>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>
--- a/_includes/sections/selfhosted-cloud.html
+++ b/_includes/sections/selfhosted-cloud.html
@ -5,35 +5,37 @@
 </div>

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

 <h3>Worth Mentioning</h3>
--- a/_includes/sections/social-networks.html
+++ b/_includes/sections/social-networks.html
@ -5,78 +5,77 @@
 </div>

 {% include cardv2.html
-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"
+  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/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/"
+  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/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/"
+  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/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/"
+  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="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"
+  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>
--- a/_includes/sections/social-news-aggregator.html
+++ b/_includes/sections/social-news-aggregator.html
@ -9,6 +9,7 @@ title="Aether"
 image="/assets/img/svg/3rd-party/aether.svg"
 description='<a href="https://github.com/nehbit/aether/blob/master/LICENSE.md">Aether is a free and open-source</a> decentralized social news aggregator with a built-in voting system.'
 website="https://getaether.net/"
+privacy-policy="https://getaether.net/privacypolicy/"
 forum="https://forum.privacytools.io/t/discussion-aether/1256"
 github="https://github.com/nehbit/aether"
 windows="https://getaether.net/download/"
@ -21,6 +22,7 @@ title="Tildes"
 image="/assets/img/svg/3rd-party/tildes.svg"
 description='Tildes is a web-based self-hostable online bulletin board. It is licensed under <a href="https://gitlab.com/tildes/tildes/blob/master/LICENSE">GPL 3.0</a>.'
 website="https://tildes.net"
+privacy-policy="https://docs.tildes.net/policies/privacy-policy"
 forum="https://forum.privacytools.io/t/discussion-tildes/1257"
 gitlab="https://gitlab.com/tildes/tildes"
 web="https://tildes.net"
@ -31,6 +33,7 @@ title="Raddle"
 image="/assets/img/png/3rd-party/raddle.png"
 description="Raddle is a public Postmill instance focused on privacy and anti-censorship."
 website="https://raddle.me"
+privacy-policy="https://raddle.me/wiki/privacy_policy"
 forum="https://forum.privacytools.io/t/discussion-raddle/1258"
 gitlab="https://gitlab.com/postmill/"
 web="https://raddle.me"
--- a/_includes/sections/teamchat.html
+++ b/_includes/sections/teamchat.html
@ -1,17 +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="Matrix"
-  image="/assets/img/svg/3rd-party/matrix.svg"
-  image-dark="/assets/img/svg/3rd-party/matrix-dark.svg"
-  description='<a href="https://matrix.org/docs/guides/introduction">Matrix</a> is an open-source project that publishes the <a href="https://matrix.org/docs/spec">Matrix open standard</a> for secure, decentralized, real-time communication.<br />
-  <a href="https://en.wikipedia.org/wiki/Riot.im">Riot.im</a> is the popular reference client produced by the Matrix.org team. It offers optional E2EE for 1:1 and group conversations that <strong>must</strong> be turned on by the user. (This can be done by clicking on the toggle switch which is accessed by clicking the room name or user name of the chat → Security &amp; Privacy → Encrypted). In the future it will be <a href="https://github.com/vector-im/riot-web/issues/6779">on by default.</a>'
+  title="Riot"
+  image="/assets/img/svg/3rd-party/riotim.svg"
+  description='<a href="//about.riot.im">Riot.im</a> is the reference client for the <a href="//matrix.org/docs/guides/introduction">Matrix</a> network. The <a href="//matrix.org/docs/spec">Matrix open standard</a> is an open-source standard for secure, decentralized, real-time communication.<br />'
+  labels="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/"
@ -28,8 +32,9 @@
  title="Rocket.chat"
  image="/assets/img/svg/3rd-party/rocketchat.svg"
  description="Rocket.chat is an self-hostable open source platform for team communication. It has optional federation and experimental E2EE."
-  labels="warning:<a href=//rocket.chat/docs/user-guides/end-to-end-encryption/>Experimental E2EE</a>:Regarding E2EE their documentation states 'This feature is currently in alpha. It's also not yet supported on mobile'. There is no forward secrecy so compromised decryption password would leak all messages. Federation was also added afterwards, potentially causing room for mistakes."
+  labels="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"
@ -45,8 +50,9 @@
  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 through the use of cryptographic signing of "<a href="https://en.wikipedia.org/wiki/Keybase#Identity_proofs">identity proofs</a>".'
-  labels="warning:<a href=github.com/keybase/client/issues/6374>Warning</a>:This software relies on a closed-source central server."
+  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"
--- a/_includes/sections/voice-video-messenger.html
+++ b/_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/svg/3rd-party/linphone.svg"
-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/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"
+  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>
--- a/_includes/sections/vpn.html
+++ b/_includes/sections/vpn.html
@ -9,8 +9,8 @@
  <div class="row mb-2">
    <div class="col-lg-3 col-sm-12 pt-lg-5">
      <img
-        src="/assets/img/svg/3rd-party/mullvad.svg"
-        data-theme-src="/assets/img/svg/3rd-party/mullvad-dark.svg"
+        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"
@ -19,88 +19,89 @@
    <div class="col">
    <h2 id="mullvad" class="anchor">
      <a href="#mullvad"><i class="fas fa-link anchor-icon"></i></a> Mullvad
-      <span class="badge badge-info">EUR €60/Year</span>
+      {% 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><span class="badge badge-success">35 Countries</span></h5>
+    <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><span class="badge badge-success">Independently Audited</span></h5>
+    <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">Open Source Clients</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><span class="badge badge-success">Accepts Bitcoin</span></h5>
+    <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-success">WireGuard Support</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><span class="badge badge-success">IPv6 Support</span></h5>
+    <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><span class="badge badge-success">Remote Port Forwarding</span></h5>
+    <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><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="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="/assets/img/svg/3rd-party/protonvpn.svg" height="70" width="200" class="img-fluid d-block mr-auto ml-auto align-middle" alt="ProtonVPN">
+      <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
-      <span class="badge badge-info">Free</span>
-      <span class="badge badge-info">USD $96/year</span>
+      {% 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.</p>
-    <h5><span class="badge badge-success">44 Countries</span></h5>
+    <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><span class="badge badge-success">Independently Audited</span></h5>
+    <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><span class="badge badge-success">Open Source Clients</span></h5>
+    <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><span class="badge badge-success">Accepts Bitcoin</span></h5>
+    <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><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-warning">No Port Forwarding</span></h5>
+    <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><span class="badge badge-info">Extra Functionality</span></h5>
+    <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="/assets/img/svg/3rd-party/ivpn.svg" height="70" width="200" class="img-fluid d-block mr-auto ml-auto align-middle" alt="IVPN">
+      <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
-      <span class="badge badge-info">Standard USD $60/Year</span>
-      <span class="badge badge-secondary">Pro USD $100/Year</span>
+      {% 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><span class="badge badge-success">32 Countries</span></h5>
+    <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><span class="badge badge-success">Independently Audited</span></h5>
+    <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><span class="badge badge-success">Open Source Clients</span></h5>
+    <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><span class="badge badge-success">Accepts Bitcoin</span></h5>
+    <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><span class="badge badge-success">WireGuard Support</span></h5>
+    <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><span class="badge badge-success">Remote Port Forwarding</span></h5>
+    <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><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>
+    <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>
--- a/_includes/sections/warrant-canary.html
+++ b/_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/svg/layout/warrant_canary_example.svg" width="450px" 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>

--- a/_includes/sections/windows10.html
+++ b/_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/svg/layout/windows_privacy.svg" 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>
--- a/_includes/sponsors/gold.html
+++ b/_includes/sponsors/gold.html
@ -1,8 +1,8 @@
 <div class="d-flex flex-wrap justify-content-center">
  <a class="m-3" href="https://safing.io" target="_blank" rel="noreferrer">
    <img
-      src="/assets/img/svg/3rd-party/sponsors/safing.svg"
-      data-theme-src="/assets/img/svg/3rd-party/sponsors/safing-dark.svg"
+      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/_includes/team.html
+++ b/_includes/team.html
@ -1,6 +1,6 @@
-<div class="col-12 col-sm-6 col-lg-4 col-xl-3">
-  <div class="card mb-3 mx-4 mx-sm-0" itemscope itemtype="http://schema.org/Person">
-    <img src="{{ site.baseurl }}/assets/img/png/team/{{ include.avatar }}" class="card-img-top" itemprop="image" alt="{% if include.nick %}{{ include.nick }}{% else %}{{ include.name }}{% endif %}">
+<div class="col-12 col-sm-6 col-lg-4 {% unless include.emeritus %}col-xl-3{% endunless %}">
+  <div class="card mb-3 mx-4 mx-sm-0" itemprop="member" itemscope itemtype="http://schema.org/Person">
+    {% if include.avatar %}<img src="{{ site.baseurl }}/assets/img/{{ include.avatar | split: "." | last }}/team/{{ include.avatar }}" class="card-img-top" itemprop="image" alt="{% if include.nick %}{{ include.nick }}{% else %}{{ include.name }}{% endif %}">{% endif %}
    <div class="card-body">

      <h5 class="card-title mt-0" itemprop="name">
@ -11,9 +11,8 @@
        {{ 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="{{ include.email }}" aria-label="Email" class="mx-2 text-decoration-none" itemprop="email">
--- a/_layouts/minimal.html
+++ b/_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>
--- a/assets/css/style.scss
+++ b/assets/css/style.scss
@ -219,7 +219,13 @@ h2, h3:not(.h5), h4, h5 {
  background: darken($tor, 5%);
 }

+.icon-btn {
+  padding: 0px;
+}

+.flow-root {
+  display: flow-root;
+}

 /*
 * Bootstrap 4.2+ features
--- a/assets/img/png/favicons/browserconfig.xml
+++ b/assets/img/png/favicons/browserconfig.xml
@ -2,7 +2,7 @@
 <browserconfig>
    <msapplication>
        <tile>
-            <square150x150logo src="/assets/img/png/favicons/mstile-150x150.png"/>
+            <square150x150logo src="{% if jekyll.environment == "production" and site.pull_cdn %}{{site.pull_cdn}}{% endif %}/assets/img/png/favicons/mstile-150x150.png"/>
            <TileColor>#3498db</TileColor>
        </tile>
    </msapplication>
--- a/assets/img/png/layout/this-video-is-sponsored-by-vpn.png
+++ b/assets/img/png/layout/this-video-is-sponsored-by-vpn.png
--- a/assets/img/png/team/dawid.png
+++ b/assets/img/png/team/dawid.png
--- a/assets/img/png/team/mikaela.png
+++ b/assets/img/png/team/mikaela.png
--- a/assets/img/svg/3rd-party/7zip.svg
+++ b/assets/img/svg/3rd-party/7zip.svg
@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="128mm" height="128mm" version="1.1" viewBox="0 0 128 128" xmlns="http://www.w3.org/2000/svg"><defs><clipPath id="clipPath"><path d="m49.912 52.756h168.59v51.021c-43.95 52.893-71.726 113.87-74.314 187.45h-57.676c2.2698-63.394 8.8358-125.71 57.676-177.47h-94.278z" fill="#fff" fill-rule="evenodd"/></clipPath><filter id="filter" x="-.5" y="-.5" width="4" height="2"><feGaussianBlur stdDeviation="4.0"/></filter><clipPath id="clipPatho"><path d="m0-0.0625v345.62h603.38v-268.84h-334.53v-76.781z"/></clipPath><filter id="filterH" x="-.5" y="-.5" width="4" height="2"><feGaussianBlur stdDeviation="4.0"/></filter><clipPath id="clipPathN"><path d="m415.94 112.66v175.25h36.594v-175.25zm-130.88 1.0938v39.938h56.562l-58.781 96.5v38.812h107.59v-38.812h-68.781l71-100.94v-35.5zm200.72 0.0625v176.22h39.938v-62.062h26.594c42.589-0.14551 43.72-115.5-2.25-114.16zm37.719 37.719h15.594c17.348-0.59446 17.713 38.937 0 36.5l-14.406 1.2188z" fill-rule="evenodd"/></clipPath><filter id="filterI" x="-.5" y="-.5" width="4" height="2"><feGaussianBlur stdDeviation="4.0"/></filter><clipPath id="clipPathk"><path transform="rotate(90)" d="m80.591-598.41h261.11v335.68h-261.11z" fill="#fff"/></clipPath><filter id="filterHr" x="-.5" y="-.5" width="2" height="2"><feGaussianBlur stdDeviation="4.0"/></filter></defs><g transform="translate(0,-169)"><g transform="matrix(.21214 0 0 .21145 -1.3344e-6 196.47)"><path d="m0-0.0625v345.62h603.38v-268.84h-334.53v-76.781z"/><path d="m49.912 52.756h168.59v51.021c-43.95 52.893-71.726 113.87-74.314 187.45h-57.676c2.2698-63.394 8.8358-125.71 57.676-177.47h-94.278z" fill="#fff" fill-rule="evenodd"/><g clip-path="url(#clipPath)"><g fill="none" stroke-width="10"><path d="m49.912 52.756h168.59v51.021c-43.95 52.893-71.726 113.87-74.314 187.45" filter="url(#filter)" stroke="#fff"/><path d="m144.19 291.22h-57.676c2.2698-63.394 8.8358-125.71 57.676-177.47h-94.278v-61.004" filter="url(#filter)" stroke="#000"/></g></g><g clip-path="url(#clipPatho)"><g fill="none" stroke-width="10"><path d="m603.38 345.56v-268.84h-334.53v-76.781h-268.84" filter="url(#filterH)" stroke="#fff"/><path d="m0-0.0625v345.62h603.38" filter="url(#filterH)" stroke="#000"/></g></g><g transform="matrix(.99424 0 0 .98519 1.5138 5.0623)"><path transform="rotate(90)" d="m80.591-598.41h261.11v335.68h-261.11z" fill="#fff"/><path d="m415.94 112.66v175.25h36.594v-175.25zm-130.88 1.0938v39.938h56.562l-58.781 96.5v38.812h107.59v-38.812h-68.781l71-100.94v-35.5zm200.72 0.0625v176.22h39.938v-62.062h26.594c42.589-0.14551 43.72-115.5-2.25-114.16zm37.719 37.719h15.594c17.348-0.59446 17.713 38.937 0 36.5l-14.406 1.2188z" fill-rule="evenodd"/><g clip-path="url(#clipPathN)"><g fill="none" stroke-width="10"><path d="m452.53 287.91v-175.25h-36.594m-25.5 176.34v-38.812h-68.781l71-100.94v-35.5h-107.59m240.66 176.28v-62.062m26.594 0c42.589-0.14551 43.72-115.5-2.25-114.16h-64.281m53.312 74.219-14.406 1.2188-1.1875-37.719" filter="url(#filterI)" stroke="#fff"/><path d="m415.94 112.66v175.25h36.594m-167.47-174.16v39.938h56.562l-58.781 96.5v38.812h107.59m95.344-175.19v176.22h39.938m0-62.062h26.594m-28.812-76.438h15.594c17.348-0.59446 17.713 38.937 0 36.5" filter="url(#filterI)" stroke="#000"/></g></g><g clip-path="url(#clipPathk)"><g fill="none" stroke-width="10"><path transform="rotate(90)" d="m80.591-598.41h261.11m-261.11 335.68v-335.68" filter="url(#filterHr)" stroke="#fff"/><path transform="rotate(90)" d="m341.71-598.41v335.68h-261.11" filter="url(#filterHr)" stroke="#000"/></g></g></g></g></g></svg>
--- a/assets/img/svg/3rd-party/bitmessage.svg
+++ b/assets/img/svg/3rd-party/bitmessage.svg
@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="128" height="128" version="1.1" viewBox="0 0 33.866 33.866" xmlns="http://www.w3.org/2000/svg"><g transform="matrix(.043931 0 0 .043931 -.034709 -1.092)"><path d="m55.393 532.82 286.97-491.31c96.403-72.992 403.62 137.03 376.36 224.4l-264.75 505.47c59.224-106.03-313.56-331.49-398.58-238.56z" fill="#e6e6e6" fill-rule="evenodd" stroke="#241c1c" stroke-width="3"/><g stroke="#000"><path d="m395.55 28.063-283.02 480.54" fill="#808080" stroke-opacity=".1195" stroke-width="1.6468px"/><path d="m193.27 521.67 273.63-478.51" fill="none" stroke-opacity=".069182" stroke-width="1.6578px"/><path d="m283.67 559.55 266.09-481.82" fill="#b3b3b3" stroke-opacity=".075472" stroke-width="1.6507px"/><path d="m442.34 696.99 259.36-486.94" fill="none" stroke-opacity=".21384" stroke-width="1.6507px"/></g><g fill-rule="evenodd"><path d="m393.67 26.59c-19.648 0.192-36.822 4.5488-50.18 14.061l-287.65 491.55c12.787-13.406 31.767-19.932 54.652-20.971l285.37-484.63c-0.73275-0.0042-1.4673-0.013-2.1934-0.0059z" fill="#e6e6e6"/><path d="m395.86 26.596-285.37 484.63c23.701-1.076 51.577 3.7251 81.08 12.856l276.08-483.72c-25.631-8.6186-50.148-13.645-71.791-13.77z" fill="#ececec"/><path d="m467.65 40.363-276.08 483.72c29.573 9.1522 60.771 22.657 91.027 38.934l267.15-485.29c-27.233-15.378-55.27-28.34-82.098-37.361z" fill="#e6e6e6"/><path d="m549.75 77.723-267.16 485.3c47.653 25.635 92.959 58.148 125.85 91.445l262.54-485.38c-31.608-32.535-75.256-65.399-121.24-91.365z" fill="#e6e6e6"/><path d="m670.99 169.09-262.55 485.38c13.999 14.171 25.744 28.479 34.471 42.457l260.31-488.34c-8.2409-12.768-19.229-26.1-32.238-39.49z" fill="#ccc"/><path d="m703.23 208.58-260.31 488.34c14.528 23.271 20.674 45.62 14.856 64.869l260.85-496.58c4.4659-15.775-1.7012-35.425-15.393-56.637z" fill="#b3b3b3"/></g><ellipse transform="matrix(.85943 .51126 -.48882 .87238 0 0)" cx="541.96" cy="429.54" rx="232.96" ry="92.651" stroke-width="1.651"/></g></svg>
--- a/assets/img/svg/3rd-party/canvasblocker.svg
+++ b/assets/img/svg/3rd-party/canvasblocker.svg
--- a/assets/img/svg/3rd-party/clearurls.svg
+++ b/assets/img/svg/3rd-party/clearurls.svg
@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="128" height="128" version="1.1" viewBox="0 0 33.867 33.867" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><defs><linearGradient id="linearGradient4509" x1="-397.31" x2="-1652" y1="831.3" y2="-525.36" gradientTransform="matrix(.0508 0 0 .0508 55.984 -22.686)" gradientUnits="userSpaceOnUse"><stop stop-color="#f47721" offset="0"/><stop stop-color="#f47721" stop-opacity="0" offset="1"/></linearGradient><linearGradient id="linearGradient4517" x1="884.47" x2="-407.03" y1="1018.2" y2="-326.92" gradientTransform="matrix(.0508 0 0 .0508 -7.718 -29.976)" gradientUnits="userSpaceOnUse"><stop stop-color="#fca" offset="0"/><stop stop-color="#fca" stop-opacity="0" offset="1"/></linearGradient></defs><g transform="translate(-2.7214 16.933)"><path d="m14.363-12.7v-2.1167c0-1.0583 1.0583-2.1167 2.1167-2.1167h6.35c1.0583 0 2.1167 1.0583 2.1167 2.1167v2.1167h6.35c1.0583 0 2.1167 1.0583 2.1167 2.1167v4.2333h-2.1167l-1.3229 19.844c-0.26459 1.852-1.8521 3.4395-3.7042 3.4395h-13.176c-2.1167 0-3.7042-1.5875-3.7042-3.4395l-1.3758-19.844h-2.1167v-4.2333c0-1.3758 1.0583-2.1167 2.1167-2.1167z" fill="#fff" stroke-width="0"/><path d="m14.363-12.7v-2.1167c0-1.0583 1.0583-2.1167 2.1167-2.1167h6.35c1.0583 0 2.1167 1.0583 2.1167 2.1167v2.1167h6.35c1.0583 0 2.1167 1.0583 2.1167 2.1167v4.2333h-2.1167l-1.3229 19.844c-0.26459 1.852-1.8521 3.4395-3.7042 3.4395h-13.176c-2.1167 0-3.7042-1.5875-3.7042-3.4395l-1.3758-19.844h-2.1167v-4.2333c0-1.3758 1.0583-2.1167 2.1167-2.1167z" fill="url(#linearGradient4509)" stroke-width="0"/><path d="m18.614-2.6346h1.9911l0.10763 13.525h-2.1167zm-2.6638 13.631-2.1167 0.15882-0.79375-13.758h2.1167zm7.5671 0 1.9579 0.15882 0.79375-13.758h-2.1167z" fill="url(#linearGradient4517)" stroke-width=".52917"/></g></svg>
--- a/assets/img/svg/3rd-party/etag_stoppa.svg
+++ b/assets/img/svg/3rd-party/etag_stoppa.svg
@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="128" height="128" version="1.1" viewBox="0 0 33.867 33.867" xmlns="http://www.w3.org/2000/svg"><path d="m32.638 23.419-9.1858 9.2052-13.004 0.013762-9.2052-9.1858-0.013762-13.004 9.1858-9.2052 13.004-0.013762 9.2052 9.1858z" fill="#ad0006" stroke="#fff" stroke-linejoin="round" stroke-width="1.3229" style="paint-order:stroke fill markers"/><g fill="#fff" stroke-width=".40382" aria-label="ETAG"><path d="m2.3735 10.549h5.5368v2.5555h-2.2163v2.4214h2.0743v2.4293h-2.0743v2.8078h2.4371v2.5555h-5.7577z"/><path d="m15.561 10.549v2.5555h-1.9718v10.214h-3.3205v-10.214h-1.9639v-2.5555z"/><path d="m21.405 10.549 1.9008 12.769h-3.3994l-0.16563-2.2952h-1.191l-0.19718 2.2952h-3.4388l1.6879-12.769zm-1.7588 8.2106q-0.25239-2.169-0.50478-5.3554-0.50478 3.6597-0.63098 5.3554z"/><path d="m31.493 15.249h-3.3205v-1.1594q0-1.0963-0.09465-1.3724-0.09465-0.27605-0.44957-0.27605-0.3076 0-0.41802 0.23662-0.11042 0.23662-0.11042 1.2146v6.1284q0 0.85971 0.11042 1.1358 0.11042 0.26816 0.44168 0.26816 0.36281 0 0.48901-0.3076 0.13408-0.3076 0.13408-1.1989v-1.5143h-0.67041v-1.9403h3.8884v6.854h-2.0901l-0.3076-0.91492q-0.33915 0.59154-0.85971 0.89126-0.51267 0.29183-1.2146 0.29183-0.83604 0-1.5696-0.40225-0.72562-0.41014-1.1042-1.0096-0.37859-0.59943-0.47323-1.2541-0.09465-0.66253-0.09465-1.9797v-3.7937q0-1.8298 0.19718-2.658 0.19718-0.82816 1.1279-1.5143 0.93858-0.69408 2.4214-0.69408 1.4591 0 2.4214 0.59943t1.2541 1.4276q0.29183 0.82027 0.29183 2.3898z"/></g></svg>
--- a/assets/img/svg/3rd-party/exifcleaner.svg
+++ b/assets/img/svg/3rd-party/exifcleaner.svg
@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="128" height="128" version="1.1" viewBox="0 0 33.867 33.867" xmlns="http://www.w3.org/2000/svg"><g transform="translate(0 -263.13)"><g transform="matrix(.25 0 0 .25 -75.421 228.27)"><circle cx="369.42" cy="207.2" r="67.733" fill="#521737" stroke-width=".71866"/><path transform="matrix(.26458 0 0 .26458 301.69 139.47)" d="m265.99 65.18v0.0078c1.8901 2.438 3.0273 5.5806 3.0273 9.0215v195.24c19.426 3.3884 50.314 16.138 55.404 62.422l0.26367 2.377 1.9512 17.611h-2e-3l10.252 92.566h-161.81l64.785 67.07c5.4118 0.44356 10.702 0.40924 16.131 0.50781 6.0422 3e-4 12.082-0.21339 18.109-0.64062 8.5134-0.60344 16.992-1.6336 25.402-3.084 8.4107-1.4512 16.743-3.3219 24.967-5.6055 8.2243-2.2825 16.33-4.9742 24.285-8.0664 7.9553-3.0931 15.751-6.5833 23.357-10.455 7.6063-3.8716 15.013-8.1208 22.195-12.732 7.1823-4.6114 14.13-9.5793 20.816-14.885 6.6858-5.3055 13.102-10.942 19.225-16.889 6.1225-5.9464 11.945-12.195 17.443-18.723 5.4986-6.528 10.667-13.327 15.486-20.371 4.8192-7.0443 9.2831-14.324 13.375-21.814 4.0921-7.4904 7.8071-15.181 11.131-23.043 3.3233-7.8616 6.2497-15.885 8.7715-24.039 2.5223-8.154 4.6364-16.428 6.332-24.793 0.0435-0.28271 0.12174-0.53757 0.16407-0.82032zm-119.28 111.21c-3e-3 20.217 16.387 36.607 36.604 36.605zm36.604 36.605c-20.216-1e-3 -36.605 16.387-36.604 36.604 9.4e-4 -4.2e-4 50.205 51.017 50.205 51.017 12.099-18.158 28.866-28.067 41.949-30.349zm-36.604 36.604c1e-3 -20.216-16.387-36.605-36.604-36.604z" fill="#351228" stroke-width=".98462"/><g transform="matrix(.98462 0 0 .98462 4.6413 4.2297)" fill="#fff"><path d="m370.47 153.51c-1.9408 0-3.5026 1.6846-3.5026 3.777v54.445c0 2.0925 1.5618 3.777 3.5026 3.777s3.5026-1.6846 3.5026-3.777v-54.445c0-2.0924-1.5618-3.777-3.5026-3.777z" stroke-width=".62166"/><path d="m341.11 184.75a9.8353 9.8353 0 0 1-9.836 9.836 9.8353 9.8353 0 0 1 9.836 9.836 9.8353 9.8353 0 0 1 9.836-9.836 9.8353 9.8353 0 0 1-9.836-9.836z" fill="#fff" stroke-width=".63312"/><path d="m401.71 203.66a8.3455 8.3455 0 0 1-8.3461 8.3461 8.3455 8.3455 0 0 1 8.3461 8.3461 8.3455 8.3455 0 0 1 8.3461-8.3461 8.3455 8.3455 0 0 1-8.3461-8.3461z" fill="#fff" stroke-width=".53722"/><path d="m370.47 153.51v62c-1.9408 0-3.5026-1.6846-3.5026-3.777v-54.445c0-2.0924 1.5618-3.777 3.5026-3.777z" stroke-width=".62166"/></g><path d="m369.42 155.38v61.046c1.911 0 3.4488-1.6587 3.4488-3.7189v-53.608c0-2.0602-1.5378-3.7189-3.4488-3.7189z" fill="#dfdfe0" stroke-width=".61209"/><path d="m369.42 210.44c-3.3202 0-16.374 1.0601-18.108 16.828l-3.2974 29.78h42.811l-3.2974-29.78c-1.7341-15.768-14.788-16.828-18.108-16.828z" fill="#f8d057" stroke-width=".56531"/><path d="m351.31 227.27c1.7341-15.768 14.788-16.828 18.108-16.828v46.608h-21.406z" fill="#f8d057" stroke-width=".56531"/><path d="m351.24 227.9 18.178-3e-5 1e-5 4.6596h-18.694z" fill="#e97043" stroke-width=".25734"/><path d="m387.52 227.27c-1.7341-15.768-14.788-16.828-18.108-16.828v46.608h21.406z" fill="#f2b55a" stroke-width=".56531"/><path d="m387.59 227.9h-18.178v4.6596h18.694z" fill="#a15439" stroke-width=".25734"/></g></g></svg>
--- a/assets/img/svg/3rd-party/firefox_multi_account_containers.svg
+++ b/assets/img/svg/3rd-party/firefox_multi_account_containers.svg
@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="128" height="128" version="1.1" viewBox="0 0 33.867 33.867" xmlns="http://www.w3.org/2000/svg"><defs><linearGradient id="a" x2="500" y2="500" gradientUnits="userSpaceOnUse"><stop stop-color="#3186c7" offset="0"/><stop stop-color="#4c5eb0" offset="1"/></linearGradient></defs><g transform="scale(.067733)"><path d="m0 0h500v500h-500z" fill="url(#a)"/><path d="m393.32 106.68v-52.802c0-12.498-10.132-22.629-22.629-22.629-12.498 0-22.629 10.131-22.629 22.629v52.802h-52.802c-12.498 0-22.629 10.131-22.629 22.629 0 12.498 10.131 22.629 22.629 22.629h52.802v52.802c0 12.498 10.132 22.629 22.629 22.629 12.498 0 22.629-10.131 22.629-22.629v-52.802h52.802c12.498 0 22.629-10.131 22.629-22.629 0-12.498-10.132-22.629-22.629-22.629zm-362.07 194.89c0-15.982 12.868-28.938 28.938-28.938h138.24c15.982 0 28.938 12.868 28.938 28.938v138.24c0 15.982-12.868 28.938-28.938 28.938h-138.24c-15.982 0-28.938-12.868-28.938-28.938zm241.38 0c0-15.982 12.868-28.938 28.938-28.938h138.24c15.982 0 28.938 12.868 28.938 28.938v138.24c0 15.982-12.868 28.938-28.938 28.938h-138.24c-15.982 0-28.938-12.868-28.938-28.938zm-241.38-241.38c0-15.982 12.868-28.938 28.938-28.938h138.24c15.982 0 28.938 12.868 28.938 28.938v138.24c0 15.982-12.868 28.938-28.938 28.938h-138.24c-15.982 0-28.938-12.868-28.938-28.938z" fill="#ebf0f8" stroke-width="29.167"/></g></svg>
--- a/assets/img/svg/3rd-party/noscript.svg
+++ b/assets/img/svg/3rd-party/noscript.svg
@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="128" height="128" version="1.1" viewBox="0 0 33.867 33.867" xmlns="http://www.w3.org/2000/svg"><defs><filter id="a" x="-.12917" y="-.098235" width="1.2583" height="1.1965" color-interpolation-filters="sRGB"><feFlood flood-color="#fff" result="flood"/><feComposite in="flood" in2="SourceGraphic" operator="out" result="composite1"/><feGaussianBlur in="composite1" result="blur" stdDeviation="1.0047711"/><feOffset dx="0" dy="0" result="offset"/><feComposite in="offset" in2="SourceGraphic" operator="atop" result="composite2"/></filter></defs><g transform="matrix(.5 0 0 .5 44.083 -34.4)" stroke="#000"><path d="m-45.85 92.603-0.7254-6.0796 3.6961 1.7617z" fill="#fff" stroke-width=".54713"/><path d="m-54.555 92.569 0.65631-6.5631-4.4906 0.58722z" fill="#fff" stroke-width=".54713"/><g transform="matrix(2.0679 0 0 2.0679 93.244 -145.01)" fill="#002fc8" filter="url(#a)" stroke-width=".52917"><path d="m-63.962 108.8v5.0078q-1.9492-0.87161-3.8034-1.3153-1.8542-0.44373-3.5023-0.44373-2.1869 0-3.2329 0.6022t-1.0459 1.87q0 0.95084 0.69729 1.4897 0.71314 0.52296 2.5673 0.9033l2.599 0.52297q3.946 0.79237 5.61 2.4088t1.664 4.5958q0 3.9143-2.3296 5.8319-2.3137 1.9017-7.0838 1.9017-2.2503 0-4.5165-0.42788t-4.5324-1.2678v-5.1504q2.2662 1.2044 4.3739 1.8225 2.1236 0.6022 4.0886 0.6022 1.9968 0 3.0586-0.66559 1.0618-0.6656 1.0618-1.9017 0-1.1093-0.72898-1.7115-0.71314-0.6022-2.8684-1.0776l-2.3613-0.52296q-3.5498-0.76068-5.198-2.4247-1.6323-1.664-1.6323-4.4848 0-3.534 2.282-5.4357t6.5608-1.9017q1.9492 0 4.0094 0.3011 2.0602 0.28526 4.263 0.87161z" fill="#00397e" stroke="#000" stroke-width=".52917"/></g><path d="m-39.064 79.977v10.356q-4.0308-1.8024-7.865-2.72t-7.2424-0.91759q-4.5224 0-6.6853 1.2453t-2.1629 3.867q0 1.9663 1.4419 3.0805 1.4747 1.0814 5.3089 1.8679l5.3744 1.0814q8.16 1.6385 11.601 4.9812 3.4409 3.3426 3.4409 9.5036 0 8.0944-4.8173 12.06-4.7846 3.9325-14.649 3.9325-4.6535 0-9.3397-0.88482-4.6862-0.88481-9.3725-2.6217v-10.651q4.6862 2.4906 9.0448 3.7687 4.3913 1.2453 8.4549 1.2453 4.1291 0 6.3248-1.3764t2.1957-3.9325q0-2.294-1.5075-3.5393-1.4747-1.2453-5.9315-2.2284l-4.8829-1.0814q-7.3407-1.573-10.749-5.014-3.3754-3.4409-3.3754-9.2742 0-7.3079 4.719-11.24 4.719-3.9325 13.567-3.9325 4.0308 0 8.291 0.62265 4.2602 0.58988 8.8154 1.8024z" fill="none" stroke="#000" stroke-width="1.0939"/><path d="m-54.297 69.063a33.603 33.603 0 0 0-33.604 33.604 33.603 33.603 0 0 0 33.604 33.603 33.603 33.603 0 0 0 33.603-33.603 33.603 33.603 0 0 0-33.603-33.604zm-0.46164 6.401a26.883 26.883 0 0 1 26.882 26.882 26.883 26.883 0 0 1-4.7073 15.196l-37.655-37.133a26.883 26.883 0 0 1 15.48-4.9445zm-21.711 11.077 36.65 38.129a26.883 26.883 0 0 1-14.939 4.5587 26.883 26.883 0 0 1-26.883-26.883 26.883 26.883 0 0 1 5.1721-15.805z" fill="#f00" stroke-width=".5269"/><ellipse cx="-44.197" cy="78.506" rx="4.855" ry="4.6251" fill="#fff" stroke-width=".57239"/><ellipse cx="-56.8" cy="78.433" rx="4.855" ry="4.6251" fill="#fff" stroke-width=".57239"/><g stroke-width=".54713"><path d="m-38.261 69.323 1.8075 3.1753-11.382 3.4684-0.73277-0.87933z"/><path d="m-63.182 69.197-1.8075 3.1753 11.382 3.4684 0.73277-0.87933z"/></g></g><circle cx="22.518" cy="5.5594" r="1.3441" stroke-width=".5"/><circle cx="16.128" cy="5.6111" r="1.3441" stroke-width=".5"/></svg>
--- a/assets/img/svg/3rd-party/peazip.svg
+++ b/assets/img/svg/3rd-party/peazip.svg
@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="128" height="128" version="1.1" viewBox="0 0 33.867 33.867" xmlns="http://www.w3.org/2000/svg"><g transform="scale(.2655 .2655)"><g id="Warstwa_1_1_"><g clip-rule="evenodd" fill-rule="evenodd"><path d="m110.48 63.783c10.859 18.761 17.079 40.542 17.079 63.774h-127.56c47.204 0 88.423-25.654 110.48-63.774z" fill="#78e600"/><path d="M 0.001,0 H 127.56 C 104.328,0 82.542,6.216 63.779,17.075 45.014,6.216 23.235,0 0.001,0 Z" fill="#ffab00"/><path d="m127.56 0v127.56c0-23.232-6.216-45.019-17.074-63.781 10.858-18.764 17.074-40.544 17.074-63.777z" fill="#91bf00"/><path d="m127.56 0c-1e-3 23.232-6.216 45.014-17.074 63.777-3.459-5.976-7.387-11.649-11.737-16.963 0.405 0.025 0.813 0.041 1.226 0.041 10.64 0 19.268-8.626 19.268-19.267 0-10.642-8.628-19.27-19.268-19.27-10.642 0-19.269 8.628-19.269 19.27 0 0.41 0.015 0.82 0.041 1.226-5.315-4.351-10.985-8.28-16.964-11.738 18.764-10.86 40.543-17.076 63.777-17.076z" fill="#6c8300"/><path d="m1e-3 127.56c1e-3 -47.2 25.658-88.418 63.778-110.48 5.979 3.46 11.65 7.393 16.966 11.745 0.612 9.654 8.335 17.375 17.988 17.988 4.354 5.316 8.288 10.986 11.749 16.967-22.06 38.121-63.278 63.776-110.48 63.776zm63.779-91.366c15.234 0 27.586 12.354 27.586 27.588 0 15.23-12.352 27.584-27.586 27.584s-27.586-12.353-27.586-27.583c0-15.235 12.352-27.589 27.586-27.589zm-36.193 44.512c10.641 0 19.269 8.629 19.269 19.267 0 10.642-8.628 19.27-19.269 19.27-10.638 0-19.268-8.628-19.268-19.27 0-10.638 8.63-19.267 19.268-19.267z" fill="#6e9600"/><path d="m27.588 89.818c5.606 0 10.152 4.548 10.152 10.154s-4.546 10.151-10.152 10.151-10.153-4.545-10.153-10.151 4.546-10.154 10.153-10.154zm36.192-40.576c8.027 0 14.537 6.511 14.537 14.537s-6.51 14.537-14.537 14.537-14.537-6.511-14.537-14.537 6.51-14.537 14.537-14.537zm36.193-31.807c5.607 0 10.153 4.545 10.153 10.151 0 5.608-4.546 10.153-10.153 10.153-5.606 0-10.153-4.545-10.153-10.153-1e-3 -5.607 4.546-10.151 10.153-10.151zm-99.972 110.12v-127.56c23.232 0 45.014 6.22 63.777 17.078-38.123 22.059-63.777 63.276-63.777 110.48z" fill="#ffe600"/><path d="m99.973 8.318c10.64 0 19.269 8.629 19.269 19.269s-8.629 19.268-19.269 19.268c-0.413 0-0.823-0.015-1.23-0.04-5.387-6.58-11.417-12.61-17.997-17.998-0.025-0.407-0.04-0.816-0.04-1.229-1e-3 -10.641 8.627-19.27 19.267-19.27zm0 9.116c5.606 0 10.153 4.546 10.153 10.153 0 5.606-4.547 10.152-10.153 10.152s-10.153-4.546-10.153-10.152c-1e-3 -5.608 4.546-10.153 10.153-10.153z" fill="#32a000"/><path d="m98.742 46.814c-9.658-0.609-17.388-8.339-17.997-17.998 6.58 5.388 12.61 11.418 17.997 17.998zm-71.154 43.004c5.606 0 10.153 4.547 10.153 10.153s-4.547 10.153-10.153 10.153-10.153-4.547-10.153-10.153 4.546-10.153 10.153-10.153zm36.192-40.576c8.027 0 14.537 6.51 14.537 14.537s-6.51 14.536-14.537 14.536-14.537-6.509-14.537-14.536 6.51-14.537 14.537-14.537zm0-13.05c15.233 0 27.586 12.354 27.586 27.586s-12.353 27.586-27.586 27.586-27.586-12.353-27.586-27.585c0-15.233 12.353-27.587 27.586-27.587zm-36.192 44.511c10.64 0 19.269 8.629 19.269 19.269s-8.629 19.268-19.269 19.268-19.269-8.629-19.269-19.269 8.629-19.268 19.269-19.268z" fill="#32be00"/></g></g></g></svg>
--- a/assets/img/svg/3rd-party/privacy_badger.svg
+++ b/assets/img/svg/3rd-party/privacy_badger.svg
--- a/assets/img/svg/3rd-party/signal.svg
+++ b/assets/img/svg/3rd-party/signal.svg
@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg width="128" height="128" version="1.1" viewBox="0 0 33.866 33.866" xmlns="http://www.w3.org/2000/svg"><g transform="matrix(.090361 0 0 .090361 -5.5773 -.077823)"><g transform="matrix(5.856 0 0 5.856 61.722 -1135.2)"><path d="m0 194h64v64h-64z" fill="#1a91eb" stroke-width=".17441"/><g transform="matrix(.2825 0 0 .2825 -1.667 94.059)" stroke-width=".64895"><path d="m67.017 539.86 4.0966-1.3174 2.2541 7.0782 6.7774-2.9584 1.7142 3.9598-8.9635 3.9103c-0.27185 0.11803-0.56258 0.17895-0.84953 0.17895-0.30584 0-0.60789-0.0609-0.8873-0.19038-0.5588-0.25129-0.9779-0.72723-1.1629-1.3098zm40.468-155.72c3.8399-0.51019 7.7666-0.76528 11.682-0.76528 2.711 0 5.4181 0.12182 8.0913 0.36548l-0.39267 4.3026c-6.2224-0.56737-12.637-0.43784-18.822 0.38078zm26.849 4.927 0.77779-4.2492c6.5244 1.1955 12.898 3.1373 18.935 5.7722l-1.7066 3.9637c-5.7391-2.5016-11.792-4.3483-18.006-5.4866zm-53.343 3.027c5.9241-2.89 12.211-5.0983 18.686-6.5642l0.9477 4.2188c-6.1582 1.3897-12.131 3.4839-17.757 6.2291zm78.112 5.7951 2.0692-3.7809c5.8335 3.225 11.255 7.1277 16.1 11.594l-2.9073 3.187c-4.5912-4.2378-9.73-7.9388-15.261-11zm-100.68 10.311c4.6479-4.6832 9.8961-8.8182 15.594-12.298l2.2314 3.6933c-5.4068 3.2973-10.379 7.2228-14.778 11.655zm121.23 6.0653 3.2018-2.8784c4.4666 5.0144 8.25 10.543 11.244 16.422l-3.821 1.9761c-2.8318-5.5553-6.4074-10.775-10.625-15.52zm-137.03 16.799c2.7147-6.0235 6.2412-11.72 10.478-16.94l3.3264 2.7376c-3.9947 4.927-7.3249 10.307-9.8886 15.988zm150.72 5.6047 4.0098-1.5535c2.39 6.2558 3.9267 12.797 4.5573 19.441l-4.2741 0.41503c-0.60023-6.2596-2.0464-12.416-4.2929-18.303zm-157.22 21.486c0.30583-6.6784 1.5216-13.288 3.602-19.635l4.0815 1.3517c-1.9558 5.9778-3.0961 12.195-3.3944 18.485zm159.07 22.94c1.7482-6.0349 2.6733-12.287 2.7487-18.596l4.2968 0.0533c-0.0793 6.6974-1.0648 13.342-2.9186 19.75zm-159.09-14.994 4.2967-0.13707c0.21899 7.0287 0.98168 13.189 2.3296 18.824l-4.1797 1.009c-1.4159-5.9207-2.2201-12.367-2.4467-19.696zm147.25 38.418c3.8399-5.0564 6.9812-10.543 9.3524-16.308l3.972 1.641c-2.5146 6.1149-5.8448 11.933-9.9112 17.282zm-142.51-11.038 4.0362-1.4887c2.2163 6.0806 5.2331 11.35 9.2165 16.125l-3.2924 2.7719c-4.3081-5.1516-7.5627-10.855-9.9603-17.408zm123.24 28.914c5.3048-3.4686 10.149-7.5389 14.408-12.112l3.1376 2.9508c-4.4968 4.8317-9.6091 9.1304-15.205 12.782zm-107.72-5.6998 2.8884-3.1983c1.4574 1.3326 3.0319 2.6272 4.6781 3.857 0.35869 0.27033 0.62677 0.64727 0.76268 1.0775l3.9871 12.523-4.0928 1.3212-3.7757-11.872c-1.5594-1.1841-3.0508-2.4292-4.4478-3.7085zm83.651 16.277c6.1129-1.5687 12.018-3.8418 17.565-6.7583l1.9898 3.8342c-5.841 3.0612-12.056 5.4562-18.49 7.1086zm-39.15 0.63205c0.27185-0.11804 0.56258-0.17896 0.85331-0.17896 0.19255 0 0.38512 0.0267 0.57389 0.08 1.7444 0.48736 3.0885 0.83004 4.2363 1.0928l-0.95147 4.2149c-1.0459-0.23607-2.2314-0.54066-3.6964-0.94425l-12.939 5.6542-1.7142-3.9674zm18.263 1.9951c4.5308 0 9.0768-0.36171 13.506-1.0851l0.68718 4.272c-4.6554 0.75008-9.4317 1.1346-14.193 1.1346-2.2579 0-3.9683-0.0114-5.505-0.0647l0.15859-4.3215c1.4687 0.0533 3.1338 0.0647 5.3464 0.0647z" fill="#9bdbf4"/><path d="m80.411 531.09c-0.34249 0-0.68498-0.0835-0.99736-0.2505-0.6511-0.34536-1.0802-0.99816-1.1366-1.7382l-1.6485-21.295c-6.989-5.3248-12.424-12.194-16.161-20.438-3.6883-8.122-5.5588-17.189-5.5588-26.931 0-33.266 29.258-60.334 65.219-60.334 35.957 0 65.219 27.068 65.219 60.334 0 33.27-29.262 60.338-65.219 60.338-5.9804 0-11.9-0.74767-17.617-2.2316l-21.023 12.255c-0.33496 0.19355-0.70379 0.29224-1.0764 0.29224" fill="#f2f2f2"/></g></g></g></svg>
+<svg width="128" height="128" version="1.1" viewBox="0 0 33.867 33.867" xmlns="http://www.w3.org/2000/svg"><g transform="translate(-88.068 -131.57)"><path d="m100.94 132.06 0.38097 1.5398a15.302 15.302 0 0 0-4.2542 1.7593l-0.81485-1.3598a16.869 16.869 0 0 1 4.6881-1.9392zm8.1274 0-0.38097 1.5398a15.302 15.302 0 0 1 4.2542 1.7593l0.82014-1.3598a16.869 16.869 0 0 0-4.6933-1.9392zm-18.562 7.6856a16.869 16.869 0 0 0-1.9392 4.688l1.5398 0.38097a15.302 15.302 0 0 1 1.7593-4.2542zm-0.8466 8.7517a15.318 15.318 0 0 1 0.17197-2.299l-1.5689-0.2381a16.993 16.993 0 0 0 0 5.0743l1.5689-0.2381a15.318 15.318 0 0 1-0.17197-2.2991zm24.096 14.498-0.81485-1.3598a15.302 15.302 0 0 1-4.2489 1.7594l0.38097 1.5398a16.869 16.869 0 0 0 4.6828-1.9392zm6.5929-14.498a15.318 15.318 0 0 1-0.17196 2.2991l1.5689 0.2381a16.993 16.993 0 0 0 0-5.0743l-1.5689 0.2381a15.318 15.318 0 0 1 0.17196 2.299zm1.0926 4.0637-1.5398-0.38097a15.302 15.302 0 0 1-1.7593 4.2542l1.3598 0.82014a16.869 16.869 0 0 0 1.9392-4.6933zm-14.138 11.112a15.453 15.453 0 0 1-4.5981 0l-0.2381 1.5688a16.993 16.993 0 0 0 5.0743 0zm10.053-6.0717a15.4 15.4 0 0 1-3.2515 3.2488l0.94184 1.2778a16.958 16.958 0 0 0 3.5875-3.5769zm-3.2515-21.456a15.4 15.4 0 0 1 3.2515 3.2515l1.2778-0.95242a16.958 16.958 0 0 0-3.5769-3.5769zm-21.453 3.2515a15.4 15.4 0 0 1 3.2515-3.2515l-0.95243-1.2778a16.958 16.958 0 0 0-3.5769 3.5769zm26.85 0.34923-1.3598 0.81485a15.302 15.302 0 0 1 1.7593 4.2489l1.5398-0.38097a16.869 16.869 0 0 0-1.9392-4.6828zm-16.797-6.4209a15.453 15.453 0 0 1 4.5981 0l0.23811-1.5689a16.993 16.993 0 0 0-5.0743 0zm-9.2385 29.224-3.2779 0.76459 0.76459-3.2779-1.545-0.36245-0.76459 3.2779a1.5874 1.5874 0 0 0 1.9075 1.9075l3.2753-0.75136zm-3.7277-4.2912 1.545 0.3598 0.52913-2.2726a15.279 15.279 0 0 1-1.7064-4.1642l-1.5398 0.38097a16.805 16.805 0 0 0 1.5609 4.024zm7.4078 3.4393-2.2726 0.52913 0.35981 1.545 1.672-0.3889a16.805 16.805 0 0 0 4.024 1.5609l0.38097-1.5398a15.279 15.279 0 0 1-4.1536-1.717zm7.8575-26.956a13.757 13.757 0 0 0-11.641 21.078l-1.3228 5.6431 5.6431-1.3228a13.757 13.757 0 1 0 7.3204-25.398z" fill="#3a76f0" stroke-width=".26456"/></g></svg>
--- a/assets/img/svg/3rd-party/simplelogin.svg
+++ b/assets/img/svg/3rd-party/simplelogin.svg
--- a/assets/img/svg/3rd-party/startmail-dark.svg
+++ b/assets/img/svg/3rd-party/startmail-dark.svg
--- a/assets/img/svg/3rd-party/startmail.svg
+++ b/assets/img/svg/3rd-party/startmail.svg
--- a/assets/img/svg/3rd-party/startpage.svg
+++ b/assets/img/svg/3rd-party/startpage.svg
@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="128" height="128" version="1.1" viewBox="0 0 33.866 33.866" xmlns="http://www.w3.org/2000/svg"><rect x="-5.6458e-7" y="-5.6458e-7" width="33.866" height="33.866" fill="#fff" stroke-width=".27976"/><path d="m0 8.8687v8.8581l2.3071-0.23283c4.5507-0.45507 6.3605-0.50799 16.372-0.50799 5.2386 0 10.795 0.04233 12.361 0.08466l2.8257 0.09525v-17.166h-33.866z" fill="#6573ff" stroke-width=".10583"/><path d="m28.363 19.695c-6.678 0.21166-14.16 0.65616-20.373 1.2065-2.8574 0.254-7.2706 0.6879-7.641 0.7514l-0.34924 0.05292v12.16h33.866v-14.287l-1.5028 0.02117c-0.83607 0-2.6352 0.05292-4.0004 0.09525z" fill="#202945" stroke-width=".10583"/></svg>
--- a/assets/img/svg/3rd-party/temporary_containers-dark.svg
+++ b/assets/img/svg/3rd-party/temporary_containers-dark.svg
@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="128" height="128" version="1.1" viewBox="0 0 33.867 33.867" xmlns="http://www.w3.org/2000/svg"><g fill="#fff"><path d="m10.059 2.6825-2.1795-2.5149-7.7122 6.371 2.1795 2.5149zm23.64 3.8561-7.7122-6.5386-2.1795 2.5149 7.7122 6.5386zm-16.766-2.8502c-8.3828 0-15.089 6.7063-15.089 15.089s6.7063 15.089 15.089 15.089c8.3828 0 15.089-6.7063 15.089-15.089s-6.7063-15.089-15.089-15.089zm0 26.825c-6.5386 0-11.736-5.1974-11.736-11.736s5.1974-11.736 11.736-11.736c6.5386 0 11.736 5.1974 11.736 11.736s-5.1974 11.736-11.736 11.736zm1.6766-18.442h-3.3531v5.0297h-5.0297v3.3531h5.0297v5.0297h3.3531v-5.0297h5.0297v-3.3531h-5.0297z" fill-rule="evenodd" stroke-width="1.6766"/><path d="m15.008 33.713c-5.0456-0.64895-9.4614-3.8378-11.644-8.4085-1.9677-4.1212-1.9644-8.9637 0.008894-13.053 0.73828-1.5298 1.5335-2.6803 2.6994-3.9055 5.0082-5.2627 13.194-6.1307 19.29-2.0454 5.0399 3.3779 7.524 9.4838 6.3115 15.513-1.0007 4.9758-4.5419 9.1656-9.2983 11.001-1.0333 0.39877-2.2173 0.70467-3.3513 0.86587-0.86505 0.12297-3.1655 0.14112-4.0163 0.03169zm4.2738-3.3964c5.8515-1.1902 9.8262-6.4603 9.3732-12.428-0.0844-1.1118-0.2386-1.888-0.57834-2.911-0.57626-1.7353-1.479-3.1814-2.8273-4.529-1.7714-1.7706-3.8506-2.8459-6.3175-3.2673-0.8001-0.13667-1.1484-0.15416-2.3726-0.11912-1.5785 0.04518-2.4375 0.19986-3.737 0.67295-5.6372 2.0523-8.7688 8.0784-7.2782 14.005 1.1622 4.6211 5.03 8.0479 9.8408 8.7187 0.8176 0.11402 3.034 0.03291 3.8969-0.14259z" stroke-width=".13229"/></g></svg>
--- a/assets/img/svg/3rd-party/temporary_containers.svg
+++ b/assets/img/svg/3rd-party/temporary_containers.svg
@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="128" height="128" version="1.1" viewBox="0 0 33.867 33.867" xmlns="http://www.w3.org/2000/svg"><g transform="translate(3.698 25.515)"><path d="m6.3614-22.832-2.1795-2.5149-7.7122 6.371 2.1795 2.5149zm23.64 3.8561-7.7122-6.5386-2.1795 2.5149 7.7122 6.5386zm-16.766-2.8502c-8.3828 0-15.089 6.7063-15.089 15.089 0 8.3828 6.7063 15.089 15.089 15.089 8.3828 0 15.089-6.7063 15.089-15.089 0-8.3828-6.7063-15.089-15.089-15.089zm0 26.825c-6.5386 0-11.736-5.1974-11.736-11.736 0-6.5386 5.1974-11.736 11.736-11.736 6.5386 0 11.736 5.1974 11.736 11.736 0 6.5386-5.1974 11.736-11.736 11.736zm1.6766-18.442h-3.3531v5.0297h-5.0297v3.3531h5.0297v5.0297h3.3531v-5.0297h5.0297v-3.3531h-5.0297z" fill-rule="evenodd" stroke-width="1.6766"/><path d="m11.31 8.1983c-5.0456-0.64895-9.4614-3.8378-11.644-8.4085-1.9677-4.1212-1.9644-8.9637 0.008894-13.053 0.73828-1.5298 1.5335-2.6803 2.6994-3.9055 5.0082-5.2627 13.194-6.1307 19.29-2.0454 5.0399 3.3779 7.524 9.4838 6.3115 15.513-1.0007 4.9758-4.5419 9.1656-9.2983 11.001-1.0333 0.39877-2.2173 0.70467-3.3513 0.86587-0.86505 0.12297-3.1655 0.14112-4.0163 0.031695zm4.2738-3.3964c5.8515-1.1902 9.8262-6.4603 9.3732-12.428-0.0844-1.1118-0.2386-1.888-0.57834-2.911-0.57626-1.7353-1.479-3.1814-2.8273-4.529-1.7714-1.7706-3.8506-2.8459-6.3175-3.2673-0.8001-0.13667-1.1484-0.15416-2.3726-0.11912-1.5785 0.04518-2.4375 0.19986-3.737 0.67295-5.6372 2.0523-8.7688 8.0784-7.2782 14.005 1.1622 4.6211 5.03 8.0479 9.8408 8.7187 0.8176 0.11401 3.034 0.032915 3.8969-0.14259z" stroke-width=".13229"/></g></svg>
--- a/assets/img/svg/3rd-party/tox-dark.svg
+++ b/assets/img/svg/3rd-party/tox-dark.svg
@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="128" height="128" version="1.1" viewBox="0 0 33.866 33.866" xmlns="http://www.w3.org/2000/svg"><g transform="matrix(.31143 0 0 .31143 2.9966 4.9564e-5)" fill="#fff"><path d="m71.574 41.851c0-4.685 0.074-10.553-0.033-15.237-0.047-2.018-0.268-4.076-0.746-6.034-3.421-13.999-16.972-22.705-31.201-20.13-12.596 2.279-21.973 13.518-21.973 26.336v15.035c-0.475 0-0.794-1e-3 -1.116 0h-11.482c-2.773 0-5.023 2.249-5.023 5.023v56.875c0 2.773 2.25 5.023 5.023 5.023h79.451c2.775 0 5.024-2.25 5.024-5.023v-56.875c0-2.774-2.249-5.023-5.024-5.023zm-19.467 53.267h-14.775c-2.322 0-4.203-1.914-4.203-4.274 0-0.063 7e-3 -0.127 9e-3 -0.19-5e-3 0-6e-3 -1.021-8e-3 -2.041-1e-3 -1.129 0.511-4.289 2.061-6.574 1.641-2.418 3.855-3.99 6.257-4.697-3.166-1.291-5.396-4.398-5.396-8.025 0-4.789 3.88-8.668 8.667-8.668 4.789 0 8.667 3.879 8.667 8.668 0 3.719-2.344 6.891-5.637 8.12 2.332 0.753 4.537 2.313 6.273 4.707 1.621 2.235 2.285 5.343 2.285 6.47v2.043c-6e-3 0.062 0 0.125 0 0.189 1e-3 2.358-1.88 4.272-4.2 4.272m9.672-62.014c-1.562 4.611-4.52 8.305-7.61 11.912-2.386 2.783-5.19 5.125-8.176 7.247-0.144 0.103-0.298 0.188-0.685 0.427 1.781-3.076 3.217-5.998 3.633-9.404-4.234 1.002-8.227 0.564-12.093-1.14-6.862-3.023-10.963-9.618-10.263-17.063 0.573-6.127 3.94-10.543 9.321-13.395 8.667-4.593 19.734-1.655 24.689 6.516 2.887 4.758 2.932 9.741 1.184 14.9" fill="#fff"/></g></svg>
--- a/assets/img/svg/3rd-party/tox.svg
+++ b/assets/img/svg/3rd-party/tox.svg
@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="128" height="128" version="1.1" viewBox="0 0 33.866 33.866" xmlns="http://www.w3.org/2000/svg"><g transform="matrix(.31143 0 0 .31143 2.9966 4.9564e-5)" fill="#414141"><path d="m71.574 41.851c0-4.685 0.074-10.553-0.033-15.237-0.047-2.018-0.268-4.076-0.746-6.034-3.421-13.999-16.972-22.705-31.201-20.13-12.596 2.279-21.973 13.518-21.973 26.336v15.035c-0.475 0-0.794-1e-3 -1.116 0h-11.482c-2.773 0-5.023 2.249-5.023 5.023v56.875c0 2.773 2.25 5.023 5.023 5.023h79.451c2.775 0 5.024-2.25 5.024-5.023v-56.875c0-2.774-2.249-5.023-5.024-5.023zm-19.467 53.267h-14.775c-2.322 0-4.203-1.914-4.203-4.274 0-0.063 7e-3 -0.127 9e-3 -0.19-5e-3 0-6e-3 -1.021-8e-3 -2.041-1e-3 -1.129 0.511-4.289 2.061-6.574 1.641-2.418 3.855-3.99 6.257-4.697-3.166-1.291-5.396-4.398-5.396-8.025 0-4.789 3.88-8.668 8.667-8.668 4.789 0 8.667 3.879 8.667 8.668 0 3.719-2.344 6.891-5.637 8.12 2.332 0.753 4.537 2.313 6.273 4.707 1.621 2.235 2.285 5.343 2.285 6.47v2.043c-6e-3 0.062 0 0.125 0 0.189 1e-3 2.358-1.88 4.272-4.2 4.272m9.672-62.014c-1.562 4.611-4.52 8.305-7.61 11.912-2.386 2.783-5.19 5.125-8.176 7.247-0.144 0.103-0.298 0.188-0.685 0.427 1.781-3.076 3.217-5.998 3.633-9.404-4.234 1.002-8.227 0.564-12.093-1.14-6.862-3.023-10.963-9.618-10.263-17.063 0.573-6.127 3.94-10.543 9.321-13.395 8.667-4.593 19.734-1.655 24.689 6.516 2.887 4.758 2.932 9.741 1.184 14.9" fill="#414141"/></g></svg>
--- a/assets/img/svg/team/dawid.svg
+++ b/assets/img/svg/team/dawid.svg
@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" viewBox="0 0 512 512" xmlns="http://www.w3.org/2000/svg"><g transform="matrix(.87897 0 0 .87897 -5.196 483.74)"><rect transform="scale(-1,1)" x="-588.41144" y="-550.34869" width="582.5" height="582.5" ry="0" fill="#966bab" stroke-width="15.61100006"/><g transform="matrix(9.8600256,0,0,9.8681904,1.607183,-428.03719)"><g fill="#fff" stroke-width=".99958003"><path d="m21.975 29.955c-2.58 0-5.631 2.4639-6.586 3.4111-0.571 0.57152-1.433 0.74237-2.179 0.43264-0.748-0.30874-1.235-1.0371-1.235-1.8454 0-3.4561 1.672-9.9916 8-9.9916 0.757 0 1.45 0.42764 1.789 1.1051l2 3.9966c0.31 0.61948 0.277 1.3549-0.088 1.9444-0.364 0.5885-1.008 0.9472-1.701 0.9472zm24.766 3.8438c-0.75 0.31074-1.607 0.13888-2.18-0.43364-0.886-0.88425-3.997-3.4101-6.586-3.4101-0.693 0-1.337-0.3587-1.701-0.9482-0.364-0.5885-0.397-1.3249-0.088-1.9444l2-3.9966c0.339-0.67643 1.031-1.1041 1.789-1.1041 6.328 0 8 6.5355 8 9.9916 0 0.80832-0.487 1.5367-1.234 1.8454z"/><path d="m29.975-2.0185c-9.941 0-18 8.0522-18 17.985 0 9.9327 8.059 17.985 18 17.985s18-8.0522 18-17.985c0-9.9327-8.059-17.985-18-17.985zm0 6.9942c6.212 0 9.3 5.0248 9.429 5.2386 0.123 0.20383 0.08296 0.46754-0.09405 0.6274-0.178 0.15887-0.4439 0.17088-0.6349 0.029-0.038-0.02897-3.9341-2.8976-8.7001-2.8976-4.778 0-8.6611 2.8686-8.7001 2.8976-0.191 0.14188-0.4569 0.13187-0.6349-0.029-0.178-0.15986-0.21704-0.42257-0.09405-0.6274 0.128-0.21482 3.217-5.2386 9.429-5.2386zm-6.5 10.991a2.5 3.4971 0 0 1 2.5 3.4971 2.5 3.4971 0 0 1-2.5 3.4971 2.5 3.4971 0 0 1-2.5-3.4971 2.5 3.4971 0 0 1 2.5-3.4971zm13 0a2.5 3.4971 0 0 1 2.5 3.4971 2.5 3.4971 0 0 1-2.5 3.4971 2.5 3.4971 0 0 1-2.5-3.4971 2.5 3.4971 0 0 1 2.5-3.4971z"/></g></g></g></svg>
--- a/index.html
+++ b/index.html
@ -2,7 +2,7 @@
 layout: default
 ---

-<script src="/assets/js/redirects.js"></script>
+<script src="{% if jekyll.environment == "production" and site.pull_cdn %}{{site.pull_cdn}}{% endif %}/assets/js/redirects.js"></script>
 {% include sections/header.html %}
 {% include sections/resources.html %}

--- a/nginx/010-headers.conf
+++ b/nginx/010-headers.conf
@ -1,7 +1,8 @@
 add_header X-Frame-Options DENY always;
 add_header X-XSS-Protection "1; mode=block" always;
 add_header X-Content-Type-Options nosniff always;
-add_header Content-Security-Policy "default-src 'none'; script-src 'self' https://stats.privacytools.io; style-src 'self'; img-src 'self' data: https://*.privacytools.io; object-src 'none'; frame-src https://stats.privacytools.io; font-src 'self'; base-uri 'none'; form-action 'self' https://search.privacytools.io; frame-ancestors 'none'; manifest-src 'self';" always;
+add_header Content-Security-Policy "default-src 'none'; script-src 'self' https://cdn.privacytools.io https://stats.privacytools.io; style-src 'self' https://cdn.privacytools.io; img-src 'self' https://cdn.privacytools.io data: https://*.privacytools.io; object-src 'none'; frame-src https://stats.privacytools.io; font-src 'self' https://cdn.privacytools.io; base-uri 'none'; form-action 'self' https://search.privacytools.io; frame-ancestors 'none'; manifest-src 'self' https://cdn.privacytools.io;" always;
+add_header 'Access-Control-Allow-Origin' '*';
 add_header Strict-Transport-Security "max-age=31557600; includeSubDomains; preload";
 add_header Alt-Svc 'h2="privacy2zbidut4m4jyj3ksdqidzkw3uoip2vhvhbvwxbqux5xy5obyd.onion:443"; ma=86400; persist=1';
 add_header Expect-CT 'max-age=86400, enforce';
--- a/pages/about.html
+++ b/pages/about.html
@ -5,36 +5,28 @@ title: "About PrivacyTools"
 description: "About the PrivacyTools organization, and contributors to the PrivacyTools website, communities, and services."
 hidedesc: true
 ---
-
+<div itemscope itemtype="http://schema.org/Organization">
+<meta itemprop="alternateName" content="privacytoolsIO">
+<meta itemprop="alternateName" content="Privacy Tools">
+<meta itemprop="alternateName" content="privacytools.io">
+<link itemprop="logo" href="{{ site.production_url }}/assets/img/svg/layout/brand/square-transparent.svg">
 <div class="row">
  <div class="col">
-    <p><em>You are being watched. Private and state-sponsored organizations are monitoring and recording your online activities.</em></p>
-    <p>At <strong>PrivacyTools</strong>, we provide services, tools, and knowledge to protect your privacy against global mass surveillance, and moderate a thriving community of privacy-minded individuals like yourself to discuss and learn about new advances in protecting your online data. This website serves as the centerpiece of our organization, where we research and recommend various software solutions for our community.</p>
-    <p><strong>Transparency</strong> is our strongest value, and it's what sets us apart from the rest of the "privacy recommendations" community. Editorial changes to this website and the products we recommend are always discussed on our extensive <a href="https://github.com/privacytoolsIO/privacytools.io/issues">issue tracker</a>, drafted in a public <a href="https://github.com/privacytoolsIO/privacytools.io/pulls">pull request</a> open for further discussion, and logged in a comprehensive <a href="https://github.com/privacytoolsIO/privacytools.io/commits/master">commit log</a> dating back to our original founding date in 2015. The <em>core</em> team members listed below are responsible for most of the edits and final decisions to changes on this website and across our services, but this website is truly the work of hundreds <a href="https://github.com/privacytoolsIO/privacytools.io/graphs/contributors">contributors and fact checkers</a> working to make sure our recommendations are solid and trustworthy.</p>
-    <p>Additionally, we are a not-for-profit organization. We do not utilize paid recommendations or affiliate programs to make the recommendations on this website. Unfortunately this practice is very common elsewhere online, which makes it difficult to trust other review sites. We are unique in this area, in that all of our research is conducted independently, and we will never accept payments to modify, add, or remove any of our reviews or recommendations. Our finances are provided entirely by our community <a href="https://opencollective.com/privacytoolsio">donors</a> and <a href="/sponsors/">sponsors</a>, and are handled by the Open Collective Foundation 501(c)(3). Because we are operating as a charity in the United States, we are legally obligated to only use our funding to further our mission of spreading privacy education and promoting online services like Mastodon, Matrix, and WriteFreely. This website is a public resource, not a profit generator. To that regard, all our financial transactions (incoming and outgoing) are logged and made available to the public via our page at <a href="https://opencollective.com/privacytoolsio">opencollective.com/privacytoolsio</a>.</p>
-    <p>We take the operation of our various <a href="/services/">services</a> very seriously, and require all participants to adhere to our <a href="https://github.com/privacytoolsIO/.github/blob/master/CODE_OF_CONDUCT.md">Code of Conduct</a>. For any questions or to report abuse, please see our CoC’s <a href="https://github.com/privacytoolsIO/.github/blob/master/CODE_OF_CONDUCT.md#enforcement">Enforcement section</a>.</p>
+    <p itemprop="description"><em>You are being watched. Private and state-sponsored organizations are monitoring and recording your online activities.</em></p>
+    <p>At <strong itemprop="name">PrivacyTools</strong>, we provide services, tools, and knowledge to protect your <span itemprop="knowsAbout">privacy</span> against <span itemprop="knowsAbout">global mass surveillance</span>, and moderate a thriving community of privacy-minded individuals like yourself to discuss and learn about new advances in protecting your online data. <a itemprop="url" href="{{ site.production_url }}">This website</a> serves as the centerpiece of our organization, where we research and recommend various software solutions for our community.</p>
+    <p><strong>Transparency</strong> is our strongest value, and it's what sets us apart from the rest of the "privacy recommendations" community. Editorial changes to this website and the products we recommend are always discussed on our extensive <a href="https://github.com/privacytools/privacytools.io/issues">issue tracker</a>, drafted in a public <a href="https://github.com/privacytools/privacytools.io/pulls">pull request</a> open for further discussion, and logged in a comprehensive <a href="https://github.com/privacytools/privacytools.io/commits/master">commit log</a> dating back to our original founding date in <span itemprop="foundingDate">2015</span>. The <em>core</em> team members listed below are responsible for most of the edits and final decisions to changes on this website and across our services, but this website is truly the work of hundreds <a href="https://github.com/privacytools/privacytools.io/graphs/contributors">contributors and fact checkers</a> working to make sure our recommendations are solid and trustworthy.</p>
+    <p>Additionally, we are a not-for-profit organization. We do not utilize paid recommendations or affiliate programs to make the recommendations on this website. Unfortunately this practice is very common elsewhere online, which makes it difficult to trust other review sites. We are unique in this area, in that all of our research is conducted independently, and we will never accept payments to modify, add, or remove any of our reviews or recommendations. Our finances are provided entirely by our community <a href="https://opencollective.com/privacytools">donors</a> and <a href="/sponsors/">sponsors</a>, and are handled by the Open Collective Foundation 501(c)(3). Because we are operating as a charity in the United States, we are legally obligated to only use our funding to further our mission of spreading privacy education and promoting online services like Mastodon, Matrix, and WriteFreely. This website is a public resource, not a profit generator. To that regard, all our financial transactions (incoming and outgoing) are logged and made available to the public via our page at <a href="https://opencollective.com/privacytools">opencollective.com/privacytools</a>.</p>
+    <p>We take the operation of our various <a href="/services/">services</a> very seriously, and require all participants to adhere to our <a href="https://github.com/privacytools/.github/blob/master/CODE_OF_CONDUCT.md">Code of Conduct</a>. For any questions or to report abuse, please see our CoC’s <a href="https://github.com/privacytools/.github/blob/master/CODE_OF_CONDUCT.md#enforcement">Enforcement section</a>.</p>
  </div>
 </div>

 <div class="row">
  <div class="col">
-    <h2>Core Contributors</h2>
+    <h2>Team Members</h2>
  </div>
 </div>

 <div class="row">
-
-{% include team.html
-avatar="burung.png"
-name="Burung Hantu"
-role="Founder"
-bio="I founded PrivacyTools in 2015 to share resources and tools, allowing users to avoid international mass-surveillance programs."
-email="mailto:dude@privacytools.io"
-keys="https://keybase.io/privacytools"
-mastodon="https://social.privacytools.io/@BurungHantu"
-twitter="privacytoolsIO"
-%}
-
 {% include team.html
 avatar="jonah.png"
 name="Jonah Aragon"
@ -48,6 +40,16 @@ twitter="JonahAragon"
 blog="jonah"
 %}

+{% include team.html
+avatar="burung.png"
+name="Burung Hantu"
+role="Founder"
+bio="I founded PrivacyTools in 2015 to share resources and tools, allowing users to avoid international mass-surveillance programs."
+keys="https://keybase.io/privacytools"
+mastodon="https://social.privacytools.io/@BurungHantu"
+twitter="privacytoolsIO"
+%}
+
 {% include team.html
 avatar="blacklight447.png"
 name="Niek de Wilde"
@ -65,14 +67,14 @@ role="Blogging & Education"
 bio="I'm an author, columnist, and privacy advocate whose work has appeared in Time, Huff Post, OpenSource, and more."
 website="https://danarel.com"
 email="mailto:dan@privacytools.io"
-keys="https://keybase.io/dan_arel"
+keys="https://www.danarel.com/keys/"
 twitter="danarel"
 mastodon="https://mastodon.technology/@danarel"
 blog="danarel"
 %}

 {% include team.html
-avatar="dawid.png"
+avatar="dawid.svg"
 name="Dawid Potocki"
 role="Developer"
 bio="I'm a student interested in software development. I help improve PrivacyTools and promote using free libre software."
@ -94,15 +96,6 @@ keys="https://keybase.io/dngray"
 mastodon="https://social.privacytools.io/@dngray"
 %}

-{% include team.html
-avatar="mikaela.png"
-name="Mikaela Suomalainen"
-nick="Mikaela"
-bio="I am interested in instant messengers. I review privacy tools, and participate in our forum, Matrix room, and issue tracker."
-website="https://mikaela.info/"
-keys="https://gitea.blesmrt.net/mikaela/shell-things/src/branch/master/.mikaela/keys"
-%}
-
 {% include team.html
 avatar="nitrohorse.png"
 name="Andreas Basurto"
@ -110,7 +103,8 @@ nick="nitrohorse"
 role="Developer"
 bio="I'm a privacy advocate and software developer. I write web extensions, help research, and make updates to the site."
 website="https://nitrohorse.com/"
-keys="https://keybase.io/513"
+email="mailto:nitrohorse@privacytools.io"
+keys="https://nitrohorse.com/keys"
 mastodon="https://nitro.horse/@andreas"
 blog="nitrohorse"
 %}
@ -123,13 +117,13 @@ bio="I'm the moderator at r/Privacy and r/privacytoolsIO. Day to day, I am also
 email="mailto:trai_dep@privacytools.io"
 website="https://www.reddit.com/user/trai_dep"
 %}
-
 </div>
+
 <div class="row mt-4 mb-4">
  <div class="col">
    <div class="card">
      <div class="card-body">
-        <p class="card-text">Of course, we couldn't do any of this without our very generous <a href="https://opencollective.com/privacytoolsio/">financial contributors</a>, <a href="https://github.com/privacytoolsIO/privacytools.io/graphs/contributors">website contributors</a>, and the countless community members that help share new ideas and spread the word! Thank you.</p>
+        <p class="card-text">Of course, we couldn't do any of this without our very generous <a href="https://opencollective.com/privacytools/">financial contributors</a>, <a href="https://github.com/privacytools/privacytools.io/graphs/contributors">website contributors</a>, and the countless community members that help share new ideas and spread the word! Thank you.</p>
        <a href="/#participate" class="btn btn-primary"><i class="fas fa-hands-helping"></i> Get involved!</a>
        <a href="/donate/" class="btn btn-outline-danger"><i class="fas fa-heart"></i> Donate</a>
      </div>
@ -137,14 +131,35 @@ website="https://www.reddit.com/user/trai_dep"
  </div>
 </div>

+<div class="row">
+  <div class="col">
+    <h2>Emeritus</h2>
+    <p>Emeriti are honorary PrivacyTools team members who have formerly contributed to the project in a central way but are no longer currently active.</p>
+  </div>
+</div>
+
+<div class="row">
+{% include team.html
+name="Mikaela Suomalainen"
+website="https://mikaela.info/"
+keys="https://gitea.blesmrt.net/mikaela/shell-things/src/branch/master/.mikaela/keys"
+emeritus=true
+%}
+</div>
+
 <div class="row">
  <div class="col">
    <h2>Contact Us</h2>
    <p>It's very important to us to stay up-to-date on the latest changes in the privacy space. If you have a software recommendation for us, or want to request a change on this website, please don't hesitate to reach out in one of the following ways.</p>
    <p><a href="https://forum.privacytools.io/"><i class="fab fa-discourse fa-lg fa-fw"></i> Start a discussion in our Discourse forum</a></p>
-    <p><a href="https://github.com/privacytoolsIO/privacytools.io/issues"><i class="fab fa-github fa-lg fa-fw"></i> Open an issue on GitHub</a></p>
+    <p><a href="https://github.com/privacytools/privacytools.io/issues"><i class="fab fa-github fa-lg fa-fw"></i> Open an issue on GitHub</a></p>
    <p><a href="https://www.reddit.com/r/privacytoolsIO/"><i class="fab fa-reddit fa-lg fa-fw"></i> Suggest something new on our subreddit</a></p>
    <p>For complete transparency, software and providers will only be considered for this website after discussions take place on our GitHub issue tracker. We of course don't make any changes in secret.</p>
    <p>Join our Matrix room at <code>#general:privacytools.io</code> or join the <a href="https://keybase.io/team/privacytools_io">privacytools_io Keybase team</a> to chat with us and other members about this site and privacy in general! If you need a Matrix account, you can sign up with our own homeserver (<code>https://chat.privacytools.io</code>) using <a href="https://riot.privacytools.io">Riot</a>.</p>
+    <p>You can also email the team at <a itemprop="email" href="mailto:support@privacytools.io">support@privacytools.io</a> and find us on <a itemprop="sameAs" href="https://twitter.com/privacytoolsIO">Twitter</a> and <a itemprop="sameAs" href="https://social.privacytools.io/@privacytools">Mastodon</a>.</p>
+    <link itemprop="sameAs" href="https://blog.privacytools.io">
+    <link itemprop="sameAs" href="https://www.youtube.com/channel/UCen3taxHtzByXV8Da73B1Vg">
+    <link itemprop="sameAs" href="https://github.com/privacytools">
  </div>
 </div>
+</div>
--- a/pages/about/librejs.html
+++ b/pages/about/librejs.html
@ -5,15 +5,15 @@ permalink: /about/javascript/
 <table id="jslicense-labels1" border="1">
  <tr>
    <td><a href="/assets/js/main.js">main.js</a></td>
-    <td><a href="https://github.com/privacytoolsIO/privacytools.io/raw/master/LICENSE.txt">CC0-1.0-only</a></td>
+    <td><a href="https://github.com/privacytools/privacytools.io/raw/master/LICENSE.txt">CC0-1.0-only</a></td>
  </tr>
  <tr>
    <td><a href="/assets/js/applytheme.js">applytheme.js</a>
-    <td><a href="https://github.com/privacytoolsIO/privacytools.io/raw/master/LICENSE.txt">CC0-1.0-only</a></td>
+    <td><a href="https://github.com/privacytools/privacytools.io/raw/master/LICENSE.txt">CC0-1.0-only</a></td>
  </tr>
  <tr>
    <td><a href="/assets/js/redirects.js">redirects.js</a></td>
-    <td><a href="https://github.com/privacytoolsIO/privacytools.io/raw/master/LICENSE.txt">CC0-1.0-only</a></td>
+    <td><a href="https://github.com/privacytools/privacytools.io/raw/master/LICENSE.txt">CC0-1.0-only</a></td>
  </tr>
  <tr>
    <td><a href="/assets/js/bootstrap.min.js">bootstrap.min.js</a></td>
--- a/pages/donate.html
+++ b/pages/donate.html
@ -8,7 +8,7 @@ permalink: /donate/
    <div class="mx-auto text-center">
      <div class="mt-4 mb-4">
        <a href="{{ site.production_url }}">
-          <img class="img-fluid" src="/assets/img/svg/layout/brand/horizontal.svg" width="450px" alt="{{ site.name }}">
+          <img class="img-fluid" src="{% if jekyll.environment == "production" and site.pull_cdn %}{{site.pull_cdn}}{% endif %}/assets/img/svg/layout/brand/horizontal.svg" width="450px" alt="{{ site.name }}">
        </a>
      </div>

@ -16,7 +16,7 @@ permalink: /donate/
        <div class="card-header text-success"><i class="fas fa-donate fa-fw"></i> Donate via OpenCollective</div>
        <div class="card-body text-success">
          <p class="card-text">If you are able, please consider contributing to our development and outreach programs. <strong>Contributions via OpenCollective to {{ site.name }} are tax deductible for US taxpayers.</strong> These funds are transparently and primarily used to cover server costs.</p>
-          <a href="https://opencollective.com/privacytoolsio#section-contribute" class="btn btn-success">Contribute</a>
+          <a href="https://opencollective.com/privacytools#section-contribute" class="btn btn-success">Contribute</a>
          <a href="https://blog.privacytools.io/privacytools-io-joins-the-open-collective-foundation" class="btn btn-outline-success">More Info</a>
        </div>
      </div>
--- a/pages/notices.md
+++ b/pages/notices.md
@ -19,24 +19,24 @@ PrivacyTools additionally does not warrant that this website will be constantly
 <span class="badge badge-secondary mt-5">Section 2</span>
 # Licenses

-<span class="lead">Content copyright on this website is waived under the terms of [CC0 1.0 Universal](https://github.com/privacytoolsIO/privacytools.io/blob/master/LICENSE.txt).</span>
+<span class="lead">Content copyright on this website is waived under the terms of [CC0 1.0 Universal](https://github.com/privacytools/privacytools.io/blob/master/LICENSE.txt).</span>

-In certain jurisdictions, namely those in which the copyright waiver in the CC0-1.0 is judged for any reason to be legally invalid or ineffective under applicable law, content may be copyright &copy; PrivacyTools contributors, released under the [CC 1.0 Universal](https://github.com/privacytoolsIO/privacytools.io/blob/master/LICENSE.txt) license.
+In certain jurisdictions, namely those in which the copyright waiver in the CC0-1.0 is judged for any reason to be legally invalid or ineffective under applicable law, content may be copyright &copy; PrivacyTools contributors, released under the [CC 1.0 Universal](https://github.com/privacytools/privacytools.io/blob/master/LICENSE.txt) license.

-**Content** on this website is based on [github.com/privacytoolsIO/privacytools.io](https://github.com/privacytoolsIO/privacytools.io) and is made freely available under the CC-1.0.
+**Content** on this website is based on [github.com/privacytools/privacytools.io](https://github.com/privacytools/privacytools.io) and is made freely available under the CC-1.0.

 Code, including source files and code samples if any in the content, is released under CC-1.0, with the following exceptions:

 - Bootstrap code is under the MIT license. See: [github.com/twbs/bootstrap/blob/master/LICENSE](https://github.com/twbs/bootstrap/blob/master/LICENSE)
- [jQuery](https://github.com/privacytoolsIO/privacytools.io/blob/master/assets/js/jquery-3.3.1.min.js) is under the MIT license. See: [jquery.org/license](https://jquery.org/license/)
- [Popper.js](https://github.com/privacytoolsIO/privacytools.io/blob/master/assets/js/popper.min.js) is under the MIT license. See: [github.com/FezVrasta/popper.js/raw/master/LICENSE.md](https://github.com/FezVrasta/popper.js/raw/master/LICENSE.md)
- [Sortable](https://github.com/privacytoolsIO/privacytools.io/blob/master/assets/js/sortable.min.js) is under the MIT license. See: [github.com/HubSpot/sortable/raw/master/LICENSE](https://github.com/HubSpot/sortable/raw/master/LICENSE)
+- [jQuery](https://github.com/privacytools/privacytools.io/blob/master/assets/js/jquery-3.3.1.min.js) is under the MIT license. See: [jquery.org/license](https://jquery.org/license/)
+- [Popper.js](https://github.com/privacytools/privacytools.io/blob/master/assets/js/popper.min.js) is under the MIT license. See: [github.com/FezVrasta/popper.js/raw/master/LICENSE.md](https://github.com/FezVrasta/popper.js/raw/master/LICENSE.md)
+- [Sortable](https://github.com/privacytools/privacytools.io/blob/master/assets/js/sortable.min.js) is under the MIT license. See: [github.com/HubSpot/sortable/raw/master/LICENSE](https://github.com/HubSpot/sortable/raw/master/LICENSE)
 - The Font Awesome icons are under CC-BY-4.0, Font Awesome fonts are under SIL OFL 1.1, and Font Awesome code is under the MIT License. See: [fontawesome.com/license/free](https://fontawesome.com/license/free)
- The PrivacyTools fonts, icons, and code in `fonts` are under ISC license. See: [github.com/privacytoolsIO/privacytools.io/blob/master/font/LICENSE](https://github.com/privacytoolsIO/privacytools.io/blob/master/font/LICENSE).
+- The PrivacyTools fonts, icons, and code in `fonts` are under ISC license. See: [github.com/privacytools/privacytools.io/blob/master/font/LICENSE](https://github.com/privacytools/privacytools.io/blob/master/font/LICENSE).

 Portions of this notice itself were adopted from [opensource.guide](https://github.com/github/opensource.guide/blob/master/notices.md) on GitHub, released under [CC-BY-4.0](https://github.com/github/opensource.guide/blob/master/LICENSE).

-This means that you can use the code and content in this repository **except** for the PrivacyTools [branding](https://github.com/privacytoolsIO/brand) in your own projects. PrivacyTools's brand trademarks include the "PrivacyTools" wordmark and shield logo. More information on the use of PrivacyTools's branding can be found on our [branding guidelines page](https://github.com/privacytoolsIO/brand).
+This means that you can use the code and content in this repository **except** for the PrivacyTools [branding](https://github.com/privacytools/brand) in your own projects. PrivacyTools's brand trademarks include the "PrivacyTools" wordmark and shield logo. More information on the use of PrivacyTools's branding can be found on our [branding guidelines page](https://github.com/privacytools/brand).

 We believe that the logos and other images in `assets` from third-party providers are either in the public domain or **fair use**. In a nutshell, legal [fair use doctrine](https://en.wikipedia.org/wiki/Fair_use) allows the use of copyrighted image in order to identify the subject matter for purposes of public comment. However, these logos and other images may still be subject to trademark laws in one or more jurisdictions. Before using this content, please ensure that it is used to identify the entity or organization that owns the trademark and that you have the right to use it under the laws which apply in the circumstances of your intended use. *You are solely responsible for ensuring that you do not infringe someone else's trademark or copyright.*

@ -55,4 +55,4 @@ You must not conduct any systematic or automated data collection activities on o
 - Data Mining
 - ‘Framing’ (IFrames)

-We take the security of our website, infrastructure, and services very seriously. Our [SECURITY.md](https://github.com/privacytoolsIO/.github/blob/master/SECURITY.md) document outlines responsible disclosure guidelines and other security-related information.
+We take the security of our website, infrastructure, and services very seriously. Our [SECURITY.md](https://github.com/privacytools/.github/blob/master/SECURITY.md) document outlines responsible disclosure guidelines and other security-related information.
--- a/pages/privacy.md
+++ b/pages/privacy.md
@ -7,7 +7,7 @@ description: "This Privacy Statement explains what information PrivacyTools and

 ## Who is {{ site.name }}?

-{{ site.name }} is an unincorporated community developing this website and a number of privacy-friendly services. The current list of public team members [can be found on GitHub](https://github.com/orgs/privacytoolsIO/people). In order to operate these services, {{ site.name }} receives hosting and administration services from Aragon Ventures LLC.
+{{ site.name }} is an unincorporated community developing this website and a number of privacy-friendly services. The current list of public team members [can be found on GitHub](https://github.com/orgs/privacytools/people). In order to operate these services, {{ site.name }} receives hosting and administration services from Aragon Ventures LLC.

 ## How does {{ site.name }} collect data about me?

@ -120,4 +120,4 @@ This version of our privacy statement took effect October 9th, 2019.

 We will post any new versions of this statement at [{{ site.production_url }}/privacy/]({{ site.production_url }}/privacy/). We may change how we announce changes in future versions of this document. In the meantime we may update our contact information at any time without announcing a change. Please refer to [{{ site.production_url }}/privacy/]({{ site.production_url }}/privacy/) for the latest contact information at any time.

-A full [revision history](https://github.com/privacytoolsIO/privacytools.io/commits/master/pages/privacy.md) for this page can be found on GitHub.
+A full [revision history](https://github.com/privacytools/privacytools.io/commits/master/pages/privacy.md) for this page can be found on GitHub.
--- a/pages/providers/dns.html
+++ b/pages/providers/dns.html
@ -13,10 +13,21 @@ breadcrumb: "DNS"
 <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>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.
+        {% include badge.html
+        color="warning"
+        icon="fas fa-exclamation-triangle"
+        tooltip="In other words automatic mode leaves your DNS traffic vulnerable to SSL strip and MITM attacks."
+        %}</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>DNS-over-HTTPS (DoH) - Similar to DoT, but uses HTTPS instead, being indistinguishable from "normal" HTTPS traffic on port 443.
+    {% include badge.html
+    color="warning"
+    icon="fas fa-exclamation-triangle"
+    link="https://tools.ietf.org/html/rfc8484#section-8.2"
+    tooltip="DoH contains metadata such as user-agent (which may include system information) that is sent to the DNS server."
+    %}</li>
  <li>DNSCrypt - An older yet robust method of encrypting DNS.</li>
 </ul>

@ -25,9 +36,20 @@ breadcrumb: "DNS"
 <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 <a href="https://www.dnsleaktest.com/">DNSLeakTest.com</a>.
+        {% include badge.html
+        color="warning"
+        icon="fas fa-exclamation-triangle"
+        tooltip="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."
+        %}</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>
+      <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.
+        {% include badge.html
+        color="warning"
+        icon="fas fa-exclamation-triangle"
+        link="https://wiki.mozilla.org/Trusted_Recursive_Resolver"
+        tooltip="Some fields will say 'false' depending on the the value of network.trr.mode in about:config"
+        %}</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>
@ -40,7 +62,14 @@ breadcrumb: "DNS"
 <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>
+      <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.
+        {% include badge.html
+        color="warning"
+        icon="fas fa-exclamation-triangle"
+        link="https://developers.cloudflare.com/1.1.1.1/commitment-to-privacy/privacy-policy/firefox/"
+        tooltip="&quot;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.&quot;"
+        %}
+        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>
@ -49,9 +78,20 @@ breadcrumb: "DNS"
  </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>
+      <li><em>Android 9</em> comes with a DoT client by <a href="https://support.google.com/android/answer/9089903">default</a>.
+        {% include badge.html
+        color="warning"
+        icon="fas fa-exclamation-triangle"
+        link="https://www.quad9.net/private-dns-quad9-android9/"
+        tooltip="...but with some caveats"
+        %}</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>
+          <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).
+            {% include badge.html
+            color="warning"
+            icon="fas fa-exclamation-triangle"
+            tooltip="If you are on a network blocking access to port 853, Android will error about the network not having internet connectivity."
+            %}</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>
--- a/pages/providers/email.html
+++ b/pages/providers/email.html
@ -17,7 +17,7 @@ description: "Find a secure email provider that will keep your privacy in mind.
 <div class="container">
  <div class="row">
    <div class="col-12">
-      <h3><span class="badge badge-info">Jurisdiction</span></h3>
+      <h3>{% include badge.html color="info" text="Jurisdiction" %}</h3>
      <p>Operating outside the five/nine/fourteen-eyes countries is not necessarily a guarantee of privacy, and there are other factors to consider. However, we believe that avoiding these countries is important if you wish to avoid mass government dragnet surveillance, especially from the United States. Read our page on <a href="/providers/#ukusa">global mass surveillance and avoiding the US and UK</a> to learn more about why we feel this is important.</p>
    </div>
    <div class="col-md-6">
@ -35,7 +35,7 @@ description: "Find a secure email provider that will keep your privacy in mind.
    </div>

    <div class="col-12">
-      <h3><span class="badge badge-info">Technology</span></h3>
+      <h3>{% include badge.html color="info" text="Technology" %}</h3>
      <p>We regard these features as important in order to provide a safe and optimal service to users. Users should consider the provider which has the features they require.</p>
    </div>
    <div class="col-md-6">
@ -60,7 +60,7 @@ description: "Find a secure email provider that will keep your privacy in mind.
    </div>

    <div class="col-12">
-      <h3><span class="badge badge-info">Privacy</span></h3>
+      <h3>{% include badge.html color="info" text="Privacy" %}</h3>
      <p>We prefer our recommended providers to collect as little data as possible.</p>
    </div>
    <div class="col-md-6">
@ -79,7 +79,7 @@ description: "Find a secure email provider that will keep your privacy in mind.
    </div>

    <div class="col-12">
-      <h3><span class="badge badge-info">Security</span></h3>
+      <h3>{% include badge.html color="info" text="Security" %}</h3>
      <p>Email servers deal with a lot of very sensitive data. We expect that providers will adopt best industry practices in order to protect their users.</p>
    </div>
    <div class="col-md-6">
@ -91,7 +91,6 @@ description: "Find a secure email provider that will keep your privacy in mind.
        <li>No <a href="https://en.wikipedia.org/wiki/Opportunistic_TLS">TLS</a> errors/vulnerabilities when being profiled by tools such as <a href="https://www.hardenize.com">Hardenize</a>, <a href="https://testssl.sh">testssl.sh</a> or <a href="https://www.ssllabs.com/ssltest">Qualys SSL Labs</a>, this includes certificate related errors, poor or weak ciphers suites, weak DH parameters such as those that led to <a href="https://en.wikipedia.org/wiki/Logjam_(computer_security)">Logjam</a>.</li>
        <li>A valid <a href="https://tools.ietf.org/html/rfc8461">MTA-STS</a> and <a href="https://tools.ietf.org/html/rfc8460">TLS-RPT</a> policy.</li>
        <li>Valid <a href="https://en.wikipedia.org/wiki/DNS-based_Authentication_of_Named_Entities">DANE</a> records.</li>
-        <li>Registration on the EFF's <a href="https://starttls-everywhere.org">STARTTLS-Everywhere</a> list.</li>
        <li>Valid <a href="https://en.wikipedia.org/wiki/Sender_Policy_Framework">SPF</a>, <a href="https://en.wikipedia.org/wiki/DomainKeys_Identified_Mail">DKIM</a> and <a href="https://en.wikipedia.org/wiki/DMARC">DMARC</a>, with the policy <code>p</code> value set to either <code>none</code>, <code>quarantine</code> or <code>reject</code>.</li>
        <li>A server suite preference of TLS 1.2 or later and a plan for <a href="https://datatracker.ietf.org/doc/draft-ietf-tls-oldversions-deprecate/">Deprecating TLSv1.0 and TLSv1.1</a>.</li>
        <li><a href="https://en.wikipedia.org/wiki/SMTPS">SMTPS</a> submission, assuming SMTP is used.</li>
@ -119,8 +118,8 @@ description: "Find a secure email provider that will keep your privacy in mind.
    </div>

    <div class="col-12">
-      <h3><span class="badge badge-info">Trust</span></h3>
-      <p>You wouldn't trust your finances to someone with a fake identity, so why trust them with your internet data? We require our recommended providers to be public about their ownership or leadership. We also would like to see frequent transparency reports, especially in regard to how government requests are handled.</p>
+      <h3>{% include badge.html color="info" text="Trust" %}</h3>
+      <p>You wouldn't trust your finances to someone with a fake identity, so why trust them with your email? We require our recommended providers to be public about their ownership or leadership. We also would like to see frequent transparency reports, especially in regard to how government requests are handled.</p>
    </div>
    <div class="col-md-6">
      <p><strong>Minimum to Qualify:</strong></p>
@ -137,7 +136,7 @@ description: "Find a secure email provider that will keep your privacy in mind.
    </div>

    <div class="col-12">
-      <h3><span class="badge badge-info">Marketing</span></h3>
+      <h3>{% include badge.html color="info" text="Marketing" %}</h3>
      <p>With the email providers we recommend we like to see responsible marketing.</p>
    </div>
    <div class="col-md-6">
@ -163,7 +162,7 @@ description: "Find a secure email provider that will keep your privacy in mind.
    </div>

    <div class="col-12">
-      <h3><span class="badge badge-info">Additional Functionality</span></h3>
+      <h3>{% include badge.html color="info" text="Additional Functionality" %}</h3>
      <p>While not strictly requirements, there are some factors we looked into when determining which providers to recommend.</p>
    </div>
  </div>
@ -218,12 +217,20 @@ description: "Find a secure email provider that will keep your privacy in mind.
 <h1 id="cloaking" class="anchor"><a href="#cloaking"><i class="fas fa-link anchor-icon"></i></a> Email cloaking services</h1>
 <div class="container">
  <a href="https://anonaddy.com">
-    <img src="/assets/img/svg/3rd-party/anonaddy.svg"
-        data-theme-src="/assets/img/svg/3rd-party/anonaddy-dark.svg"
+    <img src="{% if jekyll.environment == "production" and site.pull_cdn %}{{site.pull_cdn}}{% endif %}/assets/img/svg/3rd-party/anonaddy.svg"
+        data-theme-src="{% if jekyll.environment == "production" and site.pull_cdn %}{{site.pull_cdn}}{% endif %}/assets/img/svg/3rd-party/anonaddy-dark.svg"
         width="180rem" class="img-fluid float-left mr-3"
         alt="AnonAddy">
  </a>
+  <br>
  <p><strong><a href="https://anonaddy.com">AnonAddy</a></strong> lets users create aliases that forward to their email address. Can be self-hosted. <a href="https://github.com/anonaddy/anonaddy">Source code on GitHub</a>.</p>
+  <a href="https://simplelogin.io">
+    <img src="{% if jekyll.environment == "production" and site.pull_cdn %}{{site.pull_cdn}}{% endif %}/assets/img/svg/3rd-party/simplelogin.svg"
+         width="180rem" class="img-fluid float-left mr-3"
+         alt="SimpleLogin">
+  </a>
+  <br>
+  <p><strong><a href="https://simplelogin.io">SimpleLogin</a></strong> allows you to easily create aliases for your email. Can be self-hosted. <a href="https://github.com/simple-login/app">Source code on GitHub</a>.</p>
 </div>

 <h1 id="selfhosting" class="anchor"><a href="#selfhosting"><i class="fas fa-link anchor-icon"></i></a> Self-hosting Email</h1>
@ -231,14 +238,14 @@ description: "Find a secure email provider that will keep your privacy in mind.
  <p>Advanced users may consider setting up their own email server. Mailservers require attention and continuous maintenance in order to keep things secure and mail delivery reliable.</p>
  <h3>Combined software solutions</h3>
  <a href="https://mailinabox.email/">
-    <img src="/assets/img/svg/3rd-party/mail-in-a-box.svg"
+    <img src="{% if jekyll.environment == "production" and site.pull_cdn %}{{site.pull_cdn}}{% endif %}/assets/img/svg/3rd-party/mail-in-a-box.svg"
         width="80rem" class="img-fluid float-left mr-3"
         alt="Mail-in-a-Box">
  </a>
  <br>
  <p><strong><a href="https://mailinabox.email">Mail-in-a-Box</a></strong> is an automated setup script for deploying a mail server on Ubuntu. Its goal is to make it easier for users to set up their own mail server.</p>
  <a href="https://mailcow.email/">
-    <img src="/assets/img/svg/3rd-party/mailcow.svg"
+    <img src="{% if jekyll.environment == "production" and site.pull_cdn %}{{site.pull_cdn}}{% endif %}/assets/img/svg/3rd-party/mailcow.svg"
         width="80rem" class="img-fluid float-left mr-3"
         alt="Mailcow">
  </a>
--- a/pages/providers/vpn.html
+++ b/pages/providers/vpn.html
@ -29,7 +29,7 @@ breadcrumb: "VPN"
 <div class="container">
  <div class="row">
    <div class="col-12">
-      <h3><span class="badge badge-info">Jurisdiction</span></h3>
+      <h3>{% include badge.html color="info" text="Jurisdiction" %}</h3>
      <p>Operating outside the five/nine/fourteen-eyes countries is not a guarantee of privacy necessarily, and there are other factors to consider. However, we believe that avoiding these countries is important if you wish to avoid mass government dragnet surveillance, especially from the United States. Read our page on <a href="/providers/#ukusa">global mass surveillance and avoiding the US and UK</a> to learn more about why we feel this is important.</p>
    </div>
    <div class="col-md-6">
@ -47,7 +47,7 @@ breadcrumb: "VPN"
    </div>

    <div class="col-12">
-      <h3><span class="badge badge-info">Technology</span></h3>
+      <h3>{% include badge.html color="info" text="Technology" %}</h3>
      <p>We require all our recommended VPN providers to provide OpenVPN configuration files to be used in any client. <strong>If</strong> a VPN provides their own custom client, we require a killswitch to block network data leaks when disconnected.</p>
    </div>
    <div class="col-md-6">
@ -70,7 +70,7 @@ breadcrumb: "VPN"
    </div>

    <div class="col-12">
-      <h3><span class="badge badge-info">Privacy</span></h3>
+      <h3>{% include badge.html color="info" text="Privacy" %}</h3>
      <p>We prefer our recommended providers to collect as little data as possible. Not collecting personal information on registration, and accepting anonymous forms of payment are required.</p>
    </div>
    <div class="col-md-6">
@ -89,7 +89,7 @@ breadcrumb: "VPN"
    </div>

    <div class="col-12">
-      <h3><span class="badge badge-info">Security</span></h3>
+      <h3>{% include badge.html color="info" text="Security" %}</h3>
      <p>A VPN is pointless if it can't even provide adequate security. We require all our recommended providers to abide by current security standards for their OpenVPN connections. Ideally, they would use more future-proof encryption schemes by default. We also require an independent third-party to audit the provider's security, ideally in a very comprehensive manner and on a repeated (yearly) basis.</p>
    </div>
    <div class="col-md-6">
@ -111,7 +111,7 @@ breadcrumb: "VPN"
    </div>

    <div class="col-12">
-      <h3><span class="badge badge-info">Trust</span></h3>
+      <h3>{% include badge.html color="info" text="Trust" %}</h3>
      <p>You wouldn't trust your finances to someone with a fake identity, so why trust them with your internet data? We require our recommended providers to be public about their ownership or leadership. We also would like to see frequent transparency reports, especially in regard to how government requests are handled.</p>
    </div>
    <div class="col-md-6">
@ -129,7 +129,7 @@ breadcrumb: "VPN"
    </div>

    <div class="col-12">
-      <h3><span class="badge badge-info">Marketing</span></h3>
+      <h3>{% include badge.html color="info" text="Marketing" %}</h3>
      <p>With the VPN providers we recommend we like to see responsible marketing.</p>
    </div>
    <div class="col-md-6">
@ -159,7 +159,7 @@ breadcrumb: "VPN"
    </div>

    <div class="col-12">
-      <h3><span class="badge badge-info">Additional Functionality</span></h3>
+      <h3>{% include badge.html color="info" text="Additional Functionality" %}</h3>
      <p>While not strictly requirements, there are some factors we looked into when determining which providers to recommend. These include adblocking/tracker-blocking functionality, warrant canaries, multihop connections, excellent customer support, the number of allowed simultaneous connections, etc.</p>
    </div>
  </div>
@ -214,30 +214,69 @@ breadcrumb: "VPN"

  <hr>

-  <div class="container">
+  <div id="related-vpn-info" class="container">
    <div class="row">
-      <div class="col-md-6">
-
-        <h3>More VPN Providers</h3>
-        <ul>
-          <li><a href="https://thatoneprivacysite.net/vpn-comparison-chart/">Spreadsheet with unbiased, independently verifiable data on over 100 VPN services.</a></li>
-        </ul>
-      </div>
-
-      <div class="col-md-6">
+      <div class="col-md-12">

        <h3>Related VPN information</h3>

        <ul>
+          <li><a href="https://thatoneprivacysite.net/vpn-comparison-chart/">Spreadsheet with unbiased, independently verifiable data on over 100 VPN services.</a></li>
          <li><a href="https://vikingvpn.com/blogs/off-topic/beware-of-vpn-marketing-and-affiliate-programs">Beware of False Reviews - VPN Marketing and Affiliate Programs</a></li>
-          <li><a href="https://www.goldenfrog.com/take-back-your-internet/articles/7-myths-about-vpn-logging-and-anonymity">I am Anonymous When I Use a VPN - 7 Myths Debunked</a><br />(<strong>Note:</strong> While this is a good read, they also use the article for self-promotion)</li>
          <li><a href="https://torrentfreak.com/proxy-sh-vpn-provider-monitored-traffic-to-catch-hacker-130930/">Proxy.sh VPN Provider Sniffed Server Traffic to Catch Hacker</a></li>
          <li><a href="https://proxy.sh/panel/knowledgebase.php?action=displayarticle&id=5">Ethical policy - All of the reasons why Proxy.sh might enable logging</a></li>
          <li><a href="https://www.ivpn.net/privacy">IVPN.net will collect your email and IP address after sign up</a><br />Read the <a data-toggle="tooltip" data-placement="top" data-original-title="The IP collected at signup is only used for a few seconds by our fraud module and then discarded, it is not stored. Storing them would significantly increase our own liability and certainly would not be in our interest. You're absolutely welcome to signup using Tor or a VPN.">Email statement</a> from IVPN.</li>
          <li><a href="https://medium.com/@blackVPN/no-logs-6d65d95a3016">blackVPN announced to delete connection logs after disconnection</a></li>
          <li><a href="https://gist.github.com/kennwhite/1f3bc4d889b02b35d8aa">Don't use LT2P IPSec, use other protocols.</a></li>
+          <li>
+            <a href="https://www.top10vpn.com/free-vpn-app-investigation/">Free VPN App Investigation</a>
+            {% include badge.html
+            color="warning"
+            icon="fas fa-exclamation-triangle"
+            link="https://blog.privacytools.io/the-trouble-with-vpn-and-privacy-reviews"
+            tooltip="This site has affiliate based recommendations. They get paid for referring visitors to specific VPN providers."
+            text="Affiliate program"
+            %}
+          </li>
+          <li>
+            <a href="https://vpnpro.com/blog/hidden-vpn-owners-unveiled-97-vpns-23-companies/">Hidden VPN owners unveiled: 101 VPN products run by just 23 companies</a>
+            {% include badge.html
+            color="warning"
+            icon="fas fa-exclamation-triangle"
+            link="https://blog.privacytools.io/the-trouble-with-vpn-and-privacy-reviews"
+            tooltip="This site has affiliate based recommendations. They get paid for referring visitors to specific VPN providers."
+            text="Affiliate program"
+            %}
+          </li>
+          <li>
+            <a href="https://vpnpro.com/blog/chinese-company-secretly-behind-popular-apps-seeking-dangerous-permissions/">This Chinese company is secretly behind 24 popular apps seeking dangerous permissions</a>
+            {% include badge.html
+            color="warning"
+            icon="fas fa-exclamation-triangle"
+            link="https://blog.privacytools.io/the-trouble-with-vpn-and-privacy-reviews"
+            tooltip="This site has affiliate based recommendations. They get paid for referring visitors to specific VPN providers."
+            text="Affiliate program"
+            %}
+          </li>
        </ul>

      </div>
    </div>
  </div>
+
+  <hr>
+
+  <div class="container">
+    <div class="row">
+      <div class="col-lg-6 col-12">
+      <h3>Related Videos</h3>
+        <a href="https://invidio.us/watch?v=WVDQEoe6ZWY" target="_blank">
+          <img
+            src="{% if jekyll.environment == "production" and site.pull_cdn %}{{site.pull_cdn}}{% endif %}/assets/img/png/layout/this-video-is-sponsored-by-vpn.png"
+            class="img-fluid float-left mr-3"
+            alt="This Video Is Sponsored By censored VPN">
+        </a>
+      </div>
+    </div>
+  </div>
+</div>
--- a/pages/services.html
+++ b/pages/services.html
@ -9,14 +9,34 @@ description: "The PrivacyTools team is proud to introduce a suite of privacy-cen

 <div class="card card-list">
  <ul class="list-group list-group-flush">
-  	<li class="list-group-item"><a href="https://search.privacytools.io/"><i class="fas fa-search fa-lg fa-fw"></i> Searx - Privacy Friendly Search at search.privacytools.io</a></li>
+    <li class="list-group-item"><a href="https://search.privacytools.io/"><i class="fas fa-search fa-lg fa-fw"></i> Searx - Privacy Friendly Search at search.privacytools.io</a></li>
    <li class="list-group-item"><a href="https://social.privacytools.io/"><i class="fas fa-retweet fa-lg fa-fw"></i> Mastodon - Tracker Free Social Networking at social.privacytools.io</a></li>
    <li class="list-group-item"><a href="https://chat.privacytools.io/"><i class="fas fa-comment fa-lg fa-fw"></i> Matrix - Federated private chat at chat.privacytools.io</a></li>
    <li class="list-group-item"><a href="https://forum.privacytools.io/"><i class="fab fa-discourse fa-lg fa-fw"></i> Discourse - Forum at forum.privacytools.io</a></li>
-    <li class="list-group-item"><a href="https://git.privacytools.io/"><i class="fab fa-git fa-lg fa-fw"></i> Gitea - Git-Repository Manager at git.privacytools.io</a></li>
    <li class="list-group-item"><a href="https://write.privacytools.io/"><i class="fas fa-pen-alt fa-lg fa-fw"></i> Write Freely - Federated minimalist blog at write.privacytools.io</a></li>
    <li class="list-group-item"><a href="https://bin.privacytools.io/"><i class="fas fa-clipboard fa-lg fa-fw"></i> PrivateBin - Encrypted Pastebin at bin.privacytools.io</a></li>
  </ul>
 </div>

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

 <h3 id="exploiting-centralized-networks" class="anchor">
-    <a href="#exploiting-centralized-networks">
-        <i class="fas fa-link anchor-icon"></i>
+  <a href="#exploiting-centralized-networks">
+    <i class="fas fa-link anchor-icon"></i>
 </a>
-    Recent news about breaking E2EE on centralized instant messengers
+  Recent news about breaking E2EE on centralized instant messengers
 </h3>

 <h5>March 2020</h5>
 <ul>
-    <li><a href="https://www.eff.org/deeplinks/2020/03/graham-blumenthal-bill-new-path-doj-finally-break-encryption">The Graham-Blumenthal Bill: A New Path for DOJ to Finally Break Encryption (EFF)</a></li>
+  <li><a href="https://www.eff.org/deeplinks/2020/03/graham-blumenthal-bill-new-path-doj-finally-break-encryption">The Graham-Blumenthal Bill: A New Path for DOJ to Finally Break Encryption (EFF)</a></li>
 </ul>

 <h5>January 2020</h5>
 <ul>
-    <li><a href="https://cyberlaw.stanford.edu/blog/2020/01/earn-it-act-how-ban-end-end-encryption-without-actually-banning-it">The EARN IT Act: How to Ban End-to-End Encryption Without Actually Banning It</a></li>
+  <li><a href="https://cyberlaw.stanford.edu/blog/2020/01/earn-it-act-how-ban-end-end-encryption-without-actually-banning-it">The EARN IT Act: How to Ban End-to-End Encryption Without Actually Banning It (Stanford)</a></li>
 </ul>

 <h5>November 2019</h5>
 <ul>
-    <li><a href="https://www.reuters.com/article/us-interpol-encryption-exclusive-idUSKBN1XR0S7">Exclusive: Interpol plans to condemn encryption spread, citing predators, sources say (Reuters)</a></li>
-    <li><a href="https://arstechnica.com/tech-policy/2019/11/think-of-the-children-fbi-sought-interpol-statement-against-end-to-end-crypto/">Think of the children: FBI sought Interpol statement against end-to-end crypto (ArsTechnica)</a></li>
+  <li><a href="https://www.reuters.com/article/us-interpol-encryption-exclusive-idUSKBN1XR0S7">Exclusive: Interpol plans to condemn encryption spread, citing predators, sources say (Reuters)</a></li>
+  <li><a href="https://arstechnica.com/tech-policy/2019/11/think-of-the-children-fbi-sought-interpol-statement-against-end-to-end-crypto/">Think of the children: FBI sought Interpol statement against end-to-end crypto (ArsTechnica)</a></li>
 </ul>

 <h5>October 2019</h5>
 <ul>
-    <li><a href="https://www.eff.org/deeplinks/2019/10/open-letter-governments-us-uk-and-australia-facebook-all-out-attack-encryption">The Open Letter from the Governments of US, UK, and Australia to Facebook is An All-Out Attack on Encryption (EFF)</a></li>
-    <li><a href="https://arstechnica.com/tech-policy/2019/10/the-broken-record-why-barrs-call-against-end-to-end-encryption-is-nuts/">The broken record: Why Barr’s call against end-to-end encryption is nuts (ArsTechnica)</a></li>
-    <li><a href="https://arstechnica.com/information-technology/2019/10/ag-barr-is-pushing-facebook-to-backdoor-whatsapp-and-halt-encryption-plans">US wants Facebook to backdoor WhatsApp and halt encryption plans (ArsTechnica)</a></li>
+  <li><a href="https://www.eff.org/deeplinks/2019/10/open-letter-governments-us-uk-and-australia-facebook-all-out-attack-encryption">The Open Letter from the Governments of US, UK, and Australia to Facebook is An All-Out Attack on Encryption (EFF)</a></li>
+  <li><a href="https://arstechnica.com/tech-policy/2019/10/the-broken-record-why-barrs-call-against-end-to-end-encryption-is-nuts/">The broken record: Why Barr’s call against end-to-end encryption is nuts (ArsTechnica)</a></li>
+  <li><a href="https://arstechnica.com/information-technology/2019/10/ag-barr-is-pushing-facebook-to-backdoor-whatsapp-and-halt-encryption-plans">US wants Facebook to backdoor WhatsApp and halt encryption plans (ArsTechnica)</a></li>
 </ul>

 <h5>August 2019</h5>
 <ul>
-    <li><a href="https://arstechnica.com/tech-policy/2019/08/post-snowden-tech-became-more-secure-but-is-govt-really-at-risk-of-going-dark">Post Snowden tech became more secure, but is government really at risk of going dark? (ArsTechnica)</a></li>
+  <li><a href="https://arstechnica.com/tech-policy/2019/08/post-snowden-tech-became-more-secure-but-is-govt-really-at-risk-of-going-dark">Post Snowden tech became more secure, but is government really at risk of going dark? (ArsTechnica)</a></li>
 </ul>

 <h5>July 2019</h5>
 <ul>
-    <li><a href="https://techcrunch.com/2019/07/23/william-barr-consumers-security-risks-backdoors/">US attorney general William Barr says Americans should accept security risks of encryption backdoors (TechCrunch)</a></li>
-    <li><a href="https://www.theregister.co.uk/2019/07/23/us_encryption_backdoor/">Low Barr: Don't give me that crap about security, just put the backdoors in the encryption, roars US Attorney General (The Register)</a></li>
+  <li><a href="https://techcrunch.com/2019/07/23/william-barr-consumers-security-risks-backdoors/">US attorney general William Barr says Americans should accept security risks of encryption backdoors (TechCrunch)</a></li>
+  <li><a href="https://www.theregister.co.uk/2019/07/23/us_encryption_backdoor/">Low Barr: Don't give me that crap about security, just put the backdoors in the encryption, roars US Attorney General (The Register)</a></li>
 </ul>

 <h5>May 2019</h5>
 <ul>
-    <li><a href="https://www.theguardian.com/uk-news/2019/may/30/apple-and-whatsapp-condemn-gchq-plans-to-eavesdrop-on-encrypted-chats">Apple and WhatsApp condemn GCHQ plans to eavesdrop on encrypted chats (The Guardian)</a></li>
+  <li><a href="https://www.theguardian.com/uk-news/2019/may/30/apple-and-whatsapp-condemn-gchq-plans-to-eavesdrop-on-encrypted-chats">Apple and WhatsApp condemn GCHQ plans to eavesdrop on encrypted chats (The Guardian)</a></li>
 </ul>

 <h5>January 2019</h5>
 <ul>
-    <li><a href="https://www.justsecurity.org/62114/give-ghost-backdoor/">Give Up the Ghost: A Backdoor by Another Name (Just Security)</a></li>
+  <li><a href="https://www.justsecurity.org/62114/give-ghost-backdoor/">Give Up the Ghost: A Backdoor by Another Name (Just Security)</a></li>
 </ul>

 <h5>December 2018</h5>
 <ul>
-    <li><a href="https://www.zdnet.com/article/whats-actually-in-australias-encryption-laws-everything-you-need-to-know/">What's actually in Australia's encryption laws? Everything you need to know (ZDnet)</a></li>
+  <li><a href="https://www.zdnet.com/article/whats-actually-in-australias-encryption-laws-everything-you-need-to-know/">What's actually in Australia's encryption laws? Everything you need to know (ZDnet)</a></li>
 </ul>

 <h3>Complete Comparison</h3>
 <ul>
-    <li><a href="https://securechatguide.org/effguide.html">securechatguide.org</a> - Guide to Choosing a Messenger.</li>
-    <li><a href="https://www.securemessagingapps.com/">securemessagingapps.com</a> - Secure Messaging Apps Comparison.</li>
+  <li><a href="https://securechatguide.org/effguide.html">securechatguide.org</a> - Guide to Choosing a Messenger.</li>
+  <li><a href="https://www.securemessagingapps.com/">securemessagingapps.com</a> - Secure Messaging Apps Comparison.</li>
 </ul>

 <h3 id="#rtc-independent-security-audits">Independent security audits</h3>
 <ul>
-    <li><a href="https://eprint.iacr.org/2016/1013.pdf">A Formal Security Analysis of the Signal Messaging Protocol (2019)</a> by Katriel Cohn-Gordon, Cas Cremers, Benjamin Dowling, Luke Garratt and Douglas Stebila</li>
-    <li><a href="https://keybase.io/docs-assets/blog/NCC_Group_Keybase_KB2018_Public_Report_2019-02-27_v1.3.pdf">Keybase's Protocol Security Review (2019)</a> by <a href="https://www.nccgroup.trust/">NCC Group</a></li>
-    <li><a href="https://www.nccgroup.trust/us/our-research/matrix-olm-cryptographic-review/">Matrix Olm Cryptographic Review</a></li>
-    <li><a href="https://briarproject.org/news/2017-beta-released-security-audit">Briar - Darknet Messenger Releases Beta, Passes Security Audit</a></li>
+  <li><a href="https://eprint.iacr.org/2016/1013.pdf">A Formal Security Analysis of the Signal Messaging Protocol (2019)</a> by Katriel Cohn-Gordon, Cas Cremers, Benjamin Dowling, Luke Garratt and Douglas Stebila</li>
+  <li><a href="https://keybase.io/docs-assets/blog/NCC_Group_Keybase_KB2018_Public_Report_2019-02-27_v1.3.pdf">Keybase's Protocol Security Review (2019)</a> by <a href="https://www.nccgroup.trust/">NCC Group</a></li>
+  <li><a href="https://www.nccgroup.trust/us/our-research/matrix-olm-cryptographic-review/">Matrix Olm Cryptographic Review</a></li>
+  <li><a href="https://briarproject.org/news/2017-beta-released-security-audit">Briar - Darknet Messenger Releases Beta, Passes Security Audit</a></li>
 </ul>

 <hr/>
--- a/pages/sponsors.html
+++ b/pages/sponsors.html
@ -16,7 +16,7 @@ permalink: /sponsors/
      <div class="mb-4">
        <p>The {{ site.name }} website and services are a community project. There is no advertising, affiliate links, or other forms of monetization.<br><strong>Your donations here directly support hosting this website and compensating contributors to this project.</strong></p>
        <p>
-          <a href="https://opencollective.com/privacytoolsio#section-contribute" class="btn btn-success">Become a Sponsor</a>
+          <a href="https://opencollective.com/privacytools#section-contribute" class="btn btn-success">Become a Sponsor</a>
          <a href="/donate/" class="btn btn-outline-danger"><span class="fas fa-heart fa-fw"></span> Donate Directly</a>
        </p>
      </div>
@ -36,15 +36,15 @@ permalink: /sponsors/
  <p>As a sponsor of {{ site.name }}, your company will be widely recognized in a variety of ways, some of which we've detailed below.</p>
  <h5>General Information</h5>
  <p>This website receives well over 250,000 pageviews on a monthly basis and is highly ranked for privacy-related keywords. In addition to the benefits below your contribution will be featured on our OpenCollective page and we will thank you via social media for your contribution.</p>
-  <h5>🥉 Bronze Sponsorship - <a href="https://opencollective.com/privacytoolsio/contribute/bronze-12311">Info</a></h5>
+  <h5>🥉 Bronze Sponsorship - <a href="https://opencollective.com/privacytools/contribute/bronze-12311">Info</a></h5>
  <ul>
  <li>Your name and link along with a small logo or avatar on the sponsors page of this website.</li>
  </ul>
-  <h5>🥈 Silver Sponsorship - <a href="https://opencollective.com/privacytoolsio/contribute/silver-12313">Info</a></h5>
+  <h5>🥈 Silver Sponsorship - <a href="https://opencollective.com/privacytools/contribute/silver-12313">Info</a></h5>
  <ul>
  <li>Your medium-sized logo as a link at the top of our sponsors page.</li>
  </ul>
-  <h5>🥇 Gold Sponsorship - <a href="https://opencollective.com/privacytoolsio/contribute/gold-12312">Info</a></h5>
+  <h5>🥇 Gold Sponsorship - <a href="https://opencollective.com/privacytools/contribute/gold-12312">Info</a></h5>
  <ul>
  <li>Your medium-sized logo as a link on the {{ site.name }} homepage and at the very top of our sponsors page.</li>
  </ul>
@ -55,6 +55,6 @@ permalink: /sponsors/
  <h5>More Information</h5>
  <p>If you are interested and have further questions, you are welcome to reach out to us directly at <a href="mailto:sponsors@privacytools.io">sponsors@privacytools.io</a>.</p>
  <div class="mt-5 text-center">
-    <a href="https://opencollective.com/privacytoolsio#section-contribute" class="btn btn-success mb-5">Contribute to PrivacyTools</a>
+    <a href="https://opencollective.com/privacytools#section-contribute" class="btn btn-success mb-5">Contribute to PrivacyTools</a>
  </div>
 </div>
Author	SHA1	Message	Date
Jonah Aragon	9310ec49cd	Use SRI	2020-05-26 23:57:47 -05:00
Jonah Aragon	cad8c8a5cf	Use cdn.privacytools.io for static resources	2020-05-26 00:01:45 -05:00
Daniel Nathan Gray	c299f2f18c	Update other old badges and fix indenting (#1924 )	2020-05-21 02:50:05 +00:00
Daniel Nathan Gray	d4b86b25c9	Fixed missing oldstyle badge and indenting (#1923 )	2020-05-17 16:05:31 +00:00
Filip Š	729c96fe91	Add warning to Keybase products (#1913 )	2020-05-16 09:03:50 +00:00
Jonah Aragon	00b9be54c2	Use badges syntax for labels outside of cardv2 (#1921 )	2020-05-16 09:03:22 +00:00
Jonah Aragon	916b7a2256	Update label syntax (#1914 )	2020-05-14 13:18:36 +00:00
Daniel Nathan Gray	462129717b	Update warning riot, team and change jitsi link (#1912 )	2020-05-13 13:49:59 +00:00
Dan Arel	c5dbffa03d	Update Dan’s profile (#1906 )	2020-05-12 01:03:21 -07:00
nitrohorse	87838a9619	Update nitrohorse’s profile (#1907 )	2020-05-12 01:02:18 -07:00
Jonah Aragon	65d6bfa4dc	Update Open Collective Link	2020-05-11 12:55:32 -05:00
Jonah Aragon	9cabe11a27	Move @privacytoolsIO to @privacytools (#1904 )	2020-05-11 02:33:48 -05:00
Dan Arel	44b0393d1e	fixed missing link code (#1903 )	2020-05-10 22:54:35 -07:00
Daniel Nathan Gray	a027f4622f	ProtonVPN and IVPN clients in F-Droid (#1902 )	2020-05-10 18:25:52 +00:00
Daniel Nathan Gray	a0aa9aa2ac	Cross-signing and E2EE on by default in Riot (#1893 )	2020-05-08 04:22:41 +00:00
nitrohorse	16a49cfa20	Add additional VPN resource links (#1891 )	2020-05-08 03:50:11 +00:00
Daniel Nathan Gray	28ca30d1c5	Mention 1st party script blocking (uMatrix) (#1884 )	2020-05-05 16:40:11 +00:00
Daniel Nathan Gray	946984d613	Add ClearURLs Addon (#1889 )	2020-05-05 16:30:38 +00:00
Daniel Nathan Gray	513de75e05	Add SimpleLogin (#1890 )	2020-05-05 16:28:41 +00:00
Daniel Nathan Gray	cdda746c00	Add temporary container solution (#1888 )	2020-05-05 16:28:21 +00:00
Daniel Nathan Gray	dc903f87f3	Remove StartTLS-Everywhere, as its run its course (#1882 )	2020-05-05 16:27:23 +00:00
Daniel Nathan Gray	1387712207	Tidy links. Let browser figure out language. (#1885 )	2020-05-05 16:26:33 +00:00
Daniel Nathan Gray	720e458f93	Add canvasblocker as advanced addon (#1886 )	2020-05-05 16:26:16 +00:00
Daniel Nathan Gray	79e4a60a18	Don't mention specific addons under fingerprinting (#1883 )	2020-05-05 15:59:38 +00:00
Jonah Aragon	d43c6419e6	Update Startpage.com Listing (#1878 )	2020-05-04 21:08:26 -05:00
nitrohorse	2743bf4885	Remove SecureDNS (#1873 ) https://github.com/privacytoolsIO/privacytools.io/issues/1869#issuecomment-622996340	2020-05-03 10:45:10 -07:00
Jonah Aragon	2be0e0db4a	Add KBFS as recommended cloud storage provider (#1876 )	2020-05-03 10:44:37 -07:00
Jonah Aragon	c5bb48c169	Remove Gitea (#1875 ) Closes #1875	2020-05-03 12:02:07 -05:00
Jonah Aragon	6ed4cb7730	Update 010-headers.conf Removing 'Access-Control-Allow-Origin' broke something.	2020-04-29 20:10:14 -05:00
Jonah Aragon	22d5325efc	Restore cookie_autodelete.png	2020-04-28 23:34:56 -05:00
Jonah Aragon	52cef9ad93	Browser add-on cleanup (#1864 )	2020-04-28 22:53:09 -05:00
Dan Arel	6614c9ce2b	Relist StartPage in Search Engines (#1592 )	2020-04-28 21:15:41 -05:00
nitrohorse	2741e3cdea	Add privacy policy links for Firefox Send, Nextcloud (#1863 )	2020-04-27 03:23:55 +00:00
nitrohorse	90a026fcf9	Add privacy policy links for OS pages (#1862 )	2020-04-26 12:44:31 -07:00
nitrohorse	20886ca92c	Add privacy policy links to Search Engine cards (#1844 ) * Cleanup search engines * Add privacy policy links to DDG and Qwant * Use tab for warning banner * Add source code link for Yacy * Use 2 spaces for consistency * Add privacy policy links for Metager and Mojeek	2020-04-26 09:18:40 -07:00
nitrohorse	88519a0bb3	Add privacy policy links to Social News Aggregator cards (#1857 ) * Add privacy policies to Social News cards * Use 2 spaces for consistency	2020-04-26 09:17:16 -07:00
nitrohorse	f80a37e89c	Add privacy policy links (#1861 ) * Add privacy policy links for hosting providers * Add privacy policy links for calendar-contacts-sync * Add privacy policy links for email-clients * Add privacy policy links for file-encryption * Add privacy policy links for password-managers * Add privacy policy links for paste-services * Add privacy policy links for productivity-tools * Add privacy policy links for selfhosted-cloud	2020-04-26 00:28:13 -07:00
nitrohorse	7d9a15eaba	Add privacy policy links to Browsers (#1858 ) * Add privacy policy links to browser recommendations * Add privacy policy links to browser webextensions	2020-04-25 16:29:08 -07:00
nitrohorse	d76d7d0543	Add privacy policy links for RTC (#1860 ) * Add privacy policy links for RTC * Add privacy policy links for RTC - teamchat and voice	2020-04-25 16:26:15 -07:00
nitrohorse	6b141207c4	Add privacy policy links for digital notebooks (#1859 )	2020-04-25 16:22:19 -07:00
nitrohorse	18aacfcb94	Update cardv2 for mobile layouts (#1849 )	2020-04-25 01:19:39 +00:00
Daniel Nathan Gray	6f0cedfcc3	Fix canvas to be 384x128 (#1852 )	2020-04-22 22:02:19 -07:00
Daniel Nathan Gray	aea5278a8c	Add Tomb (#1853 )	2020-04-22 18:18:07 +00:00
Dan Arel	902e486701	updated VSCodium description to remove mention of fork (#1855 )	2020-04-22 10:34:36 -07:00
Daniel Nathan Gray	99c686f3ac	New version of StartMail logo (dark) (#1851 )	2020-04-22 00:10:59 -05:00
nitrohorse	ce12b1c99d	Remove Minds.com from Worth Mentioning (#1850 )	2020-04-21 21:52:00 -07:00
Mikaela Suomalainen	2fa634c07f	Add .github/stale.yml for stale bot in case we add it (#1125 )	2020-04-21 04:33:01 +00:00
Jonah Aragon	a1ab2d2daa	Site Cleanup (#1840 )	2020-04-20 18:38:19 -05:00
dependabot[bot]	4c601a07f7	Bump nokogiri from 1.10.4 to 1.10.8 (#1737 ) Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.10.4 to 1.10.8. - [Release notes](https://github.com/sparklemotion/nokogiri/releases) - [Changelog](https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md) - [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.10.4...v1.10.8) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-04-19 11:04:39 -07:00
Daniel Nathan Gray	f1878a80eb	Re-add StartMail (#1830 )	2020-04-19 05:53:43 +00:00
Daniel Nathan Gray	94629b75f7	Cleanup 2.0 instant messenger page (#1836 )	2020-04-19 05:51:34 +00:00
Daniel Nathan Gray	49cfda170b	Fixed pricing for ProtonVPN (#1829 )	2020-04-14 01:36:07 +00:00
Mikaela Suomalainen	4eae9a7fb7	assets: update signal.svg (#1826 )	2020-04-13 02:18:59 +00:00
xelarate86	ff7cdbe8a1	Updated Mullvad VPN details with Play Store and App Store Links (#1824 )	2020-04-12 02:03:45 +00:00
Mikaela Suomalainen	080edbfa3a	VoIP: remove Google Analytics warning of Jitsi Meet (#1816 )	2020-04-05 15:20:19 +03:00
Mikaela Suomalainen	78cc88397d	VoIP warning: sort + mention Zoom (#1817 ) Co-authored-by: dngray <dng@disroot.org>	2020-04-05 15:19:54 +03:00
Zenithium	b84f5741cf	Remove Sparkleshare from File Sync (#1771 )	2020-04-05 04:12:14 +00:00
Daniel Nathan Gray	b29b500781	Fix Joplin GooglePlay link (#1812 )	2020-04-02 14:09:48 -07:00
Mikaela Suomalainen	c4eadf3e7e	privacy-resources: delist The Great Cloudwall (#1804 )	2020-03-27 20:42:51 +02:00
Mikaela Suomalainen	acff755519	participate.html: mention the Matrix rooms / XMPP bridge (#1775 ) Resolves: #1674	2020-03-27 17:32:10 +02:00
szTheory	a5ec15d5e9	Added ExifCleaner to the Metadata Removal Tools section on the Productivity Tools page (#1802 ) * Added ExifCleaner to the Metadata Removal Tools section on the Productivity Tools page * ExifCleaner logo: Convert PNG to SVG with vectorizer.io and export as optimized SVG using Inkscape. * Remove redundent text * Mention ExifTool * Oops missing " * Replace svg with one that isn't retarded * Change canvas to 128x128 px Co-authored-by: Daniel Nathan Gray <dng@disroot.org> Co-authored-by: Dawid Potocki <dawid@dawidpotocki.com>	2020-03-27 12:19:36 +01:00
Daniel Nathan Gray	a4c14b9efb	Add 7zip, remove Peazip, Keka not FOSS (#1797 )	2020-03-27 04:07:17 +00:00
Daniel Nathan Gray	95d167c618	Add warning, E2EE alpha Nextcloud (#1799 )	2020-03-26 13:40:04 +00:00
blacklight447	bd50e952b5	remove bad vpn link (#1798 ) removes a link on the vpn page which spread miss information about Tor.	2020-03-26 14:26:11 +01:00
Stephen Karl Larroque	3539fc3f14	add partial centralization warning for Jami (#1752 )	2020-03-22 10:30:33 +00:00
Mikaela Suomalainen	481bc43246	VoIP: Jitsi Meet: warn about E2EE, GA & link public instances list (#1793 )	2020-03-22 09:11:36 +02:00
Jonah Aragon	10c679d687	Add a note on self-hosting (#1732 ) * Add a note on self-hosting * Use <code> for our matrix room Co-Authored-By: Mikaela Suomalainen <mikaela+git@mikaela.info> * Update services.html Recommend that people should also seek out other hosters. * Update services.html fix the librehosters link * Update services.html * Reworded Don't use idioms like "eggs in basket", as they don't translate well. * 2 spaces * Missing closed paragraph * As Always, sounds better than long story short Co-authored-by: Daniel Nathan Gray <dng@disroot.org> Co-authored-by: Mikaela Suomalainen <mikaela+git@mikaela.info> Co-authored-by: blacklight447 <blacklight447@privacytools.io>	2020-03-12 16:28:53 +01:00
Daniel Nathan Gray	c9886ae960	Mention mailbox.org supports Exchange ActiveSync (#1780 )	2020-03-12 16:28:03 +01:00
Daniel Nathan Gray	eb05fbf69c	Correct mistake from VPN page (#1781 )	2020-03-12 16:26:47 +01:00