diff --git a/KleinDocs.tree b/KleinDocs.tree
index 1199cea..c732efb 100644
--- a/KleinDocs.tree
+++ b/KleinDocs.tree
@@ -6,62 +6,80 @@
                  name="KleinDocs"
                  start-page="FrontPage.md">
     <toc-element topic="FrontPage.md"/>
-    <toc-element topic="KleinOps_frontpage.md">
-        <toc-element topic="OS_frontpage.md">
+    <toc-element toc-title="KleinOps: operational docs">
+        <toc-element toc-title="OS">
             <toc-element topic="Proxmox.md"/>
             <toc-element topic="Windows.md"/>
-            <toc-element topic="Linux_frontpage.md">
+            <toc-element toc-title="Linux">
                 <toc-element topic="Sysadmin_commands.md"/>
                 <toc-element topic="SSH_keys.md"/>
             </toc-element>
         </toc-element>
-        <toc-element topic="Apps_frontpage.md">
-            <toc-element topic="Grafana.md"/>
-            <toc-element topic="InfluxDB.md"/>
-            <toc-element topic="Cockpit.md"/>
-            <toc-element topic="Paperless-NGX.md">
-                <toc-element topic="Paperless-gebruik.md"/>
+        <toc-element toc-title="Apps">
+            <toc-element toc-title="Servers">
+                <toc-element topic="Netdata.md"/>
+                <toc-element topic="Notifier.md"/>
+                <toc-element topic="Openmediavault.md"/>
+                <toc-element topic="Cockpit.md"/>
+                <toc-element topic="TrueNAS_Scale.md"/>
+                <toc-element topic="OPNsense.md"/>
+                <toc-element topic="Gitea.md"/>
+                <toc-element topic="Wazuh.md"/>
+            </toc-element>
+            <toc-element toc-title="K8s">
+                <toc-element topic="Archive-team.md"/>
+                <toc-element topic="Blinko.md"/>
+                <toc-element topic="ConvertX.md"/>
+                <toc-element topic="Gethomepage.md"/>
+                <toc-element topic="Grafana.md"/>
+                <toc-element topic="ITtools.md"/>
+                <toc-element topic="Immich.md"/>
+                <toc-element topic="InfluxDB.md"/>
+                <toc-element topic="Myspeed.md"/>
+                <toc-element topic="Speedtest.md"/>
+                <toc-element topic="Paperless-NGX.md">
+                    <toc-element topic="Paperless-gebruik.md"/>
+                </toc-element>
+                <toc-element topic="Termix.md"/>
+                <toc-element topic="Uptime-kuma.md"/>
+                <toc-element topic="Vert.md"/>
             </toc-element>
-            <toc-element topic="TrueNAS_Scale.md"/>
-            <toc-element topic="OPNsense.md"/>
-            <toc-element topic="Netdata.md"/>
-            <toc-element topic="Immich.md"/>
-            <toc-element topic="Gitea.md"/>
-            <toc-element topic="Wazuh.md"/>
         </toc-element>
-        <toc-element topic="Network_frontpage.md">
+        <toc-element toc-title="Network">
+            <toc-element topic="CloudflareConfig.md"/>
+            <toc-element topic="Networking.md"/>
             <toc-element topic="Network_drawing.md"/>
-            <toc-element topic="Switches_frontpage.md">
+            <toc-element topic="Remote-Wireshark-on-Linux.md"/>
+            <toc-element toc-title="Switches">
                 <toc-element topic="Switch-addresses.md"/>
             </toc-element>
-            <toc-element topic="Kvms_frontpage.md">
+            <toc-element toc-title="KVMs">
+                <toc-element toc-title="Routers">
+                    <toc-element topic="Nginx-configuration.md"/>
+                    <toc-element topic="Router-addresses.md"/>
+                </toc-element>
                 <toc-element topic="JetKVM-addresses.md"/>
             </toc-element>
-            <toc-element topic="Servers_frontpage.md">
+            <toc-element toc-title="Servers">
                 <toc-element topic="Server-addresses.md"/>
                 <toc-element topic="Kleinserver-info.md"/>
             </toc-element>
-            <toc-element topic="Routers_frontpage.md">
-                <toc-element topic="Router-addresses.md"/>
-            </toc-element>
-            <toc-element topic="Remote-Wireshark-on-Linux.md"/>
-            <toc-element topic="Nginx-configuration.md"/>
-            <toc-element topic="Networking.md"/>
-            <toc-element topic="CloudflareConfig.md"/>
         </toc-element>
