diff --git a/_data/nav/2_software.yml b/_data/nav/2_software.yml
index f6548c1d..a450839f 100644
--- a/_data/nav/2_software.yml
+++ b/_data/nav/2_software.yml
@@ -25,8 +25,7 @@ items:
   - type: link
     title: File Encryption Tools
     icon: fad fa-file-certificate
-    file: legacy_pages/software/productivity.html
-    anchor: encrypt
+    file: legacy_pages/software/file-encryption.html
   - type: link
     title: File Sharing and Sync
     icon: fad fa-file-user
@@ -34,8 +33,7 @@ items:
   - type: link
     title: Metadata Removal Tools
     icon: fad fa-file-times
-    file: legacy_pages/software/productivity.html
-    anchor: metadata-removal-tools
+    file: legacy_pages/software/metadata-removal-tools.html
   - type: link
     title: Password Managers
     icon: fad fa-user-lock
diff --git a/_includes/legacy/sections/file-encryption.html b/_includes/legacy/sections/file-encryption.html
index 78d76dfd..aeeba3a0 100644
--- a/_includes/legacy/sections/file-encryption.html
+++ b/_includes/legacy/sections/file-encryption.html
@@ -1,5 +1,3 @@
-<h2 id="encrypt" class="anchor"><a href="#encrypt"><i class="fas fa-link anchor-icon"></i></a> File Encryption Software</h2>
-
 <div class="alert alert-warning" role="alert">
   <strong>If you are currently not using encryption software for your hard disk, emails, or file archives, you should pick one here.</strong>
 </div>
diff --git a/_includes/legacy/sections/metadata-removal-tools.html b/_includes/legacy/sections/metadata-removal-tools.html
index 0055cb14..9b64c998 100644
--- a/_includes/legacy/sections/metadata-removal-tools.html
+++ b/_includes/legacy/sections/metadata-removal-tools.html
@@ -1,5 +1,3 @@
-<h2 id="metadata-removal-tools" class="anchor"><a href="#metadata-removal-tools"><i class="fas fa-link anchor-icon"></i></a> Metadata Removal Tools</h2>
-
 {%
   include legacy/cardv2.html
   title="MAT2"
diff --git a/_includes/legacy/sections/productivity-tools.html b/_includes/legacy/sections/productivity-tools.html
index fbf87faa..3d1d27d3 100644
--- a/_includes/legacy/sections/productivity-tools.html
+++ b/_includes/legacy/sections/productivity-tools.html
@@ -1,5 +1,3 @@
-<h2 id="productivity" class="anchor"><a href="#productivity"><i class="fas fa-link anchor-icon"></i></a> Productivity Tools</h2>
-
 {% include legacy/cardv2.html
   title="PrivateBin"
   image="/assets/img/legacy_svg/3rd-party/privatebin.svg"
diff --git a/legacy_pages/software/file-encryption.html b/legacy_pages/software/file-encryption.html
new file mode 100644
index 00000000..40f9d153
--- /dev/null
+++ b/legacy_pages/software/file-encryption.html
@@ -0,0 +1,9 @@
+---
+layout: page
+permalink: /software/file-encryption/
+title: "File Encryption Software"
+description: "Get working and collaborating without sharing your documents with a middleman or trusting a cloud provider."
+---
+
+{% include legacy/sections/file-encryption.html %}
+
diff --git a/legacy_pages/software/metadata-removal-tools.html b/legacy_pages/software/metadata-removal-tools.html
new file mode 100644
index 00000000..1b3d6dfc
--- /dev/null
+++ b/legacy_pages/software/metadata-removal-tools.html
@@ -0,0 +1,9 @@
+---
+layout: page
+permalink: /software/metadata-removal-tools/
+title: "Metadata Removal Tools"
+description: "Get working and collaborating without sharing your documents with a middleman or trusting a cloud provider."
+---
+
+{% include legacy/sections/metadata-removal-tools.html %}
+
diff --git a/legacy_pages/software/productivity.html b/legacy_pages/software/productivity.html
index 53765fd7..5e239d28 100644
--- a/legacy_pages/software/productivity.html
+++ b/legacy_pages/software/productivity.html
@@ -6,7 +6,3 @@ 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 %}