From 12ae72ffa343adb5d5726f561d4921a0f1ecf77f Mon Sep 17 00:00:00 2001
From: Jonah Aragon <jonah@triplebit.net>
Date: Fri, 4 Dec 2020 01:06:04 -0600
Subject: [PATCH] Cleaning up old cruft

---
 _includes/breadcrumbs.html                    |  25 ++
 _includes/footer.html                         |   2 +-
 _includes/legacy/badge.html                   |  20 --
 _includes/legacy/breadcrumbs.html             |  23 --
 _includes/legacy/cardv2.html                  |   6 +-
 _includes/legacy/footer.html                  |  97 ------
 _includes/legacy/head.html                    |  65 ----
 _includes/legacy/nav.html                     | 145 --------
 _includes/legacy/scripts.html                 |   5 -
 .../sections/android-operating-systems.html   |   4 +-
 .../sections/browser-recommendation.html      |   2 +-
 _includes/legacy/sections/cloud-storage.html  |   2 +-
 _includes/legacy/sections/dns.html            |   2 +-
 .../legacy/sections/email-providers.html      |  96 +++---
 .../legacy/sections/file-encryption.html      |   4 +-
 _includes/legacy/sections/file-sharing.html   |   2 +-
 .../sections/self-contained-networks.html     |   8 +-
 .../sections/voice-video-messenger.html       |   2 +-
 _includes/legacy/sections/vpn.html            |  60 ++--
 _includes/legacy/sponsors/gold.html           |  32 --
 _includes/legacy/sponsors/list.html           |  11 -
 _includes/legacy/sponsors/silver.html         |  36 --
 _includes/legacy/team.html                    |  50 ---
 _layouts/page.html                            |   1 +
 legacy_pages/about/about.html                 | 171 ----------
 legacy_pages/about/librejs.html               |  34 --
 legacy_pages/donate.html                      | 312 ------------------
 legacy_pages/old.html                         |  94 ------
 legacy_pages/providers/email.html             |  14 +-
 legacy_pages/providers/vpn.html               |  20 +-
 legacy_pages/services/services.html           |  43 ---
 legacy_pages/sponsors.html                    |  76 -----
 legacy_pages/notices.md => notices.md         |  22 +-
 privacy-policy.md                             |   2 +-
 34 files changed, 148 insertions(+), 1340 deletions(-)
 create mode 100644 _includes/breadcrumbs.html
 delete mode 100644 _includes/legacy/badge.html
 delete mode 100644 _includes/legacy/breadcrumbs.html
 delete mode 100644 _includes/legacy/footer.html
 delete mode 100644 _includes/legacy/head.html
 delete mode 100644 _includes/legacy/nav.html
 delete mode 100644 _includes/legacy/scripts.html
 delete mode 100644 _includes/legacy/sponsors/gold.html
 delete mode 100644 _includes/legacy/sponsors/list.html
 delete mode 100644 _includes/legacy/sponsors/silver.html
 delete mode 100644 _includes/legacy/team.html
 delete mode 100644 legacy_pages/about/about.html
 delete mode 100644 legacy_pages/about/librejs.html
 delete mode 100644 legacy_pages/donate.html
 delete mode 100644 legacy_pages/old.html
 delete mode 100644 legacy_pages/services/services.html
 delete mode 100644 legacy_pages/sponsors.html
 rename legacy_pages/notices.md => notices.md (56%)

diff --git a/_includes/breadcrumbs.html b/_includes/breadcrumbs.html
new file mode 100644
index 00000000..e4ed6b6f
--- /dev/null
+++ b/_includes/breadcrumbs.html
@@ -0,0 +1,25 @@
+<div class="mb-5">
+  <nav id="breadcrumb" aria-label="breadcrumb">
+    {% assign crumbs = page.url | remove:'/index.html' | split: '/' %}
+    <ol class="breadcrumb" itemscope itemtype="https://schema.org/BreadcrumbList">
+      <li class="breadcrumb-item">
+        <a href="/"><i class="fas fa-home" aria-hidden="true"></i> <span>Home</span></a>
+      </li>
+      {% for crumb in crumbs offset: 1 %}
+      {% if forloop.last %}
+      <li class="breadcrumb-item active" aria-current="page" itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem">
+        <link href="{% assign crumb_limit = forloop.index | plus: 1 %}{% for crumb in crumbs limit: crumb_limit %}{{ crumb | append: '/' | replace:'without-plugin/','without-plugins/' }}{% endfor %}" itemprop="item"  />
+        <span itemprop="name">{% if page.breadcrumb %}{{ page.breadcrumb }}{% else %}{% assign words = crumb | replace:'-',' ' | remove:'.html' | split: ' ' %}{% capture titlecase %}{% for word in words %}{{ word | capitalize }} {% endfor %}{% endcapture %}{{ titlecase }}{% endif %}
+        </span>
+        <meta itemprop="position" content="{{ forloop.index }}" />
+      </li>
+      {% else %}
+      <li class="breadcrumb-item" itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem">
+        <a href="{% assign crumb_limit = forloop.index | plus: 1 %}{% for crumb in crumbs limit: crumb_limit %}{{ crumb | append: '/' | replace:'without-plugin/','without-plugins/' }}{% endfor %}" itemprop="item"><span itemprop="name">{{ crumb | replace:'-',' ' | remove:'.html' | capitalize }}</span></a>
+        <meta itemprop="position" content="{{ forloop.index }}" />
+      </li>
+      {% endif %}
+      {% endfor %}
+    </ol>
+  </nav>
+</div>
diff --git a/_includes/footer.html b/_includes/footer.html
index 8bbbff3d..c7cfe7d0 100644
--- a/_includes/footer.html
+++ b/_includes/footer.html
@@ -4,4 +4,4 @@
 
 <p><i class="fab fa-creative-commons fa-fw"></i><i class="fab fa-creative-commons-by fa-fw"></i><i class="fab fa-creative-commons-nc fa-fw"></i> Unless otherwise noted, the original content on this website is licensed under a <a href="http://creativecommons.org/licenses/by-nc/4.0/">Creative Commons Attribution-NonCommercial 4.0 International License</a>. <span class="text-muted">The underlying source code used to format and display this content is not licensed for third-party use unless otherwise noted.</span></p>
 
-<p><small>Copyright &copy; 2020 <a href="https://jonaharagon.com">Jonah Aragon</a>, <a href="https://aragon.ventures">Aragon Ventures LLC</a>, and <a href="https://code.aragon.ventures/privacyguides/privacyguides.org/-/graphs/master">Contributors</a> | <a href="https://code.aragon.ventures/privacyguides/privacyguides.org">Website Source Code</a> | <a href="https://code.aragon.ventures/privacyguides/privacyguides.org/-/issues">Open an Issue</a> | <a href="/privacy-policy/">Privacy Policy</a> | <a href="/terms-and-notices/">Website Terms &amp; Notices</a></small></p>
+<p><small>Copyright &copy; 2020 <a href="https://jonaharagon.com">Jonah Aragon</a>, <a href="https://aragon.ventures">Aragon Ventures LLC</a>, and <a href="https://github.com/privacyguides/privacyguides/graphs/contributors">Contributors</a> | <a href="https://github.com/privacyguides/privacyguides">Website Source Code</a> | <a href="https://github.com/privacyguides/privacyguides/issues">Open an Issue</a> | <a href="/privacy-policy/">Privacy Policy</a> | <a href="/terms-and-notices/">Website Terms &amp; Notices</a></small></p>
diff --git a/_includes/legacy/badge.html b/_includes/legacy/badge.html
deleted file mode 100644
index f908ecf8..00000000
--- a/_includes/legacy/badge.html
+++ /dev/null
@@ -1,20 +0,0 @@
-{% if include.link %}
-<a
-  href="{{ include.link }}" class="badge badge-{{ include.color | default: "info" }}"
-  {% if include.tooltip %}
-  data-toggle="tooltip"
-  title="{{ include.tooltip }}"><i class="{{ include.icon | default: "far fa-question-circle"}}"></i> {{ include.text }}
-{% else %}><i class="{{ include.icon | default: "fas fa-external-link-alt"}}"></i> {{ include.text }}{% endif %}
-</a>
-{% else %}
-<span
-  class="badge badge-{{ include.color | default: "info" }}"
-  {% if include.tooltip %}
-    data-toggle="tooltip"
-    title="{{ include.tooltip }}"
-    > <i class="{{ include.icon | default: "far fa-question-circle"}}"></i> {{include.text}}
-  {% else %}
-    > {% if include.icon %}<i class="{{ include.icon }}"></i>{% endif %} {{include.text}}
-  {% endif %}
-</span>
-{% endif %}
diff --git a/_includes/legacy/breadcrumbs.html b/_includes/legacy/breadcrumbs.html
deleted file mode 100644
index b744bb53..00000000
--- a/_includes/legacy/breadcrumbs.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<nav id="breadcrumb" aria-label="breadcrumb">
-  {% assign crumbs = page.url | remove:'/index.html' | split: '/' %}
-  <ol class="breadcrumb" itemscope itemtype="https://schema.org/BreadcrumbList">
-    <li class="breadcrumb-item">
-      <a href="/"><i class="fas fa-home" aria-hidden="true"></i> <span>Home</span></a>
-    </li>
-    {% for crumb in crumbs offset: 1 %}
-    {% if forloop.last %}
-    <li class="breadcrumb-item active" aria-current="page" itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem">
-      <link href="{% assign crumb_limit = forloop.index | plus: 1 %}{% for crumb in crumbs limit: crumb_limit %}{{ crumb | append: '/' | replace:'without-plugin/','without-plugins/' }}{% endfor %}" itemprop="item"  />
-      <span itemprop="name">{% if page.breadcrumb %}{{ page.breadcrumb }}{% else %}{% assign words = crumb | replace:'-',' ' | remove:'.html' | split: ' ' %}{% capture titlecase %}{% for word in words %}{{ word | capitalize }} {% endfor %}{% endcapture %}{{ titlecase }}{% endif %}
-      </span>
-      <meta itemprop="position" content="{{ forloop.index }}" />
-    </li>
-    {% else %}
-    <li class="breadcrumb-item" itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem">
-      <a href="{% assign crumb_limit = forloop.index | plus: 1 %}{% for crumb in crumbs limit: crumb_limit %}{{ crumb | append: '/' | replace:'without-plugin/','without-plugins/' }}{% endfor %}" itemprop="item"><span itemprop="name">{{ crumb | replace:'-',' ' | remove:'.html' | capitalize }}</span></a>
-      <meta itemprop="position" content="{{ forloop.index }}" />
-    </li>
-    {% endif %}
-    {% endfor %}
-  </ol>
-</nav>
diff --git a/_includes/legacy/cardv2.html b/_includes/legacy/cardv2.html
index 0af2d74a..77a45a5d 100644
--- a/_includes/legacy/cardv2.html
+++ b/_includes/legacy/cardv2.html
@@ -57,7 +57,7 @@
               {% assign tooltip = attr[1] %}
             {% endif %}
           {% endfor %}