-        <toc-element topic="Security_frontpage.md"/>
-        <toc-element topic="Other_frontpage.md">
+        <toc-element toc-title="Security"/>
+        <toc-element toc-title="Energy">
+            <toc-element toc-title="Home grid"/>
+            <toc-element toc-title="Solar"/>
+            <toc-element toc-title="EV"/>
+            <toc-element toc-title="Home Automation">
+                <toc-element topic="HomeAssistant.md"/>
+            </toc-element>
+        </toc-element>
+        <toc-element toc-title="Other">
             <toc-element topic="Dev-test.md"/>
             <toc-element topic="ToDo.md"/>
         </toc-element>
-        <toc-element topic="Home_automation_frontpage.md">
-            <toc-element topic="Solar_frontpage.md"/>
-            <toc-element topic="EV_frontpage.md"/>
-            <toc-element topic="HomeAssistant.md">
-            </toc-element>
-        </toc-element>
     </toc-element>
-    <toc-element topic="KleinArchives.md">
+    <toc-element toc-title="KleinArch: Familie Klein Archief">
         <toc-element topic="Media.md">
             <toc-element topic="Klein-Familiearchief.md"/>
             <toc-element topic="Familie-Klein-foto-archief.md"/>
@@ -70,8 +88,4 @@
             <toc-element topic="Paperless-ngx-handleiding.md"/>
         </toc-element>
     </toc-element>
-    <toc-element topic="Home_grid_frontpage.md"/>
-    <toc-element topic="Openmediavault.md"/>
-    <toc-element topic="Archive-team.md"/>
-    <toc-element topic="Blinko.md"/>
 </instance-profile>
\ No newline at end of file
diff --git a/topics/FrontPage.md b/topics/FrontPage.md
index c090115..167da88 100644
--- a/topics/FrontPage.md
+++ b/topics/FrontPage.md
@@ -1,9 +1,9 @@
 <primary-label ref="frontpage"></primary-label>
 
-# FrontPage
+# Klein document repository
 
-This the Klein document library. The library is split in 2 major parts: KleinOps for technical documentation and 
-KleinArchives for family related documents.  
+This the Klein document repository. The repository is split in 2 major parts: KleinOps for technical documentation and 
+KleinArch for family related documents.  
 
 Select the subject you're looking for in the left menu bar.
 ## ___________________
