diff --git a/_includes/legacy/sections/email-clients.html b/_includes/legacy/sections/email-clients.html
index 9e04ebee..4dcd5971 100644
--- a/_includes/legacy/sections/email-clients.html
+++ b/_includes/legacy/sections/email-clients.html
@@ -21,7 +21,7 @@
   description="Mailpile is a free, community funded, open source email client with user-friendly encryption and privacy features."
   website="https://www.mailpile.is/"
   privacy-policy="https://www.mailpile.is/privacy.html"
-  tor="clgs64523yi2bkhz.onion"
+  tor="http://clgs64523yi2bkhz.onion"
   github="https://github.com/mailpile/Mailpile"
   linux="https://www.mailpile.is/download/linux.html"
 %}
diff --git a/_includes/legacy/sections/instant-messenger.html b/_includes/legacy/sections/instant-messenger.html
index 344d2308..6d1ddaaf 100644
--- a/_includes/legacy/sections/instant-messenger.html
+++ b/_includes/legacy/sections/instant-messenger.html
@@ -141,7 +141,7 @@
   include legacy/cardv2.html
   title="Jami"
   image="/assets/img/legacy_svg/3rd-party/jami.svg"
-  description="Encrypted instant messaging and video calling software. All communications are E2EE using <a href=//jami.net/improving-performance-and-security-with-tls-1-3/>TLS 1.3</a> and never stored elsewhere than on user's devices, even when <a href=//jami.net/why-is-jami-truly-distributed/>TURN servers are used</a>."
+  description='Encrypted instant messaging and video calling software. All communications are E2EE using <a href="https://jami.net/improving-performance-and-security-with-tls-1-3/">TLS 1.3</a> and never stored outside the client, even when <a href="https://jami.net/why-is-jami-truly-distributed/">TURN servers are used</a>.'
   labels="color==warning::link==https://git.jami.net/savoirfairelinux/ring-project/issues/765::text==Warning::tooltip==This software is partially centralized but can be self-hosted.|text==VoIP"
   website="https://jami.net/"
   privacy-policy="https://jami.net/privacy-policy/"
diff --git a/_includes/legacy/sections/ios-addons.html b/_includes/legacy/sections/ios-addons.html
index 4931a2de..ddd9c43f 100644
--- a/_includes/legacy/sections/ios-addons.html
+++ b/_includes/legacy/sections/ios-addons.html
@@ -4,7 +4,7 @@
 
   <div class="row mb-2">
     <div class="col-lg-3 col-sm-12 pt-lg-5">
-      <img src="/assets/img/png/3rd-party/passepartout.png" height="70" width="70" class="img-fluid d-block mr-auto ml-auto align-middle" alt="Passepartout">
+      <img src="/assets/img/legacy_png/3rd-party/passepartout.png" height="70" width="70" class="img-fluid d-block mr-auto ml-auto align-middle" alt="Passepartout">
     </div>
     <div class="col">
     <h3>Use a VPN with <a href="https://passepartoutvpn.app">Passepartout</a></h3>
@@ -14,7 +14,7 @@
 
   <div class="row mb-2">
     <div class="col-lg-3 col-sm-12 pt-lg-5">
-      <img src="/assets/img/png/3rd-party/adguard.png" height="70" width="70" class="img-fluid d-block mr-auto ml-auto align-middle" alt="AdGuard">
+      <img src="/assets/img/legacy_png/3rd-party/adguard.png" height="70" width="70" class="img-fluid d-block mr-auto ml-auto align-middle" alt="AdGuard">
     </div>
     <div class="col">
     <h3>Block content in Safari with <a href="https://adguard.com/en/adguard-ios/overview.html">AdGuard for iOS</a></h3>
diff --git a/index.html b/index.html
index 614538b7..1ef5c78c 100644
--- a/index.html
+++ b/index.html
@@ -24,7 +24,6 @@ layout: default
       <h5 class="mt-2">“I have nothing to hide. Why should I care about my privacy?”</h5>
       <p class="mt-2">Much like the right to interracial marriage, woman's suffrage, freedom of speech, and many others, we didn't always have the right to privacy. In several dictatorships, many still don't. Generations before ours fought for our right to privacy. <mark>Privacy is a human right inherent to all of us</mark>, that we are entitled to without discrimination.</p>
       <p>You shouldn't confuse privacy with secrecy. We know what happens in the bathroom, but you still close the door. That's because you want privacy, not secrecy. <strong>Everyone</strong> has something to hide, privacy is something that makes you human.</p>
-      <a href="/privacy/" class="btn btn-primary mt-2">Learn More About Privacy</a>
     </div>
     <div class="col-2 d-none d-lg-block">
       {% include svg/phone-like-icon.svg %}
@@ -50,21 +49,10 @@ layout: default
 <div class="container">
   <div class="row mt-3">
     <div class="col text-center">
-      <h2>Privacy Tools &amp; Services</h2>
+      <h2>Privacy Tools</h2>
       <p>The devices, software, and services that will protect your privacy highly depend on your use case, workflow, and threat model. But, if you don't know where to get started, we've chosen some recommended tools to get you going :)</p>
     </div>
   </div>
-  <div class="row mb-5">
-    <div class="col-6 col-sm-4 col-md-3 col-xl-2 mt-3">
-      <a href="/devices/">
-        <div class="card text-center mx-auto" style="width: 160px;">
-          <div class="card-body">
-            <span class="card-title display-4"><i class="fal fa-phone-laptop mb-3" aria-hidden="true"></i></span>
-            <p class="card-subtitle">Devices</p>
-          </div>
-        </div>
-      </a>
-    </div>
     <div class="col-6 col-sm-4 col-md-3 col-xl-2 mt-3">
       <a href="/browsers/">
         <div class="card text-center mx-auto" style="width: 160px;">
@@ -105,16 +93,6 @@ layout: default
         </div>
       </a>
     </div>
-    <div class="col-6 col-sm-4 col-md-3 col-xl-2 mt-3">
-      <a href="/services/">
-        <div class="card text-center mx-auto" style="width: 160px;">
-          <div class="card-body">
-            <span class="card-title display-4"><i class="fal fa-server mb-3" aria-hidden="true"></i></span>
-            <p class="card-subtitle">Services</p>
-          </div>
-        </div>
-      </a>
-    </div>
   </div>
 </div>
 </div>
diff --git a/legacy_pages/software.html b/legacy_pages/software.html
index de355351..0799c893 100644
--- a/legacy_pages/software.html
+++ b/legacy_pages/software.html
@@ -17,7 +17,6 @@ description: "Discover a variety of open-source software built to protect your p
     <li class="list-group-item"><a href="/software/passwords/"><span class="fas fa-user-lock fa-fw"></span> Password Manager</a></li>
     <li class="list-group-item"><a href="/software/productivity/"><span class="fas fa-briefcase fa-fw"></span> Productivity Tools</a></li>
     <li class="list-group-item"><a href="/software/real-time-communication/"><span class="fas fa-comments fa-fw"></span> Real-Time Communication</a></li>
-    <li class="list-group-item"><a href="/software/file-sync/"><span class="fas fa-copy fa-fw"></span> Secure File Sync</a></li>
     <li class="list-group-item"><a href="/software/networks/"><span class="fas fa-user-secret fa-fw"></span> Self-contained Networks</a></li>
     <li class="list-group-item"><a href="/software/cloud/"><span class="fas fa-hdd fa-fw"></span> Self-Hosted Cloud Server</a></li>
   </ul>