_includes/nav.html

@@ -24,7 +24,7 @@
             Provider
           </a>
           <div class="dropdown-menu" aria-labelledby="providerDropdown">
-            <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/"><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>

pages/providers.html

@@ -2,5 +2,26 @@
 layout: page
 permalink: /providers/
 title: "Providers"
-description: "Discover online providers that offer a variety of privacy-centric services."
+description: "There's a ton of people providing services online. Discover which ones you should avoid and our recommendations for a variety of services."
 ---
+
+{% include sections/fourteen-eyes.html %}
+
+{% include sections/key-disclosure-law.html %}
+
+<h1 id="os" class="anchor">Services</h1>
+
+<p>Click on whatever service you need to view our recommendations.</p>
+
+<div class="card">
+  <ul class="list-group list-group-flush">
+    <li class="list-group-item"><a href="/providers/vpn/"><i class="far fa-eye-slash"></i> Virtual Private Network (VPN)</a></li>
+    <li class="list-group-item"><a href="/providers/email/"><i class="fas fa-mail-bulk"></i> Privacy Email</a></li>
+    <li class="list-group-item"><a href="/providers/cloud-storage/"><i class="fas fa-cloud"></i> Encrypted Cloud Storage Services</a></li>
+    <li class="list-group-item"><a href="/providers/social-networks/"><i class="fas fa-expand-arrows-alt"></i> Decentralized Social Networks</a></li>
+    <li class="list-group-item"><a href="/providers/dns/"><i class="fa fa-tasks"></i> Domain Name System (DNS)</a></li>
+    <li class="list-group-item"><a href="/providers/search-engines/"><i class="fab fa-searchengin"></i> Privacy Respecting Search Engines</a></li>
+    <li class="list-group-item"><a href="/providers/hosting/"><i class="fas fa-database"></i> Secure Hosting Providers</a></li>
+    <li class="list-group-item"><a href="/providers/paste"><i class="fas fa-paste"></i> Paste Services</a></li>
+  </ul>
+</div>

pages/providers/dns.html

@@ -1,7 +1,7 @@
 ---
 layout: page
 permalink: /providers/dns/
-title: "Web Browsers"
+title: "DNS"
 description: "Don't let Google see all your DNS traffic. Discover privacy-centric alternatives to the traditional DNS providers."
 ---
 

pages/providers/jurisdiction.html

@@ -1,10 +0,0 @@
----
-layout: page
-permalink: /providers/jurisdictions/
-title: "Jurisdictions"
-description: "Learn about how certain governments track their citizens and foreigners, and which places to avoid to preserve your privacy online."
----
-
-{% include sections/fourteen-eyes.html %}
-
-{% include sections/key-disclosure-law.html %}

pages/software.html

@@ -4,3 +4,25 @@ permalink: /software/
 title: "Software"
 description: "Discover a variety of open source software built to protect your privacy and keep your digital data secure."
 ---
+
+<h1 id="os" class="anchor">Software</h1>
+
+<p>Click on whatever software you need to view our recommendations.</p>
+
+<div class="card">
+  <ul class="list-group list-group-flush">
+    <li class="list-group-item"><a href="/software/email/"><i class="fas fa-envelope"></i> Email Clients</a></li>
+    <li class="list-group-item"><a href="/software/email/#messaging"><i class="fas fa-random"></i> Email Alternatives</a></li>
+    <li class="list-group-item"><a href="/software/im/"><i class="fab fa-telegram-plane"></i> Instant Messenger</a></li>
+    <li class="list-group-item"><a href="/software/voip/"><i class="fas fa-phone"></i> Video & Voice Messenger</a></li>
+    <li class="list-group-item"><a href="/software/file-sharing/"><i class="fas fa-file-export"></i> File Sharing</a></li>
+    <li class="list-group-item"><a href="/software/cloud/"><i class="fas fa-hdd"></i> Self-Hosted Cloud Server</a></li>
+    <li class="list-group-item"><a href="/software/file-sync/"><i class="fas fa-copy"></i> Secure File Sync</a></li>
+    <li class="list-group-item"><a href="/software/passwords/"><i class="fas fa-user-lock"></i> Password Manager</a></li>
+    <li class="list-group-item"><a href="/software/calendar-contacts/"><i class="far fa-calendar-alt"></i> Calendar and Contacts Sync</a></li>
+    <li class="list-group-item"><a href="/software/encryption-tools/"><i class="fas fa-lock"></i> File Encryption</a></li>
+    <li class="list-group-item"><a href="/software/networks/"><i class="fas fa-user-secret"></i> Self-contained Networks</a></li>
+    <li class="list-group-item"><a href="/software/notebooks/"><i class="far fa-sticky-note"></i> Digital Notebook</a></li>
+    <li class="list-group-item"><a href="/software/productivity/"><i class="fas fa-briefcase"></i> Productivity Tools</a></li>
+  </ul>
+</div>