diff --git a/topics/KleinOps/KleinOps_frontpage.md b/topics/KleinOps/KleinOps_frontpage.md
deleted file mode 100644
index fcb7888..0000000
--- a/topics/KleinOps/KleinOps_frontpage.md
+++ /dev/null
@@ -1,8 +0,0 @@
-<primary-label ref="chapter"></primary-label>
-
-# KleinOps
-## ___________________
-
-KleinOps: the document archive for technical documentation.
-
-<a  href="FrontPage.md" >Back to frontpage</a>
\ No newline at end of file
diff --git a/topics/KleinOps/apps/Apps_frontpage.md b/topics/KleinOps/apps/Apps_frontpage.md
deleted file mode 100644
index 90a02c2..0000000
--- a/topics/KleinOps/apps/Apps_frontpage.md
+++ /dev/null
@@ -1,8 +0,0 @@
-<primary-label ref="chapter"></primary-label>
-
-# Apps
-These pages contain a description of important apps in use on our local network.
-## ___________________
-
-<a  href="FrontPage.md" >Back to frontpage</a>
-
diff --git a/topics/KleinOps/apps/K8s/Archive-team.md b/topics/KleinOps/apps/k8s/Archive-team.md
similarity index 100%
rename from topics/KleinOps/apps/K8s/Archive-team.md
rename to topics/KleinOps/apps/k8s/Archive-team.md
diff --git a/topics/KleinOps/apps/K8s/Blinko.md b/topics/KleinOps/apps/k8s/Blinko.md
similarity index 100%
rename from topics/KleinOps/apps/K8s/Blinko.md
rename to topics/KleinOps/apps/k8s/Blinko.md
diff --git a/topics/KleinOps/apps/K8s/ConvertX.md b/topics/KleinOps/apps/k8s/ConvertX.md
similarity index 100%
rename from topics/KleinOps/apps/K8s/ConvertX.md
rename to topics/KleinOps/apps/k8s/ConvertX.md
diff --git a/topics/KleinOps/apps/K8s/Gethomepage.md b/topics/KleinOps/apps/k8s/Gethomepage.md
similarity index 100%
rename from topics/KleinOps/apps/K8s/Gethomepage.md
rename to topics/KleinOps/apps/k8s/Gethomepage.md
diff --git a/topics/KleinOps/apps/K8s/Grafana.md b/topics/KleinOps/apps/k8s/Grafana.md
similarity index 100%
rename from topics/KleinOps/apps/K8s/Grafana.md
rename to topics/KleinOps/apps/k8s/Grafana.md
diff --git a/topics/KleinOps/apps/K8s/ITtools.md b/topics/KleinOps/apps/k8s/ITtools.md
similarity index 100%
rename from topics/KleinOps/apps/K8s/ITtools.md
rename to topics/KleinOps/apps/k8s/ITtools.md
diff --git a/topics/KleinOps/apps/K8s/Immich.md b/topics/KleinOps/apps/k8s/Immich.md
similarity index 100%
rename from topics/KleinOps/apps/K8s/Immich.md
rename to topics/KleinOps/apps/k8s/Immich.md
diff --git a/topics/KleinOps/apps/K8s/InfluxDB.md b/topics/KleinOps/apps/k8s/InfluxDB.md
similarity index 100%
rename from topics/KleinOps/apps/K8s/InfluxDB.md
rename to topics/KleinOps/apps/k8s/InfluxDB.md
diff --git a/topics/KleinOps/apps/K8s/Myspeed.md b/topics/KleinOps/apps/k8s/Myspeed.md
similarity index 100%
rename from topics/KleinOps/apps/K8s/Myspeed.md
rename to topics/KleinOps/apps/k8s/Myspeed.md
diff --git a/topics/KleinOps/apps/K8s/Paperless-NGX.md b/topics/KleinOps/apps/k8s/Paperless-NGX.md
similarity index 100%
rename from topics/KleinOps/apps/K8s/Paperless-NGX.md
rename to topics/KleinOps/apps/k8s/Paperless-NGX.md
diff --git a/topics/KleinOps/apps/K8s/Paperless-ngx-handleiding.md b/topics/KleinOps/apps/k8s/Paperless-ngx-handleiding.md
similarity index 100%
rename from topics/KleinOps/apps/K8s/Paperless-ngx-handleiding.md
rename to topics/KleinOps/apps/k8s/Paperless-ngx-handleiding.md
diff --git a/topics/KleinOps/apps/K8s/Speedtest.md b/topics/KleinOps/apps/k8s/Speedtest.md
similarity index 100%
rename from topics/KleinOps/apps/K8s/Speedtest.md
rename to topics/KleinOps/apps/k8s/Speedtest.md
diff --git a/topics/KleinOps/apps/K8s/Termix.md b/topics/KleinOps/apps/k8s/Termix.md
similarity index 95%
rename from topics/KleinOps/apps/K8s/Termix.md
rename to topics/KleinOps/apps/k8s/Termix.md
index 81efc3a..10b8e56 100644
--- a/topics/KleinOps/apps/K8s/Termix.md
+++ b/topics/KleinOps/apps/k8s/Termix.md
@@ -1,6 +1,6 @@
 <primary-label ref="document"></primary-label>
 
-# OpenSpeedTest (K8s, Klein8s)
+# Termix (K8s, Klein8s)
 Termix is an open-source, forever-free, self-hosted all-in-one server management platform. It provides a multi-platform solution for managing your servers and infrastructure through a single, intuitive interface. Termix offers SSH terminal access, SSH tunneling capabilities, and remote file management, with many more tools to come. Termix is the perfect free and self-hosted alternative to Termius available for all platforms.
 ## ___________________
 
diff --git a/topics/KleinOps/apps/K8s/Uptime-kuma.md b/topics/KleinOps/apps/k8s/Uptime-kuma.md
similarity index 95%
rename from topics/KleinOps/apps/K8s/Uptime-kuma.md
rename to topics/KleinOps/apps/k8s/Uptime-kuma.md
index a9f64f6..b560a12 100644
--- a/topics/KleinOps/apps/K8s/Uptime-kuma.md
+++ b/topics/KleinOps/apps/k8s/Uptime-kuma.md
@@ -1,6 +1,6 @@
 <primary-label ref="document"></primary-label>
 
