diff --git a/_includes/card.html b/_includes/card.html
index dbc353c4..178155e4 100644
--- a/_includes/card.html
+++ b/_includes/card.html
@@ -1,4 +1,4 @@
-<div class="col-xl-4 col-lg-6 col-md-12 mb-2">
+<div class="col-xl-4 col-lg-6 col-md-12 mb-4">
     <div class="card card-{{include.color}}">
         {% if include.color == "warning" %}
         <div class="card-header text-dark bg-{{include.color}}">
@@ -37,7 +37,7 @@
             <div>
             <p>
                 {% if include.url %}
-                <a class="btn btn-{{include.color}} mb-1" href="{{include.url}}">Website:
+                <a class="btn btn-{{include.color}} mb-1" href="{{include.url}}">
                     {% if include.website %}
                         {{include.website}}
                     {% else %}
diff --git a/_includes/footer.html b/_includes/footer.html
index 1ca12dfc..d7ea3871 100644
--- a/_includes/footer.html
+++ b/_includes/footer.html
@@ -44,27 +44,23 @@
   <h3>Copy URL and Description</h3>
 
   <p>
-  <input type="text" value="www.privacytools.io - encryption against global mass surveillance" onclick="this.focus();this.select()" class="form-control input-lg">
+  <input type="text" value="privacytools.io - encryption against global mass surveillance" onclick="this.focus();this.select()" class="form-control input-lg">
   <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-md-3 col-sm-6 mb-3 d-flex justify-content-center d-flex justify-content-center">
-      <a href="https://www.privacytools.io/LICENSE.txt" data-toggle="tooltip" data-placement="top" data-original-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;."><img alt="CC0" src="/assets/img/layout/zero.png" width="32" height="32">CC0</a>
+    <div class="col-sm-4 mb-3 d-flex justify-content-center d-flex justify-content-center">
+      <a href="/LICENSE.txt" data-toggle="tooltip" data-placement="top" data-original-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;."><img alt="CC0" src="/assets/img/layout/zero.png" width="32" height="32">CC0</a>
     </div>
 
-    <div class="col-md-3 col-sm-6 mb-3 d-flex justify-content-center">
-      <a href="https://www.kopimi.com/" data-toggle="tooltip" data-placement="top" data-original-title="kopimi (copyme), symbol showing that you want to be copied. use kopimi in your own fancy. kopimi may be put on homepages or blogs, in books, in software, as sound logos in music or whatever."><img alt="kopimi" src="/assets/img/layout/kopimi.png" width="32" height="33">kopimi</a>
-    </div>
-
-    <div class="col-md-3 col-sm-6 mb-3 d-flex justify-content-center">
+    <div class="col-sm-4 mb-3 d-flex justify-content-center">
       <i class="far fa-envelope fa-2x"></i>
       <a href="/contact/">Contact</a>
     </div>
 
-    <div class="col-md-3 col-sm-6 mb-3 d-flex justify-content-center">
+    <div class="col-sm-4 mb-3 d-flex justify-content-center">
       <i class="fas fa-heart fa-2x text-danger"></i>
       <a 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 cost for server and domain." href="/donate/">Donate</a>
     </div>
diff --git a/_includes/nav.html b/_includes/nav.html
index 7895497f..35f5577e 100644
--- a/_includes/nav.html
+++ b/_includes/nav.html
@@ -45,11 +45,11 @@
             </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/#fingerprint"><span class="fas fa-fingerprint fa-fw"></span> Fingerprinting Info</a>
             <a class="dropdown-item" href="/browsers/#about_config"><span class="fas fa-wrench fa-fw"></span> Firefox Tweaks</a>
+            <a class="dropdown-item" href="/browsers/#browser"><span class="fas fa-check fa-fw"></span> Recommendation</a>
+            <a class="dropdown-item" href="/browsers/#webrtc"><span class="far fa-eye fa-fw"></span> WebRTC IP Leak</a>
           </span>
         </details>
 
@@ -68,10 +68,11 @@
             <a class="dropdown-item" href="/software/email/"><span class="fas fa-envelope fa-fw"></span> Email Clients</a>
             <a class="dropdown-item" href="/software/encryption-tools/"><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/file-sync/"><span class="fas fa-copy fa-fw"></span> Secure File Sync</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>
@@ -86,12 +87,12 @@
             </span>
           </summary>
           <span class="nav-dropdown">
-            <a class="dropdown-item" href="/operating-systems/#os"><span class="fas fa-th-large fa-fw"></span> PC OS</a>
+            <a class="dropdown-item" href="/operating-systems/#aaddons"><span class="fas fa-th fa-fw"></span> Android Privacy Add-ons</a>
+            <a class="dropdown-item" href="/operating-systems/#win10"><span class="far fa-thumbs-down fa-fw"></span> Don't use Windows 10</a>
             <a class="dropdown-item" href="/operating-systems/#live_os"><span class="fas fa-compact-disc fa-fw"></span> Live CD OS</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/#os"><span class="fas fa-th-large fa-fw"></span> PC OS</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>
 
diff --git a/_includes/panel.html b/_includes/panel.html
index f9e77415..ed21ee28 100644
--- a/_includes/panel.html
+++ b/_includes/panel.html
@@ -1,4 +1,4 @@
-<div class="col-xl-4 col-lg-6 col-md-12 mb-2">
+<div class="col-xl-4 col-lg-6 col-md-12 mb-4">
     <div class="card card-{{include.color}}">
         {% if include.color == "warning" %}
         <div class="card-header text-dark bg-{{include.color}}">
@@ -11,4 +11,4 @@
             {{include.body}}
         </div>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/_includes/sections/android-addons.html b/_includes/sections/android-addons.html