-        {% include legacy/badge.html
+        {% include badge.html
           link=link
           color=color
           text=text
@@ -77,7 +77,7 @@
         <a
           href="{{include.website}}"
           rel="noopener"
-          class="btn btn-primary mt-1 mr-1">
+          class="btn btn-secondary mt-1 mr-1">
           <i class="fas fa-external-link-alt fa-fw"></i>
           Website
         </a>
@@ -94,7 +94,7 @@
           <a
             href="{{include.forum}}"
             rel="noopener"
-            class="btn btn-secondary mt-1 mr-1">
+            class="btn btn-primary mt-1 mr-1">
             <i class="fab fa-discourse fa-fw"></i>
             Forum
           </a>
diff --git a/_includes/legacy/footer.html b/_includes/legacy/footer.html
deleted file mode 100644
index 474888f1..00000000
--- a/_includes/legacy/footer.html
+++ /dev/null
@@ -1,97 +0,0 @@
-<footer>
-
-  <hr class="footer-divider" />
-
-  <h3 id="participate">Spread the word and help your friends</h3>
-
-  <div class="row mb-4">
-    <div class="col-12 col-md-6 d-flex justify-content-between">
-      <a href="mailto:?subject=privacytools.io%20-%20encryption%20against%20global%20mass%20surveillance&body=https://privacyguides.org/" class="share-btn email" title="Email">
-        <i class="fas fa-envelope"></i>
-      </a>
-
-      <a href="https://www.facebook.com/sharer/sharer.php?u=https://privacyguides.org" class="share-btn facebook" title="Facebook">
-        <i class="fab fa-facebook-f"></i>
-      </a>
-
-      <a href="https://twitter.com/share?text=Knowledge%20and%20tools%20to%20protect%20your%20privacy%20against%20global%20mass%20surveillance%20&amp;url=https://privacyguides.org/&amp;via=privacytoolsIO" class="share-btn twitter" title="Twitter">
-        <i class="fab fa-twitter"></i>
-      </a>
-
-      <a href="https://sharetomastodon.github.io/?title=privacytools.io%20-%20encryption%20against%20global%20mass%20surveillance&url=https://privacyguides.org" class="share-btn mastodon" title="Mastodon">
-        <i class="fab fa-mastodon"></i>
-      </a>
-    </div>
-    <div class="col-12 col-md-6 d-flex justify-content-between">
-      <a href="https://reddit.com/submit?url=https://privacyguides.org&title=privacytools.io%20-%20encryption%20against%20global%20mass%20surveillance" class="share-btn reddit" title="reddit">
-        <i class="fab fa-reddit-alien"></i>
-      </a>
-
-      <a href="https://www.linkedin.com/shareArticle?url=https://privacyguides.org&title=privacytools.io%20-%20encryption%20against%20global%20mass%20surveillance" class="share-btn linkedin" title="LinkedIn">
-        <i class="fab fa-linkedin-in"></i>
-      </a>
-
-      <a href="https://mix.com/mixit?su=submit&url=https://privacyguides.org&title=privacytools.io%20-%20encryption%20against%20global%20mass%20surveillance" class="share-btn mix" title="Mix">
-        <i class="ptio-mix"></i>
-      </a>
-
-      <a href="https://sharetodiaspora.github.io/?title=privacytools.io%20-%20encryption%20against%20global%20mass%20surveillance&url=https://privacyguides.org" class="share-btn diaspora" title="Diaspora*">
-        <i class="fas fa-asterisk"></i>
-      </a>
-    </div>
-  </div>
-
-  <h3>Copy URL and Description</h3>
-
-  <p>
-  <input type="text" value="Privacy Guides - Encryption and tools to protect against global mass surveillance - https://privacyguides.org" class="form-control input-lg onclick-select">
-  <span class="help-block">For easy copy and paste. Share this text snippet.</span>
-  </p>
-
-  <hr class="footer-divider" />
-
-  <div class="row mt-3">
-    <div class="col-sm-4 mb-3 d-flex justify-content-center align-items-center">
-      <span class="fab fa-creative-commons-zero fa-2x mr-2"></span>
-      <a
-        href="/LICENSE.txt"
-        title="This work is free. You can redistribute it and/or modify it under the terms of the &quot;Creative Commons CC0 1.0 Universal Public Domain Dedication&quot;."
-        data-toggle="tooltip"
-        data-placement="top">
-        CC0
-      </a>
-    </div>
-
-    <div class="col-sm-4 mb-3 d-flex justify-content-center align-items-center">
-      <span class="far fa-address-card fa-2x mr-2"></span>
-      <a href="/about/">About Us &amp; Contact</a>
-    </div>
-
-    <div class="col-sm-4 mb-3 d-flex justify-content-center align-items-center">
-      <span class="fas fa-donate fa-2x mr-2"></span>
-      <a href="/donate/" data-toggle="tooltip" data-placement="top" data-original-title="Please support this project by donating. We are ad-free and not affiliated with any providers. Your donation will cover our costs for servers and domains.">Support Us!</a>
-    </div>
-  </div>
-
-  <div class="copyright-text">
-    <a href="/about/javascript" data-jslicense="1">
-      <span class="fab fa-js fa-lg"></span>
-      JavaScript Licenses
-    </a>
-    <p class="mt-2">
-      <strong>No Ads, No Google Analytics, No Affiliates, No Cross-Site Requests.</strong>
-      <em>Privacy Guides is a socially motivated website that provides information for protecting your data security and privacy. Never trust any company with your privacy, always encrypt.</em>
-    </p>
-    <p class="text-left">
-      Tor v3: <strong>privacy2zbidut4m4jyj3ksdqidzkw3uoip2vhvhbvwxbqux5xy5obyd.onion</strong>
-      (<a href="https://write.privacytools.io/jonah/tor-on-privacytools-io">Learn More</a>)
-    </p>
-    <small>
-      <a href="/privacy/">Privacy Statement</a> |
-      <a href="/notices/">Notices &amp; Disclaimers</a> |
-      <a href="https://github.com/privacytools/brand">Brand Assets &amp; Guidelines</a> |
-      <a href="https://status.privacytools.io">Status Page</a>
-    </small>
-
-  </div>
-</footer>
diff --git a/_includes/legacy/head.html b/_includes/legacy/head.html
deleted file mode 100644
index 30296c17..00000000
--- a/_includes/legacy/head.html
+++ /dev/null
@@ -1,65 +0,0 @@
-<head>
-  <meta charset="utf-8">
-  <meta name="referrer" content="no-referrer">
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <meta name="keywords" content="privacy, anonymity, privacy tools, surveillance, encryption">
-  <meta name="description" content="{% if page.description %}{{ page.description }}{% else %}{{ site.description }}{% endif %}">
-  <link rel="canonical" href="https://privacyguides.org{{ page.url | replace:'index.html',''}}">
-
-  <!-- title -->
-  {% if page.title %}
-  <title>{{ page.title }} | Privacy Guides</title>
-  <meta property="og:title" content="{{ page.title }} | Privacy Guides" />
-  {% else %}
-  <title>{{ site.title }}</title>
-  <meta property="og:title" content="{{ site.title }}" />
-  {% endif %}
-  <meta property="og:type" content="website" />
-  <meta property="og:url" content="{{ page.permalink | prepend: site.url }}" />
-  <meta property="og:image" content="https://privacyguides.org/assets/img/legacy_svg/layout/brand/square-transparent.svg" />
-  <meta property="og:description" content="{% if page.description %}{{ page.description }}{% else %}{{ site.description }}{% endif %}"/>
-  <meta property="og:locale" content="en_GB" />
-  <meta property="og:site_name" content="Privacy Guides" />
-
-  {% if page.url == "/" %}
-  <script type="application/ld+json">
-  {
-    "@context": "https://schema.org",
-    "@type": "Organization",
-    "name": "Privacy Guides",
-    "description": "{{ site.description }}",
-    "alternateName": [
-      "privacytools.io",
-      "Privacy Tools",
-      "privacytoolsIO"
-    ],
-    "url": "https://privacyguides.org",
-    "logo": "https://privacyguides.org/assets/img/legacy_svg/layout/brand/square-transparent.svg",
-    "sameAs": [
-      "https://blog.privacytools.io",
-      "https://twitter.com/privacytoolsIO",
-      "https://social.privacytools.io/@privacytools",
-      "https://www.youtube.com/channel/UCen3taxHtzByXV8Da73B1Vg",
-      "https://github.com/privacytools"
-    ]
-  }
-  </script>
-  {% endif %}
-
-  <!-- icons -->
-  <link rel="apple-touch-icon" sizes="180x180" href="/assets/img/legacy_png/favicons/apple-touch-icon.png?v=2">
-  <link rel="icon" type="image/png" sizes="32x32" href="/assets/img/legacy_png/favicons/favicon-32x32.png?v=2">
-  <link rel="icon" type="image/png" sizes="16x16" href="/assets/img/legacy_png/favicons/favicon-16x16.png?v=2">
-  <link rel="manifest" href="/assets/img/legacy_png/favicons/site.webmanifest?v=2">
-  <link rel="mask-icon" href="/assets/img/legacy_png/favicons/safari-pinned-tab.svg?v=2" color="#3498db">
-  <link rel="shortcut icon" href="/assets/img/legacy_png/favicons/favicon.ico?v=2">
-  <meta name="msapplication-TileColor" content="#3498db">
-  <meta name="msapplication-config" content="/assets/img/legacy_png/favicons/browserconfig.xml?v=2">
-  <meta name="theme-color" content="#ffffff">
-
-
-  <!-- CSS stylesheets -->
-  <link href="/assets/css/style.css?v=9" rel="stylesheet">
-  {% unless page.url == '/sponsors/' %}<link id="dark-css" href="/assets/css/dark.css?v=4" rel="stylesheet" media="(prefers-color-scheme: dark)">{% endunless %}
-</head>
diff --git a/_includes/legacy/nav.html b/_includes/legacy/nav.html
deleted file mode 100644
index 03c701dd..00000000
--- a/_includes/legacy/nav.html
+++ /dev/null
@@ -1,145 +0,0 @@
-<nav class="fixed-top bg-dark">
-  <div id="navbar" class="d-flex flex-wrap justify-content-between align-items-center">
-    <div class="w-50">
-      <a id="nav-home-mobile" class="nav-anchor" href="/">
-        <img src="/assets/img/legacy_svg/layout/brand/horizontal.svg" width="150px" />
-      </a>
-    </div>
-    <input type="checkbox" id="nav-toggle" checked />
-    <label for="nav-toggle" id="nav-toggle-label" class="fas fa-bars fa-lg"></label>
-
-    <div class="menu w-100">
-      <div id="nav-left" class="position-relative flex-col">
-        <a class="nav-anchor" href="/">
-          <span id="nav-home" class="fas fa-home fa-fw"></span>
-        </a>
-
-        <!-- Provider -->
-        <details class="nav-details">
-          <summary>
-            <span class="nav-summary">
-              Provider
-              <span class="dropdown-toggle"></span>
-            </span>
-          </summary>
-          <span class="nav-dropdown">
-            <a class="dropdown-item" href="/providers/#ukusa"><span class="fas fa-user-secret fa-fw"></span> Avoid US & UK services</a>
-            <a class="dropdown-item" href="/providers/cloud-storage/"><span class="fas fa-cloud fa-fw"></span> Cloud Storage</a>
-            <a class="dropdown-item" href="/providers/dns/"><span class="fa fa-tasks fa-fw"></span> DNS</a>
-            <a class="dropdown-item" href="/providers/email/"><span class="fas fa-mail-bulk fa-fw"></span> Email</a>
-            <a class="dropdown-item" href="/providers/hosting/"><span class="fas fa-database fa-fw"></span> Hosting</a>
-            <a class="dropdown-item" href="/providers/paste/"><span class="fas fa-paste fa-fw"></span> Pastebins</a>
-            <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>
-
-        <!-- Browser -->
-        <details class="nav-details">
-          <summary>
-            <span class="nav-summary">
-              Browser
-              <span class="dropdown-toggle"></span>
-            </span>
-          </summary>
-          <span class="nav-dropdown">
-            <a class="dropdown-item" href="/browsers/#browser"><span class="fas fa-check fa-fw"></span> Recommendation</a>
-            <a class="dropdown-item" href="/browsers/#fingerprint"><span class="fas fa-fingerprint fa-fw"></span> Fingerprinting Info</a>
-            <a class="dropdown-item" href="/browsers/#webrtc"><span class="far fa-eye fa-fw"></span> WebRTC IP Leak</a>
-            <a class="dropdown-item" href="/browsers/#addons"><span class="far fa-list-alt fa-fw"></span> Browser Add-ons</a>
-            <a class="dropdown-item" href="/browsers/#about_config"><span class="fas fa-wrench fa-fw"></span> Firefox Tweaks</a>
-          </span>
-        </details>
-
-        <!-- Software -->
-        <details class="nav-details">
-          <summary>
-            <span class="nav-summary">
-              Software
-              <span class="dropdown-toggle"></span>
-            </span>
-          </summary>
-          <span class="nav-dropdown">
-            <a class="dropdown-item" href="/software/calendar-contacts/"><span class="fas fa-calendar fa-fw"></span> Calendar/Contacts Sync Tools</a>
-            <a class="dropdown-item" href="/software/notebooks/"><span class="far fa-sticky-note fa-fw"></span> Digital Notebook</a>
-            <a class="dropdown-item" href="/software/email/"><span class="fas fa-envelope fa-fw"></span> Email Clients</a>
-            <a class="dropdown-item" href="/software/productivity/#encrypt"><span class="fas fa-lock fa-fw"></span> File Encryption</a>
-            <a class="dropdown-item" href="/software/file-sharing/"><span class="fas fa-file-export fa-fw"></span> File Sharing</a>
-            <a class="dropdown-item" href="/software/file-sync/"><span class="fas fa-copy fa-fw"></span> File Sync</a>
-            <a class="dropdown-item" href="/software/productivity/#metadata-removal-tools"><span class="far fa-eye-slash fa-fw"></span> Metadata Removal Tools</a>
-            <a class="dropdown-item" href="/software/passwords/"><span class="fas fa-user-lock fa-fw"></span> Password Manager</a>
-            <a class="dropdown-item" href="/software/productivity/"><span class="fas fa-briefcase fa-fw"></span> Productivity Tools</a>
-            <a class="dropdown-item" href="/software/real-time-communication/"><span class="fas fa-comments fa-fw"></span> Real-Time Communication</a>
-            <a class="dropdown-item" href="/software/networks/"><span class="fas fa-user-secret fa-fw"></span> Self-contained Networks</a>
-            <a class="dropdown-item" href="/software/cloud/"><span class="fas fa-hdd fa-fw"></span> Self-Hosted Cloud Server</a>
-          </span>
-        </details>
-
-        <!-- OS -->
-        <details class="nav-details">
-          <summary>
-            <span class="nav-summary">
-              OS
-              <span class="dropdown-toggle"></span>
-            </span>
-          </summary>
-          <span class="nav-dropdown">
-            <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/#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>
-            <a class="dropdown-item" href="/operating-systems/#win10"><span class="far fa-thumbs-down fa-fw"></span> Don't use Windows 10</a>
-          </span>
-        </details>
-
-        <a class="nav-anchor" href="/index.html#participate">Participate</a>
-      </div>
-
-      <!-- Language -->
-      <div id="nav-right">
-
-        <a href="/services/" class="nav-anchor">
-          Services
-        </a>
-        <a href="https://blog.privacytools.io/" class="nav-anchor">
-          Blog
-        </a>
-        <a href="/sponsors/" class="nav-anchor">
-          Sponsors
-        </a>
-        <a href="/about/" class="nav-anchor">
-          About Us
-        </a>{% unless page.url == '/sponsors/' %}
-        <span id="nav-switch-theme" class="nav-anchor">
-          <span class="nav-theme-icon fas fa-fw" aria-hidden="true" title="Theme"></span>
-          <span class="sr-only">Toggle Theme</span>
-        </span>
-
-        <details class="nav-details">
-          <summary>
-            <span class="nav-summary">
-              <span class="fas fa-language text-danger fa-fw" aria-hidden="true" title="Language"></span>
-              <span class="sr-only">Language Selection</span>
-              <span class="dropdown-toggle"></span>
-            </span>
-          </summary>
-          <span class="nav-dropdown">
-            <a href="https://www.privacytools.io/" class="dropdown-item">English</a>
-            <a href="https://privacytools.twngo.xyz/" rel="nofollow noopener" class="dropdown-item">繁體中文</a>
-            <a href="https://victorhck.gitlab.io/privacytools-es/" rel="nofollow noopener" class="dropdown-item">Español</a>
-            <a href="https://pl.privacytools.io/" rel="nofollow noopener" class="dropdown-item">Polski</a>
-            <a href="https://www.privacidade.digital/" rel="nofollow noopener" class="dropdown-item">Português</a>
-            <a href="https://privacytools.it-sec.rocks/" rel="nofollow noopener" class="dropdown-item">Deutsch</a>
-            <a href="https://privacytools-it.github.io/" rel="nofollow noopener" class="dropdown-item">Italiano</a>
-            <a href="https://privacytools.ru" rel="nofollow noopener" class="dropdown-item">Русский</a>
-            <a href="https://privacytools.dreads-unlock.fr" rel="nofollow noopener" class="dropdown-item">Français</a>
-          </span>
-        </details>{% endunless %}
-      </div>
-    </div>
-  </div>
-</nav>
diff --git a/_includes/legacy/scripts.html b/_includes/legacy/scripts.html
deleted file mode 100644
index e17c9263..00000000
--- a/_includes/legacy/scripts.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<script src="/assets/js/jquery-3.3.1.min.js?v=4"></script>
-<script src="/assets/js/popper.min.js?v=4"></script>
-<script src="/assets/js/bootstrap.min.js?v=4"></script>
-<script src="/assets/js/sortable.min.js?v=4"></script>
-<script src="/assets/js/main.js?v=5"></script>
diff --git a/_includes/legacy/sections/android-operating-systems.html b/_includes/legacy/sections/android-operating-systems.html
index 714c2061..d73a9422 100644
--- a/_includes/legacy/sections/android-operating-systems.html
+++ b/_includes/legacy/sections/android-operating-systems.html
@@ -40,11 +40,11 @@
 <ul>
   <li>
     <a href="https://microg.org/">MicroG</a>
-    {% include legacy/badge.html
+    {% include badge.html
     color="info"
     text="Add-on Package"
     %}
-    {% include legacy/badge.html
+    {% include badge.html
     color="warning"
     icon="far fa-question-circle"
     %}
diff --git a/_includes/legacy/sections/browser-recommendation.html b/_includes/legacy/sections/browser-recommendation.html
index 2d68b290..6f542d8a 100644
--- a/_includes/legacy/sections/browser-recommendation.html
+++ b/_includes/legacy/sections/browser-recommendation.html
@@ -84,7 +84,7 @@
   <li>
     <a href="https://www.stoutner.com/privacy-browser/">Privacy Browser</a>
     - An open-source web browser focused on user privacy. Features include integrated ad blocking with <a href="https://easylist.to/">EasyList</a>, <a href="https://www.stoutner.com/privacy-browser-2-5/">SSL certificate pinning</a>, and <a href='https://guardianproject.info/apps/orbot/'>Tor Orbot proxy support.</a>
-    {% include legacy/badge.html
+    {% include badge.html
     color="warning"
     icon="fas fa-exclamation-triangle"
     link="https://play.google.com/store/apps/details?id=com.google.android.webview"
diff --git a/_includes/legacy/sections/cloud-storage.html b/_includes/legacy/sections/cloud-storage.html
index f9a411d4..ea8a8a0a 100644
--- a/_includes/legacy/sections/cloud-storage.html
+++ b/_includes/legacy/sections/cloud-storage.html
@@ -26,6 +26,6 @@
 <h3>Worth Mentioning</h3>
 
 <ul>
-  <li><a href="https://cryptomator.org/">Cryptomator</a> - Free client-side AES encryption for your cloud files. Open source software: No backdoors, no registration. {% include legacy/badge.html color="warning" tooltip="Cryptomator's mobile apps are not open-source." link="https://github.com/cryptomator/cryptomator-android/issues/1#issuecomment-257979375" icon="fas fa-exclamation-triangle" %}</li>
+  <li><a href="https://cryptomator.org/">Cryptomator</a> - Free client-side AES encryption for your cloud files. Open source software: No backdoors, no registration. {% include badge.html color="warning" tooltip="Cryptomator's mobile apps are not open-source." link="https://github.com/cryptomator/cryptomator-android/issues/1#issuecomment-257979375" icon="fas fa-exclamation-triangle" %}</li>
   <li><a href="https://cryptpad.fr">CryptPad</a> - Free and end-to-end encrypted real time collaboration sharing folders, media, and documents.</li>
 </ul>
diff --git a/_includes/legacy/sections/dns.html b/_includes/legacy/sections/dns.html
index d906ac38..f5bd1479 100644
--- a/_includes/legacy/sections/dns.html
+++ b/_includes/legacy/sections/dns.html
@@ -654,7 +654,7 @@ We also log how many times this or that tracker has been blocked. We need this i
 
 <h4>DNS-over-HTTPS (DoH)</h4>
 <p>
-  Similar to DoT, but uses HTTPS instead, being indistinguishable from "normal" HTTPS traffic on port 443 and more difficult to block. {% include legacy/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" %}
+  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" %}
 </p>
 
 <h4>DNSCrypt</h4>
diff --git a/_includes/legacy/sections/email-providers.html b/_includes/legacy/sections/email-providers.html
index c170cab6..a9c3adda 100644
--- a/_includes/legacy/sections/email-providers.html
+++ b/_includes/legacy/sections/email-providers.html
@@ -16,31 +16,31 @@
         alt="ProtonMail">
     </div>
     <div class="col">
-    <h2 id="protonmail" class="anchor"><a href="#protonmail"><i class="fas fa-link anchor-icon"></i></a> ProtonMail {% include legacy/badge.html color="info" text="Free" %}</h2>
+    <h2 id="protonmail" class="anchor"><a href="#protonmail"><i class="fas fa-link anchor-icon"></i></a> ProtonMail {% include badge.html color="info" text="Free" %}</h2>
     <p><strong><a href="https://protonmail.com">ProtonMail.com</a></strong> is an email service with a focus on privacy, encryption, security, and ease of use. They have been in operation since <strong>2013</strong>. ProtonMail is based in Genève, <span class="flag-icon flag-icon-ch"></span> Switzerland. Accounts start with 500 MB storage with their free plan.</p>
 
     <p>Free accounts have some limitations and do not allow the use of the <a href="https://protonmail.com/bridge">ProtonMail Bridge</a>, which is required to use a <a href="/software/email">recommended email client</a> (e.g. Thunderbird) or to search email by body text. Paid accounts are available starting at <strong>€48/y</strong> which include features like ProtonMail Bridge, additional storage, custom domain support, and more. The webmail and mobile apps can only search <code>To:</code>, <code>From:</code>, <code>Date:</code> and <code>Subject:</code> (this is likely to change when <a href="https://reddit.com/comments/cqwk2a/comment/ex21b4e">v4.0</a> of ProtonMail is released).</p>
 
-    <h5>{% include legacy/badge.html color="success" text="Domains and Aliases" %}</h5>
+    <h5>{% include badge.html color="success" text="Domains and Aliases" %}</h5>
     <p>Paid ProtonMail users can use their own domain with the service. <a href="https://protonmail.com/support/knowledge-base/catch-all/">Catch-all</a> addresses are supported with custom domains for Professional and Visionary plans. ProtonMail also supports <a href="https://protonmail.com/support/knowledge-base/creating-aliases/">subaddressing</a>, which is useful for users who don't want to purchase a domain.</p>
 
-    <h5>{% include legacy/badge.html color="success" text="Payment Methods" %}</h5>
+    <h5>{% include badge.html color="success" text="Payment Methods" %}</h5>
     <p>ProtonMail accepts Bitcoin in addition to accepting credit/debit cards and PayPal.</p>
 
-    <h5>{% include legacy/badge.html color="success" text="Account Security" %}</h5>
+    <h5>{% include badge.html color="success" text="Account Security" %}</h5>
     <p>ProtonMail supports <a href="https://en.wikipedia.org/wiki/Time-based_One-time_Password_Algorithm">TOTP</a> <a href="https://protonmail.com/support/knowledge-base/two-factor-authentication/">two factor authentication</a> only. The use of a <a href="https://en.wikipedia.org/wiki/Universal_2nd_Factor">U2F</a> security key is not yet supported. ProtonMail is planning to implement U2F upon completion of their <a href="https://reddit.com/comments/cheoy6/comment/feh2lw0/">Single Sign On (SSO)</a> code.</p>
 
-    <h5>{% include legacy/badge.html color="success" text="Data Security" %}</h5>
+    <h5>{% include badge.html color="success" text="Data Security" %}</h5>
     <p>ProtonMail has <a href="https://protonmail.com/blog/zero-access-encryption">zero access encryption at rest</a> for your emails, <a href="https://protonmail.com/blog/encrypted-contacts-manager">address book contacts</a>, and <a href="https://protonmail.com/blog/protoncalendar-security-model">calendars</a>. This means the messages and other data stored in your account are only readable by you. </p>
 
-    <h5>{% include legacy/badge.html color="success" text="Email Encryption" %}</h5>
+    <h5>{% include badge.html color="success" text="Email Encryption" %}</h5>
     <p>ProtonMail has <a href="https://protonmail.com/support/knowledge-base/how-to-use-pgp">integrated OpenPGP encryption</a> in their webmail. Emails to other ProtonMail users are encrypted automatically, and encryption to non-ProtonMail users with an OpenPGP key can be enabled easily in your account settings. They also allow you to <a href="https://protonmail.com/support/knowledge-base/encrypt-for-outside-users">encrypt messages to non-ProtonMail users</a> without the need for them to sign up for a ProtonMail account or use software like OpenPGP.</p>
     <p>ProtonMail also supports the discovery of public keys via HTTP from their <a href="https://wiki.gnupg.org/WKD">Web Key Directory (WKD)</a>. This allows users outside of ProtonMail to find the OpenPGP keys of ProtonMail users easily, for cross-provider E2EE.</p>
 
-    <h5>{% include legacy/badge.html color="success" text=".onion Service" %}</h5>
+    <h5>{% include badge.html color="success" text=".onion Service" %}</h5>
     <p>ProtonMail is accessible via Tor at <a href="https://protonirockerxow.onion/">protonirockerxow.onion</a>.</p>
 
-    <h5>{% include legacy/badge.html color="info" text="Extra Functionality" %}</h5>
+    <h5>{% include badge.html color="info" text="Extra Functionality" %}</h5>
     <p>ProtonMail offers a "Visionary" account for €24/Month, which also enables access to ProtonVPN in addition to providing multiple accounts, domains, aliases, and extra storage.</p>
     </div>
   </div>
@@ -54,30 +54,30 @@
         alt="Mailbox">
     </div>
     <div class="col">
-    <h2 id="mailbox" class="anchor"><a href="#mailbox"><i class="fas fa-link anchor-icon"></i></a> Mailbox.org {% include legacy/badge.html color="info" text="€12/y" %}</h2>
+    <h2 id="mailbox" class="anchor"><a href="#mailbox"><i class="fas fa-link anchor-icon"></i></a> Mailbox.org {% include badge.html color="info" text="€12/y" %}</h2>
     <p><strong><a href="https://mailbox.org">Mailbox.org</a></strong> is an email service with a focus on being secure, ad-free, and privately powered by 100% eco-friendly energy. They have been in operation since <strong>2014</strong>. Mailbox.org is based in Berlin, <span class="flag-icon flag-icon-de"></span> Germany. Accounts start with 2 GB of storage, which can be upgraded as needed.</p>
 
-    <h5>{% include legacy/badge.html color="success" text="Domains and Aliases" %}</h5>
+    <h5>{% include badge.html color="success" text="Domains and Aliases" %}</h5>
     <p>Mailbox.org lets users use their own domain and they support <a href="https://kb.mailbox.org/display/MBOKBEN/Using+catch-all+alias+with+own+domain">catch-all</a> addresses. Mailbox.org also supports <a href="https://kb.mailbox.org/display/BMBOKBEN/What+is+an+alias+and+how+do+I+use+it">subaddressing</a>, which is useful for users who don't want to purchase a domain.</p>
 
-    <h5>{% include legacy/badge.html color="warning" text="Payment Methods" %}</h5>
+    <h5>{% include badge.html color="warning" text="Payment Methods" %}</h5>
     <p>Mailbox.org doesn't accept Bitcoin or any other cryptocurrencies as a result of their payment processor BitPay suspending operations in Germany. However, they do accept Cash by mail, cash payment to bank account, bank transfer, credit card, PayPal and couple of German-specific processors: paydirekt and Sofortüberweisung.</p>
 
-    <h5>{% include legacy/badge.html color="success" text="Account Security" %}</h5>
+    <h5>{% include badge.html color="success" text="Account Security" %}</h5>
     <p>Mailbox.org supports <a href="https://kb.mailbox.org/display/MBOKBEN/How+to+use+two-factor+authentication+-+2FA">two factor authentication</a> for their webmail only. You can use either <a href="https://en.wikipedia.org/wiki/Time-based_One-time_Password_Algorithm">TOTP</a> or a <a href="https://en.wikipedia.org/wiki/YubiKey">Yubikey</a> via the <a href="https://www.yubico.com/products/services-software/yubicloud">Yubicloud</a>. Web standards such as <a href="https://en.wikipedia.org/wiki/Universal_2nd_Factor">U2F</a> and <a href="https://en.wikipedia.org/wiki/WebAuthn">WebAuthn</a> are not yet supported.</p>
 
-    <h5>{% include legacy/badge.html color="warning" text="Data Security" %}</h5>
+    <h5>{% include badge.html color="warning" text="Data Security" %}</h5>
     <p>Mailbox.org allows for encryption of incoming mail using their <a href="https://kb.mailbox.org/display/MBOKBEN/The+Encrypted+Mailbox">encrypted mailbox</a>. New messages that you receive will then be immediately encrypted with your public key.</p>
     <p>However, <a href="https://en.wikipedia.org/wiki/Open-Xchange">Open-Exchange</a>, the software platform used by Mailbox.org, <a href="https://kb.mailbox.org/display/BMBOKBEN/Encryption+of+calendar+and+address+book">does not support</a> the encryption of your address book and calendar. A <a href="/software/calendar-contacts/">standalone option</a> may be more appropriate for that information.</p>
 
-    <h5>{% include legacy/badge.html color="success" text="Email Encryption" %}</h5>
+    <h5>{% include badge.html color="success" text="Email Encryption" %}</h5>
     <p>Mailbox.org has <a href="https://kb.mailbox.org/display/MBOKBEN/Send+encrypted+e-mails+with+Guard">integrated encryption</a> in their webmail, which simplifies sending messages to users with public OpenPGP keys. They also allow <a href="https://kb.mailbox.org/display/MBOKBEN/My+recipient+does+not+use+PGP">remote recipients to decrypt an email</a> on Mailbox.org's servers. This feature is useful when the remote recipient does not have OpenPGP and cannot decrypt a copy of the email in their own mailbox.</p>
     <p>Mailbox.org also supports the discovery of public keys via HTTP from their <a href="https://wiki.gnupg.org/WKD">Web Key Directory (WKD)</a>. This allows users outside of Mailbox.org to find the OpenPGP keys of Mailbox.org users easily, for cross-provider E2EE.</p>
 
-    <h5>{% include legacy/badge.html color="warning" text=".onion Service" %}</h5>
+    <h5>{% include badge.html color="warning" text=".onion Service" %}</h5>
     <p>You can access your Mailbox.org account via IMAP/SMTP using <a href="https://kb.mailbox.org/display/MBOKBEN/The+Tor+exit+node+of+mailbox.org">their .onion service</a>. However, their webmail interface cannot be accessed via their .onion service, and users may experience TLS certificate errors.</p>
 
-    <h5>{% include legacy/badge.html color="info" text="Extra Functionality" %}</h5>
+    <h5>{% include badge.html color="info" text="Extra Functionality" %}</h5>
     <p>All accounts come with limited cloud storage that <a href="https://kb.mailbox.org/display/MBOKBEN/Encrypt+files+on+your+Drive">can be encrypted</a>. Mailbox.org also offers the alias <a href="https://kb.mailbox.org/display/MBOKBEN/Ensuring+E-Mails+are+Sent+Securely">@secure.mailbox.org</a>, which enforces the TLS encryption on the connection between mail servers, otherwise the message will not be sent at all. Mailbox.org also supports <a href="https://en.wikipedia.org/wiki/Exchange_ActiveSync">Exchange ActiveSync</a> in addition to standard access protocols like IMAP and POP3.</p>
     </div>
   </div>
@@ -91,29 +91,29 @@
         alt="Posteo">
     </div>
     <div class="col">
-    <h2 id="posteo" class="anchor"><a href="#posteo"><i class="fas fa-link anchor-icon"></i></a> Posteo {% include legacy/badge.html color="info" text="€12/y" %}</h2>
+    <h2 id="posteo" class="anchor"><a href="#posteo"><i class="fas fa-link anchor-icon"></i></a> Posteo {% include badge.html color="info" text="€12/y" %}</h2>
     <p><strong><a href="https://posteo.de">Posteo.de</a></strong> is an email provider that focuses on anonymous, secure, and private email. Their servers are powered by 100% sustainable energy. They have been in operation since <strong>2009</strong>. Posteo is based in <span class="flag-icon flag-icon-de"></span> Germany and has a free 14-day trial. Posteo comes with 2 GB for the monthly cost and an extra gigabyte can be purchased for €0.25 per month.</p>
 
-    <h5>{% include legacy/badge.html color="warning" text="Domains and Aliases" %}</h5>
+    <h5>{% include badge.html color="warning" text="Domains and Aliases" %}</h5>
     <p>Posteo does <a href="https://posteo.de/en/site/faq">not allow the use of custom domains</a>, however users may still make use of <a href="https://posteo.de/en/help/what-is-an-email-alias">subaddressing</a>.</p>
 
-    <h5>{% include legacy/badge.html color="warning" text="Payment Methods" %}</h5>
+    <h5>{% include badge.html color="warning" text="Payment Methods" %}</h5>
     <p>Posteo does not accept Bitcoin or other cryptocurrencies as a form of payment, however they do accept cash-by-mail. They also accept credit/debit cards, bank transfers, and PayPal, and remove PII (personally identifiable information) <a href="https://posteo.de/en/site/payment">that they receive</a> in connection with these payment methods.</p>
 
-    <h5>{% include legacy/badge.html color="success" text="Account Security" %}</h5>
+    <h5>{% include badge.html color="success" text="Account Security" %}</h5>
     <p>Posteo supports <a href="https://posteo.de/en/help/what-is-two-factor-authentication-and-how-do-i-set-it-up">two factor authentication</a> for their webmail only. You can use either <a href="https://en.wikipedia.org/wiki/Time-based_One-time_Password_Algorithm">TOTP</a> a <a href="https://en.wikipedia.org/wiki/YubiKey">Yubikey</a> with TOTP. Web standards such as <a href="https://en.wikipedia.org/wiki/Universal_2nd_Factor">U2F</a> and <a href="https://en.wikipedia.org/wiki/WebAuthn">WebAuthn</a> are not yet supported.</p>
 
-    <h5>{% include legacy/badge.html color="warning" text="Data Security" %}</h5>
+    <h5>{% include badge.html color="warning" text="Data Security" %}</h5>
     <p>Posteo has <a href="https://posteo.de/en/site/encryption#cryptomailstorage">zero access encryption</a> for email storage. This means the messages stored in your account are only readable by you.</p>
     <p>Posteo also supports the encryption of your <a href="https://posteo.de/en/site/features#featuresaddressbook">address book contacts</a> and <a href="https://posteo.de/en/site/features#featurescalendar">calendars</a> at rest. However, Posteo still uses standard <a href="https://en.wikipedia.org/wiki/CalDAV">CalDAV</a> and <a href="https://en.wikipedia.org/wiki/CardDAV">CardDAV</a> for calendars and contacts. These protocols do not support <a href="https://en.wikipedia.org/wiki/End-to-end_encryption">E2EE (End-To-End Encryption)</a>. A <a href="/software/calendar-contacts/">standalone option</a> may be more appropiate.</p>
 
-    <h5>{% include legacy/badge.html color="success" text="Email Encryption" %}</h5>
+    <h5>{% include badge.html color="success" text="Email Encryption" %}</h5>
     <p>Posteo has <a href="https://posteo.de/en/site/encryption#pgp_webmailer">integrated encryption</a> in their webmail, which simplifies sending messages to users with public OpenPGP keys. They also support the discovery of public keys via HTTP from their <a href="https://wiki.gnupg.org/WKD">Web Key Directory (WKD)</a>. This allows users outside of Posteo to find the OpenPGP keys of Posteo users easily, for cross-provider E2EE.</p>
 
-    <h5>{% include legacy/badge.html color="danger" text=".onion Service" %}</h5>
+    <h5>{% include badge.html color="danger" text=".onion Service" %}</h5>
     <p>Posteo does not operate a .onion service.</p>
 
-    <h5>{% include legacy/badge.html color="info" text="Extra Functionality" %}</h5>
+    <h5>{% include badge.html color="info" text="Extra Functionality" %}</h5>
     <p>Posteo allows users to <a href="https://posteo.de/en/help/does-posteo-offer-mailing-lists">set up their own mailing lists</a>. Each account can create one list for free.</p>
     </div>
   </div>
@@ -128,29 +128,29 @@
         alt="Disroot">
     </div>
     <div class="col">
-    <h2 id="disroot" class="anchor"><a href="#disroot"><i class="fas fa-link anchor-icon"></i></a> Disroot {% include legacy/badge.html color="info" text="Free" %}</h2>
+    <h2 id="disroot" class="anchor"><a href="#disroot"><i class="fas fa-link anchor-icon"></i></a> Disroot {% include badge.html color="info" text="Free" %}</h2>
     <p><strong><a href="https://disroot.org/en/services/email">Disroot</a></strong> offers email amongst <a href="https://disroot.org/en/#services">other services</a>. The service is maintained by volunteers and its community. They have been in operation since <strong>2015</strong>. Disroot is based in <span class="flag-icon flag-icon-nl"></span> Amsterdam. Disroot is free and uses open source software such as Rainloop to provide service. Users support the service through donations and buying extra storage. The mailbox limit is 1 GB, but extra storage can be purchased 0.15€ per GB per month paid yearly.</p>
 
-    <h5>{% include legacy/badge.html color="success" text="Domains and Aliases" %}</h5>
+    <h5>{% include badge.html color="success" text="Domains and Aliases" %}</h5>
     <p>Disroot lets users use their own domain. They have aliases, however you must <a href="https://disroot.org/en/forms/alias-request-form">manually apply</a> for them.</p>
 
-    <h5>{% include legacy/badge.html color="success" text="Payment Methods" %}</h5>
+    <h5>{% include badge.html color="success" text="Payment Methods" %}</h5>
     <p>Disroot accepts Bitcoin and Faircoin as payment methods. They also accept PayPal, direct bank deposit, and Patreon payments. Disroot is a not-for-profit organization that also accepts donations through Liberapay, Flattr, and Monero, but these payment methods cannot be used to purchase services.</p>
 
-    <h5>{% include legacy/badge.html color="success" text="Account Security" %}</h5>
+    <h5>{% include badge.html color="success" text="Account Security" %}</h5>
     <p>Disroot supports <a href="https://en.wikipedia.org/wiki/Time-based_One-time_Password_Algorithm">TOTP</a> two factor authentication for webmail only. They do not allow <a href="https://en.wikipedia.org/wiki/Universal_2nd_Factor">U2F</a> security key authentication.</p>
 
-    <h5>{% include legacy/badge.html color="warning" text="Data Security" %}</h5>
+    <h5>{% include badge.html color="warning" text="Data Security" %}</h5>
     <p>Disroot uses full disk encryption. However, it doesn't appear to be "zero access", meaning it is technically possible for them to decrypt the data they have.</p>
     <p>Disroot also uses the standard <a href="https://en.wikipedia.org/wiki/CalDAV">CalDAV</a> and <a href="https://en.wikipedia.org/wiki/CardDAV">CardDAV</a> protocols for calendars and contacts, which do not support E2EE. A <a href="/software/calendar-contacts/">standalone option</a> may be more appropriate.</p>
 
-    <h5>{% include legacy/badge.html color="success" text="Email Encryption" %}</h5>
+    <h5>{% include badge.html color="success" text="Email Encryption" %}</h5>
     <p>Disroot allows for encrypted emails to be sent from their webmail application using OpenPGP. However, Disroot has not integrated a <a href="https://wiki.gnupg.org/WKD">Web Key Directory (WKD)</a> for users on their platform.</p>
 
-    <h5>{% include legacy/badge.html color="danger" text=".onion Service" %}</h5>
+    <h5>{% include badge.html color="danger" text=".onion Service" %}</h5>
     <p>Disroot does not operate a .onion service.</p>
 
-    <h5>{% include legacy/badge.html color="info" text="Extra Functionality" %}</h5>
+    <h5>{% include badge.html color="info" text="Extra Functionality" %}</h5>
     <p>They offer <a href="https://disroot.org/en/#services">other services</a> such as NextCloud, XMPP Chat, Etherpad, Ethercalc, Pastebin, Online polls and a Gitea instance. They also have an app <a href="https://f-droid.org/packages/org.disroot.disrootapp/">available in F-Droid</a>.</p>
     </div>
   </div>
@@ -165,32 +165,32 @@
         alt="Tutanota">
     </div>
     <div class="col">
-    <h2 id="tutanota" class="anchor"><a href="#tutanota"><i class="fas fa-link anchor-icon"></i></a> Tutanota {% include legacy/badge.html color="info" text="Free" %}</h2>
+    <h2 id="tutanota" class="anchor"><a href="#tutanota"><i class="fas fa-link anchor-icon"></i></a> Tutanota {% include badge.html color="info" text="Free" %}</h2>
     <p><strong><a href="https://tutanota.com">Tutanota.com</a></strong> is an email service with a focus on security and privacy through the use of encryption. Tutanota has been in operation since <strong>2011</strong> and is based in Hanover, <span class="flag-icon flag-icon-de"></span> Germany. Accounts start with 1GB storage with their free plan.</p>
     <p>Tutanota <a href="https://tutanota.com/faq/#imap">doesn't allow</a> the use of third-party <a href="/software/email/">email clients</a>. There are plans to allow Tutanota pull email from <a href="https://github.com/tutao/tutanota/issues/544">external email accounts</a> using the <a href="https://en.wikipedia.org/wiki/Internet_Message_Access_Protocol">IMAP</a> protocol. <a href="https://github.com/tutao/tutanota/issues/630">Email import</a> is currently not possible.</p>
     <p>Emails can be exported <a href="https://tutanota.com/howto#generalMail">individually or by bulk selection</a>. Tutanota does not allow for <a href="https://github.com/tutao/tutanota/issues/927">subfolders</a> as you might expect with other email providers.</p>
     <p>Tutanota is working on a <a href="https://tutanota.com/blog/posts/desktop-clients/">desktop client</a> and they have an app <a href="https://f-droid.org/packages/de.tutao.tutanota">available in F-Droid</a>. They also have their app in conventional stores such as <a href="https://apps.apple.com/us/app/tutanota/id922429609">App Store</a> on iOS and <a href="https://play.google.com/store/apps/details?id=de.tutao.tutanota">Google Play</a> for Android.</p>
 
-    <h5>{% include legacy/badge.html color="success" text="Domains and Aliases" %}</h5>
+    <h5>{% include badge.html color="success" text="Domains and Aliases" %}</h5>
     <p>Paid Tutanota accounts can use up to 5 <a href="https://tutanota.com/faq#alias">aliases</a> and <a href="https://tutanota.com/faq#custom-domain">custom domains</a>. Tutanota doesn't allow for <a href="https://tutanota.com/faq#plus">subaddressing (plus addresses)</a>, but you can use a <a href="https://tutanota.com/howto#settings-global">catch-all</a> with a custom domain.</p>
 
-    <h5>{% include legacy/badge.html color="danger" text="Payment Methods" %}</h5>
+    <h5>{% include badge.html color="danger" text="Payment Methods" %}</h5>
     <p>Tutanota accepts only credit cards and PayPal.</p>
 
-    <h5>{% include legacy/badge.html color="success" text="Account Security" %}</h5>
+    <h5>{% include badge.html color="success" text="Account Security" %}</h5>
     <p>Tutanota supports <a href="https://tutanota.com/faq#2fa">two factor authentication</a>. Users can either use <a href="https://en.wikipedia.org/wiki/Time-based_One-time_Password_Algorithm">TOTP</a> or <a href="https://en.wikipedia.org/wiki/Universal_2nd_Factor">U2F</a>. U2F support is <a href="https://github.com/tutao/tutanota/issues/443">not yet available on Android</a>.</p>
 
-    <h5>{% include legacy/badge.html color="success" text="Data Security" %}</h5>
+    <h5>{% include badge.html color="success" text="Data Security" %}</h5>
     <p>Tutanota has <a href="https://tutanota.com/faq#what-encrypted">zero access encryption at rest</a> for your emails, <a href="https://tutanota.com/faq#encrypted-address-book">address book contacts</a>, and <a href="https://tutanota.com/faq#calendar">calendars</a>. This means the messages and other data stored in your account are only readable by you. </p>
 
-    <h5>{% include legacy/badge.html color="warning" text="Email Encryption" %}</h5>
+    <h5>{% include badge.html color="warning" text="Email Encryption" %}</h5>
     <p>Tutanota <a href="https://www.tutanota.com/faq/#pgp">does not use OpenPGP</a>. Tutanota users can only receive encrypted emails when external users send them through a <a href="https://www.tutanota.com/howto/#encrypted-email-external">temporary Tutanota mailbox</a>.</p>
     <p>Tutanota <a href="https://github.com/tutao/tutanota/issues/198">does have plans</a> to support <a href="https://autocrypt.org">AutoCrypt</a>. This would allow for external users to send encrypted emails to Tutanota users as long as their email client supports the AutoCrypt headers.</p>
 
-    <h5>{% include legacy/badge.html color="danger" text=".onion Service" %}</h5>
+    <h5>{% include badge.html color="danger" text=".onion Service" %}</h5>
     <p>Tutanota does not operate a .onion service but <a href="https://github.com/tutao/tutanota/issues/528">may consider</a> it in the future.</p>
 
-    <h5>{% include legacy/badge.html color="info" text="Extra Functionality" %}</h5>
+    <h5>{% include badge.html color="info" text="Extra Functionality" %}</h5>
     <p>Tutanota offers the business version of <a href="https://tutanota.com/blog/posts/secure-email-for-non-profit">Tutanota to non-profit organizations</a> for free or with a heavy discount.</p>
 
     <p>Tutanota also has a business feature called <a href="https://tutanota.com/secure-connect/">Secure Connect</a>. This ensures customer contact to the business uses E2EE. The feature costs €240/y.</p>
@@ -207,30 +207,30 @@
         alt="StartMail">
     </div>
     <div class="col">
-    <h2 id="startmail" class="anchor"><a href="#startmail"><i class="fas fa-link anchor-icon"></i></a> StartMail {% include legacy/badge.html color="info" text="Personal USD $59.95/y" %}</h2>
+    <h2 id="startmail" class="anchor"><a href="#startmail"><i class="fas fa-link anchor-icon"></i></a> StartMail {% include badge.html color="info" text="Personal USD $59.95/y" %}</h2>
     <p><strong><a href="https://startmail.com">StartMail.com</a></strong> is an email service with a focus on security and privacy through the use of standard OpenPGP encryption. StartMail has been in operation since <strong>2014</strong> and is based in Boulevard 11, Zeist <span class="flag-icon flag-icon-nl"></span> Netherlands. Accounts start with 10GB. They offer a 30-day trial.</p>
 
-    <h5>{% include legacy/badge.html color="success" text="Domains and Aliases" %}</h5>
+    <h5>{% include badge.html color="success" text="Domains and Aliases" %}</h5>
     <p>Personal accounts can use <a href="https://support.startmail.com/hc/en-us/articles/360007297457-Aliases">Custom or Generated</a> aliases. Business accounts can use <a href="https://support.startmail.com/hc/en-us/articles/360006840058">Domain aliases</a>.</p>
 
-    <h5>{% include legacy/badge.html color="warning" text="Payment Methods" %}</h5>
+    <h5>{% include badge.html color="warning" text="Payment Methods" %}</h5>
     <p>StartMail accepts Visa, MasterCard, American Express and Paypal. StartMail also has other <a href="https://support.startmail.com/hc/en-us/articles/360006620637-Payment-methods">payment options</a> such as Bitcoin (currently only for Personal accounts) and SEPA Direct Debit for accounts older than a year.</p>
 
-    <h5>{% include legacy/badge.html color="success" text="Account Security" %}</h5>
+    <h5>{% include badge.html color="success" text="Account Security" %}</h5>
     <p>StartMail supports <a href="https://en.wikipedia.org/wiki/Time-based_One-time_Password_Algorithm">TOTP</a> two factor authentication <a href="https://support.startmail.com/hc/en-us/articles/360006682158-Two-factor-authentication-2FA">for webmail only</a>. They do not allow <a href="https://en.wikipedia.org/wiki/Universal_2nd_Factor">U2F</a> security key authentication.</p>
 
-    <h5>{% include legacy/badge.html color="warning" text="Data Security" %}</h5>
+    <h5>{% include badge.html color="warning" text="Data Security" %}</h5>
     <p>StartMail has <a href="https://www.startmail.com/en/whitepaper/#_Toc458527835">zero access encryption at rest</a>, using their "user vault" system. When a user logs in, the vault is opened, and the email is then moved to the vault out of the queue where it is decrypted by the corresponding private key.</p>
 
     <p>StartMail supports importing <a href="https://support.startmail.com/hc/en-us/articles/360006495557-Import-contacts">contacts</a> however, they are only accessible in the webmail and not through protocols such as <a href="https://en.wikipedia.org/wiki/CalDAV">CalDAV</a>. Contacts are also not stored using zero knowledge encryption, so a <a href="/software/calendar-contacts/">standalone option</a> may be more appropriate.</p>
 
-    <h5>{% include legacy/badge.html color="success" text="Email Encryption" %}</h5>
+    <h5>{% include badge.html color="success" text="Email Encryption" %}</h5>
     <p>StartMail has <a href="https://support.startmail.com/hc/en-us/sections/360001889078-Encryption">integrated encryption</a> in their webmail, which simplifies sending messages to users with public OpenPGP keys.</p>
 
-    <h5>{% include legacy/badge.html color="danger" text=".onion Service" %}</h5>
+    <h5>{% include badge.html color="danger" text=".onion Service" %}</h5>
     <p>StartMail does not operate a .onion service.</p>
 
-    <h5>{% include legacy/badge.html color="info" text="Extra Functionality" %}</h5>
+    <h5>{% include badge.html color="info" text="Extra Functionality" %}</h5>
     <p>StartMail allows for proxying of images within emails. If a user allows the remote image to be loaded, the sender won't know what the user's IP address is.</p>
     </div>
   </div>
diff --git a/_includes/legacy/sections/file-encryption.html b/_includes/legacy/sections/file-encryption.html
index 080a93ca..2dc47fad 100644
--- a/_includes/legacy/sections/file-encryption.html
+++ b/_includes/legacy/sections/file-encryption.html
@@ -57,7 +57,7 @@
 <ul>
   <li>
     <a href="https://cryptomator.org/">Cryptomator</a> - Free client-side AES encryption for your cloud files. Open source software: No backdoors, no registration.
-    {% include legacy/badge.html
+    {% include badge.html
       color="warning"
       text="Closed source"
       icon="fas fa-exclamation-triangle"
@@ -70,7 +70,7 @@
   <li><a href="https://hat.sh/">Hat.sh</a> - A cross-platform, serverless JavaScript web application that provides secure file encryption using the AES-256-GCM algorithm in your browser. It can also be downloaded and run offline.</li>
     <li>
       <a href="https://kryptor.co.uk/">Kryptor</a> is a file encryption program for Windows, MacOS, and Linux.
-      {% include legacy/badge.html
+      {% include badge.html
         color="warning"
         icon="fas fa-exclamation-triangle"
         text="Beta"
diff --git a/_includes/legacy/sections/file-sharing.html b/_includes/legacy/sections/file-sharing.html
index af502ccc..d790e31e 100644
--- a/_includes/legacy/sections/file-sharing.html
+++ b/_includes/legacy/sections/file-sharing.html
@@ -34,7 +34,7 @@
 
 <ul>
   <li><a href="https://framadrop.org/">FramaDrop</a> - Stores a file of any size for 24h. Data is end-to-end encrypted from your browser, powered by <a href="https://framagit.org/fiat-tux/hat-softwares/lufi">LuFi</a>.
-    {% include legacy/badge.html
+    {% include badge.html
     color="warning"
     icon="fas fa-exclamation-triangle"
     link="https://framasoft.org/en/cgu/"
diff --git a/_includes/legacy/sections/self-contained-networks.html b/_includes/legacy/sections/self-contained-networks.html
index 53ea6782..6f05cdc1 100644
--- a/_includes/legacy/sections/self-contained-networks.html
+++ b/_includes/legacy/sections/self-contained-networks.html
@@ -63,7 +63,7 @@
 <ul>
   <li>
     <a href="https://zeronet.io/">ZeroNet</a> - Open, free, and uncensorable websites, using Bitcoin cryptography and BitTorrent network.
-    {% include legacy/badge.html
+    {% include badge.html
     color="danger"
     icon="fas fa-exclamation-triangle"
     tooltip="Your IP address isn't hidden by default and won't be, unless you enforce Tor usage."
@@ -75,7 +75,7 @@
   <li><a href="https://gnunet.org/">GNUnet</a> - GNUnet provides a strong foundation of free software for a global, distributed network that provides security and privacy.</li>
   <li>
     <a href="https://ipfs.io/">IPFS</a> <em>and</em> <a href="https://github.com/ipfs-shipyard/ipfs-companion">IPFS Companion</a>- A peer-to-peer hypermedia protocol to make the web faster, safer, and more open. IPFS Companion is a browser extension for redirecting queries to a gateway of your choice (generally local).
-    {% include legacy/badge.html
+    {% include badge.html
     color="warning"
     icon="fas fa-exclamation-triangle"
     link="https://github.com/privacytools/privacytools.io/pull/361#issuecomment-344414022"
@@ -86,13 +86,13 @@
     <a href="https://yggdrasil-network.github.io/">Yggdrasil</a>
     - An early-stage implementation of a fully end-to-end encrypted IPv6 network. It is lightweight, self-arranging, supported on multiple platforms, and allows pretty much any IPv6-capable application to communicate securely with other Yggdrasil nodes. Yggdrasil does not require you to have IPv6 Internet connectivity - it also works over IPv4.
 
-    {% include legacy/badge.html
+    {% include badge.html
     color="warning"
     icon="far fa-question-circle"
     tooltip="The project is currently in early stages but it is being actively developed."
     text="Experimental"
     %}
-    {% include legacy/badge.html
+    {% include badge.html
     color="danger"
     icon="fas fa-exclamation-triangle"
     link=""
diff --git a/_includes/legacy/sections/voice-video-messenger.html b/_includes/legacy/sections/voice-video-messenger.html
index ff8eed93..2cb33600 100644
--- a/_includes/legacy/sections/voice-video-messenger.html
+++ b/_includes/legacy/sections/voice-video-messenger.html
@@ -1,7 +1,7 @@
 <h1 id="voip" class="anchor"><a href="#voip"><i class="fas fa-link anchor-icon"></i></a> Video/Voice Calling</h1>
 
 <div class="alert alert-warning" role="alert">
-  <strong>If you are currently using a Video/Voice Calling app like Google Hangouts, Skype, Viber or <a href="https://blog.privacytools.io/protecting-your-privacy-while-using-zoom-at-home/">Zoom</a>, you should pick an alternative here.</strong> Please note that many of the above instant messengers also support {% include legacy/badge.html color="info" text="VoIP" %}. The software listed below are <em>primarily</em> Voice/Video focused.
+  <strong>If you are currently using a Video/Voice Calling app like Google Hangouts, Skype, Viber or <a href="https://blog.privacytools.io/protecting-your-privacy-while-using-zoom-at-home/">Zoom</a>, you should pick an alternative here.</strong> Please note that many of the above instant messengers also support {% include badge.html color="info" text="VoIP" %}. The software listed below are <em>primarily</em> Voice/Video focused.
 </div>
 
 {% include legacy/cardv2.html
diff --git a/_includes/legacy/sections/vpn.html b/_includes/legacy/sections/vpn.html
index 5d7c4d9c..e8309277 100644
--- a/_includes/legacy/sections/vpn.html
+++ b/_includes/legacy/sections/vpn.html
@@ -19,31 +19,31 @@
     <div class="col">
     <h2 id="mullvad" class="anchor">
       <a href="#mullvad"><i class="fas fa-link anchor-icon"></i></a> Mullvad
-      {% include legacy/badge.html color="info" text="EUR €60/y" %}
+      {% include badge.html color="info" text="EUR €60/y" %}
     </h2>
     <p><strong><a href="https://mullvad.net/">Mullvad.net</a> </strong> is a fast and inexpensive VPN with a serious focus on transparency and security. They have been in operation since <strong>2009</strong>. Mullvad is based in <span class="flag-icon flag-icon-se"></span> Sweden and does not have a free trial.</p>
-    <h5>{% include legacy/badge.html color="success" text="35 Countries" %}</h5>
+    <h5>{% include badge.html color="success" text="35 Countries" %}</h5>
     <p>Mullvad has <a href="https://mullvad.net/en/servers/">servers in 35 countries</a> at the time of writing this page. Picking a VPN provider with a server nearest to you will reduce latency of the network traffic you send. This is because of a shorter route (less hops) to the destination.</p>
     <p>We also think it's better for the security of the VPN provider's private keys if they use <a href="https://en.wikipedia.org/wiki/Dedicated_hosting_service">dedicated servers</a>, instead of cheaper shared solutions (with other customers) such as <a href="https://en.wikipedia.org/wiki/Virtual_private_server">virtual private servers</a>.</p>
-    <h5>{% include legacy/badge.html color="success" text="Independently Audited" %}</h5>
+    <h5>{% include badge.html color="success" text="Independently Audited" %}</h5>
     <p>Mullvad's VPN clients have been audited by Cure53 and Assured AB in a pentest report <a href="https://cure53.de/pentest-report_mullvad_v2.pdf">published at cure53.de</a>. The security researchers concluded:</p>
     <blockquote class="blockquote">
       <p class="mb-0">...Cure53 and Assured AB are happy with the results of the audit and the software leaves an overall positive impression. With security dedication of the in-house team at the Mullvad VPN compound, the testers have no doubts about the project being on the right track from a security standpoint.</p>
     </blockquote>
     <p>In 2020 a second audit <a href="https://mullvad.net/blog/2020/6/25/results-available-audit-mullvad-app/">was announced</a> and the <a href="https://cure53.de/pentest-report_mullvad_2020_v2.pdf">final audit report</a> was made available on Cure53's website.</p>
-    <h5>{% include legacy/badge.html color="success" text="Open Source Clients" %}</h5>
+    <h5>{% include badge.html color="success" text="Open Source Clients" %}</h5>
     <p>Mullvad provides the source code for their desktop and mobile clients in their <a href="https://github.com/mullvad/mullvadvpn-app">GitHub organization</a>.</p>
-    <h5>{% include legacy/badge.html color="success" text="Accepts Bitcoin" %}</h5>
+    <h5>{% include badge.html color="success" text="Accepts Bitcoin" %}</h5>
     <p>Mullvad in addition to accepting credit/debit cards and PayPal, accepts <strong>Bitcoin</strong>, <strong>Bitcoin Cash</strong>, and <strong>cash/local currency</strong> as anonymous forms of payment. They also accept Swish and bank wire transfers.</p>
-    <h5>{% include legacy/badge.html color="success" text="WireGuard Support" %}</h5>
+    <h5>{% include badge.html color="success" text="WireGuard Support" %}</h5>
     <p>In addition to standard OpenVPN connections, Mullvad supports WireGuard. WireGuard is an experimental protocol with theoretically better security and higher reliability, although it is not currently recommended for production use.</p>
-    <h5>{% include legacy/badge.html color="success" text="IPv6 Support" %}</h5>
+    <h5>{% include badge.html color="success" text="IPv6 Support" %}</h5>
     <p>Mullvad supports the future of networking <a href="https://en.wikipedia.org/wiki/IPv6">IPv6</a>. Their network allows users to <a href="https://mullvad.net/en/blog/2014/9/15/ipv6-support/">access services hosted on IPv6</a> as opposed to other providers who block IPv6 connections.</p>
-    <h5>{% include legacy/badge.html color="success" text="Remote Port Forwarding" %}</h5>
+    <h5>{% include badge.html color="success" text="Remote Port Forwarding" %}</h5>
     <p>Remote <a href="https://en.wikipedia.org/wiki/Port_forwarding">port forwarding</a> is allowed on Mullvad, see <a href="https://mullvad.net/help/port-forwarding-and-mullvad/">Port forwarding with Mullvad VPN</a>.</p>
-    <h5>{% include legacy/badge.html color="success" text="Mobile Clients" %}</h5>
+    <h5>{% include badge.html color="success" text="Mobile Clients" %}</h5>
     <p>Mullvad has published <a href ="https://apps.apple.com/app/mullvad-vpn/id1488466513">App Store</a> and <a href="https://play.google.com/store/apps/details?id=net.mullvad.mullvadvpn">Google Play</a> clients, both supporting an easy-to use interface as opposed to requiring users to manual configure their WireGuard connections. 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">reproducible builds</a>.</p></p>
-    <h5>{% include legacy/badge.html color="info" text="Extra Functionality" %}</h5>
+    <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>
@@ -54,25 +54,25 @@
     <div class="col">
     <h2 id="protonvpn" class="anchor">
       <a href="#protonvpn"><i class="fas fa-link anchor-icon"></i></a> ProtonVPN
-      {% include legacy/badge.html color="info" text="Free" %}
-      {% include legacy/badge.html color="info" text="Basic USD $48/y" %}
-      {% include legacy/badge.html color="secondary" text="Plus USD $96/y" %}
+      {% include badge.html color="info" text="Free" %}
+      {% include badge.html color="info" text="Basic USD $48/y" %}
+      {% include badge.html color="secondary" text="Plus USD $96/y" %}
     </h2>
     <p><strong><a href="https://protonvpn.com/">ProtonVPN.com</a></strong> is a strong contender in the VPN space, and they have been in operation since <strong>2016</strong>. ProtonVPN is based in <span class="flag-icon flag-icon-ch"></span> Switzerland and offers a limited free pricing tier, as well as premium options. They offer a further 14% discount for buying a 2 year subscription.</p>
-    <h5>{% include legacy/badge.html color="success" text="44 Countries" %}</h5>
+    <h5>{% include badge.html color="success" text="44 Countries" %}</h5>
     <p>ProtonVPN has <a href="https://protonvpn.com/vpn-servers">servers in 44 countries</a> at the time of writing this page. Picking a VPN provider with a server nearest to you will reduce latency of the network traffic you send. This is because of a shorter route (less hops) to the destination.</p>
     <p>We also think it's better for the security of the VPN provider's private keys if they use <a href="https://en.wikipedia.org/wiki/Dedicated_hosting_service">dedicated servers</a>, instead of cheaper shared solutions (with other customers) such as <a href="https://en.wikipedia.org/wiki/Virtual_private_server">virtual private servers</a>.</p>
-    <h5>{% include legacy/badge.html color="success" text="Independently Audited" %}</h5>
+    <h5>{% include badge.html color="success" text="Independently Audited" %}</h5>
     <p>As of January 2020 ProtonVPN has undergone an independent audit by SEC Consult. SEC Consult found some medium and low risk vulnerabilities in ProtonVPN's Windows, Android, and iOS applications, all of which were "properly fixed" by ProtonVPN before the reports were published. None of the issues identified would have provided an attacker remote access to a user's device or traffic. You can view individual reports for each platform at <a href="https://protonvpn.com/blog/open-source/">protonvpn.com</a>.
-    <h5>{% include legacy/badge.html color="success" text="Open Source Clients" %}</h5>
+    <h5>{% include badge.html color="success" text="Open Source Clients" %}</h5>
     <p>ProtonVPN provides the source code for their desktop and mobile clients in their <a href="https://github.com/ProtonVPN">GitHub organization</a>.</p>
-    <h5>{% include legacy/badge.html color="success" text="Accepts Bitcoin" %}</h5>
+    <h5>{% include badge.html color="success" text="Accepts Bitcoin" %}</h5>
     <p>ProtonVPN does technically accept Bitcoin payments; however, you either need to have an existing account, or contact their support team in advance to register with Bitcoin.</p>
-    <h5>{% include legacy/badge.html color="success" text="Mobile Clients" %}</h5>
+    <h5>{% include badge.html color="success" text="Mobile Clients" %}</h5>
     <p>In addition to providing standard OpenVPN configuration files, ProtonVPN has mobile clients for <a href="https://apps.apple.com/us/app/protonvpn-fast-secure-vpn/id1437005085">App Store</a> and <a href="https://play.google.com/store/apps/details?id=ch.protonvpn.android&hl=en_US">Google Play</a> allowing for easy connections to their servers. The mobile client on Android is also available in <a href="https://f-droid.org/en/packages/ch.protonvpn.android">F-Droid</a>, which ensures that it is compiled with <a href="https://www.f-droid.org/en/2019/05/05/trust-privacy-and-free-software.html">reproducible builds</a>.</p>
-    <h5>{% include legacy/badge.html color="warning" text="No Port Forwarding" %}</h5>
+    <h5>{% include badge.html color="warning" text="No Port Forwarding" %}</h5>
     <p>ProtonVPN does not currently support remote port forwarding, which may impact some applications. Especially Peer-to-Peer applications like Torrent clients.</p>
-    <h5>{% include legacy/badge.html color="info" text="Extra Functionality" %}</h5>
+    <h5>{% include badge.html color="info" text="Extra Functionality" %}</h5>
     <p>The ProtonVPN clients have a built-in killswitch to block internet connections outside of the VPN. They also are able to automatically start on boot. ProtonVPN also offers "Tor" servers allowing you to easily connect to onion sites, but we still strongly recommend using <a href="https://www.torproject.org/">the official Tor Browser</a> for this purpose.</p>
     </div>
   </div>
@@ -83,26 +83,26 @@
     <div class="col">
     <h2 id="ivpn" class="anchor">
       <a href="#ivpn"><i class="fas fa-link anchor-icon"></i></a> IVPN
-      {% include legacy/badge.html color="info" text="Standard USD $60/y" %}
-      {% include legacy/badge.html color="secondary" text="Pro USD $100/y" %}
+      {% include badge.html color="info" text="Standard USD $60/y" %}
+      {% include badge.html color="secondary" text="Pro USD $100/y" %}
     </h2>
     <p><strong><a href="https://www.ivpn.net">IVPN.net</a></strong> is another premium VPN provider, and they have been in operation since <strong>2009</strong>. IVPN is based in <span class="flag-icon flag-icon-gi"></span> Gibraltar and offers a 3 day free trial.</p>
-    <h5>{% include legacy/badge.html color="success" text="32 Countries" %}</h5>
+    <h5>{% include badge.html color="success" text="32 Countries" %}</h5>
     <p>IVPN has <a href="https://www.ivpn.net/server-locations">servers in 32 countries</a> at the time of writing this page. Picking a VPN provider with a server nearest to you will reduce latency of the network traffic you send. This is because of a shorter route (less hops) to the destination.</p>
     <p>We also think it's better for the security of the VPN provider's private keys if they use <a href="https://en.wikipedia.org/wiki/Dedicated_hosting_service">dedicated servers</a>, instead of cheaper shared solutions (with other customers) such as <a href="https://en.wikipedia.org/wiki/Virtual_private_server">virtual private servers</a>.</p>
-    <h5>{% include legacy/badge.html color="success" text="Independently Audited" %}</h5>
+    <h5>{% include badge.html color="success" text="Independently Audited" %}</h5>
     <p>IVPN has undergone a <a href="https://cure53.de/audit-report_ivpn.pdf">no-logging audit from Cure53</a> which concluded in agreement with IVPN's no-logging claim. IVPN has also completed a <a href="https://cure53.de/summary-report_ivpn_2019.pdf">comprehensive pentest report Cure53</a> in January 2020. IVPN has also said they plan to have <a href="https://www.ivpn.net/blog/independent-security-audit-concluded">annual reports</a> in the future.</p>
-    <h5>{% include legacy/badge.html color="success" text="Open Source Clients" %}</h5>
+    <h5>{% include badge.html color="success" text="Open Source Clients" %}</h5>
     <p>As of Feburary 2020 <a href="https://www.ivpn.net/blog/ivpn-applications-are-now-open-source">IVPN applications are now open source</a>. Source code can be obtained from their <a href="https://github.com/ivpn">GitHub organization</a>.</p>
-    <h5>{% include legacy/badge.html color="success" text="Accepts Bitcoin" %}</h5>
+    <h5>{% include badge.html color="success" text="Accepts Bitcoin" %}</h5>
     <p>In addition to accepting credit/debit cards and PayPal, IVPN accepts <strong>Bitcoin</strong> and <strong>cash/local currency</strong> (on annual plans) as anonymous forms of payment.</p>
-    <h5>{% include legacy/badge.html color="success" text="WireGuard Support" %}</h5>
+    <h5>{% include badge.html color="success" text="WireGuard Support" %}</h5>
     <p>In addition to standard OpenVPN connections, IVPN supports WireGuard. WireGuard is an experimental protocol with theoretically better security and higher reliability, although it is not currently recommended for production use.</p>
-    <h5>{% include legacy/badge.html color="success" text="Remote Port Forwarding" %}</h5>
+    <h5>{% include badge.html color="success" text="Remote Port Forwarding" %}</h5>
     <p>Remote <a href="https://en.wikipedia.org/wiki/Port_forwarding">port forwarding</a> is possible with a Pro plan. Port forwarding <a href="https://www.ivpn.net/knowledgebase/81/How-do-I-activate-port-forwarding.html">can be activated</a> via the client area. Port forwarding is only available on IVPN when <a href="https://www.ivpn.net/knowledgebase/116/Port-forwarding-is-not-working-why.html">using OpenVPN and is disabled on US servers</a>.</p>
-    <h5>{% include legacy/badge.html color="success" text="Mobile Clients" %}</h5>
+    <h5>{% include badge.html color="success" text="Mobile Clients" %}</h5>
     <p>In addition to providing standard OpenVPN configuration files, IVPN has mobile clients for <a href="https://apps.apple.com/us/app/ivpn-serious-privacy-protection/id1193122683">App Store</a> and <a href="https://play.google.com/store/apps/details?id=net.ivpn.client">Google Play</a> allowing for easy connections to their servers. The mobile client on Android is also available in <a href="https://f-droid.org/en/packages/net.ivpn.client">F-Droid</a>, which ensures that it is compiled with <a href="https://www.f-droid.org/en/2019/05/05/trust-privacy-and-free-software.html">reproducible builds</a>.</p>
-    <h5>{% include legacy/badge.html color="info" text="Extra Functionality" %}</h5>
+    <h5>{% include badge.html color="info" text="Extra Functionality" %}</h5>
     <p>The IVPN clients have a built-in killswitch to block internet connections outside of the VPN. They also are able to automatically start on boot. IVPN also provides "<a href="https://www.ivpn.net/antitracker">AntiTracker</a>" functionality, which blocks advertising networks and trackers from the network level.</p>
     </div>
   </div>
diff --git a/_includes/legacy/sponsors/gold.html b/_includes/legacy/sponsors/gold.html
deleted file mode 100644
index 4b6e387d..00000000
--- a/_includes/legacy/sponsors/gold.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<div class="d-flex flex-wrap justify-content-around">
-  <a class="m-3" href="https://safing.io" target="_blank" rel="noreferrer">
-    <img
-      src="/assets/img/legacy_svg/3rd-party/sponsors/safing.svg"
-      {% unless page.url == '/sponsors/' %}data-theme-src="/assets/img/legacy_svg/3rd-party/sponsors/safing-dark.svg"{% endunless %}
-      height="70rem"
-      title="Safing Privacy Network - Launching on Kickstarter January 2nd, 2020"
-      alt="Safing Privacy Network - Safing.io Logo" />
-  </a>
-  <a class="m-3" href="https://www.oeck.com" target="_blank" rel="noreferrer">
-    <img
-      src="/assets/img/legacy_png/3rd-party/sponsors/oeck.png"
-      {% unless page.url == '/sponsors/' %}data-theme-src="/assets/img/legacy_png/3rd-party/sponsors/oeck-dark.png"{% endunless %}
-      height="70rem"
-      title="Oeck - A new type of VPN - Unique, fast and private."
-      alt="Insurgo Logo" />
-  </a>
-  <a class="m-3" href="https://insurgo.ca" target="_blank" rel="noreferrer">
-    <img
-      src="/assets/img/legacy_png/3rd-party/sponsors/insurgo.png"
-      height="70rem"
-      title="Insurgo Technologies Libres / Open Technologies — Empower yourself!"
-      alt="Insurgo Logo" />
-  </a>
-  <a class="m-3" href="https://joindeleteme.com" target="_blank" rel="noreferrer">
-    <img
-      src="/assets/img/legacy_png/3rd-party/sponsors/deleteme.png"
-      height="70rem"
-      title="DeleteMe is a hands-free subscription service that removes your personal information from data brokers and prevents it from being sold online."
-      alt="DeleteMe Logo" />
-  </a>
-</div>
diff --git a/_includes/legacy/sponsors/list.html b/_includes/legacy/sponsors/list.html
deleted file mode 100644
index a28494ae..00000000
--- a/_includes/legacy/sponsors/list.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<ul class="d-flex flex-wrap list-group-flush">
-  <li class="list-group-item flex-fill">Alex</li>
-  <li class="list-group-item flex-fill">Daw-Ran Liou</li>
-  <li class="list-group-item flex-fill">Greg Werbin</li>
-  <li class="list-group-item flex-fill">Michael DeMichillie</li>
-  <li class="list-group-item flex-fill">Nathan Myers</li>
-  <li class="list-group-item flex-fill">PablO</li>
-  <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>
diff --git a/_includes/legacy/sponsors/silver.html b/_includes/legacy/sponsors/silver.html
deleted file mode 100644
index 1e2db96a..00000000
--- a/_includes/legacy/sponsors/silver.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<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/legacy_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/legacy_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/legacy_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>
-<div class="col-6 col-sm-4 col-md-3 my-3">
-  <div class="d-flex justify-content-start">
-    <div><a href="https://www.scams.info"><img src="/assets/img/legacy_png/3rd-party/sponsors/scamsinfo.png" class="mx-3" width="64" height="64" title="An Overview of the Safest Online Gambling Sites in the UK" alt="scams.info"></a></div>
-    <div class="d-flex flex-column align-self-center">
-    <p class="my-0"><strong>scams.info</strong></p>
-    <a href="https://www.scams.info" class="my-0">https://www.scams.info</a>
-    </div>
-  </div>
-</div>
diff --git a/_includes/legacy/team.html b/_includes/legacy/team.html
deleted file mode 100644
index 120b09cd..00000000
--- a/_includes/legacy/team.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<div class="col-12 col-sm-6 col-lg-4 {% unless include.emeritus %}col-xl-3{% endunless %}">
-  <div class="card mb-3 mx-4 mx-sm-0" itemprop="member" itemscope itemtype="http://schema.org/Person">
-    {% if include.avatar %}<img src="{{ site.baseurl }}/assets/img/{{ include.avatar | split: "." | last }}/team/{{ include.avatar }}" class="card-img-top" itemprop="image" alt="{% if include.nick %}{{ include.nick }}{% else %}{{ include.name }}{% endif %}">{% endif %}
-    <div class="card-body">
-
-      <h5 class="card-title mt-0" itemprop="name">
-      {% if include.nick %}
-        {{ include.nick }}</h5>
-      <meta itemprop="alternateName" content="{{ include.name }}" />
-      {% else %}
-        {{ include.name }}</h5>
-      {% endif %}
-
-      <h6 class="card-subtitle mb-2 text-muted" itemprop="jobTitle">{% if include.role %}{{ include.role }}{% elsif include.emeritus %}Former Contributor{% else %}Contributor{% endif %}</h6>
-      {% if include.bio %}<p class="card-text" itemprop="description">{{ include.bio | default: "<i>Hmm, this user hasn't written a bio quite yet :(</i>" }}</p>{% endif %}
-      <div class="mx-n2">
-        {% if include.email %}
-        <a href="{{ include.email }}" aria-label="Email" class="mx-2 text-decoration-none" itemprop="email">
-          <i class="fas fa-envelope" aria-hidden="true" title="{{ include.email }}"></i>
-        </a>
-        {% endif %}
-        {% if include.website %}
-        <a href="{{ include.website }}" aria-label="Website" class="mx-2 text-decoration-none" itemprop="url">
-          <i class="fas fa-link" aria-hidden="true" title="Website"></i>
-        </a>
-        {% endif %}
-        {% if include.keys %}
-        <a href="{{ include.keys }}" aria-label="Keys" class="mx-2 text-decoration-none" itemprop="sameAs">
-          <i class="fas fa-key" aria-hidden="true" title="Keys"></i>
-        </a>
-        {% endif %}
-        {% if include.mastodon %}
-        <a href="{{ include.mastodon }}" aria-label="Mastodon" class="mx-2 text-decoration-none" itemprop="sameAs">
-          <i class="fab fa-mastodon" aria-hidden="true" title="Mastodon Profile"></i>
-        </a>
-        {% endif %}
-        {% if include.twitter %}
-        <a href="https://twitter.com/{{ include.twitter }}" aria-label="Twitter" class="mx-2 text-decoration-none" itemprop="sameAs">
-          <i class="fab fa-twitter" aria-hidden="true" title="Twitter Profile"></i>
-        </a>
-        {% endif %}
-        {% if include.blog %}
-        <a href="https://blog.privacytools.io/author/{{ include.blog }}" aria-label="Blog" class="mx-2 text-decoration-none" itemprop="sameAs">
-          <i class="fas fa-pen-nib" aria-hidden="true" title="Privacy Guides Blog Author"></i>
-        </a>
-        {% endif %}
-      </div>
-    </div>
-  </div>
-</div>
diff --git a/_layouts/page.html b/_layouts/page.html
index 9d95bff3..f753b29d 100644
--- a/_layouts/page.html
+++ b/_layouts/page.html
@@ -2,6 +2,7 @@
 layout: default
 ---
 <div class="container my-5">
+  {% include breadcrumbs.html %}
   <h1>{{ page.title }}</h1>
   {% if page.description %}<p class="lead">
     {{ page.description }}
diff --git a/legacy_pages/about/about.html b/legacy_pages/about/about.html
deleted file mode 100644
index ba8350ed..00000000
--- a/legacy_pages/about/about.html
+++ /dev/null
@@ -1,171 +0,0 @@
----
-layout: page
-permalink: /about/
-title: "About Privacy Guides"
-description: "About the Privacy Guides organization, and contributors to the Privacy Guides website, communities, and services."
-hidedesc: true
----
-<div itemscope itemtype="http://schema.org/Organization">
-<meta itemprop="alternateName" content="privacytoolsIO">
-<meta itemprop="alternateName" content="Privacy Tools">
-<meta itemprop="alternateName" content="privacytools.io">
-<link itemprop="logo" href="https://privacyguides.org/assets/img/legacy_svg/layout/brand/square-transparent.svg">
-<div class="row">
-  <div class="col">
-    <p itemprop="description"><em>You are being watched. Private and state-sponsored organizations are monitoring and recording your online activities.</em></p>
-    <p>At <strong itemprop="name">PrivacyTools</strong>, we provide services, tools, and knowledge to protect your <span itemprop="knowsAbout">privacy</span> against <span itemprop="knowsAbout">global mass surveillance</span>, and moderate a thriving community of privacy-minded individuals like yourself to discuss and learn about new advances in protecting your online data. <a itemprop="url" href="https://privacyguides.org">This website</a> serves as the centerpiece of our organization, where we research and recommend various software solutions for our community.</p>
-    <p><strong>Transparency</strong> is our strongest value, and it's what sets us apart from the rest of the "privacy recommendations" community. Editorial changes to this website and the products we recommend are always discussed on our extensive <a href="https://github.com/privacytools/privacytools.io/issues">issue tracker</a>, drafted in a public <a href="https://github.com/privacytools/privacytools.io/pulls">pull request</a> open for further discussion, and logged in a comprehensive <a href="https://github.com/privacytools/privacytools.io/commits/master">commit log</a> dating back to our original founding date in <span itemprop="foundingDate">2015</span>. The <em>core</em> team members listed below are responsible for most of the edits and final decisions to changes on this website and across our services, but this website is truly the work of hundreds <a href="https://github.com/privacytools/privacytools.io/graphs/contributors">contributors and fact checkers</a> working to make sure our recommendations are solid and trustworthy.</p>
-    <p>Additionally, we are a not-for-profit organization. We do not utilize paid recommendations or affiliate programs to make the recommendations on this website. Unfortunately this practice is very common elsewhere online, which makes it difficult to trust other review sites. We are unique in this area, in that all of our research is conducted independently, and we will never accept payments to modify, add, or remove any of our reviews or recommendations. Our finances are provided entirely by our community <a href="https://opencollective.com/privacytools">donors</a> and <a href="/sponsors/">sponsors</a>, and are handled by the Open Collective Foundation 501(c)(3). Because we are operating as a charity in the United States, we are legally obligated to only use our funding to further our mission of spreading privacy education and promoting online services like Mastodon, Matrix, and WriteFreely. This website is a public resource, not a profit generator. To that regard, all our financial transactions (incoming and outgoing) are logged and made available to the public via our page at <a href="https://opencollective.com/privacytools">opencollective.com/privacytools</a>.</p>
-    <p>We take the operation of our various <a href="/services/">services</a> very seriously, and require all participants to adhere to our <a href="https://github.com/privacytools/.github/blob/master/CODE_OF_CONDUCT.md">Code of Conduct</a>. For any questions or to report abuse, please see our CoC’s <a href="https://github.com/privacytools/.github/blob/master/CODE_OF_CONDUCT.md#enforcement">Enforcement section</a>.</p>
-  </div>
-</div>
-
-<div class="row">
-  <div class="col">
-    <h2>Team Members</h2>
-  </div>
-</div>
-
-<div class="row">
-{% include legacy/team.html
-avatar="burung.png"
-name="Burung Hantu"
-role="Founder"
-bio="I founded Privacy Guides in 2015 to share resources and tools, allowing users to avoid international mass-surveillance programs."
-keys="https://keybase.io/privacytools"
-mastodon="https://social.privacytools.io/@BurungHantu"
-twitter="privacytoolsIO"
-%}
-
-{% include legacy/team.html
-avatar="blacklight447.png"
-name="Niek de Wilde"
-bio="I research new privacy recommendations and moderate our communities. My expertise is endpoint security and networking."
-role="Editor-in-chief"
-email="mailto:blacklight447@privacytools.io"
-mastodon="https://social.privacytools.io/@blacklight447"
-blog="blacklight447"
-%}
-
-{% include legacy/team.html
-avatar="dngray.png"
-name="dngray"
-nick="Daniel Gray"
-bio="I liaise with and research privacy-focused services to refine our recommendations. My background is infosec and network security."
-website="https://dngray.netlify.com"
-email="https://dngray.netlify.com/email"
-keys="https://keybase.io/dngray"
-mastodon="https://social.privacytools.io/@dngray"
-%}
-
-{% include legacy/team.html
-avatar="freddy.png"
-name="Freddy Marsden"
-nick="Freddy"
-bio="I'm an amateur writer covering privacy, security and open-source development."
-role="Blogging & Education"
-website="https://write.privacytools.io/freddy/"
-email="mailto:freddy@privacytools.io"
-mastodon="https://social.privacytools.io/@freddy"
-blog="freddy"
-%}
-
-{% include legacy/team.html
-avatar="lynn.png"
-name="Lynn Stephenson"
-bio="I'm a software developer doing some pentesting on the side, specializing in security, cryptography, networking, web development, and accessibility."
-role="Researcher"
-email="mailto:lynn@privacytools.io"
-mastodon="https://ioc.exchange/@lynn_stephenson"
-%}
-
-{% include legacy/team.html
-avatar="trai_dep.png"
-name="trai_dep"
-role="Subreddit Mod"
-bio="I'm the moderator at r/Privacy and r/privacytoolsIO. Day to day, I am also – <i>irony alert</i> – an (ethical) digital marketer."
-email="mailto:trai_dep@privacytools.io"
-website="https://www.reddit.com/user/trai_dep"
-%}
-</div>
-
-<div class="row mt-4 mb-4">
-  <div class="col">
-    <div class="card">
-      <div class="card-body">
-        <p class="card-text">Of course, we couldn't do any of this without our very generous <a href="https://opencollective.com/privacytools/">financial contributors</a>, <a href="https://github.com/privacytools/privacytools.io/graphs/contributors">website contributors</a>, and the countless community members that help share new ideas and spread the word! Thank you.</p>
-        <a href="/#participate" class="btn btn-primary"><i class="fas fa-hands-helping"></i> Get involved!</a>
-        <a href="/donate/" class="btn btn-outline-danger"><i class="fas fa-heart"></i> Donate</a>
-      </div>
-    </div>
-  </div>
-</div>
-
-<div class="row">
-  <div class="col">
-    <h2>Emeritus</h2>
-    <p>Emeriti are honorary Privacy Guides team members who have formerly contributed to the project in a central way but are no longer currently active.</p>
-  </div>
-</div>
-
-<div class="row">
-{% include legacy/team.html
-name="Mikaela Suomalainen"
-website="https://mikaela.info/"
-keys="https://gitea.blesmrt.net/mikaela/shell-things/src/branch/master/.mikaela/keys"
-emeritus=true
-%}
-
-{% include legacy/team.html
-name="Dan Arel"
-website="https://danarel.com"
-keys="https://www.danarel.com/keys/"
-blog="danarel"
-emeritus=true
-%}
-
-{% include legacy/team.html
-name="Dawid Potocki"
-website="https://dawidpotocki.com"
-keys="https://dawidpotocki.com/accounts/#pgp"
-blog="dawidpotocki"
-emeritus=true
-%}
-
-{% include legacy/team.html
-name="Andreas Basurto"
-nick="nitrohorse"
-website="https://nitrohorse.com/"
-keys="https://nitrohorse.com/keys"
-blog="nitrohorse"
-emeritus=true
-%}
-
-{% include legacy/team.html
-name="Jonah Aragon"
-role="Former Sysadmin"
-website="https://jonaharagon.com"
-keys="https://jonaharagon.com/accounts/"
-mastodon="https://social.privacytools.io/@jonah"
-blog="jonah"
-twitter="JonahAragon"
-emeritus=true
-%}
-</div>
-
-<div class="row">
-  <div class="col">
-    <h2>Contact Us</h2>
-    <p>It's very important to us to stay up-to-date on the latest changes in the privacy space. If you have a software recommendation for us, or want to request a change on this website, please don't hesitate to reach out in one of the following ways.</p>
-    <p><a href="https://forum.privacytools.io/"><i class="fab fa-discourse fa-lg fa-fw"></i> Start a discussion in our Discourse forum</a></p>
-    <p><a href="https://github.com/privacytools/privacytools.io/issues"><i class="fab fa-github fa-lg fa-fw"></i> Open an issue on GitHub</a></p>
-    <p><a href="https://www.reddit.com/r/privacytoolsIO/"><i class="fab fa-reddit fa-lg fa-fw"></i> Suggest something new on our subreddit</a></p>
-    <p>For complete transparency, software and providers will only be considered for this website after discussions take place on our GitHub issue tracker. We of course don't make any changes in secret.</p>
-    <p>Join our Matrix room at <code>#general:privacytools.io</code> to chat with us and other members about this site and privacy in general! If you need a Matrix account, you can sign up with our own homeserver (<code>https://chat.privacytools.io</code>) using <a href="https://riot.privacytools.io">Riot</a>.</p>
-    <p>You can also email the team at <a itemprop="email" href="mailto:support@privacytools.io">support@privacytools.io</a> and find us on <a itemprop="sameAs" href="https://twitter.com/privacytoolsIO">Twitter</a> and <a itemprop="sameAs" href="https://social.privacytools.io/@privacytools">Mastodon</a>.</p>
-    <link itemprop="sameAs" href="https://blog.privacytools.io">
-    <link itemprop="sameAs" href="https://www.youtube.com/channel/UCen3taxHtzByXV8Da73B1Vg">
-    <link itemprop="sameAs" href="https://github.com/privacytools">
-  </div>
-</div>
-</div>
diff --git a/legacy_pages/about/librejs.html b/legacy_pages/about/librejs.html
deleted file mode 100644
index 43d7ba5c..00000000
--- a/legacy_pages/about/librejs.html
+++ /dev/null
@@ -1,34 +0,0 @@
----
-permalink: /about/javascript/
----
-<h3>JavaScript Licenses</h3>
-<table id="jslicense-labels1" border="1">
-  <tr>
-    <td><a href="/assets/js/main.js">main.js</a></td>
-    <td><a href="https://github.com/privacytools/privacytools.io/raw/master/LICENSE.txt">CC0-1.0-only</a></td>
-  </tr>
-  <tr>
-    <td><a href="/assets/js/applytheme.js">applytheme.js</a>
-    <td><a href="https://github.com/privacytools/privacytools.io/raw/master/LICENSE.txt">CC0-1.0-only</a></td>
-  </tr>
-  <tr>
-    <td><a href="/assets/js/redirects.js">redirects.js</a></td>
-    <td><a href="https://github.com/privacytools/privacytools.io/raw/master/LICENSE.txt">CC0-1.0-only</a></td>
-  </tr>
-  <tr>
-    <td><a href="/assets/js/bootstrap.min.js">bootstrap.min.js</a></td>
-    <td><a href="https://github.com/twbs/bootstrap/raw/main/LICENSE">Expat</a></td>
-  </tr>
-  <tr>
-    <td><a href="/assets/js/jquery-3.3.1.min.js">jquery-3.3.1.min.js</a></td>
-    <td><a href="https://github.com/jquery/jquery/raw/master/LICENSE.txt">Expat</a></td>
-  </tr>
-  <tr>
-    <td><a href="/assets/js/popper.min.js">popper.min.js</a></td>
-    <td><a href="https://github.com/FezVrasta/popper.js/raw/master/LICENSE.md">Expat</a></td>
-  </tr>
-  <tr>
-    <td><a href="/assets/js/sortable.min.js">sortable.min.js</a></td>
-    <td><a href="https://github.com/HubSpot/sortable/raw/master/LICENSE">Expat</a></td>
-  </tr>
-</table>
diff --git a/legacy_pages/donate.html b/legacy_pages/donate.html
deleted file mode 100644
index 2de54a09..00000000
--- a/legacy_pages/donate.html
+++ /dev/null
@@ -1,312 +0,0 @@
----
-layout: default
-active_page: donate
-permalink: /donate/
----
-<div class="col-12">
-  <div class="row">
-    <div class="mx-auto text-center">
-      <div class="mt-4 mb-4">
-        <a href="https://privacyguides.org">
-          <img class="img-fluid" src="/assets/img/legacy_svg/layout/brand/horizontal.svg" width="450px" alt="Privacy Guides">
-        </a>
-      </div>
-
-      <div class="card border-success mt-5 mb-5">
-        <div class="card-header text-success"><i class="fas fa-donate fa-fw"></i> Donate via OpenCollective</div>
-        <div class="card-body text-success">
-          <p class="card-text">If you are able, please consider contributing to our development and outreach programs. <strong>Contributions via OpenCollective to Privacy Guides are tax deductible for US taxpayers.</strong> These funds are transparently and primarily used to cover server costs.</p>
-          <a href="https://opencollective.com/privacytools#section-contribute" class="btn btn-success">Contribute</a>
-          <a href="https://blog.privacytools.io/privacytools-io-joins-the-open-collective-foundation" class="btn btn-outline-success">More Info</a>
-        </div>
-      </div>
-
-      <h1>Please Donate</h1>
-
-      <p>Our website is free of advertisements and not affiliated with any listed providers.<br>Your donation will cover our costs for servers, domains, coffee, beer, and pizza.</p>
-      <p>You may also contribute via the cryptocurrencies below, however we will not be able to provide a receipt for your contribution.<br>Your contribution will be considered an anonymous, unrestricted contribution and paid to our Fiscal Host at OpenCollective when we convert to currency.</p>
-
-    </div>
-  </div>
-  <div class="row">
-    <div class="col-md-12 col-lg-8 offset-lg-2 text-right">
-
-      <div class="form-group row">
-        <label for="BTC" class="col-sm-4 col-form-label"><strong>Bitcoin (BTC)</strong> <a href="/assets/img/legacy_svg/qr/btc.svg"><i class="fa fa-qrcode"></i></a></label>
-        <div class="col-sm-8">
-          <input id="BTC" type="text" value="1C3MVvvJwfEiS5KQmZzJkiVq7obYi2zRqb" class="form-control input-lg onclick-select" readonly>
-        </div>
-      </div>
-
-      <div class="form-group row">
-        <label for="BCH" class="col-sm-4 col-form-label"><strong>Bitcoin Cash (BCH)</strong> <a href="/assets/img/legacy_svg/qr/bch.svg"><i class="fa fa-qrcode"></i></a></label>
-        <div class="col-sm-8">
-          <input id="BCH" type="text" value="bitcoincash:qzs5eh484cc7gq2frw4y0ygdg33uv6ucrq48ewgqqf" class="form-control input-lg onclick-select" readonly>
-        </div>
-      </div>
-
-      <div class="form-group row">
-        <label for="ETH" class="col-sm-4 col-form-label"><strong>Ethereum (ETH)</strong> <a href="/assets/img/legacy_svg/qr/eth.svg"><i class="fa fa-qrcode"></i></a></label>
-        <div class="col-sm-8">
-          <input id="ETH" type="text" value="0x1DdD9c188aaf9198b664CeBce9a9cD03E75FdD49" class="form-control input-lg onclick-select" readonly>
-        </div>
-      </div>
-
-      <div class="form-group row">
-        <label for="ZEC" class="col-sm-4 col-form-label"><strong>Zcash (ZEC)</strong> <a href="/assets/img/legacy_svg/qr/zec.svg"><i class="fa fa-qrcode"></i></a></label>
-        <div class="col-sm-8">
-          <input id="ZEC" type="text" value="t1Sv6rSRchWUXkWNz7PkeYixTs9M2aAs4wX" class="form-control input-lg onclick-select" readonly>
-        </div>
-      </div>
-
-      <div class="form-group row">
-        <label for="LTC" class="col-sm-4 col-form-label"><strong>Litecoin (LTC)</strong> <a href="/assets/img/legacy_svg/qr/ltc.svg"><i class="fa fa-qrcode"></i></a></label>
-        <div class="col-sm-8">
-          <input id="LTC" type="text" value="LSccXrCDm7zu4Gc6PiiW6sBaKjADfFGQSQ" class="form-control input-lg onclick-select" readonly>
-        </div>
-      </div>
-
-      <div class="form-group row">
-        <label for="XLM" class="col-sm-4 col-form-label"><strong>Stellar (XLM)</strong> <a href="/assets/img/legacy_svg/qr/xlm.svg"><i class="fa fa-qrcode"></i></a></label>
-        <div class="col-sm-8">
-          <input id="XLM" type="text" value="GA3GFFRS2PEZHFYOKYO5FSK5GAMW44AOGI4RY5ISXOWMD3PWAARFVAA4" class="form-control input-lg onclick-select" readonly>
-        </div>
-      </div>
-
-      <div class="form-group row">
-        <label for="XMR" class="col-sm-4 col-form-label"><strong>Monero (XMR)</strong> <a href="/assets/img/legacy_svg/qr/xmr.svg"><i class="fa fa-qrcode"></i></a></label>
-        <div class="col-sm-8">
-          <input id="XMR" type="text" value="45yJ8LkShLt2f9gCqbBQUcDw7um9XxD2vZ8h2Rt3GoLq9kMrznB3UAHBS1chJk9KjugpBbbJFGtdAeXE5j99wuGxDcbYUri" class="form-control input-lg onclick-select" readonly>
-        </div>
-      </div>
-
-    <div class="text-center">
-      <p>We prefer Bitcoin donations to be above $5 due to the state of the network's transaction fees. You are welcome to donate any smaller or larger amount on any other cryptocurrency, such as Bitcoin Cash, Ethereum, or Stellar.</p>
-
-      <h2>More Cryptocurrencies</h2>
-
-    </div>
-
-    </div>
-  </div>
-
-
-  <div class="row">
-
-<div class="col-md-12 col-lg-8 offset-lg-2 text-right">
-
-      <div class="form-group row">
-        <label for="BNB" class="col-sm-4 col-form-label"><strong>Binance Coin (BNB)</strong></label>
-        <div class="col-sm-8">
-          <input id="BNB" type="text" value="bnb17zlv4xnkjsujks80cclx46uhm9h8txms82htwj" class="form-control input-lg onclick-select" readonly>
-        </div>
-      </div>
-
-      <div class="form-group row">
-        <label for="EOS" class="col-sm-4 col-form-label"><strong>EOS</strong></label>
-        <div class="col-sm-8">
-          <input id="EOS" type="text" value="privacytools" class="form-control input-lg onclick-select" readonly>
-        </div>
-      </div>
-
-      <div class="form-group row">
-        <label for="BAT" class="col-sm-4 col-form-label"><strong>Brave (BAT)</strong></label>
-        <div class="col-sm-8">
-          <input id="BAT" type="text" value="0x13DA8c6176a9bd171B8285067Ae38420B39eC11E" class="form-control input-lg onclick-select" readonly>
-        </div>
-      </div>
-
-      <div class="form-group row">
-        <label for="XRP" class="col-sm-4 col-form-label"><strong>Ripple (XRP)</strong></label>
-        <div class="col-sm-8">
-          <input id="XRP" type="text" value="r3EPSFMZNoHPKKhWUBfobtxck5UVR2T8mF" class="form-control input-lg onclick-select" readonly>
-        </div>
-      </div>
-
-      <div class="form-group row">
-        <label for="DOGE" class="col-sm-4 col-form-label"><strong>Dogecoin (DOGE)</strong></label>
-        <div class="col-sm-8">
-          <input id="DOGE" type="text" value="DHHPUaDq562BzET6QxhudJepXNDoG7yP12" class="form-control input-lg onclick-select" readonly>
-        </div>
-      </div>
-
-      <div class="form-group row">
-        <label for="ETC" class="col-sm-4 col-form-label"><strong>Ethereum Classic (ETC)</strong></label>
-        <div class="col-sm-8">
-          <input id="ETC" type="text" value="0x6807739f23B74AE07F8902aBDA03cF854678dc7e" class="form-control input-lg onclick-select" readonly>
-        </div>
-      </div>
-
-      <div class="form-group row">
-        <label for="BSV" class="col-sm-4 col-form-label"><strong>Bitcoin SV (BSV)</strong></label>
-        <div class="col-sm-8">
-          <input id="BSV" type="text" value="1GamahbRfa4EBDBSN3ufEhJaE8xnH7kLim" class="form-control input-lg onclick-select" readonly>
-        </div>
-      </div>
-
-      <div class="form-group row">
-        <label for="DASH" class="col-sm-4 col-form-label"><strong>Dash (DASH)</strong></label>
-        <div class="col-sm-8">
-          <input id="DASH" type="text" value="Xb62GojDghypwwwZj96kAiPwktjrxWMqf9" class="form-control input-lg onclick-select" readonly>
-        </div>
-      </div>
-
-      <div class="form-group row">
-        <label for="ADA" class="col-sm-4 col-form-label"><strong>Cardano (ADA)</strong></label>
-        <div class="col-sm-8">
-          <input id="ADA" type="text" value="DdzFFzCqrht9wMYGwijaPDVocdpoJHXSE6MMr6L44QtxTBfSoBycXMtnrbTKzpqcRG88LZcUvJd3zXWADfgxX8K3errkhn9oB9ZuwBYe" class="form-control input-lg onclick-select" readonly>
-        </div>
-      </div>
-
-      <div class="form-group row">
-        <label for="CLO" class="col-sm-4 col-form-label"><strong>Callisto (CLO)</strong></label>
-        <div class="col-sm-8">
-          <input id="CLO" type="text" value="0xfAE4cd989afADc4ad2Cef6d33f3C50fd1F216846" class="form-control input-lg onclick-select" readonly>
-        </div>
-      </div>
-
-      <div class="form-group row">
-        <label for="DCR" class="col-sm-4 col-form-label"><strong>Decred (DCR)</strong></label>
-        <div class="col-sm-8">
-          <input id="DCR" type="text" value="DsbNyFxiKssCA4Sa2yEa4wiWrLD1EFnivFG" class="form-control input-lg onclick-select" readonly>
-        </div>
-      </div>
-
-      <div class="form-group row">
-        <label for="DGB" class="col-sm-4 col-form-label"><strong>DigiByte (DGB)</strong></label>
-        <div class="col-sm-8">
-          <input id="DGB" type="text" value="DGsMoXne1VrSd7YuA6EaKh9ca7HUCnxi7Y" class="form-control input-lg onclick-select" readonly>
-        </div>
-      </div>
-
-      <div class="form-group row">
-        <label for="EXP" class="col-sm-4 col-form-label"><strong>Expanse (EXP)</strong></label>
-        <div class="col-sm-8">
-          <input id="EXP" type="text" value="0x131b777EcdD546dfecCCC4f72642Ee4570c5B9f9" class="form-control input-lg onclick-select" readonly>
-        </div>
-      </div>
-
-      <div class="form-group row">
-        <label for="GRS" class="col-sm-4 col-form-label"><strong>Groestlcoin (GRS)</strong></label>
-        <div class="col-sm-8">
-          <input id="GRS" type="text" value="Ffjva2xhmoUmt1Xmc1LR3tHHJVuQfTDAPz" class="form-control input-lg onclick-select" readonly>
-        </div>
-      </div>
-
-      <div class="form-group row">
-        <label for="KIN" class="col-sm-4 col-form-label"><strong>Kin (KIN)</strong></label>
-        <div class="col-sm-8">
-          <input id="KIN" type="text" value="GBQT5R43PLKWLUOPFKDZFIXCIOG3QXU3KIJ432UQQALWSZIBW2QR43B2" class="form-control input-lg onclick-select" readonly>
-        </div>
-      </div>
-
-      <div class="form-group row">
-        <label for="KMD" class="col-sm-4 col-form-label"><strong>Komodo (KMD)</strong></label>
-        <div class="col-sm-8">
-          <input id="KMD" type="text" value="RDMncz9ddWUY1PQ6D9PDqkeJBLEwYvwSHC" class="form-control input-lg onclick-select" readonly>
-        </div>
-      </div>
-
-      <div class="form-group row">
-        <label for="LSK" class="col-sm-4 col-form-label"><strong>Lisk (LSK)</strong></label>
-        <div class="col-sm-8">
-          <input id="LSK" type="text" value="15983493180249602776L" class="form-control input-lg onclick-select" readonly>
-        </div>
-      </div>
-
-      <div class="form-group row">
-        <label for="NGL" class="col-sm-4 col-form-label"><strong>Gulden (NGL)</strong></label>
-        <div class="col-sm-8">
-          <input id="NGL" type="text" value="GRCpgMzWfFk1GveSrYP7FpH7BYwpt2hLQz" class="form-control input-lg onclick-select" readonly>
-        </div>
-      </div>
-
-      <div class="form-group row">
-        <label for="QTUM" class="col-sm-4 col-form-label"><strong>Qtum (QTUM)</strong></label>
-        <div class="col-sm-8">
-          <input id="QTUM" type="text" value="QYwvS7gongbRhyG2khg2wh1LymxVGRA8Rs" class="form-control input-lg onclick-select" readonly>
-        </div>
-      </div>
-
-      <div class="form-group row">
-        <label for="RDD" class="col-sm-4 col-form-label"><strong>Reddcoin (RDD)</strong></label>
-        <div class="col-sm-8">
-          <input id="RDD" type="text" value="RmoLdW9DVXkxHjoFZyiDu1xzVtvckRf2Mn" class="form-control input-lg onclick-select" readonly>
-        </div>
-      </div>
-
-      <div class="form-group row">
-        <label for="TRX" class="col-sm-4 col-form-label"><strong>Tron (TRX)</strong></label>
-        <div class="col-sm-8">
-          <input id="TRX" type="text" value="TVjrf7S4C2ATcejmL4Z1BnH8us4QC24Gdq" class="form-control input-lg onclick-select" readonly>
-        </div>
-      </div>
-
-      <div class="form-group row">
-        <label for="UBQ" class="col-sm-4 col-form-label"><strong>Ubiq (UBQ)</strong></label>
-        <div class="col-sm-8">
-          <input id="UBQ" type="text" value="0x2Aa4EfF8C9f8877fC733FA54d459B68840303707" class="form-control input-lg onclick-select" readonly>
-        </div>
-      </div>
-
-      <div class="form-group row">
-        <label for="VTC" class="col-sm-4 col-form-label"><strong>Vertcoin (VTC)</strong></label>
-        <div class="col-sm-8">
-          <input id="VTC" type="text" value="VgCf1Fwks8yaKMcDTzu5wkQTc5QLVMCwPd" class="form-control input-lg onclick-select" readonly>
-        </div>
-      </div>
-
-      <div class="form-group row">
-        <label for="WAVES" class="col-sm-4 col-form-label"><strong>Waves (WAVES)</strong></label>
-        <div class="col-sm-8">
-          <input id="WAVES" type="text" value="3PES6AF194L56BuhRwrLF41eAsGzcGDARCi" class="form-control input-lg onclick-select" readonly>
-        </div>
-      </div>
-
-      <div class="form-group row">
-        <label for="XEM" class="col-sm-4 col-form-label"><strong>NEM (XEM)</strong></label>
-        <div class="col-sm-8">
-          <input id="XEM" type="text" value="NC7KTVGV7MH2EJMDM4YHAJ2AECQEBE2AXJSFACG6" class="form-control input-lg onclick-select" readonly>
-        </div>
-      </div>
-
-      <div class="form-group row">
-        <label for="XTZ" class="col-sm-4 col-form-label"><strong>Tezos (XTZ)</strong></label>
-        <div class="col-sm-8">
-          <input id="XTZ" type="text" value="tz1SUiszXUx8njTueLdnwqahYRM4QTEQ2wT3" class="form-control input-lg onclick-select" readonly>
-        </div>
-      </div>
-
-      <div class="form-group row">
-        <label for="XVG" class="col-sm-4 col-form-label"><strong>Verge (XVG)</strong></label>
-        <div class="col-sm-8">
-          <input id="XVG" type="text" value="D5vWPfcSbwdc55amx4Z2kVvXuHa6kiaGUH" class="form-control input-lg onclick-select" readonly>
-        </div>
-      </div>
-
-      <div class="form-group row">
-        <label for="XZC" class="col-sm-4 col-form-label"><strong>ZCoin (XZC)</strong></label>
-        <div class="col-sm-8">
-          <input id="XZC" type="text" value="a2sHJ3A2mo1yggmkhj4Ki6nqAT5ZnVE42n" class="form-control input-lg onclick-select" readonly>
-        </div>
-      </div>
-
-      <div class="form-group row">
-        <label for="ZEN" class="col-sm-4 col-form-label"><strong>Horizen (ZEN)</strong></label>
-        <div class="col-sm-8">
-          <input id="ZEN" type="text" value="znSwHaaYhPr2Uu6MTi5T7QCW3qP5UWmWDuY" class="form-control input-lg onclick-select" readonly>
-        </div>
-      </div>
-
-    <div class="text-center">
-      <p>The <a href="/contact/">Privacy Guides team</a> does not necessarily endorse all of the cryptocurrencies listed on this page. Please conduct your own research before purchasing any cryptocurrencies.</p>
-      <h3>Thanks for your support. You are awesome!</h3>
-      <p>
-      <span class="far fa-smile-beam fa-3x"></span>
-      </p>
-    </div>
-
-    </div>
-  </div>
-
-</div>
diff --git a/legacy_pages/old.html b/legacy_pages/old.html
deleted file mode 100644
index fb6dce73..00000000
--- a/legacy_pages/old.html
+++ /dev/null
@@ -1,94 +0,0 @@
----
-layout: default
-permalink: /classic/
----
-
-<div class="alert alert-warning" role="alert">
-  We will try and keep this page up-to-date with added sections and other content, but to be guaranteed the latest recommendations, we recommend you check out our new Providers, Browsers, Software, and OS pages in the navbar above :)
-</div>
-
-{% include legacy/sections/header.html %}
-
-{% include legacy/sections/quotes.html %}
-
-{% include legacy/sections/fourteen-eyes.html %}
-
-{% include legacy/sections/key-disclosure-law.html %}
-
-{% include legacy/sections/vpn.html %}
-
-{% include legacy/sections/warrant-canary.html %}
-
-{% include legacy/sections/browser-recommendation.html %}
-
-{% include legacy/sections/browser-fingerprint.html %}
-
-{% include legacy/sections/browser-webrtc.html %}
-
-{% include legacy/sections/browser-addons.html %}
-
-{% include legacy/sections/browser-tweaks.html %}
-
-{% include legacy/sections/email-providers.html %}
-
-{% include legacy/sections/email-clients.html %}
-
-{% include legacy/sections/search-engines.html %}
-
-{% include legacy/sections/instant-messenger.html %}
-
-{% include legacy/sections/voice-video-messenger.html %}
-
-{% include legacy/sections/teamchat.html %}
-
-{% include legacy/sections/file-sharing.html %}
-
-{% include legacy/sections/cloud-storage.html %}
-
-{% include legacy/sections/selfhosted-cloud.html %}
-
-{% include legacy/sections/hosting-provider.html %}
-
-{% include legacy/sections/file-sync.html %}
-
-{% include legacy/sections/password-managers.html %}
-
-{% include legacy/sections/calendar-contacts-sync.html %}
-
-{% include legacy/sections/file-encryption.html %}
-
-{% include legacy/sections/self-contained-networks.html %}
-
-{% include legacy/sections/social-networks.html %}
-
-{% include legacy/sections/social-news-aggregator.html %}
-
-{% include legacy/sections/decentralized-video.html %}
-
-{% include legacy/sections/video-frontends.html %}
-
-{% include legacy/sections/dns.html %}
-
-{% include legacy/sections/notebooks.html %}
-
-{% include legacy/sections/paste-services.html %}
-
-{% include legacy/sections/productivity-tools.html %}
-
-{% include legacy/sections/operating-systems.html %}
-
-{% include legacy/sections/tor-operating-systems.html %}
-
-{% include legacy/sections/android-operating-systems.html %}
-
-{% include legacy/sections/android-addons.html %}
-
-{% include legacy/sections/other-mobile-operating-systems.html %}
-
-{% include legacy/sections/router-firmware.html %}
-
-{% include legacy/sections/windows10.html %}
-
-{% include legacy/sections/privacy-resources.html %}
-
-{% include legacy/sections/participate.html %}
diff --git a/legacy_pages/providers/email.html b/legacy_pages/providers/email.html
index 7eda426f..1ab635a3 100644
--- a/legacy_pages/providers/email.html
+++ b/legacy_pages/providers/email.html
@@ -17,7 +17,7 @@ description: "Find a secure email provider that will keep your privacy in mind.
 <div class="container">
   <div class="row">
     <div class="col-12">
-      <h3>{% include legacy/badge.html color="info" text="Jurisdiction" %}</h3>
+      <h3>{% include badge.html color="info" text="Jurisdiction" %}</h3>
       <p>Operating outside the five/nine/fourteen-eyes countries is not necessarily a guarantee of privacy, and there are other factors to consider. However, we believe that avoiding these countries is important if you wish to avoid mass government dragnet surveillance, especially from the United States. Read our page on <a href="/providers/#ukusa">global mass surveillance and avoiding the US and UK</a> to learn more about why we feel this is important.</p>
     </div>
     <div class="col-md-6">
@@ -35,7 +35,7 @@ description: "Find a secure email provider that will keep your privacy in mind.
     </div>
 
     <div class="col-12">
-      <h3>{% include legacy/badge.html color="info" text="Technology" %}</h3>
+      <h3>{% include badge.html color="info" text="Technology" %}</h3>
       <p>We regard these features as important in order to provide a safe and optimal service to users. Users should consider the provider which has the features they require.</p>
     </div>
     <div class="col-md-6">
@@ -60,7 +60,7 @@ description: "Find a secure email provider that will keep your privacy in mind.
     </div>
 
     <div class="col-12">
-      <h3>{% include legacy/badge.html color="info" text="Privacy" %}</h3>
+      <h3>{% include badge.html color="info" text="Privacy" %}</h3>
       <p>We prefer our recommended providers to collect as little data as possible.</p>
     </div>
     <div class="col-md-6">
@@ -79,7 +79,7 @@ description: "Find a secure email provider that will keep your privacy in mind.
     </div>
 
     <div class="col-12">
-      <h3>{% include legacy/badge.html color="info" text="Security" %}</h3>
+      <h3>{% include badge.html color="info" text="Security" %}</h3>
       <p>Email servers deal with a lot of very sensitive data. We expect that providers will adopt best industry practices in order to protect their users.</p>
     </div>
     <div class="col-md-6">
@@ -118,7 +118,7 @@ description: "Find a secure email provider that will keep your privacy in mind.
     </div>
 
     <div class="col-12">
-      <h3>{% include legacy/badge.html color="info" text="Trust" %}</h3>
+      <h3>{% include badge.html color="info" text="Trust" %}</h3>
       <p>You wouldn't trust your finances to someone with a fake identity, so why trust them with your email? We require our recommended providers to be public about their ownership or leadership. We also would like to see frequent transparency reports, especially in regard to how government requests are handled.</p>
     </div>
     <div class="col-md-6">
@@ -136,7 +136,7 @@ description: "Find a secure email provider that will keep your privacy in mind.
     </div>
 
     <div class="col-12">
-      <h3>{% include legacy/badge.html color="info" text="Marketing" %}</h3>
+      <h3>{% include badge.html color="info" text="Marketing" %}</h3>
       <p>With the email providers we recommend we like to see responsible marketing.</p>
     </div>
     <div class="col-md-6">
@@ -162,7 +162,7 @@ description: "Find a secure email provider that will keep your privacy in mind.
     </div>
 
     <div class="col-12">
-      <h3>{% include legacy/badge.html color="info" text="Additional Functionality" %}</h3>
+      <h3>{% include badge.html color="info" text="Additional Functionality" %}</h3>
       <p>While not strictly requirements, there are some factors we looked into when determining which providers to recommend.</p>
     </div>
   </div>
diff --git a/legacy_pages/providers/vpn.html b/legacy_pages/providers/vpn.html
index 8f6d5bf3..4cb6d4af 100644
--- a/legacy_pages/providers/vpn.html
+++ b/legacy_pages/providers/vpn.html
@@ -29,7 +29,7 @@ breadcrumb: "VPN"
 <div class="container">
   <div class="row">
     <div class="col-12">
-      <h3>{% include legacy/badge.html color="info" text="Jurisdiction" %}</h3>
+      <h3>{% include badge.html color="info" text="Jurisdiction" %}</h3>
       <p>Operating outside the five/nine/fourteen-eyes countries is not a guarantee of privacy necessarily, and there are other factors to consider. However, we believe that avoiding these countries is important if you wish to avoid mass government dragnet surveillance, especially from the United States. Read our page on <a href="/providers/#ukusa">global mass surveillance and avoiding the US and UK</a> to learn more about why we feel this is important.</p>
     </div>
     <div class="col-md-6">
@@ -47,7 +47,7 @@ breadcrumb: "VPN"
     </div>
 
     <div class="col-12">
-      <h3>{% include legacy/badge.html color="info" text="Technology" %}</h3>
+      <h3>{% include badge.html color="info" text="Technology" %}</h3>
       <p>We require all our recommended VPN providers to provide OpenVPN configuration files to be used in any client. <strong>If</strong> a VPN provides their own custom client, we require a killswitch to block network data leaks when disconnected.</p>
     </div>
     <div class="col-md-6">
@@ -70,7 +70,7 @@ breadcrumb: "VPN"
     </div>
 
     <div class="col-12">
-      <h3>{% include legacy/badge.html color="info" text="Privacy" %}</h3>
+      <h3>{% include badge.html color="info" text="Privacy" %}</h3>
       <p>We prefer our recommended providers to collect as little data as possible. Not collecting personal information on registration, and accepting anonymous forms of payment are required.</p>
     </div>
     <div class="col-md-6">
@@ -89,7 +89,7 @@ breadcrumb: "VPN"
     </div>
 
     <div class="col-12">
-      <h3>{% include legacy/badge.html color="info" text="Security" %}</h3>
+      <h3>{% include badge.html color="info" text="Security" %}</h3>
       <p>A VPN is pointless if it can't even provide adequate security. We require all our recommended providers to abide by current security standards for their OpenVPN connections. Ideally, they would use more future-proof encryption schemes by default. We also require an independent third-party to audit the provider's security, ideally in a very comprehensive manner and on a repeated (yearly) basis.</p>
     </div>
     <div class="col-md-6">
@@ -111,7 +111,7 @@ breadcrumb: "VPN"
     </div>
 
     <div class="col-12">
-      <h3>{% include legacy/badge.html color="info" text="Trust" %}</h3>
+      <h3>{% include badge.html color="info" text="Trust" %}</h3>
       <p>You wouldn't trust your finances to someone with a fake identity, so why trust them with your internet data? We require our recommended providers to be public about their ownership or leadership. We also would like to see frequent transparency reports, especially in regard to how government requests are handled.</p>
     </div>
     <div class="col-md-6">
@@ -129,7 +129,7 @@ breadcrumb: "VPN"
     </div>
 
     <div class="col-12">
-      <h3>{% include legacy/badge.html color="info" text="Marketing" %}</h3>
+      <h3>{% include badge.html color="info" text="Marketing" %}</h3>
       <p>With the VPN providers we recommend we like to see responsible marketing.</p>
     </div>
     <div class="col-md-6">
@@ -159,7 +159,7 @@ breadcrumb: "VPN"
     </div>
 
     <div class="col-12">
-      <h3>{% include legacy/badge.html color="info" text="Additional Functionality" %}</h3>
+      <h3>{% include badge.html color="info" text="Additional Functionality" %}</h3>
       <p>While not strictly requirements, there are some factors we looked into when determining which providers to recommend. These include adblocking/tracker-blocking functionality, warrant canaries, multihop connections, excellent customer support, the number of allowed simultaneous connections, etc.</p>
     </div>
   </div>
@@ -230,7 +230,7 @@ breadcrumb: "VPN"
           <li><a href="https://gist.github.com/kennwhite/1f3bc4d889b02b35d8aa">Don't use LT2P IPSec, use other protocols.</a></li>
           <li>
             <a href="https://www.top10vpn.com/free-vpn-app-investigation/">Free VPN App Investigation</a>
-            {% include legacy/badge.html
+            {% include badge.html
             color="warning"
             icon="fas fa-exclamation-triangle"
             link="https://blog.privacytools.io/the-trouble-with-vpn-and-privacy-reviews"
@@ -240,7 +240,7 @@ breadcrumb: "VPN"
           </li>
           <li>
             <a href="https://vpnpro.com/blog/hidden-vpn-owners-unveiled-97-vpns-23-companies/">Hidden VPN owners unveiled: 101 VPN products run by just 23 companies</a>
-            {% include legacy/badge.html
+            {% include badge.html
             color="warning"
             icon="fas fa-exclamation-triangle"
             link="https://blog.privacytools.io/the-trouble-with-vpn-and-privacy-reviews"
@@ -250,7 +250,7 @@ breadcrumb: "VPN"
           </li>
           <li>
             <a href="https://vpnpro.com/blog/chinese-company-secretly-behind-popular-apps-seeking-dangerous-permissions/">This Chinese company is secretly behind 24 popular apps seeking dangerous permissions</a>
-            {% include legacy/badge.html
+            {% include badge.html
             color="warning"
             icon="fas fa-exclamation-triangle"
             link="https://blog.privacytools.io/the-trouble-with-vpn-and-privacy-reviews"
diff --git a/legacy_pages/services/services.html b/legacy_pages/services/services.html
deleted file mode 100644
index b31a2abf..00000000
--- a/legacy_pages/services/services.html
+++ /dev/null
@@ -1,43 +0,0 @@
----
-layout: page
-permalink: /services/
-title: "Services from Privacy Guides"
-description: "The Privacy Guides team is proud to introduce a suite of privacy-centric online services to connect you with other privacy-minded individuals and stay safe and secure online. No advertisers, no Google Analytics, no tracking, no third-party requests of any kind."
----
-
-<p>We currently have the following free-to-use services online now.</p>
-
-<div class="card card-list">
-  <ul class="list-group list-group-flush">
-    <li class="list-group-item"><a href="https://search.privacytools.io/"><i class="fas fa-search fa-lg fa-fw"></i> Searx - Privacy Friendly Search at search.privacytools.io</a></li>
-    <li class="list-group-item"><a href="https://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="/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>
-</div>
-
-<p>More services are on the way. If there's something that would be super beneficial for us to run, don't hesitate to reach out and ask. And of course, if you like our services, please consider <a href="/donate/">donating to support our server costs</a>, <em>any donation helps!</em></p>
-
-<div class="card card-list">
-  <ul class="list-group list-group-flush">
-    <li class="list-group-item"><a href="https://status.privacytools.io/" class="text-success"><i class="fas fa-check-circle fa-lg fa-fw"></i> Statuspage - Check the status of our services for any outages or scheduled maintenance</a></li>
-  </ul>
-</div>
-
-<h3>A brief note</h3>
-
-<p>We are providing these services because we believe in decentralized and federated networks, and free and open source software. The tools we host are a great and convenient entry-point to these services like Matrix, Mastodon, and WriteFreely. We hope that we are able to spur the adoption of these alternative networks, and we strongly believe all of our services are far better than traditional providers, such as Twitter, Facebook, and Google.</p>
-<p>However, as with <em>any</em> hosted, online service, remember that using our services involves risks that may or may not be acceptable to you. Using online services requires trust in the service provider. We don't know of any surefire way to evaluate a provider for privacy, or provide a service that we can guarantee is operating in a privacy-respecting way. Of course we strive to provide the best services possible for our community, but at the end of the day this involves you trusting us and the system administrators that host our services.</p>
-<p>As always, <strong>never</strong> trust a service provider with sensitive information, even if they are trustworthy.</p>
-<p>We also recommend you don't centralize all your online activity around a single provider's services (such as ours). This is because it is not a good idea to give a single party control over everything you do online.</p>
-<p>We highly recommend hosting your own services whenever possible. Not only is it a fantastic learning experience, but it allows you to have services entirely in your control. There are a number of great resources available, including...</p>
-<ul>
-  <li><a href="https://talk.libreho.st/">The libreho.st forum</a></li>
-  <li><a href="https://homebrewserver.club/">homebrewserver.club</a></li>
-  <li><a href="https://www.reddit.com/r/selfhosted/">r/selfhosted</a></li>
-</ul>
-<p>You can also join us on Matrix at <code>#general:privacytools.io</code> and ask around! We are always happy to help you start hosting your own services.</p>
-<p>The services we provide here are for the benefit of our community, and we collect as little data as possible. But it is a convenience more than a recommendation. You should always avoid trusting others with your information, and always encrypt.</p>
diff --git a/legacy_pages/sponsors.html b/legacy_pages/sponsors.html
deleted file mode 100644
index bca12853..00000000
--- a/legacy_pages/sponsors.html
+++ /dev/null
@@ -1,76 +0,0 @@
----
-layout: default
-active_page: sponsors
-permalink: /sponsors/
----
-
-<div class="row">
-  <div class="mx-auto text-center">
-    <div class="my-4">
-      <h1>Sponsors of Privacy Guides</h1>
-      <p>A massive thank you to the following <strong>organization-level sponsors</strong> of Privacy Guides, who pledge $250+:</p>
-    </div>
-    <div class="mt-4 mb-3">
-      {% include legacy/sponsors/gold.html %}
-    </div>
-    <div class="mb-4">
-      <p>The Privacy Guides website and services are a community project. There is no advertising, affiliate links, or other forms of monetization.<br><strong>Your donations here directly support hosting this website and compensating contributors to this project.</strong></p>
-      <p>
-        <a href="https://opencollective.com/privacytools#section-contribute" class="btn btn-success">Become a Sponsor</a>
-        <a href="/donate/" class="btn btn-outline-danger"><span class="fas fa-heart fa-fw"></span> Donate Directly</a>
-      </p>
-    </div>
-  </div>
-</div>
-<div>
-  <div class="my-4">
-    <h3>Advocates</h3>
-    <p>These individuals and organizations pledge $100 - $249 to the organization.</p>
-  </div>
-  <div class="row">
-    {% include legacy/sponsors/silver.html %}
-  </div>
-</div>
-<h3>Backers</h3>
-<p>These individuals and organizations pledge $10 - $99 to the organization.</p>
-{% include legacy/sponsors/list.html %}
-
-<h3>Why sponsor Privacy Guides?</h3>
-<p>This sponsorship program is designed to allow companies, organizations, and individuals partner with the Privacy Guides 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 Privacy Guides, 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 Privacy Guides, 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 Privacy Guides 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 Privacy Guides</a>
-</div>
diff --git a/legacy_pages/notices.md b/notices.md
similarity index 56%
rename from legacy_pages/notices.md
rename to notices.md
index 7ea90ca3..5a739a26 100644
--- a/legacy_pages/notices.md
+++ b/notices.md
@@ -1,6 +1,6 @@
 ---
 layout: page
-permalink: /notices/
+permalink: /terms-and-notices/
 title: "Notices and Disclaimers"
 description: "Privacy Guides is provided with good intentions on an &quot;as-is&quot; basis, without warranty, and disclaiming liability for damages."
 ---
@@ -10,7 +10,7 @@ description: "Privacy Guides is provided with good intentions on an &quot;as-is&
 
 <span class="lead">Privacy Guides is not a law firm. As such, the Privacy Guides website and contributors are not providing legal advice. The material and recommendations in our website and guides do not constitute legal advice nor does contributing to the website or communicating with Privacy Guides or other contributors about our website create an attorney-client relationship.</span>
 
-Running this website, like any human endeavor, involves uncertainty and trade-offs. We hope this website helps, but it may include mistakes, and can’t address every situation. If you have any questions about your situation, we encourage you to do your own research, seek out other experts, and discuss with your and the Privacy Guides community. If you have any legal questions, you should consult with your own legal counsel before moving forward.
+Running this website, like any human endeavor, involves uncertainty and trade-offs. We hope this website helps, but it may include mistakes, and can’t address every situation. If you have any questions about your situation, we encourage you to do your own research, seek out other experts, and engage in discussions with the Privacy Guides community. If you have any legal questions, you should consult with your own legal counsel before moving forward.
 
 Privacy Guides is an open source project contributed to under licenses that include terms that, for the protection of the website and its contributors, make clear that the Privacy Guides project and website is offered "as-is", without warranty, and disclaiming liability for damages resulting from using the website or any recommendations contained within. Privacy Guides does not warrant or make any representations concerning the accuracy, likely results, or reliability of the use of the materials on the website or otherwise relating to such materials on the website or on any third-party sites linked on this site.
 
@@ -19,26 +19,24 @@ Privacy Guides additionally does not warrant that this website will be constantl
 <span class="badge badge-secondary mt-5">Section 2</span>
 # Licenses
 
-<span class="lead">Content copyright on this website is waived under the terms of [CC0 1.0 Universal](https://github.com/privacytools/privacytools.io/blob/master/LICENSE.txt).</span>
+<span class="lead">All content on this website is Copyright &copy; Jonah Aragon, Aragon Ventures LLC, and [Contributors](https://github.com/privacyguides/privacyguides/graphs/contributors); and is licensed under the terms of the [Creative Commons Attribution-NonCommercial 4.0 International License](http://creativecommons.org/licenses/by-nc/4.0/).</span>
 
-In certain jurisdictions, namely those in which the copyright waiver in the CC0-1.0 is judged for any reason to be legally invalid or ineffective under applicable law, content may be copyright &copy; Privacy Guides contributors, released under the [CC 1.0 Universal](https://github.com/privacytools/privacytools.io/blob/master/LICENSE.txt) license.
+**Content** on this website is based on [github.com/privacyguides/privacyguides](https://github.com/privacyguides/privacyguides) and is made available for sharing and distribution under the Creative Commons Attribution-NonCommercial 4.0 International License.
 
-**Content** on this website is based on [github.com/privacytools/privacytools.io](https://github.com/privacytools/privacytools.io) and is made freely available under the CC-1.0.
-
-Code, including source files and code samples if any in the content, is released under CC-1.0, with the following exceptions:
+Original code, including source files and code samples if any in the content, is the sole property of Aragon Ventures LLC, all rights reserved. This does not include third-party code embedded in this repository, or code where a superseding license is otherwise noted. The following are notable examples, but this list may not be all-inclusive:
 
 - Bootstrap code is under the MIT license. See: [github.com/twbs/bootstrap/blob/master/LICENSE](https://github.com/twbs/bootstrap/blob/master/LICENSE)
 - [jQuery](https://github.com/privacytools/privacytools.io/blob/master/assets/js/jquery-3.3.1.min.js) is under the MIT license. See: [jquery.org/license](https://jquery.org/license/)
 - [Popper.js](https://github.com/privacytools/privacytools.io/blob/master/assets/js/popper.min.js) is under the MIT license. See: [github.com/FezVrasta/popper.js/raw/master/LICENSE.md](https://github.com/FezVrasta/popper.js/raw/master/LICENSE.md)
 - [Sortable](https://github.com/privacytools/privacytools.io/blob/master/assets/js/sortable.min.js) is under the MIT license. See: [github.com/HubSpot/sortable/raw/master/LICENSE](https://github.com/HubSpot/sortable/raw/master/LICENSE)
 - The Font Awesome icons are under CC-BY-4.0, Font Awesome fonts are under SIL OFL 1.1, and Font Awesome code is under the MIT License. See: [fontawesome.com/license/free](https://fontawesome.com/license/free)
-- The Privacy Guides fonts, icons, and code in `fonts` are under ISC license. See: [github.com/privacytools/privacytools.io/blob/master/font/LICENSE](https://github.com/privacytools/privacytools.io/blob/master/font/LICENSE).
+- The PrivacyTools fonts, icons, and code are under ISC license. See: [github.com/privacytools/privacytools.io/blob/master/font/LICENSE](https://github.com/privacytools/privacytools.io/blob/master/font/LICENSE).
 
 Portions of this notice itself were adopted from [opensource.guide](https://github.com/github/opensource.guide/blob/master/notices.md) on GitHub, released under [CC-BY-4.0](https://github.com/github/opensource.guide/blob/master/LICENSE).
 
-This means that you can use the code and content in this repository **except** for the Privacy Guides [branding](https://github.com/privacytools/brand) in your own projects. Privacy Guides's brand trademarks include the "PrivacyTools" wordmark and shield logo. More information on the use of Privacy Guides's branding can be found on our [branding guidelines page](https://github.com/privacytools/brand).
+This means that you can use the human-readable content in this repository for your own project, as long as you follow the requirements outlined in the Creative Commons Attribution-NonCommercial 4.0 International License. You **may not** use any original code in this repository for your own project, nor use the Privacy Guides [branding](https://github.com/privacytools/brand) in your own project, without express approval from Aragon Ventures LLC. Privacy Guides's brand trademarks include the "Privacy Guides" wordmark and shield logo.
 
-We believe that the logos and other images in `assets` from third-party providers are either in the public domain or **fair use**. In a nutshell, legal [fair use doctrine](https://en.wikipedia.org/wiki/Fair_use) allows the use of copyrighted image in order to identify the subject matter for purposes of public comment. However, these logos and other images may still be subject to trademark laws in one or more jurisdictions. Before using this content, please ensure that it is used to identify the entity or organization that owns the trademark and that you have the right to use it under the laws which apply in the circumstances of your intended use. *You are solely responsible for ensuring that you do not infringe someone else's trademark or copyright.*
+We believe that the logos and other images in `assets` obtained from third-party providers are either in the public domain or **fair use**. In a nutshell, legal [fair use doctrine](https://en.wikipedia.org/wiki/Fair_use) allows the use of copyrighted image in order to identify the subject matter for purposes of public comment. However, these logos and other images may still be subject to trademark laws in one or more jurisdictions. Before using this content, please ensure that it is used to identify the entity or organization that owns the trademark and that you have the right to use it under the laws which apply in the circumstances of your intended use. *When copying content from this website, you are solely responsible for ensuring that you do not infringe someone else's trademark or copyright.*
 
 When you contribute to this repository you are doing so under the above licenses.
 
@@ -47,12 +45,10 @@ When you contribute to this repository you are doing so under the above licenses
 
 <span class="lead">You may not use this website in any way that causes or may cause damage to the website or impairment of the availability or accessibility of Privacy Guides, or in any way which is unlawful, illegal, fraudulent, or harmful, or in connection with any unlawful, illegal, fraudulent, or harmful purpose or activity.</span>
 
-You must not conduct any systematic or automated data collection activities on or in relation to this website without Privacy Guides's express written consent, including:
+You must not conduct any systematic or automated data collection activities on or in relation to this website without express written consent from Aragon Ventures LLC, including:
 
 * Excessive Automated Scans
 * Denial of Service Attacks
 * Scraping
 - Data Mining
 - ‘Framing’ (IFrames)
-
-We take the security of our website, infrastructure, and services very seriously. Our [SECURITY.md](https://github.com/privacytools/.github/blob/master/SECURITY.md) document outlines responsible disclosure guidelines and other security-related information.
diff --git a/privacy-policy.md b/privacy-policy.md
index 53df8356..fd650f8a 100644
--- a/privacy-policy.md
+++ b/privacy-policy.md
@@ -7,7 +7,7 @@ description: "This Privacy Statement explains what information Privacy Guides an
 
 ## Who is Privacy Guides?
 
-Privacy Guides community project currently under the stewardship of Aragon Ventures LLC, a Minnesota corporation, which develops this website and a number of privacy-friendly services alongside a number of active contributors. The current list of public team members [can be found on GitHub](https://github.com/orgs/privacyguides/people). Aragon Ventures LLC operates internet services and handles the financials of this project.
+Privacy Guides is a community project currently under the stewardship of Aragon Ventures LLC, a Minnesota corporation, which develops this website and a number of privacy-friendly services alongside a number of active contributors. The current list of public team members [can be found on GitHub](https://github.com/orgs/privacyguides/people). Aragon Ventures LLC operates internet services and handles the financials of this project.
 
 In the future, Privacy Guides will be an independently operated non-profit organization.