Fix div tag

They seem to have some strange moderation practices.

.github/CONTRIBUTING.md

@@ -96,8 +96,12 @@ 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.
+- We like to optimize all SVGs we add to the site. [This](https://github.com/privacytools/privacytools.io/pull/1968#issuecomment-652773633) is a helpful guide as to how we do it with [Inkscape](https://inkscape.org/)
+  - Some SVGs generated by Illustrator or Sketch are broken, therefore copying the SVG content to a new canvas is sometimes required. (We found this with the Mailcow logo). Looked fine in local builds but was wrong once rendered through netlify preview etc.
+- We only have SVGs that have a canvas size of 128x128px or 384x128px.
 - 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))
+- Tool logo dimensions are 128px x 128px ([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
 

Gemfile

@@ -1,26 +1,11 @@
 source "https://rubygems.org"
 
-# Hello! This is where you manage which Jekyll version is used to run.
+# Install github-pages gem (https://jekyllrb.com/docs/github-pages/)
-# When you want to use a different version, change it below, save the
+gem "github-pages", group: :jekyll_plugins
-# 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"
 
-# This is the default theme for new Jekyll sites. You may change this to anything you like.
+# Plugins
-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
-  gem "jekyll-feed", "~> 0.6"
+  # example: gem "jekyll-feed", "~> 0.6"
-  gem "jekyll-sitemap", "~> 1.4"
 end
 
 # Windows does not include zoneinfo files, so bundle the tzinfo-data gem
@@ -28,3 +13,4 @@ gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw, :jruby]
 
 # Performance-booster for watching directories on Windows
 gem "wdm", "~> 0.1.0" if Gem.win_platform?
+

Gemfile.lock

@@ -1,16 +1,89 @@
 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)
@@ -27,16 +100,97 @@ 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.4.0)
+    jekyll-sitemap (1.2.0)
-      jekyll (>= 3.7, < 5.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-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)
@@ -44,10 +198,17 @@ 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.8)
+      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)
@@ -55,23 +216,34 @@ 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
-  jekyll (~> 3.8.5)
+  github-pages
-  jekyll-feed (~> 0.6)
-  jekyll-sitemap (~> 1.4)
-  minima (~> 2.0)
   tzinfo-data
 
 BUNDLED WITH
-   2.1.4
+   2.0.1

README.md

@@ -1,10 +1,17 @@
+<div align="center">
 <a href="https://www.privacytools.io">
 	<img src="assets/img/svg/layout/brand/horizontal.svg" width="500px" alt="PrivacyTools" />
 </a>