index 1779258a..c44a849a 100644
--- a/_includes/sections/android-addons.html
+++ b/_includes/sections/android-addons.html
@@ -6,16 +6,6 @@
 
 <div class="container-fluid">
 
-  <div class="row mb-2">
-    <div class="col-lg-3 col-sm-12 pt-lg-5">
-      <img src="/assets/img/addons/Blokada.png" height="70" width="200" class="img-fluid d-block mr-auto ml-auto align-middle" alt="Blokada">
-    </div>
-    <div class="col">
-    <h3>Block ads with <a href="https://blokada.org/">Blokada</a></h3>
-    <p><strong>Blokada</strong> works across all of your apps, not only the browser. It doesn't require root, supports both wifi and mobile networks, and is perfectly safe and simple to use. Just turn it on, and it will do the job silently!
-    </div>
-  </div>
-
   <div class="row mb-2">
     <div class="col-lg-3 col-sm-12 pt-lg-5">
       <img src="/assets/img/addons/netguard.png" height="70" width="200" class="img-fluid d-block mr-auto ml-auto align-middle" alt="NetGuard">
@@ -36,4 +26,12 @@
     </div>
   </div>
 
-</div>
\ No newline at end of file
+</div>
+
+<h2>See also</h2>
+
+<ul>
+  <li>
+    <a href="/providers/dns#clients">Our DNS page</a> which also has information on encrypting DNS on Android.
+  </li>
+</ul>
diff --git a/_includes/sections/browser-addons.html b/_includes/sections/browser-addons.html
index 02dd1455..1f25b131 100644
--- a/_includes/sections/browser-addons.html
+++ b/_includes/sections/browser-addons.html
@@ -5,17 +5,6 @@
 </div>
 
 
-{% include cardv2.html
-title="Privacy Badger: Stop Tracking"
-image="/assets/img/addons/privacy-badger.png"
-description="<strong>Privacy Badger</strong> is a browser add-on that stops advertisers and other third-party trackers from secretly tracking where you go and what pages you look at on the web. Privacy Badger learns about trackers as you browse."
-website="https://www.eff.org/privacybadger"
-forum="https://forum.privacytools.io/t/discussion-privacy-badger/265"
-github="https://github.com/EFForg/privacybadger"
-firefox="https://addons.mozilla.org/en-US/firefox/addon/privacy-badger17"
-chrome="https://chrome.google.com/webstore/detail/privacy-badger/pkehgijcmpdhfbdbbnkijodmdjhbjlgp"
-opera="https://addons.opera.com/en/extensions/details/privacy-badger/"
-%}
 
 {% include cardv2.html
 title="uBlock Origin: Block Ads and Trackers"
@@ -71,9 +60,9 @@ title="Terms of Service; Didn’t Read: Be Informed"
 image="/assets/img/addons/tosdr.png"
 description="<strong>Terms of Service; Didn’t Read</strong> “I have read and agree to the Terms” is the biggest lie on the web. This addon aims to fix that by grading websites based on their Terms of Service agreements and gives short summaries."
 website="https://tosdr.org/"
-forum="https://forum.privacytools.io/t/discussion-decentraleyes/270"
+forum="https://forum.privacytools.io/t/discussion-terms-of-service-didn-t-read/270"
 github="https://github.com/tosdr/"
-firefox="https://addons.mozilla.org/en-US/firefox/addon/decentraleyes"
+firefox="https://addons.mozilla.org/en-US/firefox/addon/terms-of-service-didnt-read/"
 chrome="https://chrome.google.com/webstore/detail/terms-of-service-didn%E2%80%99t-r/hjdoplcnndgiblooccencgcggcoihigg"
 opera="https://addons.opera.com/en/extensions/details/terms-of-service-didnt-read"
 safari="https://safariextension.tosdr.org/"
@@ -90,6 +79,17 @@ firefox="https://addons.mozilla.org/en-US/firefox/addon/torproject-snowflake"
 chrome="https://chrome.google.com/webstore/detail/snowflake/mafpmfcccpbjnhfhjnllmmalhifmlcie"
 %}
 
+{% include cardv2.html
+title="Privacy Badger: Stop Tracking"
+image="/assets/img/addons/privacy-badger.png"
+description="<strong>Privacy Badger</strong> is a browser add-on that stops advertisers and other third-party trackers from secretly tracking where you go and what pages you look at on the web. Privacy Badger learns about trackers as you browse."
+website="https://www.eff.org/privacybadger"
+forum="https://forum.privacytools.io/t/discussion-privacy-badger/265"
+github="https://github.com/EFForg/privacybadger"
+firefox="https://addons.mozilla.org/en-US/firefox/addon/privacy-badger17"
+chrome="https://chrome.google.com/webstore/detail/privacy-badger/pkehgijcmpdhfbdbbnkijodmdjhbjlgp"
+opera="https://addons.opera.com/en/extensions/details/privacy-badger/"
+%}
 
 <h2>For Power Users Only</h2>
 
