From 53fbc96bbbaf09d3993f526e4af5fa4ca1ba712b Mon Sep 17 00:00:00 2001
From: Jonah Aragon <jonah@triplebit.net>
Date: Fri, 4 Dec 2020 00:03:31 -0600
Subject: [PATCH] Fix More Mistakes!

---
 _includes/legacy/footer.html                  | 20 +++++------
 _includes/legacy/head.html                    | 16 ++++-----
 _includes/legacy/sections/header.html         | 10 +++---
 _includes/legacy/sections/participate.html    |  2 +-
 collections/_browsers/brave.md                |  2 +-
 .../_posts/2019-10-05-understanding-vpns.md   |  2 +-
 .../_posts/2019-11-09-firefox-privacy.md      |  4 +--
 legacy_pages/about/about.html                 |  4 +--
 legacy_pages/donate.html                      |  8 ++---
 legacy_pages/software/encryption.html         |  8 -----
 legacy_pages/sponsors.html                    | 14 ++++----
 legacy_pages/privacy.md => privacy-policy.md  | 36 ++++++++++---------
 12 files changed, 60 insertions(+), 66 deletions(-)
 delete mode 100644 legacy_pages/software/encryption.html
 rename legacy_pages/privacy.md => privacy-policy.md (68%)

diff --git a/_includes/legacy/footer.html b/_includes/legacy/footer.html
index 9fb8047f..474888f1 100644
--- a/_includes/legacy/footer.html
+++ b/_includes/legacy/footer.html
@@ -6,36 +6,36 @@
 
   <div class="row mb-4">
     <div class="col-12 col-md-6 d-flex justify-content-between">
-      <a href="mailto:?subject=privacytools.io%20-%20encryption%20against%20global%20mass%20surveillance&body={{ site.production_url }}/" class="share-btn email" title="Email">
+      <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={{ site.production_url }}" class="share-btn facebook" title="Facebook">
+      <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={{ site.production_url }}/&amp;via=privacytoolsIO" class="share-btn twitter" title="Twitter">
+      <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={{ site.production_url }}" class="share-btn mastodon" title="Mastodon">
+      <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={{ site.production_url }}&title=privacytools.io%20-%20encryption%20against%20global%20mass%20surveillance" class="share-btn reddit" title="reddit">
+      <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={{ site.production_url }}&title=privacytools.io%20-%20encryption%20against%20global%20mass%20surveillance" class="share-btn linkedin" title="LinkedIn">
+      <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={{ site.production_url }}&title=privacytools.io%20-%20encryption%20against%20global%20mass%20surveillance" class="share-btn mix" title="Mix">
+      <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={{ site.production_url }}" class="share-btn diaspora" title="Diaspora*">
+      <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>
@@ -44,7 +44,7 @@
   <h3>Copy URL and Description</h3>
 
   <p>
-  <input type="text" value="{{ site.name }} - Encryption and tools to protect against global mass surveillance - {{ site.production_url }}" class="form-control input-lg onclick-select">
+  <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>
 
@@ -80,7 +80,7 @@
     </a>
     <p class="mt-2">
       <strong>No Ads, No Google Analytics, No Affiliates, No Cross-Site Requests.</strong>
-      <em>{{ site.name }} is a socially motivated website that provides information for protecting your data security and privacy. Never trust any company with your privacy, always encrypt.</em>
+      <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>
diff --git a/_includes/legacy/head.html b/_includes/legacy/head.html
index f5e9b754..30296c17 100644
--- a/_includes/legacy/head.html
+++ b/_includes/legacy/head.html
@@ -5,37 +5,37 @@
   <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="{{ site.production_url }}{{ page.url | replace:'index.html',''}}">
+  <link rel="canonical" href="https://privacyguides.org{{ page.url | replace:'index.html',''}}">
 
   <!-- title -->
   {% if page.title %}
