diff --git a/homelab/index.html b/homelab/index.html
index 330f4ff..73c8faa 100644
--- a/homelab/index.html
+++ b/homelab/index.html
@@ -94,7 +94,7 @@
           <h4 class="service-title">Decentralized Management</h4>
           <p class="service-description">No central server means no one point of failure.<br><i>Powered by <a href="https://www.ansible.com/">Ansible</a> and <a href="https://github.com/ansible/awx">AWX</a></i></p>
           <div class="service-link">
-            <a class="btn btn-default" href="https://doc.enp.one/awx/"><i class="fas fa-book"></i>&nbsp;Docs</a>
+            <a class="btn btn-default" href="https://doc.enp.one/applications/awx/"><i class="fas fa-book"></i>&nbsp;Docs</a>
             <a class="btn btn-default" href="https://awx.enp.one/"><i class="fas fa-chevron-circle-right"></i>&nbsp;AWX</a>
           </div>
         </div>
@@ -103,8 +103,8 @@
           <h4 class="service-title">VPN</h4>
           <p class="service-description">Virtual Private Networking (VPN) allows for secure network connections from anywhere in the world.<br><i>Powered by <a href="https://www.softether.org/" target="_blank">Softether</a></i></p>
           <div class="service-link">
-            <a class=" btn btn-default" href="https://doc.enp.one/vpn/"><i class="fas fa-book"></i>&nbsp;Docs</a>
-            <a class=" btn btn-default" href="https://doc.enp.one/vpn/connect/"><i class="fas fa-chevron-circle-right"></i>&nbsp;Connect</a>
+            <a class=" btn btn-default" href="https://doc.enp.one/network/vpn/"><i class="fas fa-book"></i>&nbsp;Docs</a>
+            <a class=" btn btn-default" href="https://doc.enp.one/network/vpn#connect"><i class="fas fa-chevron-circle-right"></i>&nbsp;Connect</a>
           </div>
         </div>
         <div class="col-md-4 service-item">
@@ -112,7 +112,7 @@
           <h4 class="service-title">Cloud Storage</h4>
           <p class="service-description">Personal cloud storage allows for secure storage of my data without pesky datacaps.<br><i>Powered by <a href="https://nextcloud.com/" target="_blank">NextCloud</a></i></p>
           <div class="service-link">
-            <a class=" btn btn-default" href="https://doc.enp.one/cfs/"><i class="fas fa-book"></i>&nbsp;Docs</a>
+            <a class=" btn btn-default" href="https://doc.enp.one/applications/nextcloud/"><i class="fas fa-book"></i>&nbsp;Docs</a>
             <a class=" btn btn-default" href="https://cfs.enp.one/"><i class="fas fa-chevron-circle-right"></i>&nbsp;CFS</a>
           </div>
         </div>
@@ -121,7 +121,7 @@
           <h4 class="service-title">Version Control</h4>
           <p class="service-description">Personal <a href="https://git-scm.com/book/en/v2/Getting-Started-About-Version-Control" target="_blank">version control system (VCS)</a>grants complete control of writing and programming projects.<br><i>Powered by <a href="https://gitea.io/en-us/" target="_blank">Gitea</a></i></p>
           <div class="service-link">
-            <a class=" btn btn-default" href="https://doc.enp.one/vcs/"><i class="fas fa-book"></i>&nbsp;Docs</a>
+            <a class=" btn btn-default" href="https://doc.enp.one/applications/gitea/"><i class="fas fa-book"></i>&nbsp;Docs</a>
             <a class=" btn btn-default" href="https://vcs.enp.one/"><i class="fas fa-chevron-circle-right"></i>&nbsp;VCS</a>
           </div>
         </div>
@@ -130,7 +130,7 @@
           <h4 class="service-title">Content Delivery Network</h4>
           <p class="service-description">A small number of files, always available.<br><i>Powered by <a href="https://www.digitalocean.com/">DigitalOcean</a></i></p>
           <div class="service-link">