diff --git a/_includes/sections/browser-recommendation.html b/_includes/sections/browser-recommendation.html
index e1969768..1859668d 100644
--- a/_includes/sections/browser-recommendation.html
+++ b/_includes/sections/browser-recommendation.html
@@ -1,19 +1,19 @@
-<h1 id="browser" class="anchor"><a href="#browser"><i class="fas fa-link anchor-icon"></i></a> Browser Recommendations</h1>
+<h1 id="browser" class="anchor">
+  <a href="#browser"><span class="fas fa-link anchor-icon"></span></a>
+  Browser Recommendations For Desktop
+</h1>
 
 {% include cardv2.html
-title="Mozilla Firefox"
+title="Firefox"
 image="/assets/img/tools/Firefox.png"
 description='Firefox is fast, reliable, open source and respects your privacy. Don\'t forget to adjust the settings according to our
 recommendations: <a href="#webrtc"><i class="fas fa-link"></i> WebRTC</a> and <a href="#about_config"><i class="fas fa-link"></i> about:config</a> and get the <a href="#addons"><i class="fas fa-link"></i> privacy add-ons</a>.'
-website="https://www.firefox.com/"
+website="https://firefox.com"
 forum="https://forum.privacytools.io/t/discussion-firefox/279"
-github="https://github.com/mozilla"
-windows="https://www.mozilla.org/en-US/firefox/new/"
-mac="https://www.mozilla.org/en-US/firefox/new/"
-linux="https://www.mozilla.org/en-US/firefox/new/"
-fdroid="https://f-droid.org/en/packages/org.mozilla.fennec_fdroid/"
-googleplay="https://play.google.com/store/apps/details?id=org.mozilla.firefox"
-ios="https://apps.apple.com/us/app/firefox-private-safe-browser/id989804926"
+source="https://hg.mozilla.org/mozilla-central/"
+windows="https://www.mozilla.org/firefox/windows/"
+mac="https://www.mozilla.org/firefox/mac/"
+linux="https://www.mozilla.org/firefox/linux/"
 freebsd="https://www.freshports.org/www/firefox"
 openbsd="http://openports.se/www/mozilla-firefox"
 netbsd="http://pkgsrc.se/www/firefox"
@@ -24,12 +24,112 @@ title="Tor Browser - Provides Anonymity"
 image="/assets/img/tools/Tor-Browser.png"
 description='Tor Browser is your choice if you need an extra layer of anonymity. It\'s a modified version of Firefox ESR, which comes with pre-installed privacy add-ons, encryption and an advanced proxy. <a href="https://write.privacytools.io/my-thoughts-on-security/slicing-onions-part-1-myth-busting-tor">How does Tor work?</a>'
 website="https://www.torproject.org/"
+tor="http://expyuzz4wqqyqhjn.onion/"
 forum="https://forum.privacytools.io/t/discussion-tor-browser/278"
 git="https://trac.torproject.org/projects/tor"
 windows="https://www.torproject.org/download/"
 mac="https://www.torproject.org/download/"
 linux="https://www.torproject.org/download/"
+%}
+
+<h1 id="browser-android" class="anchor">
+  <a href="#browser-android"><span class="fas fa-link anchor-icon"></span></a>
+  Browser Recommendations For Android
+</h1>
+
+{% include cardv2.html
+title="Firefox"
+image="/assets/img/tools/Firefox.png"
+description='Firefox is fast, reliable, open source and respects your privacy. Don\'t forget to adjust the settings according to our
+recommendations: <a href="#webrtc"><i class="fas fa-link"></i> WebRTC</a> and <a href="#about_config"><i class="fas fa-link"></i> about:config</a> and get the <a href="#addons"><i class="fas fa-link"></i> privacy add-ons</a>.'
+website="https://www.mozilla.org/en-US/firefox/mobile/"
+forum="https://forum.privacytools.io/t/discussion-firefox/279"
+source="https://github.com/mozilla-mobile"
+fdroid="https://f-droid.org/en/packages/org.mozilla.fennec_fdroid/"
+googleplay="https://play.google.com/store/apps/details?id=org.mozilla.firefox"
+android="https://www.mozilla.org/firefox/all/#product-android-release"
+%}
+
+{% include cardv2.html
+title="Tor Browser - Provides Anonymity"
+image="/assets/img/tools/Tor-Browser.png"
+description='Tor Browser is your choice if you need an extra layer of anonymity. It\'s a modified version of Firefox ESR, which comes with pre-installed privacy add-ons, encryption and an advanced proxy. <a href="https://write.privacytools.io/my-thoughts-on-security/slicing-onions-part-1-myth-busting-tor">How does Tor work?</a>'
+website="https://www.torproject.org/"
+tor="http://expyuzz4wqqyqhjn.onion/"
+forum="https://forum.privacytools.io/t/discussion-tor-browser-for-android-browsers/1522"
+git="https://gitweb.torproject.org/tor-browser.git/"
 android="https://www.torproject.org/download/#android"
 fdroid="https://guardianproject.info/fdroid/"
 googleplay="https://play.google.com/store/apps/details?id=org.torproject.torbrowser"
 %}