-  <title>{{ page.title }} | {{ site.name }}</title>
-  <meta property="og:title" content="{{ page.title }} | {{ site.name }}" />
+  <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="{{ site.production_url }}/assets/img/legacy_svg/layout/brand/square-transparent.svg" />
+  <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="{{ site.name }}" />
+  <meta property="og:site_name" content="Privacy Guides" />
 
   {% if page.url == "/" %}
   <script type="application/ld+json">
   {
     "@context": "https://schema.org",
     "@type": "Organization",
-    "name": "{{ site.name }}",
+    "name": "Privacy Guides",
     "description": "{{ site.description }}",
     "alternateName": [
       "privacytools.io",
       "Privacy Tools",
       "privacytoolsIO"
     ],
-    "url": "{{ site.production_url }}",
-    "logo": "{{ site.production_url }}/assets/img/legacy_svg/layout/brand/square-transparent.svg",
+    "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",
diff --git a/_includes/legacy/sections/header.html b/_includes/legacy/sections/header.html
index 198e4951..b23a4c44 100644
--- a/_includes/legacy/sections/header.html
+++ b/_includes/legacy/sections/header.html
@@ -1,18 +1,18 @@
 <div class="jumbotron p-5">
   <h1 class="display-4">
-    <a href="{{ site.production_url }}" title="{{ site.name }}">
-      <img class="img-fluid d-none d-sm-block" src="/assets/img/legacy_svg/layout/brand/horizontal.svg" width="500px" alt="{{ site.name }}">
+    <a href="https://privacyguides.org" title="Privacy Guides">
+      <img class="img-fluid d-none d-sm-block" src="/assets/img/legacy_svg/layout/brand/horizontal.svg" width="500px" alt="Privacy Guides">
       <div class="text-center">
-        <img class="img-fluid d-sm-none" src="/assets/img/legacy_svg/layout/brand/vertical.svg" width="300px" alt="{{ site.name }}">
+        <img class="img-fluid d-sm-none" src="/assets/img/legacy_svg/layout/brand/vertical.svg" width="300px" alt="Privacy Guides">
       </div>
     </a>
   </h1>
-  <p class="lead">You are being watched. Private and state-sponsored organizations are monitoring and recording your online activities. {{ site.name }} provides services, tools and knowledge to protect your privacy against global mass surveillance.</p>
+  <p class="lead">You are being watched. Private and state-sponsored organizations are monitoring and recording your online activities. Privacy Guides provides services, tools and knowledge to protect your privacy against global mass surveillance.</p>
 </div>
 
 <form method="POST" action="https://search.privacytools.io/" id="search_form" role="search">
 <div class="input-group col-12 col-md-8 offset-md-2">
-<input type="search" name="q" class="form-control input-lg" id="q" placeholder="Try {{ site.name }} Search, a Privacy-Respecting Search Engine" autocomplete="off" value="">
+<input type="search" name="q" class="form-control input-lg" id="q" placeholder="Try Privacy Guides Search, a Privacy-Respecting Search Engine" autocomplete="off" value="">
 <span class="input-group-btn">
 <button type="submit" class="btn btn-primary input-lg"><span class="hide_if_nojs"><i class="fas fa-search"></i> </span><span class="hidden active_if_nojs">start search</span></button>
 </span>
diff --git a/_includes/legacy/sections/participate.html b/_includes/legacy/sections/participate.html
index a1600e09..649217eb 100644
--- a/_includes/legacy/sections/participate.html
+++ b/_includes/legacy/sections/participate.html
@@ -2,7 +2,7 @@
   <h1 id="participate" class="anchor"><a href="#participate"><i class="fas fa-link anchor-icon"></i></a> Participate with suggestions and constructive criticism</h1>
 </div>
 
-<p>It's important for a website like {{ site.name }} to stay up-to-date. Keep an eye on software updates for the applications listed on our site. Follow recent news about providers that we recommend. We try our best to keep up, but we're not perfect and the internet is changing fast. If you find an error, or you think a provider should not be listed here, or a qualified service provider is missing, or a browser plugin is not the best choice anymore, or anything else... <strong>Talk to us please.</strong> You can also find us on <a href="/services/chat/">several Matrix rooms</a>, primarily <code class="highlighter-rouge">#general:privacytools.io</code>. XMPP users can join there via <a href="https://conversations.im/j/%23general%23privacytools.io@matrix.org">#general#privacytools.io@matrix.org</a>. When using our services, users should follow our <a href="https://wiki.privacytools.io/view/PrivacyTools:Code_of_Conduct">Code of Conduct</a>.</p>
+<p>It's important for a website like Privacy Guides to stay up-to-date. Keep an eye on software updates for the applications listed on our site. Follow recent news about providers that we recommend. We try our best to keep up, but we're not perfect and the internet is changing fast. If you find an error, or you think a provider should not be listed here, or a qualified service provider is missing, or a browser plugin is not the best choice anymore, or anything else... <strong>Talk to us please.</strong> You can also find us on <a href="/services/chat/">several Matrix rooms</a>, primarily <code class="highlighter-rouge">#general:privacytools.io</code>. XMPP users can join there via <a href="https://conversations.im/j/%23general%23privacytools.io@matrix.org">#general#privacytools.io@matrix.org</a>. When using our services, users should follow our <a href="https://wiki.privacytools.io/view/PrivacyTools:Code_of_Conduct">Code of Conduct</a>.</p>
 
 <div class="row">
 
diff --git a/collections/_browsers/brave.md b/collections/_browsers/brave.md
index 9cc2003b..f0a07144 100644
--- a/collections/_browsers/brave.md
+++ b/collections/_browsers/brave.md
@@ -2,4 +2,4 @@
 name: Brave Browser
 type: "Anti-Recommendation"
 ---
-**Brave** is widely touted as a privacy-friendly Chromium browser, but we have a number of concerns with their business practices and future business model that would prevent us from recommending them. The Brave team [has publicly stated](https://www.reddit.com/r/privacytoolsIO/comments/cs8foq/update_delisting_brave/) they do not want to be associated with privacy-focused groups like Privacy Guides ([Privacy Guides PR #657](https://github.com/privacytools/privacytools.io/pull/657)), which causes us to believe the Brave team does not wish to be under too much scrutiny from the privacy community as they continue to develop their product ([Reddit discussion](http://archive.today/2020.05.13-035943/https://www.removeddit.com/r/brave_browser/comments/csapsy/brave_browser_is_being_delisted_from/exf6i0f/)).
+**Brave** is widely touted as a privacy-friendly Chromium browser, but we have a number of concerns with their business practices and future business model that would prevent us from recommending them. The Brave team [has publicly stated](https://www.reddit.com/r/privacytoolsIO/comments/cs8foq/update_delisting_brave/) they do not want to be associated with privacy-focused groups like PrivacyTools ([PrivacyTools PR #657](https://github.com/privacytools/privacytools.io/pull/657)), which causes us to believe the Brave team does not wish to be under too much scrutiny from the privacy community as they continue to develop their product ([Reddit discussion](http://archive.today/2020.05.13-035943/https://www.removeddit.com/r/brave_browser/comments/csapsy/brave_browser_is_being_delisted_from/exf6i0f/)).
diff --git a/collections/_posts/2019-10-05-understanding-vpns.md b/collections/_posts/2019-10-05-understanding-vpns.md
index 2aeff0a9..7ad2df47 100644
--- a/collections/_posts/2019-10-05-understanding-vpns.md
+++ b/collections/_posts/2019-10-05-understanding-vpns.md
@@ -5,7 +5,7 @@ cover: understanding-vpns-cover.jpg
 cover_src: 'https://unsplash.com/@freeche'
 cover_src_publisher: Kvistholt Photography
 canonical: 'https://blog.privacytools.io/understanding-vpns/'
-canonical_publisher: the Privacy Guides Blog
+canonical_publisher: the PrivacyTools Blog
 layout: post
 excerpt: A VPN is a tool that secures your internet connection from attackers on your network...
 ---
diff --git a/collections/_posts/2019-11-09-firefox-privacy.md b/collections/_posts/2019-11-09-firefox-privacy.md
index 20d57508..57edae2d 100644
--- a/collections/_posts/2019-11-09-firefox-privacy.md
+++ b/collections/_posts/2019-11-09-firefox-privacy.md
@@ -6,7 +6,7 @@ cover_src: 'https://unsplash.com/@vmxhu'
 cover_src_publisher: Szabo Viktor
 color: "linear-gradient(to bottom, rgba(158, 82, 19, 0.5), rgba(158, 82, 19, 0.9))"
 canonical: 'https://blog.privacytools.io/firefox-privacy-an-introduction-to-safe/'
-canonical_publisher: the Privacy Guides Blog
+canonical_publisher: the PrivacyTools Blog
 layout: post
 excerpt: Mozilla Firefox is one of the most popular web browsers around, and for good reason. It's fast, secure, open-source, and it's backed by an organization that actually respects your privacy.
 ---
@@ -149,7 +149,7 @@ A containers setup may be a good alternative to techniques like regularly deleti
 
 ## Additional Resources
 
-[Web Browsers at Privacy Guides](https://www.privacytools.io/browsers/) — Privacy Guides's comprehensive set of recommendations for browsers and tweaks you can make to enhance your privacy is a great next step for more advanced users looking to protect their privacy online.
+[Web Browsers at PrivacyTools](https://www.privacytools.io/browsers/) — PrivacyTools's comprehensive set of recommendations for browsers and tweaks you can make to enhance your privacy is a great next step for more advanced users looking to protect their privacy online.
 
 [ghacks user.js](https://github.com/ghacksuserjs/ghacks-user.js) — For more advanced users, the ghacks user.js is a "configuration file that can control hundreds of Firefox settings [...] which aims to provide as much privacy and enhanced security as possible, and to reduce tracking and fingerprinting as much as possible - while minimizing any loss of functionality and breakage".
 
diff --git a/legacy_pages/about/about.html b/legacy_pages/about/about.html
index 5236da78..ba8350ed 100644
--- a/legacy_pages/about/about.html
+++ b/legacy_pages/about/about.html
@@ -9,11 +9,11 @@ hidedesc: true
 <meta itemprop="alternateName" content="privacytoolsIO">
 <meta itemprop="alternateName" content="Privacy Tools">
 <meta itemprop="alternateName" content="privacytools.io">
-<link itemprop="logo" href="{{ site.production_url }}/assets/img/legacy_svg/layout/brand/square-transparent.svg">
+<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="{{ site.production_url }}">This website</a> serves as the centerpiece of our organization, where we research and recommend various software solutions for our community.</p>
+    <p>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>
diff --git a/legacy_pages/donate.html b/legacy_pages/donate.html
index 1faab7f4..2de54a09 100644
--- a/legacy_pages/donate.html
+++ b/legacy_pages/donate.html
@@ -7,15 +7,15 @@ permalink: /donate/
   <div class="row">
     <div class="mx-auto text-center">
       <div class="mt-4 mb-4">
-        <a href="{{ site.production_url }}">
-          <img class="img-fluid" src="/assets/img/legacy_svg/layout/brand/horizontal.svg" width="450px" alt="{{ site.name }}">
+        <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 {{ site.name }} are tax deductible for US taxpayers.</strong> These funds are transparently and primarily used to cover server costs.</p>
+          <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>
@@ -299,7 +299,7 @@ permalink: /donate/
       </div>
 
     <div class="text-center">
-      <p>The <a href="/contact/">{{ site.name }} team</a> does not necessarily endorse all of the cryptocurrencies listed on this page. Please conduct your own research before purchasing any cryptocurrencies.</p>
+      <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>
diff --git a/legacy_pages/software/encryption.html b/legacy_pages/software/encryption.html
deleted file mode 100644
index c6cf7dc9..00000000
--- a/legacy_pages/software/encryption.html
+++ /dev/null
@@ -1,8 +0,0 @@
----
-layout: page
-permalink: /software/productivity/#encrypt
-title: "Encryption Tools"
-description: "Discover free, open-source, and secure ways to encrypt your sensitive data to keep it from prying eyes."
----
-
-{% include legacy/sections/file-encryption.html %}
diff --git a/legacy_pages/sponsors.html b/legacy_pages/sponsors.html
index b04d6eaf..bca12853 100644
--- a/legacy_pages/sponsors.html
+++ b/legacy_pages/sponsors.html
@@ -7,14 +7,14 @@ permalink: /sponsors/
 <div class="row">
   <div class="mx-auto text-center">
     <div class="my-4">
-      <h1>Sponsors of {{ site.name }}</h1>
-      <p>A massive thank you to the following <strong>organization-level sponsors</strong> of {{ site.name }}, who pledge $250+:</p>
+      <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 {{ site.name }} website and services are a community project. There is no advertising, affiliate links, or other forms of monetization.<br><strong>Your donations here directly support hosting this website and compensating contributors to this project.</strong></p>
+      <p>The 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>
@@ -35,8 +35,8 @@ permalink: /sponsors/
 <p>These individuals and organizations pledge $10 - $99 to the organization.</p>
 {% include legacy/sponsors/list.html %}
 
-<h3>Why sponsor {{ site.name }}?</h3>
-<p>This sponsorship program is designed to allow companies, organizations, and individuals partner with the {{ site.name }} team to support our vision of a more privacy-respecting internet and the greater online community.</p>
+<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>
@@ -45,7 +45,7 @@ permalink: /sponsors/
   <li><strong>Freedom</strong>. The right to express your opinion online without interference or surveillance is the only way we can grow as a society, and privacy-respecting tools should foster that growth.</li>
 </ul>
 <p>We reserve the right or deny all sponsors from receiving the benefits detailed below if we believe that your organization or product is not aligned with our key values. Therefore, if you are interested in sponsoring our project, please first email <a href="mailto:sponsors@privacytools.io">sponsors@privacytools.io</a> so we may discuss further.</p>
-<p>As a sponsor of {{ site.name }}, your company will be widely recognized in a variety of ways, some of which we've detailed below.</p>
+<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>
@@ -68,7 +68,7 @@ permalink: /sponsors/
 <h5>We will not provide...</h5>
 <p>We pride ourselves on our integrity and commitment to spreading unbiased and fact-based information regarding privacy and privacy-respecting tools. All tools we recommend throughout our website are subject to strict criteria as judged by our team and the community across our various platforms. Your sponsorship will not grant your organization any special consideration when choosing our recommendations throughout the website, a process which we make clear via our transparent ledger on OpenCollective and our public discussions on GitHub. Your sponsorship benefits are limited to those outlined above.</p>
 <h5>Tax and Financial Information</h5>
-<p>Your contribution to {{ site.name }} will be handled by the Open Collective Foundation 501(c)(3). For US companies and taxpayers, this means your contribution is likely <strong>tax deductible</strong>, but you should consult with your accountant regarding your specific circumstances. As a non-profit, your sponsorship contribution will not be used for private profit and will only be used to cover expenses incurred by the project. All of our transactions (donations and expenses) are published transparently on OpenCollective. For the benefit of our readership, anonymous contributions will not be eligible for the sponsorship opportunities outlined above.</p>
+<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">
diff --git a/legacy_pages/privacy.md b/privacy-policy.md
similarity index 68%
rename from legacy_pages/privacy.md
rename to privacy-policy.md
index 161be8f6..53df8356 100644
--- a/legacy_pages/privacy.md
+++ b/privacy-policy.md
@@ -1,21 +1,23 @@
 ---
 layout: page
-permalink: /privacy/
+permalink: /privacy-policy/
 title: "Privacy Q&amp;A"
 description: "This Privacy Statement explains what information Privacy Guides and its related entities collect about its users, what we do with that information, and how we handle the content you place in our products and services."
 ---
 
-## Who is {{ site.name }}?
+## Who is Privacy Guides?
 
-{{ site.name }} is an unincorporated community developing this website and a number of privacy-friendly services. The current list of public team members [can be found on GitHub](https://github.com/orgs/privacytools/people). In order to operate these services, {{ site.name }} receives hosting and administration services from Aragon Ventures LLC.
+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.
 
-## How does {{ site.name }} collect data about me?
+In the future, Privacy Guides will be an independently operated non-profit organization.
+
+## How does Privacy Guides collect data about me?
 
 We collect data:
 
-* When you browse a website, forum, or other {{ site.name }} service.
-* When you create an account on a {{ site.name }} service.
-* When you post, send private messages, or otherwise participate on a {{ site.name }} service.
+* When you browse a website, forum, or other Privacy Guides service.
+* When you create an account on a Privacy Guides service.
+* When you post, send private messages, or otherwise participate on a Privacy Guides service.
 
 This data will be collected regardless of browser, device, or app used to access our services. We do not buy or otherwise receive data from data brokers.
 
@@ -23,7 +25,7 @@ This data will be collected regardless of browser, device, or app used to access
 
 ### We collect data about visits to our websites.
 
-When you visit a {{ site.name }} website or service, regardless of whether you have an account or not, the website may use cookies, server logs, and other methods to collect the following data:
+When you visit a Privacy Guides website or service, regardless of whether you have an account or not, the website may use cookies, server logs, and other methods to collect the following data:
 
 * What pages you visit,
 * Your anonymized IP address: We anonymize the last 3 bytes of your IP, e.g. 192.xxx.xxx.xxx.
@@ -59,15 +61,15 @@ We will store your account data as long as your account remains open. After clos
 
 ## Who is my data shared with?
 
-When you use services provided by {{ site.name }} your data is shared with Aragon Ventures LLC, in order to facilitate their hosting obligations. Aragon Ventures LLC may collect and use your data as described in their privacy statement at [https://aragon.ventures/privacy](https://aragon.ventures/privacy/).
+When you use services provided by Privacy Guides your data is processed by Aragon Ventures LLC, in order to facilitate their hosting obligations. Aragon Ventures LLC may collect and use your data as described in their privacy statement at [https://aragon.ventures/privacy](https://aragon.ventures/privacy/).
 
-Your account data, posts, and other activities on {{ site.name }} services is shared with others as mentioned in the section about account data.
+Your account data, posts, and other activities on Privacy Guides services is shared with others as mentioned in the section about account data.
 
 ## Where is my data stored?
 
-Your data is stored on servers provided by Aragon Ventures LLC, a company incorporated in Minnesota, United States. The primary datacenter for {{ site.name }} is located in France. Some websites, services, or backups may reside in datacenters in multiple jurisdictions, including the United States and the European Union.
+The primary datacenter for Privacy Guides is located in Finland. Some websites, services, or backups may reside in datacenters in multiple jurisdictions, including the United States and the European Union.
 
-## Is {{ site.name }} GDPR compliant?
+## Is Privacy Guides GDPR compliant?
 
 We respect privacy rights under [Regulation (EU) 2016/679](https://eur-lex.europa.eu/legal-content/EN/TXT/?uri=uriserv:OJ.L_.2016.119.01.0001.01.ENG), the European Union’s General Data Protection Regulation (GDPR). Information that GDPR requires us to give can be found throughout this document.
 
@@ -82,9 +84,9 @@ We would like to make sure you are fully aware of all of your data protection ri
 * **The right to object to processing** – You have the right to object to our processing of your personal data, under certain conditions.
 * **The right to data portability** – You have the right to request that we transfer the data that we have collected to another organization, or directly to you, under certain conditions.
 
-## How can I contact the {{ site.name }} team about privacy?
+## How can I contact the Privacy Guides team about privacy?
 
-The {{ site.name }} team generally does not have access to personal data outside of limited access granted via some moderation panels. Inquiries regarding your personal information should be sent directly to the data controller for these services, Aragon Ventures LLC:
+The Privacy Guides team generally does not have access to personal data outside of limited access granted via some moderation panels. Inquiries regarding your personal information should be sent directly to the data controller for these services, Aragon Ventures LLC:
 
 ```
 Jonah Aragon
@@ -101,7 +103,7 @@ Anoka, MN 55303
 United States
 ```
 
-For all other inquiries, you can contact the team via methods described on our [contact page]({{ site.production_url }}/contact/).
+For all other inquiries, you can contact the team via methods described on our [contact page](https://privacyguides.org/contact/).
 
 For complaints under GDPR more generally, European Union users may lodge complaints with their local data protection supervisory authorities.
 
@@ -109,6 +111,6 @@ For complaints under GDPR more generally, European Union users may lodge complai
 
 This version of our privacy statement took effect October 9th, 2019.
 
-We will post any new versions of this statement at [{{ site.production_url }}/privacy/]({{ site.production_url }}/privacy/). We may change how we announce changes in future versions of this document. In the meantime we may update our contact information at any time without announcing a change. Please refer to [{{ site.production_url }}/privacy/]({{ site.production_url }}/privacy/) for the latest contact information at any time.
+We will post any new versions of this statement at [https://privacyguides.org/privacy-policy/](https://privacyguides.org/privacy-policy/). We may change how we announce changes in future versions of this document. In the meantime we may update our contact information at any time without announcing a change. Please refer to [https://privacyguides.org/privacy-policy/](https://privacyguides.org/privacy-policy/) for the latest contact information at any time.
 
-A full [revision history](https://github.com/privacytools/privacytools.io/commits/master/pages/privacy.md) for this page can be found on GitHub.
+A full [revision history](https://github.com/privacyguides/privacyguides/commits/main/privacy-policy.md) for this page can be found on GitHub.