-# OpenSpeedTest (K8s, Klein8s)
+# Uptime-kuma (K8s, Klein8s)
 Uptime Kuma – A Fancy Self-Hosted Monitoring Tool
 Uptime Kuma is an open-source, free and easy-to-use self-hosted monitoring tool. Uptime Kuma is compatible with multiple platforms including Linux, Windows 10 (x64) and Windows Server.
 
diff --git a/topics/KleinOps/apps/K8s/Vert.md b/topics/KleinOps/apps/k8s/Vert.md
similarity index 100%
rename from topics/KleinOps/apps/K8s/Vert.md
rename to topics/KleinOps/apps/k8s/Vert.md
diff --git a/topics/KleinOps/apps/K8s/Gitea.md b/topics/KleinOps/apps/server/Gitea.md
similarity index 100%
rename from topics/KleinOps/apps/K8s/Gitea.md
rename to topics/KleinOps/apps/server/Gitea.md
diff --git a/topics/KleinOps/apps/K8s/Netdata.md b/topics/KleinOps/apps/server/Netdata.md
similarity index 100%
rename from topics/KleinOps/apps/K8s/Netdata.md
rename to topics/KleinOps/apps/server/Netdata.md
diff --git a/topics/KleinOps/energy/EV/EV_frontpage.md b/topics/KleinOps/energy/EV/EV_frontpage.md
deleted file mode 100644
index 093bbec..0000000
--- a/topics/KleinOps/energy/EV/EV_frontpage.md
+++ /dev/null
@@ -1,17 +0,0 @@
-<primary-label ref="chapter"></primary-label>
-
-# EV
-
-These pages provide information on our EV (and battery).
-## ___________________
-
-
-
-
-
-
-
-## ___________________
-
-
-<a  href="FrontPage.md" >Back to frontpage</a>
\ No newline at end of file
diff --git a/topics/KleinOps/energy/home_automation/Home_automation_frontpage.md b/topics/KleinOps/energy/home_automation/Home_automation_frontpage.md
deleted file mode 100644
index 6663d8c..0000000
--- a/topics/KleinOps/energy/home_automation/Home_automation_frontpage.md
+++ /dev/null
@@ -1,8 +0,0 @@
-<primary-label ref="chapter"></primary-label>
-
-# Energy
-
-These pages provide information on our Power grid.
-## ___________________
-
-<a  href="FrontPage.md" >Back to frontpage</a>
\ No newline at end of file
diff --git a/topics/KleinOps/energy/home_grid/Home_grid_frontpage.md b/topics/KleinOps/energy/home_grid/Home_grid_frontpage.md
deleted file mode 100644
index 80c8d9a..0000000
--- a/topics/KleinOps/energy/home_grid/Home_grid_frontpage.md
+++ /dev/null
@@ -1,8 +0,0 @@
-<primary-label ref="chapter"></primary-label>
-
-# Home grid overview
-
-These pages provide information on our home grid.
-## ___________________
-
-<a  href="FrontPage.md" >Back to frontpage</a>
\ No newline at end of file
diff --git a/topics/KleinOps/energy/solar/Solar_frontpage.md b/topics/KleinOps/energy/solar/Solar_frontpage.md
deleted file mode 100644
index 404dcbf..0000000
--- a/topics/KleinOps/energy/solar/Solar_frontpage.md
+++ /dev/null
@@ -1,8 +0,0 @@
-<primary-label ref="chapter"></primary-label>
-
-# Solar
-
-These pages provide information on our solar system.
-## ___________________
-
-<a  href="FrontPage.md" >Back to frontpage</a>
\ No newline at end of file
diff --git a/topics/KleinOps/network/Network_frontpage.md b/topics/KleinOps/network/Network_frontpage.md
deleted file mode 100644
index 1070c9d..0000000
--- a/topics/KleinOps/network/Network_frontpage.md
+++ /dev/null
@@ -1,6 +0,0 @@
-<primary-label ref="chapter"></primary-label>
-# Network
-On the following pagwes you will find all network related information.
-## ___________________
-
-<a  href="FrontPage.md" >Back to frontpage</a>
diff --git a/topics/KleinOps/network/kvms/Kvms_frontpage.md b/topics/KleinOps/network/kvms/Kvms_frontpage.md
deleted file mode 100644
index 289b8a2..0000000
--- a/topics/KleinOps/network/kvms/Kvms_frontpage.md
+++ /dev/null
@@ -1,6 +0,0 @@
-<primary-label ref="chapter"></primary-label>
-
-# KVMs
-This chapter gives more insight on the homelab KVMs
-## ___________________
-<a  href="FrontPage.md" >Back to frontpage</a>
\ No newline at end of file
diff --git a/topics/KleinOps/network/Nginx-configuration.md b/topics/KleinOps/network/routers/Nginx-configuration.md
similarity index 100%
rename from topics/KleinOps/network/Nginx-configuration.md
rename to topics/KleinOps/network/routers/Nginx-configuration.md
diff --git a/topics/KleinOps/network/routers/Routers_frontpage.md b/topics/KleinOps/network/routers/Routers_frontpage.md
deleted file mode 100644
index f7a31ec..0000000
--- a/topics/KleinOps/network/routers/Routers_frontpage.md
+++ /dev/null
@@ -1,6 +0,0 @@
-<primary-label ref="chapter"></primary-label>
-
-# Routers
-This chapter gives more insight on the homelab routers
-## ___________________
-<a  href="FrontPage.md" >Back to frontpage</a>
\ No newline at end of file
diff --git a/topics/KleinOps/network/servers/Servers_frontpage.md b/topics/KleinOps/network/servers/Servers_frontpage.md
deleted file mode 100644
index 715bcf4..0000000
--- a/topics/KleinOps/network/servers/Servers_frontpage.md
+++ /dev/null
@@ -1,6 +0,0 @@
-<primary-label ref="chapter"></primary-label>
-
-# Servers
-
-## ___________________
-<a  href="FrontPage.md" >Back to frontpage</a>
\ No newline at end of file
diff --git a/topics/KleinOps/network/switches/Switches_frontpage.md b/topics/KleinOps/network/switches/Switches_frontpage.md
deleted file mode 100644
index 56bd67d..0000000
--- a/topics/KleinOps/network/switches/Switches_frontpage.md
+++ /dev/null
@@ -1,6 +0,0 @@
-<primary-label ref="chapter"></primary-label>
-
-# Switches
-This chapter gives more insight on the homelab switches
-## ___________________
-<a  href="FrontPage.md" >Back to frontpage</a>
\ No newline at end of file
diff --git a/topics/KleinOps/operating_systems/OS_frontpage.md b/topics/KleinOps/operating_systems/OS_frontpage.md
deleted file mode 100644
index b65e6b8..0000000
--- a/topics/KleinOps/operating_systems/OS_frontpage.md
+++ /dev/null
@@ -1,8 +0,0 @@
-<primary-label ref="chapter"></primary-label>
-# OS
-
-Operating Systems pages.  
-Contains Windows and Linux system management information
-## ___________________
-
-<a  href="FrontPage.md" >Back to frontpage</a>
\ No newline at end of file
diff --git a/topics/KleinOps/operating_systems/linux/Linux_frontpage.md b/topics/KleinOps/operating_systems/linux/Linux_frontpage.md
deleted file mode 100644
index e34e8e6..0000000
--- a/topics/KleinOps/operating_systems/linux/Linux_frontpage.md
+++ /dev/null
@@ -1,10 +0,0 @@
-<primary-label ref="document"></primary-label>
-
-# Linux
-Operating Systems pages.  
-Contains Linux system management information.
-## ___________________
-
-
-
-<a  href="FrontPage.md" >Back to frontpage</a>
\ No newline at end of file
diff --git a/topics/KleinOps/other/Other_frontpage.md b/topics/KleinOps/other/Other_frontpage.md
deleted file mode 100644
index 87be601..0000000
--- a/topics/KleinOps/other/Other_frontpage.md
+++ /dev/null
@@ -1,12 +0,0 @@
-<primary-label ref="chapter"></primary-label>
-
-# Other
-## ___________________
-
-
-
-
-ddddd
-
-
-<a  href="FrontPage.md" >Back to frontpage</a>
\ No newline at end of file
diff --git a/topics/KleinOps/security/Security_frontpage.md b/topics/KleinOps/security/Security_frontpage.md
deleted file mode 100644
index cd5d035..0000000
--- a/topics/KleinOps/security/Security_frontpage.md
+++ /dev/null
@@ -1,7 +0,0 @@
-<primary-label ref="chapter"></primary-label>
-
-# Security
-Contains security tooling, management and monitoring information
-## ___________________
-
-<a  href="FrontPage.md" >Back to frontpage</a>