+
+{% include cardv2.html
+title="Bromite"
+image="/assets/img/tools/bromite.png"
+description='Bromite is a Chromium-based browser with security enhancement patches from GrapheneOS and built-in adblocking and DNS over HTTPS support. More info can be found <a href="https://www.bromite.org/#main-features">here</a>.'
+website="https://www.bromite.org/"
+forum="https://forum.privacytools.io/t/discussion-bromite-browsers/1521"
+github="https://github.com/bromite/bromite"
+fdroid="https://www.bromite.org/fdroid"
+android="https://www.bromite.org/#download-bromite"
+%}
+
+<h3>Worth Mentioning for Android</h3>
+
+<ul>
+  <li>
+    <a href="https://www.stoutner.com/privacy-browser/">Privacy Browser</a>
+   - An open source web browser focused on user privacy. Features include integrated ad blocking with <a href="https://easylist.to/">EasyList</a>, <a href="https://www.stoutner.com/privacy-browser-2-5/">SSL certificate pinning</a>, and <a href='https://guardianproject.info/apps/orbot/'>Tor Orbot proxy support.</a>
+    <a href="https://play.google.com/store/apps/details?id=com.google.android.webview&hl=en_US">
+      <span class="badge badge-warning" data-toggle="tooltip" title="Privacy Browser relies on the Android System WebView which needs to be kept up to date to fix security issues. One can update WebView by either installing it from Google Play or Aurora Store which you can get from F-Droid.">
+        <span class="fas fa-exclamation-triangle"></span>
+        Keep Android WebView up-to-date
+      </span>
+    </a>
+  </li>
+</ul>
+
+
+<h1 id="browser-ios" class="anchor"><a href="#browser-ios"><i class="fas fa-link anchor-icon"></i></a> Browser Recommendations For iOS</h1>
+
+{% include cardv2.html
+title="Firefox"
+image="/assets/img/tools/Firefox.png"
+description='Firefox is fast, reliable, open source and respects your privacy. Note: because of limitations set by Apple in iOS, our recommended tweaks cannot be applied. However Firefox for iOS has an <a href="https://support.mozilla.org/en-US/kb/enhanced-tracking-protection-firefox-ios">Enhanced Tracking Protection</a> feature that uses a list provided by <a href="https://disconnect.me/trackerprotection">Disconnect</a> to identify and block ad, social and analytics trackers, as well as cryptominers and fingerprinters.'
+website="https://www.mozilla.org/en-US/firefox/mobile/"
+forum="https://forum.privacytools.io/t/discussion-firefox/279"
+source="https://github.com/mozilla-mobile/firefox-ios"
+ios="https://apps.apple.com/us/app/firefox-private-safe-browser/id989804926"
+%}
+
+
+{% include cardv2.html
+title="Onion Browser"
+image="/assets/img/tools/onionbrowser.png"
+description='Onion Browser is an open source browser that lets you browse the web anonymously over the Tor network on iOS devices, and is endorsed by the Tor Project. Warning: there are certain anonymity related <a href="https://onionbrowser.com/#security-advisories">issues</a> with Onion browser due to iOS limitations.'
+website="https://onionbrowser.com/"
+forum="https://forum.privacytools.io/t/discussion-onion-browser-browsers/1523"
+github="https://github.com/OnionBrowser/OnionBrowser"
+ios="https://apps.apple.com/us/app/onion-browser/id519296448"
+%}
+
+
+{% include cardv2.html
+title="DuckDuckGo Privacy Browser"
+image="/assets/img/provider/DuckDuckGo.png"
+description='DuckDuckGo Privacy Browser is an open source web browser that has built-in ad and tracker blocking and utilizes <a href="https://tosdr.org/">ToS;DR</a> to rate the privacy policies of the sites you visit.'
+website="https://duckduckgo.com/app"
+tor="https://3g2upl4pq6kufc4m.onion/app"
+forum="https://forum.privacytools.io/t/discussion-duckduckgo-privacy-browser-browsers/1524"
+github="https://github.com/duckduckgo/iOS"
+ios="https://apps.apple.com/us/app/duckduckgo-privacy-browser/id663592361"
+%}
+
+<h3>Worth Mentioning for iOS</h3>
+
+<ul>
+  <li>
+    <a href="https://snowhaze.com/en/index.html">SnowHaze</a>
+        - An open source web browser with built-in ad, tracker, cookie, and fingerprint blocking, all customizable on a per-site basis.
+  </li>
+</ul>
diff --git a/_includes/sections/browser-tweaks.html b/_includes/sections/browser-tweaks.html
index 2fa29e1e..9bdd6c4c 100644
--- a/_includes/sections/browser-tweaks.html
+++ b/_includes/sections/browser-tweaks.html
@@ -28,15 +28,6 @@
   <dt>privacy.trackingprotection.enabled = true</dt>
   <dd>This is Mozilla's new built-in tracking protection. It uses Disconnect.me filter list, which is redundant if you are already using uBlock Origin 3rd party filters, therefore you should set it to false if you are using the add-on functionalities.</dd>
 
-  <dt>browser.cache.offline.enable = false</dt>
-  <dd>Disables offline cache.</dd>
-
-  <dt>browser.safebrowsing.malware.enabled = false</dt>
-  <dd>Disable Google Safe Browsing malware checks. Security risk, but privacy improvement.</dd>
-
-  <dt>browser.safebrowsing.phishing.enabled = false</dt>
-  <dd>Disable Google Safe Browsing and phishing protection. Security risk, but privacy improvement.</dd>
-
   <dt>browser.send_pings = false</dt>
   <dd>The attribute would be useful for letting websites track visitors' clicks.</dd>
 
@@ -46,8 +37,6 @@
   <dt>browser.urlbar.speculativeConnect.enabled = false</dt>
   <dd>Disable preloading of autocomplete URLs. Firefox preloads URLs that autocomplete when a user types into the address bar, which is a concern if URLs are suggested that the user does not want to connect to. <a href="https://www.ghacks.net/2017/07/24/disable-preloading-firefox-autocomplete-urls/">Source</a></dd>
 
-  <dt>dom.battery.enabled = false</dt>
-  <dd>The battery status of your device could be tracked.</dd>
 
   <dt>dom.event.clipboardevents.enabled = false</dt>
   <dd>Disable that websites can get notifications if you copy, paste, or cut something from a web page, and it lets them know which part of the page had been selected.</dd>
@@ -74,26 +63,7 @@
   </ul>
   </dd>
 
-  <dt>network.cookie.lifetimePolicy = 2</dt>
-  <dd>
-  cookies are deleted at the end of the session
-  <ul>
-    <li>0 = Accept cookies normally</li>
-    <li>1 = Prompt for each cookie</li>
-    <li>2 = Accept for current session only</li>
-    <li>3 = Accept for N days</li>
-  </ul>
-  </dd>
 