-
+<p>
-_Encryption Against Global Mass Surveillance._
+	<em>Encryption Against Global Mass Surveillance.</em>
-
+</p>
-[![Netlify Status](https://api.netlify.com/api/v1/badges/afd98777-c205-4928-a301-f57a1448113f/deploy-status)](https://app.netlify.com/sites/privacytools-io/deploys)
+<a href="https://opencollective.com/privacytools#support">
+	<img src="https://opencollective.com/privacytools/tiers/badge.svg">
+</a>
+<a href="https://app.netlify.com/sites/privacytools-io/deploys">
+	<img src="https://api.netlify.com/api/v1/badges/afd98777-c205-4928-a301-f57a1448113f/deploy-status">
+</a>
+</div>
 
 # Contributing
 
@@ -28,17 +35,26 @@ If you want to discuss privacy in general, a new tool, or just something else, f
 
 # Support
 
-- [Donate.](https://www.privacytools.io/donate/)
+- [Donate](https://www.privacytools.io/sponsors/)
-- [Spread the word.](https://www.privacytools.io/#participate)
+- [Spread the word](https://www.privacytools.io/#participate)
-- [Join our Discourse community.](https://forum.privacytools.io/)
+- [Join our Discourse community](https://forum.privacytools.io/)
-- [Make suggestions on reddit.](https://www.reddit.com/r/privacytoolsIO/)
+- [Make suggestions on reddit](https://www.reddit.com/r/privacytoolsIO/)
 - View and edit our website source code here on GitHub.
 
-# Sponsors
+## Backers
 
-- [Safing](https://safing.io/)
+Like what we're doing? [Become a backer](https://opencollective.com/privacytools) and show your support for our project.
 
-# Community Translations
+![](https://opencollective.com/privacytools/tiers/sponsor.svg?avatarHeight=64&width=890)
+
+## Sponsors
+
+Are you working with a privacy focused company? Ask your manager or marketing team if your company would be interested in supporting our project. Your support will help us continue to develop this website, promote privacy-respecting tools and services, and reach out to thousands of data privacy newcomers every month. Also, your company's logo will show on GitHub and [our site](https://www.privacytools.io/sponsors/), and who doesn't like a little extra exposure?
+
+[![](https://opencollective.com/privacytools/tiers/gold.svg?avatarHeight=64&width=890&button=false)](https://opencollective.com/privacytools/contribute/gold-12312)
+[![](https://opencollective.com/privacytools/tiers/silver.svg?avatarHeight=64&width=890&button=false)](https://opencollective.com/privacytools/contribute/silver-12311)
+
+## Community Translations
 - [繁体中文 / Chinese](https://privacytools.twngo.xyz/) - [GitHub](https://github.com/twngo/privacytools-zh)
 - [Español / Spanish](https://victorhck.gitlab.io/privacytools-es/) - [GitLab](https://gitlab.com/victorhck/privacytools-es)
 - [Polski / Polish](https://pl.privacytools.io) - [Gitea](https://git.privacytools.io/pl-privacytoolsIO/pl.privacytools.io)

_config.yml

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

_includes/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="{% if jekyll.environment == "production" and site.pull_cdn %}{{site.pull_cdn}}{% endif %}/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="/assets/img/layout/tor.png" width="35" height="35"></a>
                 {% endif %}
 
                 {% if include.git %}

_includes/cardv2.html

@@ -29,7 +29,7 @@
   <div class="card-body">
     <p class="card-text">
       <img
-        src="{% if jekyll.environment == "production" and site.pull_cdn %}{{site.pull_cdn}}{% endif %}{{include.image}}"
+        src="{{include.image}}"
         {% if include.image-dark %}
         data-theme-src="{{include.image-dark}}"
         {% endif %}

_includes/head.html

@@ -6,8 +6,6 @@
   <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 %}
@@ -50,18 +48,18 @@
   {% endif %}
 
   <!-- icons -->
-  <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="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="{% 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="32x32" href="/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="icon" type="image/png" sizes="16x16" href="/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="manifest" href="/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="mask-icon" href="/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">
+  <link rel="shortcut icon" href="/assets/img/png/favicons/favicon.ico?v=2">
   <meta name="msapplication-TileColor" content="#3498db">
-  <meta name="msapplication-config" content="{% if jekyll.environment == "production" and site.pull_cdn %}{{site.pull_cdn}}{% endif %}/assets/img/png/favicons/browserconfig.xml?v=2">
+  <meta name="msapplication-config" content="/assets/img/png/favicons/browserconfig.xml?v=2">
   <meta name="theme-color" content="#ffffff">
 
 
   <!-- CSS stylesheets -->
-  <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 href="/assets/css/style.css?v=9" rel="stylesheet">
-  <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">
+  <link id="dark-css" href="/assets/css/dark.css?v=4" rel="stylesheet" media="(prefers-color-scheme: dark)">
 </head>

_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="{% if jekyll.environment == "production" and site.pull_cdn %}{{site.pull_cdn}}{% endif %}/assets/img/svg/layout/brand/horizontal.svg" width="150px" />
+        <img src="/assets/img/svg/layout/brand/horizontal.svg" width="150px" />
       </a>
     </div>
     <input type="checkbox" id="nav-toggle" checked />
@@ -32,6 +32,7 @@
             <a class="dropdown-item" href="/providers/search-engines/"><span class="fas fa-search fa-fw"></span> Search Engines</a>
             <a class="dropdown-item" href="/providers/social-networks/"><span class="fas fa-expand-arrows-alt fa-fw"></span> Social Networks</a>
             <a class="dropdown-item" href="/providers/social-news-aggregator/"><span class="far fa-newspaper fa-fw"></span> Social News Aggregators</a>
+            <a class="dropdown-item" href="/providers/video/"><span class="fas fa-video fa-fw"></span> Video Platforms</a>
             <a class="dropdown-item" href="/providers/vpn/"><span class="far fa-eye-slash fa-fw"></span> VPN</a>
           </span>
         </details>
@@ -86,8 +87,8 @@
             </span>
           </summary>
           <span class="nav-dropdown">
-            <a class="dropdown-item" href="/operating-systems/#os"><span class="fas fa-th-large fa-fw"></span> PC OS</a>
+            <a class="dropdown-item" href="/operating-systems"><span class="fas fa-th-large fa-fw"></span> PC OS</a>
-            <a class="dropdown-item" href="/operating-systems/#live_os"><span class="fas fa-compact-disc fa-fw"></span> PC Live OS</a>
+            <a class="dropdown-item" href="/operating-systems/#tor_os"><span class="ptio-tor"></span> Tor focused distributions</a>
             <a class="dropdown-item" href="/operating-systems/#mobile_os"><span class="fas fa-mobile-alt fa-fw"></span> Mobile OS</a>
             <a class="dropdown-item" href="/operating-systems/#aaddons"><span class="fas fa-th fa-fw"></span> Android Privacy Add-ons</a>
             <a class="dropdown-item" href="/operating-systems/#firmware"><span class="fas fa-signal fa-fw"></span> Router Firmware</a>

_includes/scripts.html

@@ -1,8 +1,8 @@
-<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="/assets/js/jquery-3.3.1.min.js?v=4"></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="/assets/js/popper.min.js?v=4"></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="/assets/js/bootstrap.min.js?v=4"></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="/assets/js/sortable.min.js?v=4"></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>
+<script src="/assets/js/main.js?v=5"></script>
 
 <!--
   Matomo is the leading open-source analytics platform:

_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="{% 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">
+      <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">
     </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="{% 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">
+      <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">
     </div>
     <div class="col">
     <h3>Tor for Android with <a href="https://guardianproject.info/apps/orbot/">Orbot</a></h3>

_includes/sections/android-operating-systems.html

@@ -0,0 +1,53 @@
+<h1 id="mobile_os" class="anchor"><a href="#mobile_os"><i class="fas fa-link anchor-icon"></i></a> Mobile Operating Systems</h1>
+
+<h2 id="aosp_os" class="anchor"><a href="#aosp_os"><i class="fas fa-link anchor-icon"></i></a> Android-based Operating Systems</h1>
+
+<div class="alert alert-warning" role="alert">
+  <strong>Even though the source code of the following operating systems is provided, installing Google Apps may compromise your setup.</strong>
+</div>
+
+{% include cardv2.html
+  title="CalyxOS"
+  image="/assets/img/svg/3rd-party/calyxos.svg"
+  description='CalyxOS is a custom ROM based on the Android Open Source Project with Pixel phones. It aims to be secure and private by default including a number of good choices for default applications. It also supports <a href="https://source.android.com/security/verifiedboot">verified boot</a>.'
+  badges="info:AOSP"
+  website="https://calyxos.org"
+  gitlab="https://gitlab.com/calyxos"
+%}
+
+{% 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"
+  website="https://grapheneos.org/"
+  github="https://github.com/GrapheneOS/"
+%}
+
+{% include cardv2.html
+  title="LineageOS (Official Builds)"
+  image="/assets/img/svg/3rd-party/lineageos.svg"
+  description='LineageOS is a custom ROM based on the Android Open Source Project with <a href="https://wiki.lineageos.org/devices/">official support for a wide variety of devices</a>. The project is the successor to the popular CyanogenMod project, focusing on system control and customization, device longevity, and privacy. For security reasons, we do not recommend third-party builds of LineageOS for unsupported devices.'
+  badges="info:AOSP"
+  website="https://www.lineageos.org/"
+  privacy-policy="https://www.lineageos.org/legal/"
+  github="https://github.com/LineageOS"
+%}
+
+<h3>Worth Mentioning</h3>
+
+<ul>
+  <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"
+    %}
+    - A project that aims to reimplement the proprietary Google Play Services in the Android operating system with a FLOSS replacement. The microG project also maintains a fork of LineageOS with microG and F-Droid preinstalled at <a href="https://lineage.microg.org/">Lineage for microG</a>.
+  </li>
+</ul>

_includes/sections/browser-addons.html

@@ -47,7 +47,7 @@
 {% include cardv2.html
   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."
+  description="<strong>ClearURLs</strong> will automatically remove tracking elements from URLs to help protect your privacy when browsing 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"

_includes/sections/browser-recommendation.html

@@ -112,7 +112,7 @@
 {% 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.'
+  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/about">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"

_includes/sections/cloud-storage.html

@@ -24,26 +24,6 @@
   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>

_includes/sections/decentralized-video.html

@@ -0,0 +1,14 @@
+<h1 id="video" class="anchor"><a href="#video"><i class="fas fa-link anchor-icon"></i></a> Decentralized Video Platforms</h1>
+
+<div class="alert alert-warning" role="alert">
+  <strong> If you are currently using a platform like YouTube or Vimeo, you should pick an alternative here.</strong>
+</div>
+
+{% include cardv2.html
+  title="PeerTube"
+  image="/assets/img/svg/3rd-party/peertube.svg"
+  description='PeerTube, developed by Framasoft, is a free and decentralized alternative to video platforms, with over 400,000 videos published by over 50,000 users and viewed over 10 million times. If you are looking for a server to join, you are welcome to join our hosted instance: <a href="https://tube.privacytools.io/">tube.privacytools.io</a>'
+  website="https://joinpeertube.org"
+  github="https://github.com/Chocobozzz/PeerTube"
+  web="https://joinpeertube.org/#what-is-peertube"
+%}

_includes/sections/dns.html

@@ -1,10 +1,12 @@
-<h1 id="dns" class="anchor"><a href="#dns"><i class="fas fa-link anchor-icon"></i></a> Encrypted Domain Name System (DNS) Resolvers</h1>
+<h1 id="dns" class="anchor">
+  <a href="#dns"><i class="fas fa-link anchor-icon"></i></a> Encrypted DNS Resolvers
+</h1>
 
 <div class="alert alert-warning" role="alert">
-  <strong>Note: Using an encrypted DNS resolver will not make you anonymous, nor hide your internet traffic from your Internet Service Provider. But, it will prevent DNS hijacking, and make your DNS requests harder for third parties to eavesdrop on and tamper with. If you are currently using Google's DNS resolver, you should pick an alternative here.</strong>
+  DNS-over-HTTPS, DNS-over-TLS, and DNSCrypt resolvers will not make you anonymous. Using Anonymized DNSCrypt hides <i>only</i> your DNS traffic from your Internet Service Provider. However, using any of these protocols will prevent DNS hijacking, and make your DNS requests harder for third parties to eavesdrop on and tamper with. If you are currently using Google's DNS resolver, you should pick an alternative here. See the <a href="#dns-definitions">definitions</a> below.
 </div>
 
-<div class="table-responsive">
+<div id="dns-table" class="table-responsive">
   <table class="table sortable-theme-bootstrap" data-sortable>
     <thead>
       <tr>
@@ -40,16 +42,15 @@
           </a>
         </td>
         <td>Commercial</td>
-        <td>No</td>
+       <td><a data-toggle="tooltip" data-placement="bottom" data-original-title='"We store aggregated performance metrics of our DNS server, namely the number of complete requests to a particular server, the number of blocked requests, the speed of processing requests.
+We keep and store the database of domains requested in the last 24 hours. We need this information to identify and block new trackers and threats.
+We also log how many times this or that tracker has been blocked. We need this information to remove outdated rules from our filters."' href="https://adguard.com/en/privacy/dns.html">Some</a></td>
         <td>DoH, DoT, DNSCrypt</td>
         <td>Yes</td>
         <td>Yes</td>
         <td>
           <span class="no-text-wrap">
-            Ads, trackers,
+            Based on server choice
-          </span>
-          <span class="no-text-wrap">
-            malicious domains
           </span>
         </td>
         <td>
@@ -60,6 +61,9 @@
           </a>
         </td>
         <td>
+          <span class="no-text-wrap">
+            <a href="https://www.choopa.com/">Choopa, LLC</a>,
+          </span>
           <span class="no-text-wrap">
             <a href="https://flops.ru/en/about.html">Serveroid, LLC</a>
           </span>
@@ -168,7 +172,11 @@
         <td>DoH, DoT</td>
         <td>Yes</td>
         <td>Yes</td>
-        <td>No</td>
+        <td>
+          <span class="no-text-wrap">
+            Based on server choice
+          </span>
+        </td>
         <td>?</td>
         <td>Self</td>
       </tr>
@@ -240,6 +248,51 @@
         </td>
       </tr>
 
+      <tr>
+        <td data-value="LibreDNS">
+          <a href="https://libredns.gr/">LibreDNS</a>
+        </td>
+        <td>
+          <span class="no-text-wrap">
+            <span class="flag-icon flag-icon-de"></span>
+            Germany
+          </span>
+        </td>
+        <td>
+          <a
+            class="btn-secondary btn-icon"
+            href="https://libreops.cc/terms.html">
+            <span class="fas fa-globe"></span>
+          </a>
+        </td>
+        <td>
+          <a data-toggle="tooltip" data-placement="bottom" data-original-title="Part of LibreHosters, &quot;a network of cooperation and solidarity that uses free software to encourage decentralisation through federation and distributed platforms.&quot;" href="https://libreho.st/">
+            Informal collective
+          </a>
+        </td>
+        <td>No</td>
+        <td>DoH, DoT</td>
+        <td>Yes</td>
+        <td>Yes</td>
+        <td>
+          <span class="no-text-wrap">
+            Based on server choice only for DoH
+          </span>
+        </td>
+        <td>
+          <a
+            class="btn-secondary btn-icon"
+            href="https://gitlab.com/libreops/libredns">
+            <span class="fas fa-globe"></span>
+          </a>
+        </td>
+        <td>
+          <span class="no-text-wrap">
+            <a href="https://www.hetzner.com/">Hetzner Online GmbH</a>
+          </span>
+        </td>
+      </tr>
+
       <tr>
         <td data-value="nextdns">
           <a href="https://www.nextdns.io/">NextDNS</a>

_includes/sections/email-providers.html

@@ -9,7 +9,7 @@
   <div class="row mb-2">
     <div class="col-lg-3 col-sm-12 pt-lg-5">
       <img
-        src="{% if jekyll.environment == "production" and site.pull_cdn %}{{site.pull_cdn}}{% endif %}/assets/img/svg/3rd-party/protonmail.svg"
+        src="/assets/img/svg/3rd-party/protonmail.svg"
         height="70"
         width="200"
         class="img-fluid d-block mr-auto ml-auto align-middle"
@@ -47,7 +47,7 @@
   <div class="row mb-2">
     <div class="col-lg-3 col-sm-12 pt-lg-5">
       <img
-        src="{% if jekyll.environment == "production" and site.pull_cdn %}{{site.pull_cdn}}{% endif %}/assets/img/svg/3rd-party/mailboxorg.svg"
+        src="/assets/img/svg/3rd-party/mailboxorg.svg"
         height="70"
         width="200"
         class="img-fluid d-block mr-auto ml-auto align-middle"
@@ -84,7 +84,7 @@
   <div class="row mb-2">
     <div class="col-lg-3 col-sm-12 pt-lg-5">
       <img
-        src="{% if jekyll.environment == "production" and site.pull_cdn %}{{site.pull_cdn}}{% endif %}/assets/img/svg/3rd-party/posteo.svg"
+        src="/assets/img/svg/3rd-party/posteo.svg"
         height="70"
         width="200"
         class="img-fluid d-block mr-auto ml-auto align-middle"
@@ -120,7 +120,7 @@
   <div class="row mb-2">
     <div class="col-lg-3 col-sm-12 pt-lg-5">
       <img
-        src="{% if jekyll.environment == "production" and site.pull_cdn %}{{site.pull_cdn}}{% endif %}/assets/img/svg/3rd-party/soverin.svg"
+        src="/assets/img/svg/3rd-party/soverin.svg"
         height="70"
         width="200"
         class="img-fluid d-block mr-auto ml-auto align-middle"
@@ -156,8 +156,8 @@
   <div class="row mb-2">
     <div class="col-lg-3 col-sm-12 pt-lg-5">
       <img
-        src="{% if jekyll.environment == "production" and site.pull_cdn %}{{site.pull_cdn}}{% endif %}/assets/img/svg/3rd-party/disroot.svg"
+        src="/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"
+        data-theme-src="/assets/img/svg/3rd-party/disroot-dark.svg"
         height="70"
         width="200"
         class="img-fluid d-block mr-auto ml-auto align-middle"
@@ -193,8 +193,8 @@
   <div class="row mb-2">
     <div class="col-lg-3 col-sm-12 pt-lg-5">
       <img
-        src="{% if jekyll.environment == "production" and site.pull_cdn %}{{site.pull_cdn}}{% endif %}/assets/img/svg/3rd-party/tutanota.svg"
+        src="/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"
+        data-theme-src="/assets/img/svg/3rd-party/tutanota-dark.svg"
         height="70"
         width="200"
         class="img-fluid d-block mr-auto ml-auto align-middle"
@@ -235,8 +235,8 @@
   <div class="row mb-2">
     <div class="col-lg-3 col-sm-12 pt-lg-5">
       <img
-        src="{% if jekyll.environment == "production" and site.pull_cdn %}{{site.pull_cdn}}{% endif %}/assets/img/svg/3rd-party/startmail.svg"
+        src="/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"
+        data-theme-src="/assets/img/svg/3rd-party/startmail-dark.svg"
         height="70"
         width="200"
         class="img-fluid d-block mr-auto ml-auto align-middle"

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

_includes/sections/header.html

@@ -5,9 +5,9 @@
 <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="{% if jekyll.environment == "production" and site.pull_cdn %}{{site.pull_cdn}}{% endif %}/assets/img/svg/layout/brand/horizontal.svg" width="500px" alt="{{ site.name }}">
+      <img class="img-fluid d-none d-sm-block" src="/assets/img/svg/layout/brand/horizontal.svg" width="500px" alt="{{ site.name }}">
       <div class="text-center">
-        <img class="img-fluid d-sm-none" src="{% if jekyll.environment == "production" and site.pull_cdn %}{{site.pull_cdn}}{% endif %}/assets/img/svg/layout/brand/vertical.svg" width="300px" alt="{{ site.name }}">
+        <img class="img-fluid d-sm-none" src="/assets/img/svg/layout/brand/vertical.svg" width="300px" alt="{{ site.name }}">
       </div>
     </a>
   </h1>

_includes/sections/hosting-provider.html

@@ -16,24 +16,8 @@
   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/"
+  labels="color==warning::link==https://github.com/privacytools/privacytools.io/issues/1920::text==Warning::tooltip==Njalla blocks port 25 traffic."
   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/"
-  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/"
-  privacy-policy="https://www.orangewebsite.com/docs/privacy-policy.php"
-  forum="https://forum.privacytools.io/t/discussion-orange-website/343"
-%}

_includes/sections/instant-messenger.html

@@ -24,7 +24,7 @@
   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"
+  labels="color==warning::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"
@@ -37,27 +37,6 @@
   ios="https://apps.apple.com/app/signal-private-messenger/id874139669"
 %}
 
-{%
-  include cardv2.html
-  title="Keybase"
-  image="/assets/img/svg/3rd-party/keybase.svg"
-  description='Keybase provides a hosted team chat with E2EE. Its protocol has also been <a href="https://keybase.io/docs-assets/blog/NCC_Group_Keybase_KB2018_Public_Report_2019-02-27_v1.3.pdf">indepedently audited (PDF)</a>. Keybase can help you prove you own social media accounts though the use of cryptographic signing of "<a href="https://en.wikipedia.org/wiki/Keybase#Identity_proofs">identity proofs</a>".'
-  labels="color==warning::link==https://github.com/keybase/client/issues/6374::text==Warning::tooltip==This software relies on a closed-source central server.| color==info::link==https://github.com/privacytools/privacytools.io/issues/1894::text==Ownership change::tooltip==Keybase has recently been acquired by Zoom."
-  website="https://keybase.io/"
-  privacy-policy="https://keybase.io/docs/privacypolicy"
-  forum="https://forum.privacytools.io/t/discussion-keybase/1224"
-  tor="http://keybase5wmilwokqirssclfnsqrjdsi7jdir5wy7y7iu3tanwmtp6oid.onion/"
-  github="https://github.com/Keybase"
-  windows="https://keybase.io/docs/the_app/install_windows"
-  mac="https://keybase.io/docs/the_app/install_macos"
-  linux="https://keybase.io/docs/the_app/install_linux"
-  freebsd="https://www.freshports.org/security/keybase/"
-  googleplay="https://play.google.com/store/apps/details?id=io.keybase.ossifrage"
-  ios="https://apps.apple.com/app/keybase-crypto-for-everyone/id1044461770"
-  firefox="https://addons.mozilla.org/firefox/addon/keybase-for-firefox/"
-  chrome="https://chrome.google.com/webstore/detail/keybase-for-reddit/ognfafcpbkogffpmmdglhbjboeojlefj"
-%}
-
 <div class="container">
   <div class="row">
     <div class="col-md-6">
@@ -92,21 +71,21 @@
 
 {%
   include cardv2.html
-  title="Riot"
+  title="Element"
-  image="/assets/img/svg/3rd-party/riotim.svg"
+  image="/assets/img/svg/3rd-party/element.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.'
+  description='<a href="https://element.io">Element</a> (formerly <a href="https://element.io/blog/welcome-to-element/">Riot</a>) is the reference client for the <a href="https://matrix.org/docs/guides/introduction">Matrix</a> network. The <a href="https://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/"
+  website="https://element.io"
-  privacy-policy="https://riot.im/privacy"
+  privacy-policy="https://element.io/privacy"
-  forum="https://forum.privacytools.io/t/discussion-riot-im/665/"
+  forum="https://forum.privacytools.io/t/discussion-element-io/665"
   github="https://github.com/vector-im/riot-web/"
-  windows="https://riot.im/download/desktop/"
+  windows="https://element.io/get-started"
-  mac="https://riot.im/download/desktop/"
+  mac="https://element.io/get-started"
-  linux="https://riot.im/download/desktop/"
+  linux="https://element.io/get-started"
-  fdroid="https://f-droid.org/repository/browse/?fdid=im.vector.alpha"
+  fdroid="https://f-droid.org/packages/im.vector.app/"
   googleplay="https://play.google.com/store/apps/details?id=im.vector.app"
-  ios="https://itunes.apple.com/app/vector.im/id1083446067"
+  ios="https://apps.apple.com/app/vector/id1083446067"
-  web="https://riot.im/app/"
+  web="https://app.element.io"
 %}
 
 <div class="container">

_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="{% 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">
+<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">
 
 <p>Services based in the United States are not recommended because of the country's surveillance programs and use of <a href="https://www.eff.org/issues/national-security-letters/faq">National Security Letters</a> (NSLs) with accompanying gag orders, which forbid the recipient from talking about the request. This combination allows the government to <a href="https://www.schneier.com/blog/archives/2013/08/more_on_the_nsa.html">secretly force</a> companies to grant complete access to customer data and transform the service into a tool of mass surveillance.</p>
 

_includes/sections/live-operating-systems.html

@@ -1,33 +0,0 @@
-<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="color==warning::text==contrib::tooltip==This software may depend on or recommend non-free software."
-  website="https://tails.boum.org/"
-  git="https://git-tails.immerda.ch/tails/"
-%}
-
-<h3>Worth Mentioning</h3>
-
-<ul>
-  <li>
-    <a href="https://getfedora.org/">Fedora Workstation</a>
-    {% include badge.html
-    color="info"
-    text="GNU/Linux"
-    %}
-    - Fedora is a Linux distribution developed by the Fedora Project and sponsored by Red Hat. Fedora Workstation is a secure, reliable, and user-friendly edition developed for desktops and laptops, using GNOME as the default desktop environment.
-  </li>
-
-  <li>
-    <a href="https://debian.org/">Debian</a>
-    {% include badge.html
-    color="info"
-    text="GNU/Linux"
-    %}
-    - Debian is a Unix-like computer operating system and a Linux distribution that is composed entirely of free and open-source software, most of which is under the GNU General Public License, and packaged by a group of individuals known as the Debian project.
-  </li>
-</ul>

_includes/sections/mobile-operating-systems.html

@@ -1,80 +0,0 @@
-<h1 id="mobile_os" class="anchor"><a href="#mobile_os"><i class="fas fa-link anchor-icon"></i></a> Mobile Operating Systems</h1>
-
-<div class="alert alert-warning" role="alert">
-  <strong>Even though the source code of the following operating systems is provided, installing Google Apps may compromise your setup.</strong>
-</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="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="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="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>
-    {% include badge.html
-    color="info"
-    text="AOSP"
-    %}
-    - An open-source operating system based on Android, aiming to replace all proprietary components with free software.
-  </li>
-
-  <li>
-    <a href="https://www.omnirom.org/">OmniROM</a>
-    {% include badge.html
-    color="info"
-    text="AOSP"
-    %}
-    {% include badge.html
-    color="warning"
-    icon="far fa-question-circle"
-    text="contrib"
-    tooltip="This software may depend on or recommend non-free software."
-    %}
-    - A free-software operating system for smartphones and tablet computers, based on the Android mobile platform.
-  </li>
-
-  <li>
-    <a href="https://microg.org/">MicroG</a>
-    {% include badge.html
-    color="info"
-    text="Add-on Package"
-    %}
-    {% include badge.html
-    color="warning"
-    icon="far fa-question-circle"
-    text="contrib"
-    tooltip="This software may depend on or recommend non-free software."
-    %}
-    - A project that aims to reimplement the proprietary Google Play Services in the Android operating system with a FLOSS replacement. The microG project also maintains a fork of LineageOS with microG and F-Droid preinstalled at <a href="https://lineage.microg.org/">Lineage for microG</a>.
-  </li>
-</ul>

_includes/sections/operating-systems.html

@@ -1,86 +1,86 @@
-<h1 id="os" class="anchor"><a href="#os"><i class="fas fa-link anchor-icon"></i></a> PC Operating Systems</h1>
+<h1 id="os" class="anchor"><a href="#os"><i class="fas fa-link anchor-icon"></i></a> Introductory Operating Systems</h1>
 
 <div class="alert alert-warning" role="alert">
-  <strong>If you are currently using an operating system like Windows 10, you should pick an alternative here.</strong>
+  <strong>If you are currently using an operating system that collects data like Windows 10, you should pick an alternative here.</strong>
 </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="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.'
+  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. Fedora by default comes with the GNOME desktop environment, other <a href="https://spins.fedoraproject.org/">desktop environments</a> are also available.'
-  badges="info:GNU/Linux"
+  badges="info: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="Ubuntu"
+  image="/assets/img/svg/3rd-party/ubuntu.svg"
+  description='Ubuntu is a Linux distribution developed by Canonical Ltd. Ubuntu is a reliable and distribution that is user-friendly and can be run on desktops, servers, and IoT devices. Ubuntu uses GNOME as the default desktop environment, while other <a href="https://ubuntu.com/download/flavours">desktop environments</a> are also available.'
+  badges="info:Linux"
+  website="https://ubuntu.com"
+  privacy-policy="https://ubuntu.com/legal/data-privacy"
+  git="https://launchpad.net/ubuntu"
+%}
+
+<h1 id="advanced_os" class="anchor"><a href="#advanced_os"><i class="fas fa-link anchor-icon"></i></a> Advanced Operating Systems</h1>
+
+<div class="alert alert-info" role="alert">
+  <strong>These options have advanced features and are unique in some way. These options will likely require the user to read technical background documentation.</strong>
+</div>
+
+{% include cardv2.html
+  title="Alpine Linux"
+  image="/assets/img/svg/3rd-party/alpinelinux.svg"
+  description='Alpine Linux is a very minimal distribution designed to be secure and very resource efficient. Alpine Linux can run from RAM, and merge configuration files into the system on boot using <a href="https://wiki.alpinelinux.org/wiki/Alpine_local_backup">Alpine local backup</a>. Alpine Linux is often used on servers and in Linux containers.'
+  badges="info:Linux"
+  website="https://alpinelinux.org/"
+  privacy-policy="https://alpinelinux.org/privacy-policy.html"
+  gitlab="https://gitlab.alpinelinux.org"
+%}
+
+{% include cardv2.html
+  title="Arch Linux"
+  image="/assets/img/svg/3rd-party/archlinux.svg"
+  description='A simple, lightweight Linux distribution. It is composed predominantly of free and open-source software, and supports community involvement.'
+  badges="info:Linux"
+  labels="color==success::link==https://tests.reproducible-builds.org/archlinux/archlinux.html::text==Reproducable builds"
+  website="https://www.archlinux.org/"
+  privacy-policy="https://wiki.archlinux.org/index.php/ArchWiki:Privacy_policy"
+  gitlab="https://gitlab.archlinux.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"
+  badges="info:Linux"
+  labels="color==success::link==https://reproducible.debian.net::text==Reproducable builds"
   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>
+{% include cardv2.html
+  title="NixOS"
+  image="/assets/img/svg/3rd-party/nixos.svg"
+  description='NixOS is a Linux distribution with a unique approach to package and configuration management. Built on top of the Nix package manager, it is completely declarative, makes upgrading systems reliable, and has many <a href="https://nixos.org/features.html">other advantages</a>.'
+  badges="info:Linux"
+  labels="color==success::link==https://r13y.com::text==Reproducable builds"
+  website="https://nixos.org"
+  privacy-policy="https://nixos.wiki/wiki/NixOS_Wiki:Privacy_policy"
+  github="https://github.com/NixOS"
+%}
 
-<ul>
+{% include cardv2.html
-  <li><a href="https://www.openbsd.org/">OpenBSD</a>
+  title="Qubes OS"
-    {% include badge.html
+  image="/assets/img/svg/3rd-party/qubes_os.svg"
-    color="info"
+  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.'
-    text="BSD"
+  badges="info:Xen"
-    %}
+  website="https://www.qubes-os.org/"
-    - A project that produces a free, multi-platform 4.4BSD-based UNIX-like operating system. Emphasizes portability, standardization, correctness, proactive security and integrated cryptography.
+  privacy-policy="https://www.qubes-os.org/privacy/"
-  </li>
+  github="https://github.com/QubesOS"
-
+  tor="http://qubesosfasa4zl44o4tws22di6kepyzfeqv3tg4e3ztknltfxqrymdad.onion/"
-  <li>
+%}
-    <a href="https://www.archlinux.org/">Arch Linux</a>
-    {% include badge.html
-    color="info"
-    text="GNU/Linux"
-    %}
-    {% include badge.html
-    color="warning"
-    icon="far fa-question-circle"
-    text="contrib"
-    tooltip="This software may depend on or recommend non-free software."
-    %}
-    - A simple, lightweight Linux distribution. It is composed predominantly of free and open-source software, and supports community involvement. <a href="https://www.parabola.nu/">Parabola</a> is a
-    completely open source version of Arch Linux.
-  </li>
-
-  <li>
-    <a href="https://trisquel.info/">Trisquel</a>
-    {% include badge.html
-    color="info"
-    text="GNU/Linux"
-    %}
-    - Derived from Ubuntu, this project aims for a fully free software system without proprietary software or firmware and uses Linux-libre, a version of the Linux kernel with the non-free code (binary blobs) removed.
-  </li>
-
-  <li>
-    <a href="https://www.whonix.org/">Whonix</a>
-    {% include badge.html
-    color="info"
-    text="GNU/Linux"
-    %}
-    - A Debian-based security-focused Linux distribution. It aims to provide privacy, security and anonymity on the internet. The operating system consists of two virtual machines, a "Workstation"
-    and a Tor "Gateway". All communication are forced through the Tor network to accomplish this.
-  </li>
-</ul>

_includes/sections/other-mobile-operating-systems.html

@@ -0,0 +1,11 @@
+<h2 id="other_os" class="anchor"><a href="#other_os"><i class="fas fa-link anchor-icon"></i></a> Other Mobile Operating Systems</h1>
+
+{% 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:Linux"
+  website="https://ubuntu-touch.io/"
+  privacy-policy="https://ubports.com/privacy"
+  github="https://github.com/ubports"
+%}

_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">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>
+<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="/services/chat/">several Matrix rooms</a>, primarily <code class="highlighter-rouge">#general:privacytools.io</code>. XMPP users can join there via <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">
 

_includes/sections/privacy-resources.html

@@ -33,7 +33,6 @@
   <li><a href="https://securityinabox.org/"><strong>Security in-a-Box</strong></a> - A guide to digital security for activists and human rights defenders throughout the world.</li>
   <li><a href="https://securedrop.org/"><strong>SecureDrop</strong></a> - An open-source whistleblower submission system that media organizations can use to securely accept documents from and communicate with anonymous sources. It was originally created
     by the late Aaron Swartz and is currently managed by Freedom of the Press Foundation.</li>
-  <li><a href="https://pack.resetthenet.org/"><strong>Reset The Net - Privacy Pack</strong></a> - Help fight to end mass surveillance. Get these tools to protect yourself and your friends.</li>
   <li><a href="https://secfirst.org/"><strong>Security First</strong></a> - Umbrella is an Android app that provides all the advice needed to operate safely in a hostile environment.</li>
   <li><a href="https://www.osalt.com/"><strong>Osalt</strong></a> - A directory to help you find open source alternatives to proprietary tools.</li>
   <li><a href="https://alternativeto.net/"><strong>AlternativeTo</strong></a> - A directory to help find alternatives to other software, with the option to only show open source software</li>

_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="{% 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>
+  <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>
   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>

_includes/sections/router-firmware.html

@@ -6,7 +6,6 @@
   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/"
 %}
@@ -17,46 +16,7 @@
   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"
-%}
-
-<h3>Worth Mentioning</h3>
-
-<ul>
-  <li>
-    <a href="https://www.openbsd.org/">OpenBSD</a>
-    {% include badge.html
-    color="info"
-    text="BSD"
-    %}
-    - A project that produces a free, multi-platform 4.4BSD-based UNIX-like operating system. Emphasizes portability, standardization, correctness, proactive security and integrated cryptography.
-  </li>
-
-  <li>
-    <a href="https://dd-wrt.com/">DD-WRT</a>
-    {% include badge.html
-    color="info"
-    text="GNU/Linux"
-    %}
-    {% include badge.html
-    color="warning"
-    icon="far fa-question-circle"
-    text="contrib"
-    tooltip="This software may depend on or recommend non-free software."
-    %}
-    - A Linux-based open-source firmware compatible with several models of routers and access points.
-  </li>
-</ul>

_includes/sections/teamchat.html

@@ -10,21 +10,21 @@
 
 {%
   include cardv2.html
-  title="Riot"
+  title="Element"
-  image="/assets/img/svg/3rd-party/riotim.svg"
+  image="/assets/img/svg/3rd-party/element.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 />'
+  description='<a href="https://element.io">Element</a> (formerly <a href="https://element.io/blog/welcome-to-element/">Riot</a>) is the reference client for the <a href="https://matrix.org/docs/guides/introduction">Matrix</a> network. The <a href="https://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/"
+  website="https://element.io"
-  privacy-policy="https://riot.im/privacy"
+  privacy-policy="https://element.io/privacy"
-  forum="https://forum.privacytools.io/t/discussion-riot-im/665/"
+  forum="https://forum.privacytools.io/t/discussion-element-io/665"
   github="https://github.com/vector-im/riot-web/"
-  windows="https://riot.im/download/desktop/"
+  windows="https://element.io/get-started"
-  mac="https://riot.im/download/desktop/"
+  mac="https://element.io/get-started"
-  linux="https://riot.im/download/desktop/"
+  linux="https://element.io/get-started"
-  fdroid="https://f-droid.org/repository/browse/?fdid=im.vector.alpha"
+  fdroid="https://f-droid.org/packages/im.vector.app/"
   googleplay="https://play.google.com/store/apps/details?id=im.vector.app"
-  ios="https://itunes.apple.com/app/vector.im/id1083446067"
+  ios="https://apps.apple.com/app/vector/id1083446067"
-  web="https://riot.im/app/"
+  web="https://app.element.io"
 %}
 
 {%
@@ -44,24 +44,3 @@
   googleplay="https://play.google.com/store/apps/details?id=chat.rocket.android"
   ios="https://itunes.apple.com/app/rocket-chat/id1148741252"
 %}
-
-{%
-  include cardv2.html
-  title="Keybase"
-  image="/assets/img/svg/3rd-party/keybase.svg"
-  description='Keybase provides a hosted team chat with E2EE. Its protocol has also been <a href="https://keybase.io/docs-assets/blog/NCC_Group_Keybase_KB2018_Public_Report_2019-02-27_v1.3.pdf">indepedently audited (PDF)</a>. Keybase can help you prove you own social media accounts through the use of cryptographic signing of "<a href="https://en.wikipedia.org/wiki/Keybase#Identity_proofs">identity proofs</a>".'
-  labels="color==warning::link==https://github.com/keybase/client/issues/6374::text==Warning::tooltip==This software relies on a closed-source central server.| color==info::link==https://github.com/privacytools/privacytools.io/issues/1894::text==Ownership change::tooltip==Keybase has recently been acquired by Zoom."
-  website="https://keybase.io/"
-  privacy-policy="https://keybase.io/docs/privacypolicy"
-  forum="https://forum.privacytools.io/t/discussion-keybase/1224"
-  tor="http://keybase5wmilwokqirssclfnsqrjdsi7jdir5wy7y7iu3tanwmtp6oid.onion/"
-  github="https://github.com/Keybase"
-  windows="https://keybase.io/docs/the_app/install_windows"
-  mac="https://keybase.io/docs/the_app/install_macos"
-  linux="https://keybase.io/docs/the_app/install_linux"
-  freebsd="https://www.freshports.org/security/keybase/"
-  googleplay="https://play.google.com/store/apps/details?id=io.keybase.ossifrage"
-  ios="https://apps.apple.com/app/keybase-crypto-for-everyone/id1044461770"
-  firefox="https://addons.mozilla.org/firefox/addon/keybase-for-firefox/"
-  chrome="https://chrome.google.com/webstore/detail/keybase-for-reddit/ognfafcpbkogffpmmdglhbjboeojlefj"
-%}

_includes/sections/tor-operating-systems.html

@@ -0,0 +1,23 @@
+<h1 id="tor_os" class="anchor"><a href="#tor_os"><i class="fas fa-link anchor-icon"></i></a> Tor-Focused Distributions</h1>
+
+<div class="alert alert-info" role="alert">
+  <strong>These Linux distributions are developed with the purpose of directing all network traffic through Tor.</strong>
+</div>
+
+{% 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:Linux"
+  website="https://tails.boum.org/"
+  git="https://git-tails.immerda.ch/tails/"
+  %}
+
+{% include cardv2.html
+  title="Whonix"
+  image="/assets/img/svg/3rd-party/whonix.svg"
+  description='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. <a href="https://www.whonix.org/wiki/Qubes/Why_use_Qubes_over_other_Virtualizers">Whonix is best used in conjunction with Qubes.</a>'
+  badges="info:Linux"
+  website="https://www.whonix.org/"
+  github="https://github.com/Whonix"
+%}

_includes/sections/video-frontends.html

@@ -0,0 +1,14 @@
+<h1 id="proxies" class="anchor"><a href="#proxies"><i class="fas fa-link anchor-icon"></i></a> Frontends and Proxies</h1>
+
+<div class="alert alert-warning" role="alert">
+  <strong> If you are currently using a platform like YouTube, you can keep watching videos without sharing your IP.</strong>
+</div>
+
+{% include cardv2.html
+  title="Invidious"
+  image="/assets/img/svg/3rd-party/invidious.svg"
+  description='Invidious is an alternative front-end to YouTube. It is free software, with no advertising or Javascript dependency to play videos, with lots of other features that allow you to have a complete YouTube experience, sans Google.'
+  website="https://invidio.us"
+  github="https://github.com/omarroth/invidious"
+  web="https://instances.invidio.us"
+%}

_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="{% if jekyll.environment == "production" and site.pull_cdn %}{{site.pull_cdn}}{% endif %}/assets/img/svg/3rd-party/mullvad.svg"
+        src="/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"
+        data-theme-src="/assets/img/svg/3rd-party/mullvad-dark.svg"
         height="70"
         width="200"
         class="img-fluid d-block mr-auto ml-auto align-middle"
@@ -41,14 +41,14 @@
     <h5>{% include badge.html color="success" text="Remote Port Forwarding" %}</h5>
     <p>Remote <a href="https://en.wikipedia.org/wiki/Port_forwarding">port forwarding</a> is allowed on Mullvad, see <a href="https://mullvad.net/help/port-forwarding-and-mullvad/">Port forwarding with Mullvad VPN</a>.</p>
     <h5>{% include badge.html color="success" text="Mobile Clients" %}</h5>
-    <p>Mullvad has published <a href ="https://apps.apple.com/app/mullvad-vpn/id1488466513">App Store</a> and <a href="https://play.google.com/store/apps/details?id=net.mullvad.mullvadvpn">Google Play</a> clients, both supporting an easy-to use interface as opposed to requiring users to manual configure their WireGuard connections.</p>
+    <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. The mobile client on Android is also available in <a href="https://f-droid.org/packages/net.mullvad.mullvadvpn">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></p>
     <h5>{% include badge.html color="info" text="Extra Functionality" %}</h5>
     <p>The Mullvad VPN clients have a built-in killswitch to block internet connections outside of the VPN. They also are able to automatically start on boot. The Mullvad website is also accessible via Tor at <a href="http://xcln5hkbriyklr6n.onion/">xcln5hkbriyklr6n.onion</a>.</p>
     </div>
   </div>
   <div class="row mb-2">
     <div class="col-lg-3 col-sm-12 pt-lg-5">
-      <img src="{% if jekyll.environment == "production" and site.pull_cdn %}{{site.pull_cdn}}{% endif %}/assets/img/svg/3rd-party/protonvpn.svg" height="70" width="200" class="img-fluid d-block mr-auto ml-auto align-middle" alt="ProtonVPN">
+      <img src="/assets/img/svg/3rd-party/protonvpn.svg" height="70" width="200" class="img-fluid d-block mr-auto ml-auto align-middle" alt="ProtonVPN">
     </div>
     <div class="col">
     <h2 id="protonvpn" class="anchor">
@@ -77,7 +77,7 @@
   </div>
   <div class="row mb-2">
     <div class="col-lg-3 col-sm-12 pt-lg-5">
-      <img src="{% if jekyll.environment == "production" and site.pull_cdn %}{{site.pull_cdn}}{% endif %}/assets/img/svg/3rd-party/ivpn.svg" height="70" width="200" class="img-fluid d-block mr-auto ml-auto align-middle" alt="IVPN">
+      <img src="/assets/img/svg/3rd-party/ivpn.svg" height="70" width="200" class="img-fluid d-block mr-auto ml-auto align-middle" alt="IVPN">
     </div>
     <div class="col">
     <h2 id="ivpn" class="anchor">

_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="{% 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">
+<img src="/assets/img/svg/layout/warrant_canary_example.svg" width="450px" class="img-fluid float-right ml-3" alt="Warrant Canary Example">
 
 <p>A warrant canary is a posted document stating that an organization has not received any secret subpoenas during a specific period of time. If this document fails to be updated during the specified time then the user is to assume that the service has received such a subpoena and should stop using the service.</p>
 

_includes/sections/windows10.html

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

_includes/sponsors/gold.html

@@ -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="{% if jekyll.environment == "production" and site.pull_cdn %}{{site.pull_cdn}}{% endif %}/assets/img/svg/3rd-party/sponsors/safing.svg"
+      src="/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"
+      data-theme-src="/assets/img/svg/3rd-party/sponsors/safing-dark.svg"
       width="210rem"
       title="Safing Privacy Network - Launching on Kickstarter January 2nd, 2020"
       alt="Safing Privacy Network - Safing.io Logo" />

_includes/sponsors/list.html

@@ -0,0 +1,8 @@
+<ul class="d-flex flex-wrap list-group-flush">
+  <li class="list-group-item flex-fill">Daw-Ran Liou</li>
+  <li class="list-group-item flex-fill">Michael DeMichillie</li>
+  <li class="list-group-item flex-fill">PablO</li>
+  <li class="list-group-item flex-fill">Syfaer</li>
+  <li class="list-group-item flex-fill">the0</li>
+  <li class="list-group-item flex-fill">Troy Vassalotti</li>
+</ul>

_includes/sponsors/silver.html

@@ -0,0 +1,27 @@
+<div class="col-6 col-sm-4 col-md-3 my-3">
+  <div class="d-flex justify-content-start">
+    <div><a href="https://techlore.tech"><img src="/assets/img/svg/3rd-party/sponsors/techlore.svg" class="mx-3" width="64" height="64" title="Techlore, Home of Go Incognito" alt="Techlore Logo"></a></div>
+    <div class="d-flex flex-column align-self-center">
+    <p class="my-0"><strong>Techlore</strong></p>
+    <a href="https://techlore.tech" class="my-0">https://techlore.tech</a>
+    </div>
+  </div>
+</div>
+<div class="col-6 col-sm-4 col-md-3 my-3">
+  <div class="d-flex justify-content-start">
+    <div><a href="https://www.awesomeresources.co.uk/"><img src="/assets/img/png/3rd-party/sponsors/awesomeresources.png" class="mx-3" width="64" height="64" alt="Awesome Resources Logo"></a></div>
+    <div class="d-flex flex-column align-self-center">
+    <p class="my-0"><strong>Awesome Resources Ltd</strong></p>
+    <a href="https://www.awesomeresources.co.uk/" class="my-0">https://www.awesomeresources.co.uk</a>
+    </div>
+  </div>
+</div>
+<div class="col-6 col-sm-4 col-md-3 my-3">
+  <div class="d-flex justify-content-start">
+    <div><a href="https://www.looktotheright.com"><img src="/assets/img/png/3rd-party/sponsors/looktotheright.png" class="mx-3" width="64" height="64" title="Providing Google Ads/Paid Search/PPC services and Custom SEO solutions to businesses in the Greater Raleigh, NC area, Santiago, Chile & Globally." alt="Look To The Right Logo"></a></div>
+    <div class="d-flex flex-column align-self-center">
+    <p class="my-0"><strong>Look To The Right</strong></p>
+    <a href="https://www.looktotheright.com" class="my-0">https://looktotheright.com</a>
+    </div>
+  </div>
+</div>

_layouts/minimal.html

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

assets/img/png/favicons/browserconfig.xml

@@ -2,7 +2,7 @@
 <browserconfig>
     <msapplication>
         <tile>
-            <square150x150logo src="{% if jekyll.environment == "production" and site.pull_cdn %}{{site.pull_cdn}}{% endif %}/assets/img/png/favicons/mstile-150x150.png"/>
+            <square150x150logo src="/assets/img/png/favicons/mstile-150x150.png"/>
             <TileColor>#3498db</TileColor>
         </tile>
     </msapplication>

assets/img/svg/3rd-party/alpinelinux.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="#0d597f"><g transform="matrix(.22745 0 0 -.22745 12.303 20.536)"><path d="m0 0v15.687l-11.296-11.308c1.217-0.847 2.364-1.543 3.443-2.109 1.079-0.567 2.089-1.005 3.03-1.338 0.941-0.334 1.814-0.562 2.617-0.71 0.804-0.147 1.539-0.213 2.206-0.222m57.751 1.304c0.02-0.017 0.13-0.11 0.333-0.239 0.204-0.13 0.502-0.297 0.898-0.462 0.395-0.164 0.889-0.327 1.485-0.448 0.596-0.122 1.294-0.202 2.098-0.202 0.671 0 1.411 0.059 2.222 0.2 0.812 0.142 1.693 0.367 2.645 0.699 0.953 0.333 1.976 0.773 3.07 1.344 1.094 0.572 2.259 1.276 3.495 2.136l-8.572 8.397-28.41 28.516-12.466-12.469-16.816 17.341-42.204-41.727c1.235-0.86 2.398-1.564 3.491-2.136 1.093-0.571 2.115-1.011 3.067-1.344 0.951-0.332 1.832-0.557 2.643-0.698 0.81-0.142 1.55-0.201 2.22-0.201 0.804 0 1.502 0.08 2.097 0.202 0.596 0.121 1.089 0.284 1.485 0.449 0.396 0.164 0.693 0.331 0.897 0.461s0.314 0.223 0.334 0.24l19.052 19.052 6.813 6.533 18.866-18.866 6.591-6.778c0.02-0.017 0.13-0.11 0.334-0.239 0.204-0.13 0.501-0.297 0.897-0.462 0.396-0.164 0.89-0.327 1.485-0.448 0.596-0.122 1.295-0.202 2.099-0.202 0.67 0 1.411 0.059 2.222 0.2 0.811 0.142 1.693 0.367 2.645 0.699 0.952 0.333 1.975 0.773 3.069 1.344 1.094 0.572 2.259 1.276 3.495 2.136l-15.139 14.825 2.818 2.818 13.101-13.101 7.64-7.57m-0.163 79.016 37.219-64.482-37.219-64.482h-74.463l-37.219 64.482 37.219 64.482z" fill="#0d597f"/></g><g transform="matrix(.22745 0 0 -.22745 20.119 16.219)"><path d="m0 0-9.913 9.895 0.705 0.709 9.983-9.874z" fill="#0d597f"/></g></g></svg>

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

@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="-147 -70 294 345">
+<g fill="#a4c639">
+<use stroke-width="14.4" xlink:href="#b" stroke="#FFF"/>
+<use xlink:href="#a" transform="scale(-1,1)"/>
+<g id="a" stroke="#FFF" stroke-width="7.2">
+<rect rx="6.5" transform="rotate(29)" height="86" width="13" y="-86" x="14"/>
+<rect id="c" rx="24" height="133" width="48" y="41" x="-143"/>
+<use y="97" x="85" xlink:href="#c"/>
+</g>
+<g id="b">
+<ellipse cy="41" rx="91" ry="84"/>
+<rect rx="22" height="182" width="182" y="20" x="-91"/>
+</g>
+</g>
+<g stroke="#FFF" stroke-width="7.2" fill="#FFF">
+<path d="m-95 44.5h190"/><circle cx="-42" r="4"/><circle cx="42" r="4"/>
+</g>
+</svg>

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

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="128" height="128" version="1.1" viewBox="0 0 33.867 33.867" xmlns="http://www.w3.org/2000/svg"><g transform="matrix(.73138 0 0 .73138 10.776 17.764)" fill="#1793d1"><path d="m7.2435-23.121c-1.9571 4.7983-3.1375 7.9369-5.3165 12.593 1.336 1.4161 2.9758 3.0653 5.6389 4.9279-2.8631-1.1781-4.8161-2.361-6.2756-3.5884-2.7887 5.819-7.1577 14.108-16.024 30.038 6.9685-4.023 12.37-6.5033 17.405-7.4497-0.21617-0.92976-0.33908-1.9355-0.33073-2.9848l0.0083-0.22324c0.11057-4.4645 2.433-7.8978 5.1842-7.6646 2.7512 0.23311 4.8896 4.0435 4.779 8.508-0.0208 0.84008-0.11556 1.6482-0.28112 2.3978 4.9796 0.9741 10.324 3.448 17.198 7.4166-1.3555-2.4955-2.5653-4.745-3.7207-6.8874-1.8199-1.4106-3.7182-3.2464-7.5902-5.2338 2.6614 0.69155 4.567 1.4894 6.0523 2.3812-11.747-21.871-12.698-24.777-16.727-34.23z" fill-rule="evenodd"/><g transform="matrix(.23141 0 0 .23141 -26.057 -55.67)"><path d="m239.84 313.7v-5.2094h-1.946v-0.697h4.6816v0.697h-1.954v5.2094h-0.78162"/><path d="m243.39 313.7v-5.9064h1.1765l1.398 4.182c0.12892 0.38947 0.22293 0.6809 0.28202 0.87429 0.0671-0.21488 0.1719-0.53048 0.31426-0.94681l1.4142-4.1095h1.0516v5.9064h-0.75341v-4.9435l-1.7163 4.9435h-0.70506l-1.7083-5.0281v5.0281h-0.75342"/></g></g></svg>

assets/img/svg/3rd-party/bitwarden.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(1.9999 0 0 1.9999 .00059996 -560.11)" stroke-width=".016536"><path id="Background" d="m16.933 294.35c0 1.4612-1.1846 2.6458-2.6458 2.6458h-11.642c-1.4612 0-2.6458-1.1846-2.6458-2.6458v-11.642c0-1.4612 1.1846-2.6458 2.6458-2.6458h11.642c1.4612 0 2.6458 1.1846 2.6458 2.6458z" fill="#3c8dbc"/><path id="Shield" d="m12.26 289.16v-5.4092h-3.7863v9.6098c0.67042-0.35496 1.2705-0.74095 1.8002-1.1579 1.3241-1.0368 1.9861-2.051 1.9861-3.0427zm1.6228-6.4911v6.4911c0 0.48452-0.0943 0.96487-0.28307 1.4411-0.18873 0.47613-0.42264 0.89876-0.7015 1.2678-0.2789 0.36896-0.6113 0.7282-0.99736 1.0776-0.38583 0.3493-0.74242 0.6395-1.0692 0.87058-0.32681 0.23098-0.66767 0.44925-1.0227 0.65499-0.35491 0.20568-0.60711 0.34508-0.75635 0.41831-0.14941 0.0732-0.26908 0.12964-0.35929 0.16911-0.0676 0.0338-0.14089 0.0507-0.21967 0.0507-0.0789 0-0.15212-0.017-0.2198-0.0507-0.0902-0.0395-0.2099-0.0959-0.35924-0.16911-0.14925-0.0732-0.40144-0.21261-0.75646-0.41831-0.35495-0.20574-0.69587-0.42403-1.0226-0.65499-0.3268-0.23108-0.68331-0.52126-1.0692-0.87058-0.38599-0.34943-0.71841-0.70867-0.99738-1.0776-0.27889-0.36904-0.51275-0.79167-0.70148-1.2678-0.18879-0.4762-0.28315-0.95655-0.28315-1.4411v-6.4911c0-0.14652 0.0536-0.2733 0.16057-0.38034 0.10712-0.10707 0.23389-0.16065 0.38034-0.16065h9.7367c0.14647 0 0.2733 0.0536 0.38034 0.16065 0.10706 0.10704 0.16049 0.23382 0.16049 0.38034z" fill="#fff"/></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 stroke-width=".033073"><path id="Background" class="st0" d="m33.867 28.575c0 2.9236-2.368 5.2917-5.2917 5.2917h-23.283c-2.9236 0-5.2917-2.368-5.2917-5.2917v-23.283c0-2.9236 2.368-5.2917 5.2917-5.2917h23.283c2.9236 0 5.2917 2.368 5.2917 5.2917z" fill="#175ddc"/><path id="Identity" class="st1" d="m27.444 4.2532c-0.21497-0.21497-0.46964-0.32081-0.76068-0.32081h-19.5c-0.29435 0-0.5457 0.10583-0.76068 0.32081s-0.32081 0.46964-0.32081 0.76068v13.001c0 0.96904 0.18852 1.9315 0.56555 2.8873 0.37703 0.9525 0.84667 1.7992 1.4056 2.54 0.55893 0.73753 1.2237 1.4585 1.9976 2.1597 0.77391 0.70115 1.4883 1.2799 2.1398 1.7429 0.65484 0.46302 1.3361 0.89958 2.0472 1.313 0.71107 0.41341 1.2171 0.69122 1.5147 0.83674s0.53909 0.26128 0.71768 0.33734c0.1356 0.06615 0.28112 0.10253 0.43987 0.10253s0.30427-0.03307 0.43987-0.10253c0.1819-0.07937 0.42003-0.19182 0.72099-0.33734 0.29766-0.14552 0.80367-0.42664 1.5147-0.83674 0.71107-0.41341 1.3924-0.84997 2.0472-1.313 0.65484-0.46302 1.3692-1.0451 2.1431-1.7429 0.77391-0.70115 1.4387-1.4188 1.9976-2.1597 0.55893-0.74083 1.0253-1.5842 1.4056-2.54 0.37703-0.9525 0.56555-1.9149 0.56555-2.8873v-12.998c0.0033-0.29435-0.10583-0.54901-0.32081-0.76398zm-2.5135 13.884c0 4.7063-7.997 8.761-7.997 8.761v-20.181h7.997v11.42z" fill="#fff"/></g></svg>

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

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="128" height="128" version="1.1" viewBox="0 0 33.867 33.867" xmlns="http://www.w3.org/2000/svg"><g transform="matrix(.43429 0 0 .43429 -102.24 -35.595)" stroke-width=".26458"><path d="m313.4 119.93c-7.7343 13.52-22.298 22.631-38.991 22.631-16.692 0-31.256-9.1114-38.991-22.631 7.7346-13.521 22.299-22.632 38.991-22.632 16.693 0 31.257 9.1115 38.991 22.632" fill="#9acc01"/><path d="m298.61 144.6-6.8334-12.569c2.364-3.4422 3.7478-7.6102 3.7478-12.101 0-11.819-9.5811-21.4-21.4-21.4-11.819 0-21.4 9.5806-21.4 21.4 0 11.819 9.5811 21.4 21.4 21.4 4.4736 0 8.6265-1.3727 12.061-3.7206l12.422 6.9937z" fill="#231f20"/><path d="m284.91 125.24c0 5.7915-4.7106 10.502-10.502 10.502-5.7915 0-10.502-4.7106-10.502-10.502v-12.917c0-0.80301 0.65352-1.456 1.4565-1.456 0.80275 0 1.456 0.65299 1.456 1.456v7.8192c0 0.4236 0.34263 0.76623 0.76702 0.76623 8e-3 0 0.0167-2e-3 0.0257-2e-3s0.0164 2e-3 0.0251 2e-3c0.4236 0 0.7665-0.34263 0.7665-0.76623v-11.856c0-0.80354 0.65299-1.4571 1.4565-1.4571s1.4565 0.65352 1.4565 1.4571v11.166c0 0.42387 0.34343 0.76624 0.76677 0.76624 0.42254 0 0.76623-0.34264 0.76623-0.76624v-13.875c0-0.80301 0.65378-1.4555 1.4563-1.4555 0.80354 0 1.4568 0.65246 1.4568 1.4555v13.773c0 0.42413 0.34317 0.76703 0.7665 0.76703 0.42307 0 0.7665-0.34317 0.7665-0.76703v-11.37c0-0.80327 0.65352-1.4565 1.4565-1.4565 0.80327 0 1.456 0.65352 1.456 1.4565v14.555c-1.7436 0.16219-5.8518 1.0464-7.543 5.7222-0.14366 0.39793 0.0622 0.83767 0.46038 0.9824 0.0857 0.031 0.1741 0.0455 0.26009 0.0455 0.31379 0 0.60748-0.19474 0.72125-0.50536 1.7732-4.903 6.6273-4.7546 6.8313-4.7464l0.80354 0.0386v-8.0939c0-0.80301 0.7112-1.4565 1.5843-1.4565 0.87392 0 1.5841 0.65352 1.5841 1.4565v9.2625zm-1.5841-12.253c-0.57864 0-1.1192 0.15557-1.5843 0.41963v-5.4277c0-1.6486-1.3409-2.9901-2.9895-2.9901-0.53314 0-1.0327 0.14261-1.4666 0.38761-0.10398-1.555-1.3991-2.789-2.98-2.789-1.6484 0-2.9893 1.3409-2.9893 2.989v0.10001c-0.4318-0.2413-0.92763-0.381-1.4565-0.381-1.6481 0-2.9893 1.3409-2.9893 2.9901v1.4594c-0.44344-0.26035-0.95752-0.41222-1.5079-0.41222-1.6486 0-2.99 1.3404-2.99 2.9893v12.917c0 6.636 5.3991 12.035 12.036 12.035 6.636 0 12.035-5.3991 12.035-12.035v-9.2631c0-1.6484-1.3981-2.9893-3.1171-2.9893" fill="#9acc01"/></g></svg>

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

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="128" height="128" version="1.1" viewBox="0 0 33.867 33.867" xmlns="http://www.w3.org/2000/svg"><g transform="matrix(.70556 0 0 .70556 -5.6444 -5.6444)" clip-rule="evenodd" fill="#0dbd8b" fill-rule="evenodd"><path d="m25.28 10.88c0-1.5906 1.2894-2.88 2.88-2.88 10.604 0 19.2 8.5961 19.2 19.2 0 1.5906-1.2894 2.88-2.88 2.88s-2.88-1.2894-2.88-2.88c0-7.4227-6.0173-13.44-13.44-13.44-1.5906 0-2.88-1.2894-2.88-2.88z"/><path d="m38.72 53.12c0 1.5906-1.2894 2.88-2.88 2.88-10.604 0-19.2-8.5961-19.2-19.2 0-1.5906 1.2894-2.88 2.88-2.88 1.5905 0 2.88 1.2894 2.88 2.88 0 7.4227 6.0173 13.44 13.44 13.44 1.5906 0 2.88 1.2894 2.88 2.88z"/><path d="m10.88 38.72c-1.5906 0-2.88-1.2894-2.88-2.88 0-10.604 8.5961-19.2 19.2-19.2 1.5906 0 2.88 1.2894 2.88 2.88 0 1.5905-1.2894 2.88-2.88 2.88-7.4227 0-13.44 6.0173-13.44 13.44 0 1.5906-1.2894 2.88-2.88 2.88z"/><path d="m53.12 25.28c1.5906 0 2.88 1.2894 2.88 2.88 0 10.604-8.5961 19.2-19.2 19.2-1.5906 0-2.88-1.2894-2.88-2.88 0-1.5905 1.2894-2.88 2.88-2.88 7.4227 0 13.44-6.0173 13.44-13.44 0-1.5906 1.2894-2.88 2.88-2.88z"/></g></svg>

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

@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg width="100%" height="100%" viewBox="0 0 31 31" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;"><g><path d="M14,0.609c-3.927,0.345 -7.717,2.21 -10.235,5.037c-2.488,2.792 -3.765,6.08 -3.765,9.703c-0.005,2.361 0.507,4.479 1.581,6.566c0.74,1.439 1.555,2.544 2.736,3.719c0.871,0.867 1.338,1.252 2.336,1.916c2.102,1.403 4.585,2.29 7.114,2.538c0.815,0.081 2.573,0.071 3.374,-0.02c4.631,-0.532 8.69,-2.99 11.213,-6.8c1.55,-2.341 2.366,-5.041 2.366,-7.869c0,-1.358 -0.111,-2.27 -0.431,-3.541c-0.476,-1.916 -1.484,-3.942 -2.741,-5.528c-0.79,-0.993 -2.275,-2.356 -3.369,-3.096c-2.052,-1.378 -4.53,-2.295 -6.987,-2.579c-0.659,-0.076 -2.544,-0.106 -3.192,-0.046Zm2.406,0.705c2.671,0.197 5.128,1.028 7.271,2.457c0.892,0.593 1.388,1.003 2.209,1.824c1.596,1.586 2.625,3.207 3.365,5.295c0.263,0.75 0.567,2.022 0.663,2.812c0.097,0.76 0.087,2.701 -0.02,3.466c-0.517,3.698 -2.478,7.002 -5.533,9.302c-1.682,1.267 -3.628,2.154 -5.751,2.63c-1.763,0.39 -3.972,0.441 -5.826,0.127c-6.152,-1.039 -11.031,-5.863 -11.907,-11.776c-0.284,-1.91 -0.152,-4.058 0.354,-5.816c0.765,-2.635 2.164,-4.814 4.307,-6.719c2.868,-2.543 6.931,-3.891 10.868,-3.602Z" style="fill-rule:nonzero;"/><path d="M14.086,7.095c-0.629,0.329 -0.623,1.292 0.015,1.616c0.436,0.223 0.993,0.081 1.251,-0.314c0.294,-0.441 0.132,-1.069 -0.339,-1.307c-0.258,-0.132 -0.669,-0.132 -0.927,0.005Z" style="fill-rule:nonzero;"/><path d="M14.567,9.937c-0.061,0.081 -0.319,0.841 -0.517,1.536c-0.152,0.527 -0.511,1.773 -0.836,2.862c-0.101,0.35 -0.294,1.009 -0.43,1.47c-0.132,0.461 -0.325,1.119 -0.431,1.469c-0.101,0.35 -0.294,1.008 -0.431,1.469c-0.132,0.462 -0.324,1.12 -0.43,1.47c-0.102,0.349 -0.289,0.988 -0.411,1.419c-0.299,1.048 -0.471,1.514 -0.583,1.57c-0.05,0.031 -0.177,0.051 -0.283,0.051c-0.37,0 -0.426,0.04 -0.411,0.273l0.015,0.208l1.156,0.015l1.155,0.011l-0.015,-0.239l-0.015,-0.243l-0.37,-0.015c-0.335,-0.015 -0.375,-0.025 -0.426,-0.137c-0.066,-0.142 0,-0.527 0.188,-1.14c0.065,-0.208 0.238,-0.79 0.38,-1.292c0.141,-0.501 0.334,-1.165 0.43,-1.469c0.091,-0.309 0.284,-0.968 0.431,-1.47c0.142,-0.501 0.334,-1.165 0.431,-1.469c0.091,-0.309 0.283,-0.968 0.43,-1.469c0.431,-1.505 0.623,-2.123 0.664,-2.174c0.025,-0.025 0.086,0.056 0.142,0.177c0.051,0.122 0.973,1.992 2.042,4.15c1.069,2.159 2.265,4.57 2.65,5.361l0.704,1.429l0.851,0c0.466,0 0.851,-0.021 0.851,-0.041c0,-0.02 -0.38,-0.801 -0.841,-1.733c-2.979,-5.994 -4.909,-9.921 -5.234,-10.64c-0.147,-0.319 -0.349,-0.765 -0.451,-0.988c-0.223,-0.481 -0.293,-0.557 -0.405,-0.421Z" style="fill-rule:nonzero;"/></g></svg>

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

@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg width="100%" height="100%" viewBox="0 0 31 31" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;"><g><path d="M30.082,11.129l0,1.526l-15.02,9.23l-11.318,-5.551l0.022,-0.855l11.253,5.54l14.305,-8.786l0,-0.628l-13.504,-6.514l-15.063,9.317l0,4.166l14.262,7.055l14.889,-9.133l0.422,0.649l-15.268,9.35l-15.062,-7.445l0,-5.064l15.777,-9.761l14.305,6.904Z" style="fill:#222;fill-rule:nonzero;"/><path d="M29.887,18.163l0.216,-1.364l-1.32,-0.227l0.087,-0.53l1.85,0.314l-0.303,1.893l-0.53,-0.086Z" style="fill:#222;fill-rule:nonzero;"/></g></svg>

assets/img/svg/3rd-party/nixos.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="linearGradient4328" x1="200.6" x2="290.09" y1="351.41" y2="506.19" gradientTransform="translate(70.65 -1055.2)" gradientUnits="userSpaceOnUse"><stop stop-color="#699ad7" offset="0"/><stop stop-color="#7eb1dd" offset=".24345"/><stop stop-color="#7ebae4" offset="1"/></linearGradient><linearGradient id="linearGradient4330" x1="-584.2" x2="-496.3" y1="782.34" y2="937.71" gradientTransform="translate(864.7 -1491.3)" gradientUnits="userSpaceOnUse"><stop stop-color="#415e9a" offset="0"/><stop stop-color="#4a6baf" offset=".23169"/><stop stop-color="#5277c3" offset="1"/></linearGradient></defs><g transform="matrix(.067518 0 0 .067518 -10.566 65.26)"><path id="path3336-6" d="m309.55-710.39 122.2 211.68-56.157 0.5268-32.624-56.869-32.856 56.565-27.902-0.011-14.291-24.69 46.81-80.49-33.229-57.826z" fill="url(#linearGradient4328)" fill-rule="evenodd"/><use transform="rotate(60 407.11 -715.79)" width="100%" height="100%" xlink:href="#path3336-6"/><use transform="rotate(-60 407.31 -715.7)" width="100%" height="100%" xlink:href="#path3336-6"/><use transform="rotate(180 407.42 -715.76)" width="100%" height="100%" xlink:href="#path3336-6"/><path id="path4260-0" d="m309.55-710.39 122.2 211.68-56.157 0.5268-32.624-56.869-32.856 56.565-27.902-0.011-14.291-24.69 46.81-80.49-33.229-57.826z" color="#000000" color-rendering="auto" fill="url(#linearGradient4330)" fill-rule="evenodd" image-rendering="auto" shape-rendering="auto" solid-color="#000000" style="isolation:auto;mix-blend-mode:normal"/><use transform="rotate(120 407.34 -716.08)" width="100%" height="100%" xlink:href="#path4260-0"/><use transform="rotate(240 407.29 -715.87)" width="100%" height="100%" xlink:href="#path4260-0"/></g></svg>

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

@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg width="100%" height="100%" viewBox="0 0 31 31" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;"><g><path d="M3.84,0l0,15.36l11.52,-7.679" style="fill:#211f20;fill-rule:nonzero;"/><path d="M3.84,15.36l0,15.36l11.52,-7.679" style="fill:#737373;fill-rule:nonzero;"/><path d="M15.36,7.679l0,15.36l11.52,-7.679" style="fill:#f1680d;fill-rule:nonzero;"/></g></svg>

assets/img/svg/3rd-party/riotim.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 stroke-linecap="round" stroke-width=".84849"><path d="m13.274 9.8153v4.7835l4.8651-5e-3c0.06178 0 0.11816-0.0017 0.17424-0.0053 1.2792-0.08418 2.2791-1.1313 2.2791-2.3838 0-1.3178-1.0981-2.3894-2.4485-2.3894zm-4.8116 23.626c-2.6572 0-4.8116-2.1021-4.8116-4.6954v-8.9488c-0.01737-0.16226-0.02676-0.32729-0.02676-0.49427-2.84e-4 -0.17004 0.0088-0.33785 0.02676-0.50344v-13.68c0-2.5933 2.1544-4.6957 4.8116-4.6957h9.6816c6.6565 0 12.072 5.2847 12.072 11.78 0 6.176-4.9431 11.338-11.253 11.753-0.2682 0.01806-0.54465 0.02723-0.81854 0.02723l-4.87 0.0047v4.7568c0 2.5933-2.1541 4.6954-4.8116 4.6954z" fill="#a2ddef"/><path d="m13.274 9.8153v4.7835l4.8651-5e-3c0.06178 0 0.11816-0.0017 0.17424-0.0053 1.2792-0.08418 2.2791-1.1313 2.2791-2.3838 0-1.3178-1.0981-2.3894-2.4485-2.3894zm-9.6232 18.931v-23.626c0-2.5933 2.1544-4.6957 4.8116-4.6957h9.6816c6.6565 0 12.072 5.2847 12.072 11.78 0 6.176-4.9431 11.338-11.253 11.753-0.2682 0.01806-0.54465 0.02723-0.81854 0.02723l-4.87 0.0047v4.7568c0 2.5933-2.1541 4.6954-4.8116 4.6954-2.6572 3e-6 -4.8116-2.1021-4.8116-4.6954z" fill="none" stroke="#368bd6"/><path d="m8.4621 28.746v-23.626h9.6816c4.0096 0 7.2601 3.172 7.2601 7.0848 0 3.7505-2.9863 6.8203-6.7647 7.0684-0.16399 0.01083-0.32884 0.01639-0.4954 0.01639l-9.7083 0.0094" fill="none" stroke="#368bd6"/><path id="Combined-Shape" d="m12.427 2.4269c0.73768 1.0272 1.021 2.2735 0.79776 3.5079-0.2235 1.2352-0.92673 2.3113-1.9802 3.0306-2.1749 1.485-5.1834 0.96797-6.7063-1.1527-0.73768-1.0272-1.021-2.2732-0.79747-3.5082 0.22321-1.235 0.92644-2.3113 1.9802-3.0303 2.1749-1.485 5.1831-0.96797 6.7061 1.1527zm13.016 31.012c-1.5164 0-3.0082-0.69736-3.9447-2.0012l-6.8003-9.4702c-1.5249-2.1238-0.99677-5.0519 1.1793-6.5397 2.176-1.4889 5.1766-0.97325 6.7015 1.1505l6.8003 9.4702c1.5252 2.1238 0.99705 5.0519-1.179 6.5397-0.84046 0.57484-1.8036 0.85073-2.7571 0.85073z" fill="#368bd6"/></g></svg>

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

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="128" height="128" clip-rule="evenodd" fill-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="1.4142" version="1.1" xml:space="preserve" xmlns="http://www.w3.org/2000/svg"><g transform="matrix(.83711 0 0 .83711 16.201 .088026)" stroke-width="1.1946"><g stroke-width="1.1946"><g fill-rule="nonzero" stroke-width="1.1946"><path d="m87.5 6.548v86.4l-29.5 17c-0.597 0.299-1.303 0.299-1.9 0l-29.5-17v-86.4l-20.9 12.1c-3.528 2.042-5.706 5.824-5.7 9.9v86.4c0.021 4.07 2.191 7.839 5.7 9.9l45.7 26.4c3.533 1.998 7.867 1.998 11.4 0l45.7-26.4c3.528-2.042 5.706-5.824 5.7-9.9v-86.4c-0.021-4.07-2.191-7.839-5.7-9.9z" fill="#2d2e83"/><path d="m87.5 6.548v86.4l-29.5 17c-0.597 0.299-1.303 0.299-1.9 0l-29.5-17v-86.4l-20.9 12.1c-3.528 2.042-5.706 5.824-5.7 9.9v86.4c0.021 4.07 2.191 7.839 5.7 9.9l45.7 26.4c3.533 1.998 7.867 1.998 11.4 0l45.7-26.4c3.528-2.042 5.706-5.824 5.7-9.9v-86.4c-0.021-4.07-2.191-7.839-5.7-9.9z" fill="url(#_Linear1)"/><path d="m114.2 28.548c-0.021-4.07-2.191-7.839-5.7-9.9l-30.4-17.6c-2.337-1.398-5.263-1.398-7.6 0-2.354 1.359-3.807 3.882-3.8 6.6v66.6c0.021 4.07 2.191 7.839 5.7 9.9l36.1 20.9c3.528 2.042 5.706 5.824 5.7 9.9z" fill="#1fc2d7"/><path d="m0 28.548c0.021-4.07 2.191-7.839 5.7-9.9l30.5-17.6c2.337-1.398 5.263-1.398 7.6 0 2.354 1.359 3.807 3.882 3.8 6.6v66.6c-0.021 4.07-2.191 7.839-5.7 9.9l-36.1 20.9c-3.528 2.042-5.706 5.824-5.7 9.9z" fill="#1fc2d7"/></g></g></g><defs><linearGradient id="_Linear1" x2="1" gradientTransform="matrix(136.42 0 0 136.42 -19.353 95.041)" gradientUnits="userSpaceOnUse"><stop stop-color="#0d0d27" offset="0"/><stop stop-color="#10102f" offset=".02"/><stop stop-color="#1a1b4d" offset=".1"/><stop stop-color="#232365" offset=".19"/><stop stop-color="#282976" offset=".28"/><stop stop-color="#2c2d80" offset=".38"/><stop stop-color="#2d2e83" offset=".5"/><stop stop-color="#2c2d80" offset=".62"/><stop stop-color="#282976" offset=".72"/><stop stop-color="#232365" offset=".81"/><stop stop-color="#1a1b4d" offset=".9"/><stop stop-color="#10102f" offset=".98"/><stop stop-color="#0d0d27" offset="1"/></linearGradient></defs></svg>

assets/img/svg/3rd-party/whonix.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 stroke-width=".1341"><path d="m17.336 3.5727e-7h-0.62626c-4.1469 0-7.621 3.3074-7.621 7.455v10.012c0 4.1474 3.4741 7.476 7.621 7.476h0.62626c4.1469 0 7.4429-3.3286 7.4429-7.476v-10.012c0-4.1476-3.296-7.455-7.4429-7.455zm4.0903 13.798c0 2.5527-2.0032 4.708-4.5566 4.708h-0.20947c-2.5533 0-4.6212-2.1553-4.6212-4.708v-6.4729c0-2.5533 2.0679-4.6433 4.6212-4.6433h0.20947c2.5533 0 4.5566 2.09 4.5566 4.6433z" fill="#c3c3d1"/><circle cx="16.933" cy="21.636" r="12.23" fill="#c3c3d1"/><path d="m21.734 18.136-0.10916-0.1164c-0.02682-0.02803-0.05472-0.05699-0.08033-0.08449h-0.0023l-4.6797-4.9303-4.6782 4.9303c-0.0052 0.0052-0.01234 0.01167-0.01757 0.0169l-0.08315 0.08837-0.08918 0.09562-0.0042 0.0035c-1.125 1.2269-1.7442 2.8146-1.7442 4.4716 0 3.6496 2.9677 6.6168 6.6168 6.6168 3.65 0 6.6195-2.9672 6.6195-6.6168 0-1.657-0.61916-3.2446-1.7448-4.4716z" fill="#20aae6"/></g><g transform="matrix(.1341 0 0 .1341 -4.5903 -4.5595)" clip-rule="evenodd" fill-rule="evenodd"><path d="m196.35 202.61c0 20.085-16.274 36.365-36.364 36.365-20.086 0-36.361-16.279-36.361-36.365s16.274-36.361 36.361-36.361c20.089 0 36.364 16.274 36.364 36.361z" fill="#fff"/><path d="m182.34 202.61c0 12.347-10.005 22.351-22.351 22.351-12.343 0-22.347-10.004-22.347-22.351 0-12.344 10.004-22.347 22.347-22.347 12.347-1e-3 22.351 10.003 22.351 22.347z" fill="#d8e620"/><circle cx="159.99" cy="202.61" r="10.008" fill="#fff"/></g></svg>

assets/img/svg/team/dawid.svg

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

index.html

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

nginx/010-headers.conf

@@ -1,7 +1,7 @@
 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://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 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 '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';

pages/about/about.html

@@ -60,31 +60,6 @@ mastodon="https://social.privacytools.io/@blacklight447"
 blog="blacklight447"
 %}
 
-{% include team.html
-avatar="danarel.png"
-name="Dan Arel"
-role="Blogging & Education"
-bio="I'm an author, columnist, and privacy advocate whose work has appeared in Time, Huff Post, OpenSource, and more."
-website="https://danarel.com"
-email="mailto:dan@privacytools.io"
-keys="https://www.danarel.com/keys/"
-twitter="danarel"
-mastodon="https://mastodon.technology/@danarel"
-blog="danarel"
-%}
-
-{% include team.html
-avatar="dawid.svg"
-name="Dawid Potocki"
-role="Developer"
-bio="I'm a student interested in software development. I help improve PrivacyTools and promote using free libre software."
-website="https://dawidpotocki.com"
-email="https://dawidpotocki.com/accounts/#email"
-keys="https://dawidpotocki.com/accounts/#pgp"
-mastodon="https://social.privacytools.io/@dawidpotocki"
-blog="dawidpotocki"
-%}
-
 {% include team.html
 avatar="dngray.png"
 name="dngray"
@@ -96,19 +71,6 @@ keys="https://keybase.io/dngray"
 mastodon="https://social.privacytools.io/@dngray"
 %}
 
-{% include team.html
-avatar="nitrohorse.png"
-name="Andreas Basurto"
-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/"
-email="mailto:nitrohorse@privacytools.io"
-keys="https://nitrohorse.com/keys"
-mastodon="https://nitro.horse/@andreas"
-blog="nitrohorse"
-%}
-
 {% include team.html
 avatar="trai_dep.png"
 name="trai_dep"
@@ -145,6 +107,31 @@ website="https://mikaela.info/"
 keys="https://gitea.blesmrt.net/mikaela/shell-things/src/branch/master/.mikaela/keys"
 emeritus=true
 %}
+
+{% include team.html
+name="Dan Arel"
+website="https://danarel.com"
+keys="https://www.danarel.com/keys/"
+blog="danarel"
+emeritus=true
+%}
+
+{% include team.html
+name="Dawid Potocki"
+website="https://dawidpotocki.com"
+keys="https://dawidpotocki.com/accounts/#pgp"
+blog="dawidpotocki"
+emeritus=true
+%}
+
+{% include team.html
+name="Andreas Basurto"
+nick="nitrohorse"
+website="https://nitrohorse.com/"
+keys="https://nitrohorse.com/keys"
+blog="nitrohorse"
+emeritus=true
+%}
 </div>
 
 <div class="row">
@@ -155,7 +142,7 @@ emeritus=true
     <p><a href="https://github.com/privacytools/privacytools.io/issues"><i class="fab fa-github fa-lg fa-fw"></i> Open an issue on GitHub</a></p>
     <p><a href="https://www.reddit.com/r/privacytoolsIO/"><i class="fab fa-reddit fa-lg fa-fw"></i> Suggest something new on our subreddit</a></p>
     <p>For complete transparency, software and providers will only be considered for this website after discussions take place on our GitHub issue tracker. We of course don't make any changes in secret.</p>
-    <p>Join our Matrix room at <code>#general:privacytools.io</code> 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>Join our Matrix room at <code>#general:privacytools.io</code> to chat with us and other members about this site and privacy in general! If you need a Matrix account, you can sign up with our own homeserver (<code>https://chat.privacytools.io</code>) using <a href="https://riot.privacytools.io">Riot</a>.</p>
     <p>You can also email the team at <a itemprop="email" href="mailto:support@privacytools.io">support@privacytools.io</a> and find us on <a itemprop="sameAs" href="https://twitter.com/privacytoolsIO">Twitter</a> and <a itemprop="sameAs" href="https://social.privacytools.io/@privacytools">Mastodon</a>.</p>
     <link itemprop="sameAs" href="https://blog.privacytools.io">
     <link itemprop="sameAs" href="https://www.youtube.com/channel/UCen3taxHtzByXV8Da73B1Vg">

pages/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="{% if jekyll.environment == "production" and site.pull_cdn %}{{site.pull_cdn}}{% endif %}/assets/img/svg/layout/brand/horizontal.svg" width="450px" alt="{{ site.name }}">
+          <img class="img-fluid" src="/assets/img/svg/layout/brand/horizontal.svg" width="450px" alt="{{ site.name }}">
         </a>
       </div>
 

pages/old.html

@@ -63,6 +63,10 @@ permalink: /classic/
 
 {% include sections/social-news-aggregator.html %}
 
+{% include sections/decentralized-video.html %}
+
+{% include sections/video-frontends.html %}
+
 {% include sections/dns.html %}
 
 {% include sections/notebooks.html %}
@@ -73,12 +77,14 @@ permalink: /classic/
 
 {% include sections/operating-systems.html %}
 
-{% include sections/live-operating-systems.html %}
+{% include sections/tor-operating-systems.html %}
 
-{% include sections/mobile-operating-systems.html %}
+{% include sections/android-operating-systems.html %}
 
 {% include sections/android-addons.html %}
 
+{% include sections/other-mobile-operating-systems.html %}
+
 {% include sections/router-firmware.html %}
 
 {% include sections/windows10.html %}

pages/os.html

@@ -13,41 +13,14 @@ description: "Even your own computer could be compromising your privacy. Discove
   <li><a href="#win10"><i class="fas fa-link"></i> Don't use Windows 10 - It's a privacy nightmare</a></li>
 </ul>
 
-<h4 id="cpuvulns">Remember to check CPU vulnerability mitigations</h4>
+{% include sections/tor-operating-systems.html %}
 
-<p><em><a href="https://support.microsoft.com/en-us/help/4073757/protect-windows-devices-from-speculative-execution-side-channel-attack">This also affects Windows 10</a>, but it doesn't expose this information or mitigation instructions as easily. MacOS users check <a href="https://support.apple.com/en-us/HT210108">How to enable full mitigation for Microarchitectural Data Sampling (MDS) vulnerabilities on Apple Support</a>.</em></p>
+{% include sections/android-operating-systems.html %}
-
-<p>When running a recent enough Linux kernel, you can check the CPU vulnerabilities it detects by <code>tail -n +1 /sys/devices/system/cpu/vulnerabilities/*</code>. By using <code>tail -n +1</code> instead of <code>cat</code>, the file names are also visible.</p>
-
-<p>
-    In case you have an Intel CPU, you may notice "SMT vulnerable" display after running the <code>tail</code> command. To mitigate this, disable <a href="https://en.wikipedia.org/wiki/Hyper-threading">hyper-threading</a> from the UEFI/BIOS. You can also take the following mitigation steps below if your system/distribution uses GRUB and supports <code>/etc/default/grub.d/</code>:
-</p>
-
-<ol>
-  <li><code>sudo mkdir /etc/default/grub.d/</code> to create a directory for additional grub configuration</li>
-  <li><code>echo GRUB_CMDLINE_LINUX_DEFAULT="$GRUB_CMDLINE_LINUX_DEFAULT l1tf=full,force mds=full,nosmt mitigations=auto,nosmt nosmt=force" | sudo tee /etc/default/grub.d/mitigations.cfg</code> to create a new grub config file source with the echoed content</li>
-  <li><code>sudo grub-mkconfig -o /boot/grub/grub.cfg</code> to generate a new grub config file including these new kernel boot flags</li>
-  <li><code>sudo reboot</code> to reboot</li>
-  <li>after the reboot, check <code>tail -n +1 /sys/devices/system/cpu/vulnerabilities/*</code> again to see that everything referring to SMT now says "SMT disabled."</li>
-</ol>
-
-<h5>Further reading</h5>
-
-<ul>
-  <li><a href="https://cpu.fail/">CPU.fail</a></li>
-  <li><a href="https://www.kernel.org/doc/html/latest/admin-guide/hw-vuln/">Hardware vulnerabilities index on The Linux kernel user's and administrator's guide</a></li>
-  <li><a href="https://www.cyberciti.biz/faq/install-update-intel-microcode-firmware-linux/">How to install/update CPU microcode firmware on Linux</a> - Regardless of your CPU manufacturer, you should always install the latest microcode packages available to be protected from CPU vulnerabilities, especially if the command above reports <strong>no microcode</strong> in its output.</li>
-  <li><a href="https://www.kernel.org/doc/html/latest/admin-guide/hw-vuln/mds.html">MDS - Microarchitectural Data Sampling on The Linux kernel user's and administrator's guide</a></li>
-  <li><a href="https://mdsattacks.com/">RIDL and Fallout: MDS attacks on mdsattacks.com</a></li>
-  <li><a href="https://en.wikipedia.org/wiki/Simultaneous_multithreading">Simultaneous multithreading on Wikipedia</a></li>
-</ul>
-
-{% include sections/live-operating-systems.html %}
-
-{% include sections/mobile-operating-systems.html %}
 
 {% include sections/android-addons.html %}
 
+{% include sections/other-mobile-operating-systems.html %}
+
 {% include sections/router-firmware.html %}
 
 {% include sections/windows10.html %}

pages/providers/dns.html

@@ -8,121 +8,122 @@ breadcrumb: "DNS"
 
 {% include sections/dns.html %}
 
-<h4>Terms</h4>
+<h1 id="dns-desktop-clients" class="anchor">
+  <a href="#dns-desktop-clients">
+    <i class="fas fa-link anchor-icon"></i>
+  </a> Encrypted DNS Client Recommendations for Desktop
+</h1>
 
-<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>
+	include cardv2.html
-    <ul>
+	title="Unbound"
-        <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.
+	image="/assets/img/svg/3rd-party/unbound.svg"
-        {% include badge.html
+	description='A validating, recursive, caching DNS resolver, supporting DNS-over-TLS, and has been <a href="https://ostif.org/our-audit-of-unbound-dns-by-x41-d-sec-full-results/">independently audited</a>.'
-        color="warning"
+	website="https://nlnetlabs.nl/projects/unbound/about/"
-        icon="fas fa-exclamation-triangle"
+	forum="https://forum.privacytools.io/t/discussion-unbound/3563"
-        tooltip="In other words automatic mode leaves your DNS traffic vulnerable to SSL strip and MITM attacks."
+	github="https://github.com/NLnetLabs/unbound"
-        %}</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.
-    {% 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>
 
-<h4>How to verify DNS is encrypted</h4>
+{%
+	include cardv2.html
+	title="dnscrypt-proxy"
+	image="/assets/img/svg/3rd-party/dnscrypt-proxy.svg"
+	description='A DNS proxy with support for DNSCrypt, DNS-over-HTTPS, and <a href="https://github.com/DNSCrypt/dnscrypt-protocol/blob/master/ANONYMIZED-DNSCRYPT.txt">Anonymized DNSCrypt</a>, a <a href="https://github.com/DNSCrypt/dnscrypt-proxy/wiki/Anonymized-DNS">relay-based protocol that the hides client IP address.</a>'
+	website="https://github.com/DNSCrypt/dnscrypt-proxy/wiki"
+	forum="https://forum.privacytools.io/t/discussion-dnscrypt-proxy/1498"
+	github="https://github.com/DNSCrypt/dnscrypt-proxy"
+%}
 
-<ul>
+{%
-  <li>DoH / DoT
+	include cardv2.html
-    <ul>
+	title="Stubby"
-      <li>Check <a href="https://www.dnsleaktest.com/">DNSLeakTest.com</a>.
+	image="/assets/img/png/3rd-party/stubby.png"
-        {% include badge.html
+	description='An application that acts as a local DNS-over-TLS stub resolver. Stubby can be used in <a href="https://dnsprivacy.org/wiki/display/DP/DNS+Privacy+Clients#DNSPrivacyClients-Unbound/Stubbycombination">combination with Unbound</a> by managing the upstream TLS connections (since Unbound cannot yet re-use TCP/TLS connections) with Unbound providing a local cache.'
-        color="warning"
+	website="https://dnsprivacy.org/wiki/display/DP/DNS+Privacy+Daemon+-+Stubby"
-        icon="fas fa-exclamation-triangle"
+	forum="https://forum.privacytools.io/t/discussion-stubby/3582"
-        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."
+	github="https://github.com/getdnsapi/stubby"
-        %}</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.
-        {% 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>
-  <li>DNSSEC - Check <a href="https://dnssec.vs.uni-due.de/">DNSSEC Resolver Test by Matthäus Wander</a>.</li>
-  <li>QNAME Minimization - Run <code>dig +short txt qnamemintest.internet.nl</code> from the command-line (taken from <a href="https://nlnetlabs.nl/downloads/presentations/unbound_qnamemin_oarc24.pdf">this NLnet Labs presentation</a>). If you are on Windows 10, run <code>Resolve-DnsName -Type TXT -Name qnamemintest.internet.nl</code> from the PowerShell. You should see this display: <code>"HOORAY - QNAME minimisation is enabled on your resolver :)!"</code></li>
-</ul>
 
-<h3 id="clients">Software suggestions and Additional Information</h3>
+{%
+	include cardv2.html
+	title="Firefox's built-in DNS-over-HTTPS resolver"
+	image="/assets/img/svg/3rd-party/firefox_browser.svg"
+	description='Firefox comes with built-in DNS-over-HTTPS support for <a href="https://blog.mozilla.org/blog/2020/02/25/firefox-continues-push-to-bring-dns-over-https-by-default-for-us-users/">NextDNS and Cloudflare</a> but users can manually any other DoH resolver.'
+	labels="color==warning::icon==fas fa-exclamation-triangle::link==https://developers.cloudflare.com/1.1.1.1/privacy/firefox::text==Warning::tooltip==Cloudflare logs a limited amount of data about the DNS requests that are sent to their custom resolver for Firefox."
+	website="https://support.mozilla.org/en-US/kb/firefox-dns-over-https"
+	privacy-policy="https://wiki.mozilla.org/Security/DOH-resolver-policy"
+	forum="https://forum.privacytools.io/t/discussion-firefox-s-built-in-dns-over-https-resolver/3564"
+%}
 
-<ul>
+<h1 id="dns-android-clients" class="anchor">
-  <li><strong>Encrypted DNS clients for desktop:</strong>
+	<a href="#dns-android-clients">
-    <ul>
+		<i class="fas fa-link anchor-icon"></i>
-      <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.
+	</a> Encrypted DNS Client Recommendations for Android
-        {% include badge.html
+</h1>
-        color="warning"
+
-        icon="fas fa-exclamation-triangle"
+{%
-        link="https://developers.cloudflare.com/1.1.1.1/commitment-to-privacy/privacy-policy/firefox/"
+	include cardv2.html
-        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;"
+	title="Android 9's built-in DNS-over-TLS resolver"
-        %}
+	image="/assets/img/svg/3rd-party/android.svg"
-        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>
+	description="Android 9 (Pie) comes with built-in DNS-over-TLS support without the need for a 3rd-party application."
-          <ul>
+	labels="color==warning::icon==fas fa-exclamation-triangle::link==https://developers.google.com/speed/public-dns/docs/using#android_9_pie_or_later::text==Warning::tooltip==Android 9's DoT settings have no effect when used concurrently with VPN-based apps which override the DNS."
-              <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>
+	website="https://support.google.com/android/answer/9089903#private_dns"
-              <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>
+	forum="https://forum.privacytools.io/t/discussion-android-9s-built-in-dns-over-tls-resolver/3562"
-          </ul>
+%}
-    </ul>
+
-  </li>
+{%
-  <li><strong>Encrypted DNS clients for mobile:</strong>
+	include cardv2.html
-    <ul>
+	title="Nebulo"
-      <li><em>Android 9</em> comes with a DoT client by <a href="https://support.google.com/android/answer/9089903">default</a>.
+	image="/assets/img/png/3rd-party/nebulo.png"
-        {% include badge.html
+	description='An open-source Android client supporting DNS-over-HTTPS and DNS-over-TLS, caching DNS responses, and locally logging DNS queries.'
-        color="warning"
+	website="https://git.frostnerd.com/PublicAndroidApps/smokescreen/-/blob/master/README.md"
-        icon="fas fa-exclamation-triangle"
+	privacy-policy="https://smokescreen.app/privacypolicy"
-        link="https://www.quad9.net/private-dns-quad9-android9/"
+	forum="https://forum.privacytools.io/t/discussion-nebulo/3565"
-        tooltip="...but with some caveats"
+	fdroid="https://git.frostnerd.com/PublicAndroidApps/smokescreen#f-droid"
-        %}</li>
+	googleplay="https://play.google.com/store/apps/details?id=com.frostnerd.smokescreen"
-        <ul>
+	source="https://git.frostnerd.com/PublicAndroidApps/smokescreen"
-          <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"
+<h1 id="dns-ios-clients" class="anchor">
-            icon="fas fa-exclamation-triangle"
+	<a href="#dns-ios-clients">
-            tooltip="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-link anchor-icon"></i>
-            %}</li>
+	</a> Encrypted DNS Client Recommendations for iOS
-        </ul>
+</h1>
-      <li><em><a href="https://apps.apple.com/app/id1452162351">DNSCloak</a></em> - An <a href="https://github.com/s-s/dnscloak">open-source</a> DNSCrypt and DoH client for iOS by <td><a data-toggle="tooltip" data-placement="bottom" data-original-title='"A charitable non-profit host organization for international Free Software projects."' href="https://techcultivation.org/">the Center for the Cultivation of Technology gemeinnuetzige GmbH</a>.</li>
+
-      <li><em><a href="https://git.frostnerd.com/PublicAndroidApps/smokescreen/blob/master/README.md">Nebulo</a></em> - An open-source application for Android supporting DoH and DoT. It also supports caching DNS responses and locally logging DNS queries.</li>
+{%
-    </ul>
+	include cardv2.html
-  </li>
+	title="DNSCloak"
-  <li><strong>Local DNS servers:</strong>
+	image="/assets/img/png/3rd-party/dnscloak.png"
-    <ul>
+	description='An open-source iOS client supporting DNS-over-HTTPS, DNSCrypt, and <a href="https://github.com/DNSCrypt/dnscrypt-proxy/wiki">dnscrypt-proxy</a> options such as caching DNS responses, locally logging DNS queries, and custom block lists. Users can <a href="https://blog.privacytools.io/adding-custom-dns-over-https-resolvers-to-dnscloak/">add custom resolvers by DNS stamp</a>.'
-      <li><em><a href="https://dnsprivacy.org/wiki/display/DP/DNS+Privacy+Daemon+-+Stubby">Stubby</a></em> - An open-source application for Linux, macOS, and Windows that acts as a local DNS Privacy stub resolver using DoT.</li>
+	website="https://github.com/s-s/dnscloak/blob/master/README.md"
-      <li><em><a href="https://nlnetlabs.nl/projects/unbound/about/">Unbound</a></em> - a validating, recursive, caching DNS resolver. It can also be ran network-wide and has supported DNS-over-TLS since version 1.7.3.</li>
+	privacy-policy="https://drive.google.com/file/d/1050No_pU74CAWUS5-BwQWyO2x_aiMzWc/view"
-      <ul>
+	forum="https://forum.privacytools.io/t/discussion-dnscloak/3566"
-          <li>See also <a href="https://www.ctrl.blog/entry/unbound-tls-forwarding.html">Actually secure DNS over TLS in Unbound on ctrl.blog</a>.</li>
+	ios="https://apps.apple.com/app/id1452162351"
-      </ul>
+	github="https://github.com/s-s/dnscloak"
-    </ul>
+%}
-  </li>
+
-  <li><strong>Network wide DNS servers:</strong>
+<h2 id="dns-definitions" class="anchor">
-    <ul>
+	<a href="#dns-definitions">
-      <li><em><a href="https://pi-hole.net/">Pi-hole</a></em> - A network-wide DNS server mainly for the Raspberry Pi. Blocks ads, tracking, and malicious domains for all devices on your network.</li>
+		<i class="fas fa-link anchor-icon"></i>
-      <li><em><a href="https://gitlab.com/quidsup/notrack">NoTrack</a></em> - A network-wide DNS server like Pi-hole for blocking ads, tracking, and malicious domains.</li>
+	</a> Definitions
-    </ul>
+</h2>
-  </li>
+
-  <li><strong>Further reading:</strong>
+<h4>DNS-over-TLS (DoT)</h4>
-    <ul>
+<p>
-      <li>On Firefox, DoH and ESNI</li>
+  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.
-          <ul>
+</p>
-              <li><a href="https://wiki.mozilla.org/Trusted_Recursive_Resolver">Trusted Recursive Resolver (DoH) on MozillaWiki</a></li>
+
-              <li><a href="https://bugzilla.mozilla.org/show_bug.cgi?id=1500289">Firefox bug report requesting the ability to use ESNI without DoH</a></li>
+<h4>DNS-over-HTTPS (DoH)</h4>
-              <li><a href="https://bugzilla.mozilla.org/show_bug.cgi?id=1542754">Firefox bug report requesting the ability to use Android 9+'s Private DNS (DoT) and benefit from encrypted SNI without having to enable DoH</a></li>
+<p>
-              <li><a href="https://blog.cloudflare.com/encrypted-sni/">Encrypt it or lose it: how encrypted SNI works on Cloudflare blog</a></li>
+  Similar to DoT, but uses HTTPS instead, being indistinguishable from "normal" HTTPS traffic on port 443 and more difficult to block. {% include badge.html color="warning" text="Warning" tooltip="DoH contains metadata such as user-agent (which may include system information) that is sent to the DNS server." link="https://tools.ietf.org/html/rfc8484#section-8.2" icon="fas fa-exclamation-triangle" %}
-          </ul>
+</p>
-      <li><a href="https://www.isc.org/blogs/qname-minimization-and-privacy/">QNAME Minimization and Your Privacy</a> by the Internet Systems Consortium (ISC)</li>
+
-      <li><a href="https://www.isc.org/dnssec/">DNSSEC and BIND 9</a> by the ISC</li>
+<h4>DNSCrypt</h4>
-    </ul>
+<p>
-  </li>
+  With an <a href="https://dnscrypt.info/protocol/">open specification</a>, DNSCrypt is an older, yet robust method for encrypting DNS.
-</ul>
+</p>
+
+<h4>Anonymized DNSCrypt</h4>
+<p>
+  A <a href="https://github.com/DNSCrypt/dnscrypt-proxy/wiki/Anonymized-DNS">lightweight protocol</a> that hides the client IP address by using pre-configured relays to forward encrypted DNS data. This is a relatively new protocol created in 2019 currently only supported by <a href="#dns-desktop-clients">dnscrypt-proxy</a> and a limited number of <a href="https://github.com/DNSCrypt/dnscrypt-resolvers/blob/master/v2/relays.md">relays</a>.
+</p>

pages/providers/email.html

@@ -217,15 +217,15 @@ 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="{% if jekyll.environment == "production" and site.pull_cdn %}{{site.pull_cdn}}{% endif %}/assets/img/svg/3rd-party/anonaddy.svg"
+    <img src="/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"
+        data-theme-src="/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"
+    <img src="/assets/img/svg/3rd-party/simplelogin.svg"
          width="180rem" class="img-fluid float-left mr-3"
          alt="SimpleLogin">
   </a>
@@ -238,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="{% if jekyll.environment == "production" and site.pull_cdn %}{{site.pull_cdn}}{% endif %}/assets/img/svg/3rd-party/mail-in-a-box.svg"
+    <img src="/assets/img/svg/3rd-party/mail-in-a-box.svg"
          width="80rem" class="img-fluid float-left mr-3"
          alt="Mail-in-a-Box">
   </a>
   <br>
   <p><strong><a href="https://mailinabox.email">Mail-in-a-Box</a></strong> is an automated setup script for deploying a mail server on Ubuntu. Its goal is to make it easier for users to set up their own mail server.</p>
   <a href="https://mailcow.email/">
-    <img src="{% if jekyll.environment == "production" and site.pull_cdn %}{{site.pull_cdn}}{% endif %}/assets/img/svg/3rd-party/mailcow.svg"
+    <img src="/assets/img/svg/3rd-party/mailcow.svg"
          width="80rem" class="img-fluid float-left mr-3"
          alt="Mailcow">
   </a>

pages/providers/social-networks.html

@@ -19,5 +19,5 @@ description: "Find a social network that doesn't pry into your data or monetize
   <li><a href="https://www.facebook.com/help/delete_account">Delete your Facebook account</a> - Direct link to delete your Facebook account without being able to reactivate it again.</li>
   <li><a href="https://deletefacebook.com/">How To Permanently Delete A Facebook Account</a> - This guide will take you through a smooth and successful Facebook account deletion.</li>
   <li><a href="https://addons.mozilla.org/firefox/addon/facebook-container/">Facebook Container by Mozilla</a> - Prevent Facebook from tracking you around the web.</li>
-  <li><a href="https://www.stopusingfacebook.co/">Stop using Facebook</a> - A curated list of reasons to stop using Facebook and how to do it.</li>
+  <li><a href="https://web.archive.org/web/20190510075433/https://www.stopusingfacebook.co/">Stop using Facebook</a> - A curated list of reasons to stop using Facebook and how to do it.</li>
 </ul>

pages/providers/video.html

@@ -0,0 +1,10 @@
+---
+layout: page
+permalink: /providers/video/
+title: "Video Platforms"
+description: "Find a platform to watch and host videos that doesn't pry into your data or monetize your profile."
+---
+
+{% include sections/decentralized-video.html %}
+
+{% include sections/video-frontends.html %}

pages/providers/vpn.html

@@ -55,7 +55,7 @@ breadcrumb: "VPN"
       <ul>
         <li>OpenVPN support.</li>
         <li>Killswitch built in to clients.</li>
-        <li>If VPN cients are provided, they should be <a href="https://en.wikipedia.org/wiki/Open_source">open source</a>, like the VPN software they generally have built into them. We believe that <a href="https://en.wikipedia.org/wiki/Source_code">source code</a> availability provides greater transparency to the user about what their device is actually doing. Ideally we like to see these applications <a href="https://www.f-droid.org/en/2019/05/05/trust-privacy-and-free-software.html">available in F-Droid</a>.</li>
+        <li>If VPN clients are provided, they should be <a href="https://en.wikipedia.org/wiki/Open_source">open source</a>, like the VPN software they generally have built into them. We believe that <a href="https://en.wikipedia.org/wiki/Source_code">source code</a> availability provides greater transparency to the user about what their device is actually doing. We like to see these applications <a href="https://www.f-droid.org/en/2019/05/05/trust-privacy-and-free-software.html">available in F-Droid</a>.</li>
       </ul>
     </div>
     <div class="col-md-6">
@@ -268,15 +268,25 @@ breadcrumb: "VPN"
 
   <div class="container">
     <div class="row">
+      <div>
+        <h3>Related Videos</h3>
+      </div>
       <div class="col-lg-6 col-12">
-      <h3>Related Videos</h3>
+        <a href="https://youtube.com/watch?v=WVDQEoe6ZWY" target="_blank">
-        <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"
+            src="/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 class="col-lg-6 col-12">
+        <a href="https://www.youtube.com/watch?v=6ohvf03NiIA" target="_blank">
+          <img
+            src="/assets/img/png/layout/this-video-is-sponsored-by-vpn.png"
+            class="img-fluid float-left mr-3"
+            alt="Tor vs VPN | Which one should you use for privacy, anonymity and security">
+        </a>
+      </div>
     </div>
   </div>
 </div>

pages/services/chat.html

@@ -0,0 +1,101 @@
+---
+layout: default
+permalink: /services/chat/
+title: "Matrix"
+description: "chat.privacytools.io is our official Matrix homeserver. You can register a user account on this homeserver using any Matrix client, no email required."
+---
+
+{% include breadcrumbs.html %}
+
+<div class="jumbotron p-5">
+  <h1 class="display-4">Matrix</h1>
+  <p class="lead"><code>chat.privacytools.io</code> is our official Matrix homeserver.</p>
+  <hr class="my-4">
+  <p>You can register a user account on this homeserver using any Matrix client, no email required. However, you do not need to be a member of this homeserver to join our rooms, and choosing a smaller instance or <a href="https://element.io/matrix-services">buying</a> or <a href="https://matrix.org/docs/guides/installing-synapse">hosting</a> your own will help promote decentralization and performance in the Matrix fediverse!</p>
+  <p class="lead">
+    <a class="btn btn-primary btn-lg" href="https://element.privacytools.io/" role="button">Open in Element</a>
+    <a class="btn btn-secondary btn-lg" href="https://www.hello-matrix.net/public_servers.php" role="button">Find Another Homeserver</a>
+  </p>
+</div>
+
+<h2 class="pt-4" id="homeserverinfo">Connection Information</h2>
+<p><strong>To register on or connect to our homeserver, simply use <code>https://chat.privacytools.io</code> as the homeserver in your Matrix client.</strong></p>
+
+{%
+  include cardv2.html
+  title="Element"
+  image="/assets/img/svg/3rd-party/element.svg"
+  description='<a href="https://element.io">Element</a> (formerly <a href="https://element.io/blog/welcome-to-element/">Riot</a>) is the reference client for the <a href="https://matrix.org/docs/guides/introduction">Matrix</a> network. The <a href="https://matrix.org/docs/spec">Matrix open standard</a> is an open-source standard for secure, decentralized, real-time communication.'
+  labels="text==VoIP"
+  website="https://element.io"
+  privacy-policy="https://element.io/privacy"
+  forum="https://forum.privacytools.io/t/discussion-element-io/665"
+  github="https://github.com/vector-im/riot-web/"
+  windows="https://element.io/get-started"
+  mac="https://element.io/get-started"
+  linux="https://element.io/get-started"
+  fdroid="https://f-droid.org/packages/im.vector.app/"
+  googleplay="https://play.google.com/store/apps/details?id=im.vector.app"
+  ios="https://apps.apple.com/app/vector/id1083446067"
+  web="https://app.element.io"
+%}
+
+<p>If you're asked to enter a custom homeserver URL in a Matrix client, enter <code>https://chat.privacytools.io</code>, <strong>not</strong> privacytools.io or element.privacytools.io. You do not need to change your identity server, in fact <code>https://vector.im</code> is the only functional one, by design.</p>
+
+<p>These details will be autofilled for you in most clients if you enter your full username (e.g. @alice:privacytools.io rather than alice) into the username field. In general it is preferable to do that rather than trying to remember what the homeserver URL is.</p>
+
+<h2 class="pt-4">Frequently Asked Questions</h2>
+
+<h4>Is #general:privacytools.io or #privacy:privacytools.io chat end-to-end encrypted?</h4>
+<p><strong>No.</strong> Messages sent to the #general chat are encrypted from with client-to-server encryption, i.e. HTTPS. This means that your messages can't be viewed by an attacker on your network, or your ISP, etc. <strong>However</strong>, because this is a public chat room anybody can view your messages if they are a member, and newcomers will be able to see all message history. Do not say anything in rooms that don't use End-to-End (E2E) encryption that you wouldn't want tied to you personally.</p>
+
+<h4>Isn't Matrix behind Cloudflare?</h4>
+<p>Matrix.org is, chat.privacytools.io isn't. If you use our homeserver and our Element install, you should be good.</p>
+
+<h4>Isn't Matrix slow?</h4>
+<p>It can be, for some! Due to the trememdous amount of people registering on the matrix.org homeserver, it is often overloaded and occasionally slow to respond. Therefore, users on that homeserver occasionally report a less than ideal chat experience. If that's you, you can fix this problem by switching to another homeserver. Good alternatives include...
+  <ul>
+    <li>ours of course, at <mark><strong>chat.privacytools.io</strong></mark>, you're here right?</li>
+    <li>feneas.org, tchncs.de, weho.st, pine64.org, kde.org, halogen.city...</li>
+    <li>purchasing an instance from <a href="https://element.io/matrix-services">Element Matrix Services</a></li>
+    <li>running your own by installing <a href="https://github.com/matrix-org/synapse">synapse</a> — certainly the best option for the technically inclined!</li>
+  </ul>
+<p>Note that at time of writing, switching homeservers requires re-registering with another account at that server, as nomadic identities haven't been implemented yet.</p>
+
+<h4>What happens when I remove a message in Element?</h4>
+<p>Your homeserver will send a removal request for that message and some clients will render it as a black line, but by editing the source it's possibly for homeserver to not respect it and do nothing. If the room is bridged to protocols that don't support message removals (IRC, XMPP), their users see nothing happening. Don’t say anything you wouldn’t want to remain in the chat forever.</p>
+
+<h4>Why do XMPP users keep joining and leaving all the time?</h4>
+<p><a href="https://github.com/matrix-org/matrix-bifrost/issues/63">It's an issue with the XMPP bridge</a>.</p>
+
+<h2 class="pt-4">Rooms</h2>
+<p>To join a room, just type <code>/join [room address]</code> in any room. You can run this command from any server, not just ours!</p>
+<p>The PrivacyTools administration operates the following channels:</p>
+<ul>
+  <li><code>#dev:privacytools.io</code>: Discussions relating to <a href="https://github.com/privacytoolsIO/privacytools.io/">building</a> www.privacytools.io.</li>
+  <li><code>#forum:privacytools.io</code>: All PrivacyTools Forum updates (Automated).</li>
+  <li><strong><code>#general:privacytools.io</code>: Main discussion room.</strong></li>
+  <li><code>#github:privacytools.io</code>: GitHub updates for @privacytoolsIO (Automated).</li>
+  <li><code>#guides:privacytools.io</code>: Privacy Guides development work.</li>
+  <li><strong><code>#privacy:privacytools.io</code>: On-topic privacy, security, opsec discussion and support.</strong></li>
+  <li><code>#wiki:privacytools.io</code>: <a href="https://wiki.privacytools.io/view/Main_Page">Wiki</a>-building discussion room.</li>
+</ul>
+<p>If you're looking for more things to chat about, check out these rooms as well:</p>
+<ul>
+  <li><code>#disroot:disroot.org</code>: Disroot.org room</li>
+  <li><code>#freenode_#opennic:matrix.org</code>: OpenNIC IRC Channel.</li>
+  <li><code>#matrix:matrix.org</code>: Discuss Matrix itself!</li>
+  <li><code>#nothing_to_hide:privacytools.io</code>: More general privacy chat.</li>
+  <li><code>#_oftc_#Tor-Project:matrix.org</code>: Official Tor Project chat room!</li>
+  <li><code>#plume:disroot.org</code>: Discussion for Plume: Federated blogging.</li>
+  <li><code>#element-android:matrix.org</code>: Element Android discussion and support.</li>
+  <li><code>#element-ios:matrix.org</code>: Element iOS discussion and support.</li>
+  <li><code>#riotx:matrix.org</code>: RiotX (soon to be: Element Android) discussion and support.</li>
+  <li><code>#element-web:matrix.org</code>: Element Web/Desktop discussion and support.</li>
+</ul>
+<p>If you are a room operator and want your room listed here, feel free to contact us. Especially if you operate a large room and/or are a member of our homeserver!</p>
+<p>We do not necessarily endorse any of the content in these listed rooms.</p>
+
+<h2 class="pt-4" id="contact">Contact</h2>
+<p>For server related issues, the administrator of this homeserver is Jonah, who can be reached on Matrix at <code>@jonah:privacytools.io</code>.
+<p>For moderation related issues or anything else, you can contact Jonah or anyone in the team (listed in the <code>+team:privacytools.io</code> community) via Matrix, or via email at <code>support@privacytools.io</code>.</p>

pages/services/services.html

@@ -11,8 +11,9 @@ description: "The PrivacyTools team is proud to introduce a suite of privacy-cen
   <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://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="/services/chat/"><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://tube.privacytools.io/"><i class="fas fa-file-video fa-lg fa-fw"></i> PeerTube - Decentralized Video at tube.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>

pages/software/real-time-communication.html

@@ -14,6 +14,12 @@ description: "Discover secure and private ways to communicate with others online
   Recent news about breaking E2EE on centralized instant messengers
 </h3>
 
+<h5>June 2020</h5>
+<ul>
+  <li><a href="https://www.eff.org/deeplinks/2020/06/senates-new-anti-encryption-bill-even-worse-earn-it-and-thats-saying-something">The Senate’s New Anti-Encryption Bill Is Even Worse Than EARN IT, and That’s Saying Something (EFF)</a></li>
+  <li><a href="https://cyberlaw.stanford.edu/blog/2020/06/there%E2%80%99s-now-even-worse-anti-encryption-bill-earn-it-doesn%E2%80%99t-make-earn-it-bill-ok">There’s Now an Even Worse Anti-Encryption Bill Than EARN IT. That Doesn’t Make the EARN IT Bill OK. (Stanford)</a></li>
+</ul>
+
 <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>
@@ -72,7 +78,6 @@ description: "Discover secure and private ways to communicate with others online
 <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>
 </ul>

pages/sponsors.html

@@ -4,57 +4,73 @@ active_page: sponsors
 permalink: /sponsors/
 ---
 
-<div class="col-12">
+<div class="row">
-  <div class="row">
+  <div class="mx-auto text-center">
-    <div class="mx-auto text-center">
+    <div class="my-4">
-      <div class="my-4">
+      <h1>Sponsors of {{ site.name }}</h1>
-        <h1>Sponsors of {{ site.name }}</h1>
+      <p>A massive thank you to the following <strong>organization-level sponsors</strong> of {{ site.name }}, who pledge $250+:</p>
-      </div>
+    </div>
-      <div class="mt-4 mb-3">
+    <div class="mt-4 mb-3">
-        {% include sponsors/gold.html %}
+      {% include sponsors/gold.html %}
-      </div>
+    </div>
-      <div class="mb-4">
+    <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>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>
+      <p>
-          <a href="https://opencollective.com/privacytools#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>
+        <a href="/donate/" class="btn btn-outline-danger"><span class="fas fa-heart fa-fw"></span> Donate Directly</a>
-        </p>
+      </p>
-      </div>
     </div>
   </div>
-
+</div>
-  <h3>Why sponsor {{ site.name }}?</h3>
+<div>
-  <p>This sponsorship program is designed to allow companies, organizations, and individuals partner with the {{ site.name }} team to support our vision of a more privacy-respecting internet and the greater online community.</p>
+  <div class="my-4">
-  <p>With this exposure and sponsorship, your customers will recognize your intrinsic understanding and commitment to user privacy. Moreover, you'll directly contribute to our mission of spreading privacy-respecting tools and knowledge worldwide!</p>
+    <h3>Advocates</h3>
-  <p>At PrivacyTools, we believe in...</p>
+    <p>These individuals and organizations pledge $100 - $249 to the organization.</p>
-  <ul>
+  </div>
-    <li><strong>Privacy</strong>, of course. Privacy gives you as a user control over how your information is used and spread online. Trustworthy and secure products and services are the key to that future.</li>
+  <div class="row">
-    <li><strong>Security</strong>. We believe services cannot provide privacy at all without being secure. Strong encryption is the only way to prevent malicious actors from snooping in on our communications.</li>
+    {% include sponsors/silver.html %}
-    <li><strong>Freedom</strong>. The right to express your opinion online without interference or surveillance is the only way we can grow as a society, and privacy-respecting tools should foster that growth.</li>
-  </ul>
-  <p>We reserve the right or deny all sponsors from receiving the benefits detailed below if we believe that your organization or product is not aligned with our key values. Therefore, if you are interested in sponsoring our project, please first email <a href="mailto:sponsors@privacytools.io">sponsors@privacytools.io</a> so we may discuss further.</p>
-  <p>As a sponsor of {{ site.name }}, your company will be widely recognized in a variety of ways, some of which we've detailed below.</p>
-  <h5>General Information</h5>
-  <p>This website receives well over 250,000 pageviews on a monthly basis and is highly ranked for privacy-related keywords. In addition to the benefits below your contribution will be featured on our OpenCollective page and we will thank you via social media for your contribution.</p>
-  <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/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/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>
-  <h5>We will not provide...</h5>
-  <p>We pride ourselves on our integrity and commitment to spreading unbiased and fact-based information regarding privacy and privacy-respecting tools. All tools we recommend throughout our website are subject to strict criteria as judged by our team and the community across our various platforms. Your sponsorship will not grant your organization any special consideration when choosing our recommendations throughout the website, a process which we make clear via our transparent ledger on OpenCollective and our public discussions on GitHub. Your sponsorship benefits are limited to those outlined above.</p>
-  <h5>Tax and Financial Information</h5>
-  <p>Your contribution to {{ site.name }} will be handled by the Open Collective Foundation 501(c)(3). For US companies and taxpayers, this means your contribution is <strong>tax deductible</strong>. As a non-profit, your sponsorship contribution will not be used for private profit and will only be used to cover expenses incurred by the project. All of our transactions (donations and expenses) are published transparently on OpenCollective. For the benefit of our readership, anonymous contributions will not be eligible for the sponsorship opportunities outlined above.</p>
-  <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/privacytools#section-contribute" class="btn btn-success mb-5">Contribute to PrivacyTools</a>
   </div>
 </div>
+<h3>Backers</h3>
+<p>These individuals and organizations pledge $10 - $99 to the organization.</p>
+{% include sponsors/list.html %}
+
+<h3>Why sponsor {{ site.name }}?</h3>
+<p>This sponsorship program is designed to allow companies, organizations, and individuals partner with the {{ site.name }} team to support our vision of a more privacy-respecting internet and the greater online community.</p>
+<p>With this exposure and sponsorship, your customers will recognize your intrinsic understanding and commitment to user privacy. Moreover, you'll directly contribute to our mission of spreading privacy-respecting tools and knowledge worldwide!</p>
+<p>At PrivacyTools, we believe in...</p>
+<ul>
+  <li><strong>Privacy</strong>, of course. Privacy gives you as a user control over how your information is used and spread online. Trustworthy and secure products and services are the key to that future.</li>
+  <li><strong>Security</strong>. We believe services cannot provide privacy at all without being secure. Strong encryption is the only way to prevent malicious actors from snooping in on our communications.</li>
+  <li><strong>Freedom</strong>. The right to express your opinion online without interference or surveillance is the only way we can grow as a society, and privacy-respecting tools should foster that growth.</li>
+</ul>
+<p>We reserve the right or deny all sponsors from receiving the benefits detailed below if we believe that your organization or product is not aligned with our key values. Therefore, if you are interested in sponsoring our project, please first email <a href="mailto:sponsors@privacytools.io">sponsors@privacytools.io</a> so we may discuss further.</p>
+<p>As a sponsor of {{ site.name }}, your company will be widely recognized in a variety of ways, some of which we've detailed below.</p>
+<h5>General Information</h5>
+<p>This website receives well over 250,000 pageviews on a monthly basis and is highly ranked for privacy-related keywords. In addition to the benefits below your contribution will be featured on our OpenCollective page and we will thank you via social media for your contribution.</p>
+<p><em>Please note that this page is updated manually, and while we're generally on top of things, please don't hesitate to reach out to <a href="mailto:sponsors@privacytools.io">sponsors@privacytools.io</a> if you think we've missed something :)</em></p>
+<h5><i class="fas fa-fw fa-user text-info"></i> Backers - $10–$24</h5>
+<ul>
+<li>Your name added to the list of sponsors on this page.</li>
+</ul>
+<h5><i class="fas fa-fw fa-user-astronaut text-info"></i> Highlighted Backers - $25–$99</h5>
+<ul>
+<li>Your name in bold at the top of our general sponsors list.</li>
+</ul>
+<h5><i class="fas fa-fw fa-user-secret text-muted"></i> Advocates - $100–$249</h5>
+<ul>
+<li>Your square logo, name, and link above the general sponsors list.</li>
+</ul>
+<h5><i class="fas fa-fw fa-briefcase text-warning"></i> Organizations - $250+</h5>
+<ul>
+<li>Your medium-sized logo as a prominent link on our homepage and at the very top of our sponsors page.</li>
+</ul>
+<h5>We will not provide...</h5>
+<p>We pride ourselves on our integrity and commitment to spreading unbiased and fact-based information regarding privacy and privacy-respecting tools. All tools we recommend throughout our website are subject to strict criteria as judged by our team and the community across our various platforms. Your sponsorship will not grant your organization any special consideration when choosing our recommendations throughout the website, a process which we make clear via our transparent ledger on OpenCollective and our public discussions on GitHub. Your sponsorship benefits are limited to those outlined above.</p>
+<h5>Tax and Financial Information</h5>
+<p>Your contribution to {{ site.name }} will be handled by the Open Collective Foundation 501(c)(3). For US companies and taxpayers, this means your contribution is likely <strong>tax deductible</strong>, but you should consult with your accountant regarding your specific circumstances. As a non-profit, your sponsorship contribution will not be used for private profit and will only be used to cover expenses incurred by the project. All of our transactions (donations and expenses) are published transparently on OpenCollective. For the benefit of our readership, anonymous contributions will not be eligible for the sponsorship opportunities outlined above.</p>
+<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/privacytools#section-contribute" class="btn btn-success mb-5">Contribute to PrivacyTools</a>
+</div>