Normalize Navbar Labels

_includes/legacy/nav.html

@@ -66,7 +66,7 @@
             <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/encryption-tools/"><span class="fas fa-lock fa-fw"></span> File Encryption</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>

_includes/legacy/sections/calendar-contacts-sync.html

@@ -60,7 +60,7 @@
   </li>
 
   <li>
-    <a href="../cloud">Cloud backups</a> - Consider regularly exporting your calendar and or contacts and backing them up on a separate storage drive or uploading them to cloud storage (ideally after <a href="../encryption-tools/">encrypting</a> them).
+    <a href="../cloud">Cloud backups</a> - Consider regularly exporting your calendar and or contacts and backing them up on a separate storage drive or uploading them to cloud storage (ideally after <a href="../productivity/#encrypt">encrypting</a> them).
   </li>
 
   <li>

_includes/legacy/sections/metadata-removal-tools.html

@@ -0,0 +1,34 @@
+<h1 id="metadata-removal-tools" class="anchor">
+  <a href="#metadata-removal-tools"
+    ><i class="fas fa-link anchor-icon"></i>
+  </a> Metadata Removal Tools
+</h1>
+
+{%
+  include legacy/cardv2.html
+  title="MAT2"
+  image="/assets/img/legacy_svg/3rd-party/mat2.svg"
+  description="<strong>MAT2</strong> is free software, which allows the removal of metadata of image, audio, torrent, and document file types. It provides both a command line tool and a graphical user interface via an extension for Nautilus, the default file manager of GNOME."
+  website="https://0xacab.org/jvoisin/mat2"
+  forum="https://forum.privacytools.io/t/discussion-mat/1559"
+  gitlab="https://0xacab.org/jvoisin/mat2"
+  windows="https://pypi.org/project/mat2/"
+  mac="https://pypi.org/project/mat2/"
+  linux="https://pypi.org/project/mat2/"
+  freebsd="https://pypi.org/project/mat2/"
+  openbsd="https://pypi.org/project/mat2/"
+  netbsd="https://pypi.org/project/mat2/"
+%}
+
+{%
+  include legacy/cardv2.html
+  title="ExifCleaner"
+  image="/assets/img/legacy_svg/3rd-party/exifcleaner.svg"
+  description='<strong>ExifCleaner</strong> is a freeware, open source graphical app that uses <a href="https://exiftool.org/">ExifTool</a> to remove <a href="https://en.wikipedia.org/wiki/Exif">exif</a> metadata from images, videos, and PDF documents using a simple drag and drop interface. It supports multi-core batch processing and dark mode.'
+  website="https://exifcleaner.com"
+  forum="https://forum.privacytools.io/t/discussion-mat/TODOADDTHIS"
+  github="https://github.com/szTheory/exifcleaner"
+  windows="https://github.com/szTheory/exifcleaner/releases"
+  mac="https://github.com/szTheory/exifcleaner/releases"
+  linux="https://github.com/szTheory/exifcleaner/releases"
+%}

_includes/legacy/sections/productivity-tools.html

@@ -60,38 +60,3 @@
   <li><a href="https://www.libreoffice.org/">LibreOffice</a> - Free and open-source office suite.</li>
   <li><a href="https://vscodium.com/">VSCodium</a> - Scripts to automatically build 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>
-  </a> Metadata Removal Tools
-</h1>
-
-{%
-  include legacy/cardv2.html
-  title="MAT2"
-  image="/assets/img/legacy_svg/3rd-party/mat2.svg"
-  description="<strong>MAT2</strong> is free software, which allows the removal of metadata of image, audio, torrent, and document file types. It provides both a command line tool and a graphical user interface via an extension for Nautilus, the default file manager of GNOME."
-  website="https://0xacab.org/jvoisin/mat2"
-  forum="https://forum.privacytools.io/t/discussion-mat/1559"
-  gitlab="https://0xacab.org/jvoisin/mat2"
-  windows="https://pypi.org/project/mat2/"
-  mac="https://pypi.org/project/mat2/"
-  linux="https://pypi.org/project/mat2/"
-  freebsd="https://pypi.org/project/mat2/"
-  openbsd="https://pypi.org/project/mat2/"
-  netbsd="https://pypi.org/project/mat2/"
-%}
-
-{%
-  include legacy/cardv2.html
-  title="ExifCleaner"
-  image="/assets/img/legacy_svg/3rd-party/exifcleaner.svg"
-  description='<strong>ExifCleaner</strong> is a freeware, open source graphical app that uses <a href="https://exiftool.org/">ExifTool</a> to remove <a href="https://en.wikipedia.org/wiki/Exif">exif</a> metadata from images, videos, and PDF documents using a simple drag and drop interface. It supports multi-core batch processing and dark mode.'
-  website="https://exifcleaner.com"
-  forum="https://forum.privacytools.io/t/discussion-mat/TODOADDTHIS"
-  github="https://github.com/szTheory/exifcleaner"
-  windows="https://github.com/szTheory/exifcleaner/releases"
-  mac="https://github.com/szTheory/exifcleaner/releases"
-  linux="https://github.com/szTheory/exifcleaner/releases"
-%}

_includes/nav.html

@@ -20,17 +20,17 @@
             Providers
           </a>
           <div class="dropdown-menu" aria-labelledby="providerDropdown">