-  <dt>network.http.referer.trimmingPolicy = 2</dt>
-  <dd>
-  Send only the scheme, host, and port in the <code>Referer</code> header
-  <ul>
-    <li>0 = Send the full URL in the <code>Referer</code> header</li>
-    <li>1 = Send the URL without its query string in the <code>Referer</code> header</li>
-    <li>2 = Send only the scheme, host, and port in the <code>Referer</code> header</li>
-  </ul>
-  </dd>
 
   <dt>network.http.referer.XOriginPolicy = 2</dt>
   <dd>
@@ -131,18 +101,10 @@
   </ul>
   </dd>
 
-  <dt>extensions.pocket.enabled = false</dt>
-  <dd>Disables Pocket completely.</dd>
 
   <dt>network.IDN_show_punycode = true</dt>
   <dd>Not rendering IDNs as their Punycode equivalent leaves you open to phishing attacks that can be very difficult to notice. <a href="https://krebsonsecurity.com/2018/03/look-alike-domains-and-visual-confusion/#more-42636">Source</a></dd>
 
-  <dt>extensions.blocklist.url = https://blocklists.settings.services.mozilla.com/v1/blocklist/3/%20/%20/</dt>
-  <dd>
-  <p>Limit the amount of identifiable information sent when requesting the Mozilla harmful extension blocklist.
-  <p>Optionally, the blocklist can be disabled entirely by setting <code>extensions.blocklist.enabled</code> to false for increased privacy, but decreased security. <a href="https://old.reddit.com/r/privacytoolsIO/comments/9uqeew/firefox_tip_sanitize_firefox_blocklist_url_so_it/">Source</a></p>
-  </dd>
-</dl>
 
 <h3 id="user.js">Firefox user.js Templates</h3>
 <ul>
diff --git a/_includes/sections/dns.html b/_includes/sections/dns.html
index ee6c1f68..6acb5cf6 100644
--- a/_includes/sections/dns.html
+++ b/_includes/sections/dns.html
@@ -343,7 +343,7 @@
           </a>
         </td>
         <td>No</td>
-        <td>DoT</td>
+        <td>DoH, DoT</td>
         <td>Yes</td>
         <td>Yes</td>
         <td>
@@ -533,7 +533,7 @@
   <li>QNAME Minimization - Run <code>dig +short txt qnamemintest.internet.nl</code> from the command-line (taken from <a href="https://nlnetlabs.nl/downloads/presentations/unbound_qnamemin_oarc24.pdf">this NLnet Labs presentation</a>). If you are on Windows 10, run <code>Resolve-DnsName -Type TXT -Name qnamemintest.internet.nl</code> from the PowerShell. You should see this display: <code>"HOORAY - QNAME minimisation is enabled on your resolver :)!"</code></li>
 </ul>
 
-<h3>Worth Mentioning and Additional Information</h3>
+<h3 id="clients">Worth Mentioning and Additional Information</h3>
 
 <ul>
   <li><strong>Encrypted DNS clients for desktop:</strong>
diff --git a/_includes/sections/file-sharing.html b/_includes/sections/file-sharing.html
index a4b5dff9..e8a648a4 100644
--- a/_includes/sections/file-sharing.html
+++ b/_includes/sections/file-sharing.html
@@ -45,4 +45,5 @@ netbsd="https://pypi.org/project/magic-wormhole/"
 
 <ul>
   <li><a href="https://github.com/schollz/croc">croc</a> - Easily and securely send things from one computer to another.</li>
+  <li><a href="https://freedombox.org/">FreedomBox</a> - Designed to be your own inexpensive server at home. It runs free software and offers an increasing number of services ranging from a calendar or jabber server to a wiki or VPN.</li>
 </ul>
diff --git a/_includes/sections/file-sync.html b/_includes/sections/file-sync.html
index e7a8fd77..6dea5561 100644
--- a/_includes/sections/file-sync.html
+++ b/_includes/sections/file-sync.html
@@ -1,24 +1,36 @@
-<h1 id="sync" class="anchor"><a href="#sync"><i class="fas fa-link anchor-icon"></i></a> Secure File Sync Software</h1>
+<h1 id="sync" class="anchor">
+  <a href="#sync">
+    <i class="fas fa-link anchor-icon"></i>
+  </a>
+  File Sync
+</h1>
 
-<div class="row mb-2">
-
-  {% include card.html color="success"
-  title="SparkleShare"
-  image="/assets/img/tools/SparkleShare.png"
-  url="https://sparkleshare.org/"
-  footer="OS: Windows, macOS, Linux."
-  description="SparkleShare creates a special folder on your computer. You can add remotely hosted folders (or \"projects\") to this folder. These projects will be automatically
-  kept in sync with both the host and all of your peers when someone adds, removes or edits a file."
-  %}    {% include card.html color="primary"
+{%
+  include cardv2.html
   title="Syncthing"
   image="/assets/img/tools/Syncthing.png"
-  url="https://syncthing.net/"
-  footer="OS: Windows, macOS, Linux, Android, BSD, Solaris."
-  description="Syncthing replaces proprietary sync and cloud services with something open, trustworthy and decentralized. Your data is your data alone and you deserve to
-  choose where it is stored, if it is shared with some third-party and how it's transmitted over the Internet."
-  %}
+  description="<strong>Syncthing</strong> replaces proprietary sync and cloud services with something open, trustworthy and decentralized. Your data is your data alone and you deserve to choose where it is stored, if it is shared with some third-party and how it's transmitted over the Internet."
+  website="https://syncthing.net/"
+  forum="https://forum.privacytools.io/t/discussion-syncthing/1627/2"
+  github="https://github.com/syncthing?type=source"
+  windows="https://github.com/syncthing/syncthing-gtk/releases/latest"
+  linux="https://github.com/syncthing/syncthing-gtk/releases/latest"
+  mac="https://github.com/syncthing/syncthing-macos/releases/latest"
+  fdroid="https://f-droid.org/packages/com.github.catfriend1.syncthingandroid/"
+  googleplay="https://play.google.com/store/apps/details?id=com.github.catfriend1.syncthingandroid"
+%}
 