-            <a class=" btn btn-default" href="https://doc.enp.one/vcs/"><i class="fas fa-book"></i>&nbsp;Docs</a>
+            <a class=" btn btn-default" href="https://doc.enp.one/network/web/"><i class="fas fa-book"></i>&nbsp;Docs</a>
             <a class=" btn btn-default" href="https://cdn.enp.one/"><i class="fas fa-chevron-circle-right"></i>&nbsp;CDN</a>
           </div>
         </div>
@@ -139,8 +139,8 @@
           <h4 class="service-title">Plex Media Server</h4>
           <p class="service-description"><a href="https://www.plex.tv/" target="_blank">Plex</a> is a media management platform for sharing my movie, TV, and music collections with friends.<br><i>Powered by <a href="https://www.plex.tv/">Plex</a></i></p>
           <div class="service-link">
-            <a class=" btn btn-default" href="https://doc.enp.one/plex/"><i class="fas fa-book"></i>&nbsp;Docs</a>
-            <a class=" btn btn-default" href="https://app.plex.tv/"><i class="fas fa-chevron-circle-right"></i>&nbsp;Plex</a>
+            <a class=" btn btn-default" href="https://doc.enp.one/applications/plex/"><i class="fas fa-book"></i>&nbsp;Docs</a>
+            <a class=" btn btn-default" href="https://plx.enp.one/"><i class="fas fa-chevron-circle-right"></i>&nbsp;Plex</a>
           </div>
         </div>
         <div class="col-md-4 service-item">
@@ -148,25 +148,16 @@
           <h4 class="service-title">Secure Secret Vault</h4>
           <p class="service-description">Secure encrypted storage for passwords, financial records, and other notes.<br><i>Powered by <a href="https://bitwarden.com/">Bitwarden</a></i></p>
           <div class="service-link">
-            <a class=" btn btn-default" href="https://doc.enp.one/ssv/"><i class="fas fa-book"></i>&nbsp;Docs</a>
+            <a class=" btn btn-default" href="https://doc.enp.one/applications/bitwarden/"><i class="fas fa-book"></i>&nbsp;Docs</a>
             <a class=" btn btn-default" href="https://ssv.enp.one/"><i class="fas fa-chevron-circle-right"></i>&nbsp;SSV</a>
           </div>
         </div>
-        <div class="col-md-4 service-item">
-          <a href="https://mpw.enp.one/"><div class="service-icon"><i class="fas fa-lock"></i></div></a>
-          <h4 class="service-title">Password Manager</h4>
-          <p class="service-description">Stateless password generation and retrival system.<br><i>Powered by <a href="https://masterpassword.app/">MasterPassword</a></i></p>
-          <div class="service-link">
-            <a class=" btn btn-default" href="https://doc.enp.one/mpw/"><i class="fas fa-book"></i>&nbsp;Docs</a>
-            <a class=" btn btn-default" href="https://mpw.enp.one/"><i class="fas fa-chevron-circle-right"></i>&nbsp;MPW</a>
-          </div>
-        </div>
         <div class="col-md-4 service-item">
           <a href="https://doc.enp.one/"><div class="service-icon"><i class="fas fa-book"></i></div></a>
           <h4 class="service-title">Documentation</h4>
           <p class="service-description">"No documentation is better than wrong documentation", but accurate documentation is the best option.<br><i>Powered by <a href="http://www.mkdocs.org/" target="_blank">MkDocs</a></i></p>
           <div class="service-link">
-            <a class=" btn btn-default" href="https://doc.enp.one/doc/"><i class="fas fa-book"></i>&nbsp;Docs (Meta)</a>
+            <a class=" btn btn-default" href="https://doc.enp.one/"><i class="fas fa-book"></i>&nbsp;Docs (Meta)</a>
           </div>
         </div>
       </div>