-            <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/#ukusa"><span class="fas fa-user-secret fa-fw"></span> Global Mass Surveillance</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/dns/"><span class="fa fa-tasks fa-fw"></span> DNS Servers</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/email/"><span class="fas fa-mail-bulk fa-fw"></span> Email Providers</a>
-            <a class="dropdown-item" href="/providers/hosting/"><span class="fas fa-database fa-fw"></span> Hosting</a>
+            <a class="dropdown-item" href="/providers/hosting/"><span class="fas fa-database fa-fw"></span> Web 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>
+            <a class="dropdown-item" href="/providers/vpn/"><span class="far fa-eye-slash fa-fw"></span> VPN Services</a>
           </div>
         </li>
         <li class="nav-item dropdown">
@@ -39,17 +39,16 @@
           </a>
           <div class="dropdown-menu" aria-labelledby="softwareDropdown">
             <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/notebooks/"><span class="far fa-sticky-note fa-fw"></span> Digital Notebooks</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/encryption-tools/"><span class="fas fa-lock fa-fw"></span> File Encryption</a>
+            <a class="dropdown-item" href="/software/productivity/#encrypt"><span class="fas fa-lock fa-fw"></span> File Encryption Tools</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-sharing/"><span class="fas fa-copy fa-fw"></span> File Sharing and Sync</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/passwords/"><span class="fas fa-user-lock fa-fw"></span> Password Managers</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/real-time-communication/"><span class="fas fa-comments fa-fw"></span> Real-Time Communication Platforms</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>
+            <a class="dropdown-item" href="/software/cloud/"><span class="fas fa-hdd fa-fw"></span> Self-Hosted Cloud Servers</a>
           </div>
         </li>
         <li class="nav-item">

legacy_pages/software.html

@@ -12,7 +12,7 @@ description: "Discover a variety of open-source software built to protect your p
     <li class="list-group-item"><a href="/software/calendar-contacts/"><span class="fas fa-calendar fa-fw"></span> Calendar/Contacts Sync Tools</a></li>
     <li class="list-group-item"><a href="/software/notebooks/"><span class="far fa-sticky-note fa-fw"></span> Digital Notebook</a></li>
     <li class="list-group-item"><a href="/software/email/"><span class="fas fa-envelope fa-fw"></span> Email Clients</a></li>
-    <li class="list-group-item"><a href="/software/encryption-tools/"><span class="fas fa-lock fa-fw"></span> File Encryption</a></li>
+    <li class="list-group-item"><a href="/software/productivity/#encrypt"><span class="fas fa-lock fa-fw"></span> File Encryption</a></li>
     <li class="list-group-item"><a href="/software/file-sharing/"><span class="fas fa-file-export fa-fw"></span> File Sharing</a></li>
     <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>

legacy_pages/software/encryption.html

@@ -1,6 +1,6 @@
 ---
 layout: page
-permalink: /software/encryption-tools/
+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."
 ---

legacy_pages/software/file-sharing.html

@@ -1,8 +1,10 @@
 ---
 layout: page
 permalink: /software/file-sharing/
-title: "File Sharing"
+title: "File Sharing and Sync"
-description: "Discover how to share your files with your friends and family or anonymously, without a middleman."
+description: "Discover how to privately share your files between your devices, with your friends and family, or anonymously online."
 ---
 
 {% include legacy/sections/file-sharing.html %}
+
+{% include legacy/sections/file-sync.html %}

legacy_pages/software/file-sync.html

@@ -1,8 +0,0 @@
----
-layout: page
-permalink: /software/file-sync/
-title: "File Sync"
-description: "Discover free, open-source, and secure ways to sync your files across your devices."
----
-
-{% include legacy/sections/file-sync.html %}

legacy_pages/software/productivity.html

@@ -6,3 +6,7 @@ description: "Get working and collaborating without sharing your documents with
 ---
 
 {% include legacy/sections/productivity-tools.html %}
+
+{% include legacy/sections/metadata-removal-tools.html %}
+
+{% include legacy/sections/file-encryption.html %}

privacytools.io/assets/js/redirects.js

@@ -21,7 +21,7 @@ if (window.location == 'https://www.privacytools.io/#mycloud') {	window.location
 if (window.location == 'https://www.privacytools.io/#sync') {	window.location = 'https://www.privacytools.io/software/file-sync/';}
 if (window.location == 'https://www.privacytools.io/#pw') {	window.location = 'https://www.privacytools.io/software/passwords/';}
 if (window.location == 'https://www.privacytools.io/#calendar_contacts') {	window.location = 'https://www.privacytools.io/software/calendar-contacts/';}
-if (window.location == 'https://www.privacytools.io/#encrypt') {	window.location = 'https://www.privacytools.io/software/encryption-tools/';}
+if (window.location == 'https://www.privacytools.io/#encrypt') {	window.location = 'https://www.privacytools.io/software/productivity/#encrypt';}
 if (window.location == 'https://www.privacytools.io/#darknets') {	window.location = 'https://www.privacytools.io/software/networks/';}
 if (window.location == 'https://www.privacytools.io/#notebook') {	window.location = 'https://www.privacytools.io/software/notebooks/';}
 if (window.location == 'https://www.privacytools.io/#productivity') {	window.location = 'https://www.privacytools.io/software/productivity/';}