-</div>
+{%
+  include cardv2.html
+  title="SparkleShare"
+  image="/assets/img/tools/SparkleShare.png"
+  description="<strong>SparkleShare</strong> creates a special folder on your computer. You can add remotely hosted folders (or \"projects\") to this folder. These projects will be automatically kept in sync with both the host and all of your peers when someone adds, removes or edits a file."
+  website="https://sparkleshare.org/"
+  forum="https://forum.privacytools.io/t/discussion-sparkleshare/1626"
+  github="https://github.com/hbons/SparkleShare"
+  linux="https://www.sparkleshare.org/"
+  mac="https://github.com/hbons/SparkleShare/releases/"
+%}
 
 <h3>Worth Mentioning</h3>
 
diff --git a/_includes/sections/instant-messenger.html b/_includes/sections/instant-messenger.html
index 3ccab45c..695a458e 100644
--- a/_includes/sections/instant-messenger.html
+++ b/_includes/sections/instant-messenger.html
@@ -14,11 +14,10 @@ labels="success:VoIP"
 website="https://signal.org/"
 forum="https://forum.privacytools.io/t/discussion-signal/664"
 github="https://github.com/signalapp"
-playstore="https://play.google.com/store/apps/details?id=org.thoughtcrime.securesms"
 windows="https://signal.org/download/"
 mac="https://signal.org/download/"
 linux="https://signal.org/download/"
-playstore="https://play.google.com/store/apps/details?id=org.thoughtcrime.securesms"
+googleplay="https://play.google.com/store/apps/details?id=org.thoughtcrime.securesms"
 android="https://signal.org/android/apk/#apk-danger"
 ios="https://apps.apple.com/us/app/signal-private-messenger/id874139669"
 %}
diff --git a/_includes/sections/productivity-tools.html b/_includes/sections/productivity-tools.html
index 9f9e2004..3ffbd45c 100644
--- a/_includes/sections/productivity-tools.html
+++ b/_includes/sections/productivity-tools.html
@@ -46,6 +46,18 @@
   ios="https://itunes.apple.com/app/apple-store/id1000755153"
 %}
 
+<h3>Worth Mentioning</h3>
+
+<ul>
+  <li><a href="https://crypt.ee/">Cryptee</a> - Free privacy-friendly service for storing Documents, files and Photos</li>
+  <li><a href="https://ethercalc.net/">EtherCalc</a> - EtherCalc is a web spreadsheet. Data is saved on the web, and people can edit the same document at the same time. Changes are instantly reflected on all screens. Work together on inventories, survey forms, list management, brainstorming sessions.</li>
+  <li><a href="https://disroot.org/">Disroot</a> - Free privacy-friendly service that offers Etherpad, EtherCalc and PrivateBin.</li>
+  <li><a href="https://dudle.inf.tu-dresden.de/anonymous/">dudle</a> - An online scheduling application, free and open source. Schedule meetings or make small online polls. No email collection or the need of registration.</li>
+  <li><a href="https://framadate.org/">Framadate</a> - A free and open source online service for planning an appointment or making a decision quickly and easily. No registration is required.</li>
+  <li><a href="https://www.libreoffice.org/">LibreOffice</a> - Free and open source office suite.</li>
+  <li><a href="https://vscodium.com/">VSCodium</a> - Fork of Microsoft's Visual Studio Code editor without branding or telemetry.</li>
+</ul>
+
 <h1 id="metadata-removal-tools" class="anchor">
   <a href="#metadata-removal-tools"
     ><i class="fas fa-link anchor-icon"></i>
@@ -69,15 +81,3 @@
   netbsd="https://pypi.org/project/mat2/"
 %}
 </div>
-
-<h3>Worth Mentioning</h3>
-
-<ul>
-  <li><a href="https://crypt.ee/">Cryptee</a> - Free privacy-friendly service for storing Documents, files and Photos</li>
-  <li><a href="https://ethercalc.net/">EtherCalc</a> - EtherCalc is a web spreadsheet. Data is saved on the web, and people can edit the same document at the same time. Changes are instantly reflected on all screens. Work together on inventories, survey forms, list management, brainstorming sessions.</li>
-  <li><a href="https://disroot.org/">Disroot</a> - Free privacy-friendly service that offers Etherpad, EtherCalc and PrivateBin.</li>
-  <li><a href="https://dudle.inf.tu-dresden.de/anonymous/">dudle</a> - An online scheduling application, free and open source. Schedule meetings or make small online polls. No email collection or the need of registration.</li>
-  <li><a href="https://framadate.org/">Framadate</a> - A free and open source online service for planning an appointment or making a decision quickly and easily. No registration is required.</li>
-  <li><a href="https://www.libreoffice.org/">LibreOffice</a> - Free and open source office suite.</li>
-  <li><a href="https://vscodium.com/">VSCodium</a> - Fork of Microsoft's Visual Studio Code editor without branding or telemetry.</li>
-</ul>
diff --git a/_includes/sections/selfhosted-cloud.html b/_includes/sections/selfhosted-cloud.html
index ca02b5d0..a9f408fa 100644
--- a/_includes/sections/selfhosted-cloud.html
+++ b/_includes/sections/selfhosted-cloud.html
@@ -4,35 +4,50 @@
   <strong>If you are currently using a Cloud Storage Services like Dropbox, Google Drive, Microsoft OneDrive or Apple iCloud, you should think about hosting it on your own.</strong>
 </div>
 
