diff --git a/_includes/nav.html b/_includes/nav.html
index b86a839d..76897234 100644
--- a/_includes/nav.html
+++ b/_includes/nav.html
@@ -7,7 +7,7 @@
     <div class="collapse navbar-collapse" id="navbarSupportedContent">
       <ul class="navbar-nav mr-auto">
         <li class="nav-item">
-          <a class="nav-link" href="index.html"><i class="fas fa-home"></i> <span class="sr-only">Home</span></a>
+          <a class="nav-link" href="/index.html"><i class="fas fa-home"></i> <span class="sr-only">Home</span></a>
         </li>
         <li class="nav-item dropdown">
           <a class="nav-link dropdown-toggle" href="#" id="browserDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
@@ -24,15 +24,15 @@
             Provider
           </a>
           <div class="dropdown-menu" aria-labelledby="providerDropdown">
-            <a class="dropdown-item" href="/providers.html#ukusa"><i class="fab fa-creative-commons-nc"></i> Avoid all US and UK based services</a>
-            <a class="dropdown-item" href="/providers.html#vpn"><i class="far fa-eye-slash"></i> Virtual Private Network (VPN)</a>
-            <a class="dropdown-item" href="/providers.html#email"><i class="fas fa-mail-bulk"></i> Privacy Email</a>
-            <a class="dropdown-item" href="/providers.html#wc"><i class="fa fa-exclamation-circle"></i> Warrant Canaries</a>
-            <a class="dropdown-item" href="/providers.html#cloud"><i class="fas fa-cloud"></i> Encrypted Cloud Storage Services</a>
-            <a class="dropdown-item" href="/providers.html#social"><i class="fas fa-expand-arrows-alt"></i> Decentralized Social Networks</a>
-            <a class="dropdown-item" href="/providers.html#dns"><i class="fa fa-tasks"></i> Domain Name System (DNS)</a>
-            <a class="dropdown-item" href="/providers.html#search"><i class="fab fa-searchengin"></i> Privacy Respecting Search Engines</a>
-            <a class="dropdown-item" href="/providers.html#host"><i class="fas fa-database"></i> Secure Hosting Providers</a>
+            <a class="dropdown-item" href="/providers/jurisdictions/"><i class="fab fa-creative-commons-nc"></i> Avoid all US and UK based services</a>
+            <a class="dropdown-item" href="/providers/vpn/"><i class="far fa-eye-slash"></i> Virtual Private Network (VPN)</a>
+            <a class="dropdown-item" href="/providers/email/"><i class="fas fa-mail-bulk"></i> Privacy Email</a>
+            <a class="dropdown-item" href="/providers/cloud-storage/"><i class="fas fa-cloud"></i> Encrypted Cloud Storage Services</a>
+            <a class="dropdown-item" href="/providers/social-networks/"><i class="fas fa-expand-arrows-alt"></i> Decentralized Social Networks</a>
+            <a class="dropdown-item" href="/providers/dns/"><i class="fa fa-tasks"></i> Domain Name System (DNS)</a>
+            <a class="dropdown-item" href="/providers/search-engines/"><i class="fab fa-searchengin"></i> Privacy Respecting Search Engines</a>
+            <a class="dropdown-item" href="/providers/hosting/"><i class="fas fa-database"></i> Secure Hosting Providers</a>
+            <a class="dropdown-item" href="/providers/paste"><i class="fas fa-paste"></i> Paste Services</a>
           </div>
         </li>
         <li class="nav-item dropdown">
@@ -52,20 +52,19 @@
             Software
           </a>
           <div class="dropdown-menu" aria-labelledby="softwareDropdown">
-            <a class="dropdown-item" href="/software.html#clients"><i class="fas fa-envelope"></i> Email Clients</a>
-            <a class="dropdown-item" href="/software.html#messaging"><i class="fas fa-random"></i> Email Alternatives</a>
-            <a class="dropdown-item" href="/software.html#im"><i class="fab fa-telegram-plane"></i> Instant Messenger</a>
-            <a class="dropdown-item" href="/software.html#voip"><i class="fas fa-phone"></i> Video & Voice Messenger</a>
-            <a class="dropdown-item" href="/software.html#filesharing"><i class="fas fa-file-export"></i> File Sharing</a>
-            <a class="dropdown-item" href="/software.html#mycloud"><i class="fas fa-hdd"></i> Self-Hosted Cloud Server</a>
-            <a class="dropdown-item" href="/software.html#sync"><i class="fas fa-copy"></i> Secure File Sync</a>
-            <a class="dropdown-item" href="/software.html#pw"><i class="fas fa-user-lock"></i> Password Manager</a>
-            <a class="dropdown-item" href="/software.html#calendar_contacts"><i class="far fa-calendar-alt"></i> Calendar and Contacts Sync</a>
-            <a class="dropdown-item" href="/software.html#encrypt"><i class="fas fa-lock"></i> File Encryption</a>
-            <a class="dropdown-item" href="/software.html#darknets"><i class="fas fa-user-secret"></i> Self-contained Networks</a>
-            <a class="dropdown-item" href="/software.html#notebook"><i class="far fa-sticky-note"></i> Digital Notebook</a>
-            <a class="dropdown-item" href="/software.html#paste"><i class="fas fa-paste"></i> Paste Services</a>
-            <a class="dropdown-item" href="/software.html#productivity"><i class="fas fa-briefcase"></i> Productivity Tools</a>
+            <a class="dropdown-item" href="/software/email/"><i class="fas fa-envelope"></i> Email Clients</a>
+            <a class="dropdown-item" href="/software/email/#messaging"><i class="fas fa-random"></i> Email Alternatives</a>
+            <a class="dropdown-item" href="/software/im/"><i class="fab fa-telegram-plane"></i> Instant Messenger</a>
+            <a class="dropdown-item" href="/software/voip/"><i class="fas fa-phone"></i> Video & Voice Messenger</a>
+            <a class="dropdown-item" href="/software/file-sharing/"><i class="fas fa-file-export"></i> File Sharing</a>
+            <a class="dropdown-item" href="/software/cloud/"><i class="fas fa-hdd"></i> Self-Hosted Cloud Server</a>
+            <a class="dropdown-item" href="/software/file-sync/"><i class="fas fa-copy"></i> Secure File Sync</a>
+            <a class="dropdown-item" href="/software/passwords/"><i class="fas fa-user-lock"></i> Password Manager</a>
+            <a class="dropdown-item" href="/software/calendar-contacts/"><i class="far fa-calendar-alt"></i> Calendar and Contacts Sync</a>
+            <a class="dropdown-item" href="/software/encryption-tools/"><i class="fas fa-lock"></i> File Encryption</a>
+            <a class="dropdown-item" href="/software/networks/"><i class="fas fa-user-secret"></i> Self-contained Networks</a>
+            <a class="dropdown-item" href="/software/notebooks/"><i class="far fa-sticky-note"></i> Digital Notebook</a>
+            <a class="dropdown-item" href="/software/productivity/"><i class="fas fa-briefcase"></i> Productivity Tools</a>
           </div>
         </li>
         <li class="nav-item dropdown">