-<div class="row mb-2">
+{% include cardv2.html
+title="Nextcloud"
+image="/assets/img/provider/Nextcloud.png"
+description="Similar functionally to the widely used Dropbox, with the difference being that Nextcloud is free and open-source, and thereby allowing anyone to install and operate it without charge on a private server, with no limits on storage space or the number of connected clients."
+website="https://nextcloud.com/"
+forum="https://forum.privacytools.io/t/discussion-nextcloud/287"
+windows="https://nextcloud.com/install/#install-clients"
+mac="https://nextcloud.com/install/#install-clients"
+linux="https://nextcloud.com/install/#install-clients"
+freebsd="https://www.freshports.org/www/nextcloud/"
+openbsd="http://openports.se/www/nextcloud"
+netbsd="http://pkgsrc.se/www/php-nextcloud"
+fdroid="https://f-droid.org/packages/com.nextcloud.client/"
+googleplay="https://play.google.com/store/apps/details?id=com.nextcloud.client"
+ios="https://itunes.apple.com/us/app/nextcloud/id1125420102?mt=8"
+github="https://github.com/nextcloud"
+%}
 
-  {% include card.html color="success"
-  title="Pydio"
-  image="/assets/img/tools/Pydio.png"
-  url="https://pydio.com/"
-  footer="OS: Windows, macOS, Linux, iOS, Android."
-  description="Pydio is open source software that turns instantly any server (on-premise, NAS, cloud IaaS or PaaS) into a file sharing platform for your company. It is an alternative
-  to SaaS Boxes and Drives, with more control, safety and privacy, and favorable TCOs."
-  %}
+{% include cardv2.html
+title="Tahoe-LAFS"
+image="/assets/img/tools/Tahoe-LAFS.png"
+website="https://www.tahoe-lafs.org/"
+forum="https://forum.privacytools.io/t/discussion-tahoe-lafs/1662"
+description="Tahoe-LAFS is a Free and Open decentralized cloud storage system. It distributes your data across multiple servers. Even if some of the servers fail or are taken over by an attacker, the entire file store continues to function correctly, preserving your privacy and security."
+windows="https://github.com/tahoe-lafs/tahoe-lafs#via-pip"
+mac="https://github.com/tahoe-lafs/tahoe-lafs#via-pip"
+linux="https://github.com/tahoe-lafs/tahoe-lafs#using-os-packages"
+netbsd="http://pkgsrc.se/filesystems/tahoe-lafs"
+git="https://www.tahoe-lafs.org/trac/tahoe-lafs/browser"
+%}
 
-  {% include card.html color="primary"
-  title="Tahoe-LAFS"
-  image="/assets/img/tools/Tahoe-LAFS.png"
-  url="https://www.tahoe-lafs.org/"
-  footer="OS: Windows, macOS, Linux."
-  description="Tahoe-LAFS is a Free and Open decentralized cloud storage system. It distributes your data across multiple servers. Even if some of the servers fail or are
-  taken over by an attacker, the entire file store continues to function correctly, preserving your privacy and security."
-  %}
-
-  {% include card.html color="warning"
-  title="Nextcloud"
-  image="/assets/img/provider/Nextcloud.png"
-  url="https://nextcloud.com/"
-  footer="Client OS: Windows, macOS, Linux, BSD, Unix, iOS, Android, Fire OS. Server: Linux."
-  description="Similar functionally to the widely used Dropbox, with the difference being that Nextcloud is free and open-source, and thereby allowing anyone to install and operate it without charge on a private server, with no limits on storage space or the number of connected clients."
-  %}
-
-</div>
+{% include cardv2.html
+title="Pydio"
+image="/assets/img/tools/Pydio.png"
+website="https://pydio.com/"
+forum="https://forum.privacytools.io/t/discussion-pydio/1663"
+description="Pydio is open source software that turns instantly any server (on-premise, NAS, cloud IaaS or PaaS) into a file sharing platform for your company. It is an alternative to SaaS Boxes and Drives, with more control, safety and privacy, and favorable TCOs."
+windows="https://pydio.com/en/get-pydio/downloads/pydiosync-desktop-app"
+mac="https://pydio.com/en/get-pydio/downloads/pydiosync-desktop-app"
+linux="https://pydio.com/en/docs/v8/install-pydio-community"
+googleplay="https://play.google.com/store/apps/details?id=com.pydio.android.cells"
+ios="https://itunes.apple.com/fr/app/pydio/id709275884"
+github="https://github.com/pydio"
+%}
 
 <h3>Worth Mentioning</h3>
 <ul>
diff --git a/assets/img/addons/Blokada.png b/assets/img/addons/Blokada.png
deleted file mode 100644
index 42646666..00000000
Binary files a/assets/img/addons/Blokada.png and /dev/null differ
diff --git a/assets/img/icons/bromite.png b/assets/img/icons/bromite.png
deleted file mode 100644
index 73d7f940..00000000
Binary files a/assets/img/icons/bromite.png and /dev/null differ
diff --git a/assets/img/icons/duckduckgo.png b/assets/img/icons/duckduckgo.png
deleted file mode 100644
index c9d83dcb..00000000
Binary files a/assets/img/icons/duckduckgo.png and /dev/null differ
diff --git a/assets/img/icons/onionbrowser.png b/assets/img/icons/onionbrowser.png
deleted file mode 100644
index 22a3a96d..00000000
Binary files a/assets/img/icons/onionbrowser.png and /dev/null differ
diff --git a/assets/img/tools/bromite.png b/assets/img/tools/bromite.png
new file mode 100644
index 00000000..44fb027a
Binary files /dev/null and b/assets/img/tools/bromite.png differ
diff --git a/assets/img/tools/onionbrowser.png b/assets/img/tools/onionbrowser.png
new file mode 100644
index 00000000..33534b6a
Binary files /dev/null and b/assets/img/tools/onionbrowser.png differ
diff --git a/contact.md b/contact.md
index 50a49f09..dc49bda3 100644
--- a/contact.md
+++ b/contact.md
@@ -5,34 +5,22 @@ title: "Contact Us"
 description: "Contact the privacytoolsIO team if you have any suggestions or are experiencing any issues."
 ---
 
-## Editorial Team
+## Suggestions?
 
 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.
 
-[<i class="fab fa-discourse fa-lg fa-fw"></i> Start a discussion in our Discourse Forum](https://forum.privacytools.io/)
+[<i class="fab fa-discourse fa-lg fa-fw"></i> Start a discussion in our Discourse forum](https://forum.privacytools.io/)
 
-[<i class="fab fa-github fa-lg fa-fw"></i> Open an issue or pull request on GitHub](https://github.com/privacytoolsIO/privacytools.io/issues)
+[<i class="fab fa-github fa-lg fa-fw"></i> Open an issue on GitHub](https://github.com/privacytoolsIO/privacytools.io/issues)
 
-[<i class="fab fa-reddit fa-lg fa-fw"></i> Suggest something new on reddit](https://www.reddit.com/r/privacytoolsIO/)
+[<i class="fab fa-reddit fa-lg fa-fw"></i> Suggest something new on our subreddit](https://www.reddit.com/r/privacytoolsIO/)
 
-For complete transparency, software and providers will only be considered for this website after discussions take place on either of the above platforms.
+For complete transparency, software and providers will only be considered for this website after discussions take place on any of the above platforms.
 
-We're on Matrix! Join us at `#general:privacytools.io` 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 (`https://chat.privacytools.io`) using [riot.privacytools.io](https://riot.privacytools.io/) or any Matrix client!
+## Chat with the Team
 
-## Abuse
+Join our Matrix room at `#general:privacytools.io` or [privacytools_io Keybase team](https://keybase.io/team/privacytools_io) to chat with [us](https://github.com/orgs/privacytoolsIO/people) and other members about this site and privacy in general! If you need a Matrix account, you can sign up with our own homeserver (`https://chat.privacytools.io`) using [riot.privacytools.io](https://riot.privacytools.io/).
 
-We take the operation of our various [services](/services/) very seriously. Report only <strong>abuse</strong> here: abuse at privacytools dot io.
+## Code of Conduct
 
-<div class="row">
-  <div class="col-12">
-    <div class="card mb-4">
-      <div class="card-header">
-        GitHub Issues
-      </div>
-      <ul class="list-group list-group-flush">
-        <li class="list-group-item"><strong>Searx Issues:</strong> <a href="https://github.com/privacytoolsIO/search">github.com/privacytoolsIO/search</a></li>
-        <li class="list-group-item"><strong>Website Issues:</strong> <a href="https://github.com/privacytoolsIO/privacytools.io">github.com/privacytoolsIO/privacytools.io</a></li>
-      </ul>
-    </div>
-  </div>
-</div>
+We take the operation of our various [services](/services/) very seriously, and adhere to our [Code of Conduct](https://github.com/privacytoolsIO/privacytools.io/blob/master/CODE_OF_CONDUCT.md). For any questions or to report abuse, please see our CoC's [Enforcement](https://github.com/privacytoolsIO/privacytools.io/blob/master/CODE_OF_CONDUCT.md#enforcement) section.
diff --git a/pages/software/file-sync.html b/pages/software/file-sync.html
index 61d260aa..29702b93 100644
--- a/pages/software/file-sync.html
+++ b/pages/software/file-sync.html
@@ -1,7 +1,7 @@
 ---
 layout: page
 permalink: /software/file-sync/
-title: "File Sync Tools"
+title: "File Sync"
 description: "Discover free, open source, and secure ways to sync your files across your devices."
 ---
 
diff --git a/source_code.md b/source_code.md
index 75d44aac..ba1495ec 100644
--- a/source_code.md
+++ b/source_code.md
@@ -151,10 +151,19 @@ Backend: closed-source
 
  Jitsi Meet: https://github.com/jitsi/jitsi-meet
 
- ## File Sharing
-  OnionShare: https://github.com/micahflee/onionshare
+## File Sharing
 
-  Magic Wormhole: https://github.com/warner/magic-wormhole
+Firefox Send: https://github.com/mozilla/send
+
+OnionShare: https://github.com/micahflee/onionshare
+
+Magic Wormhole: https://github.com/warner/magic-wormhole
+
+### Worth Mentioning
+
+- croc: https://github.com/schollz/croc
+
+- FreedomBox: https://salsa.debian.org/freedombox-team
 
  ## Encrypted Cloud Storage Services
   Nextcloud: https://github.com/nextcloud
@@ -176,13 +185,14 @@ Backend: closed-source
 [WIP]
 
 ## Secure File Sync Software
- SparkleShare: https://www.github.com/hbons/SparkleShare/
 
- Syncthing: https://github.com/syncthing/syncthing
+SparkleShare: https://github.com/hbons/SparkleShare/
 
-   Worth Mentioning
-.
-    git-annex: http://source.git-annex.branchable.com/?p=source.git;a=summary
+Syncthing: https://github.com/syncthing/syncthing
+
+### Worth Mentioning
+
+- git-annex: http://source.git-annex.branchable.com/?p=source.git;a=summary
 
 ## Password Manager Software