diff --git a/KleinDocs.tree b/KleinDocs.tree
index a89cc78..61ac61e 100644
--- a/KleinDocs.tree
+++ b/KleinDocs.tree
@@ -15,8 +15,9 @@
-
-
+
+
+
@@ -35,24 +36,27 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
@@ -65,7 +69,9 @@
-
+
+
+
\ No newline at end of file
diff --git a/redirection-rules.xml b/redirection-rules.xml
index a0b5e1c..0fe9d62 100644
--- a/redirection-rules.xml
+++ b/redirection-rules.xml
@@ -38,4 +38,12 @@
Created after removal of "MyTopic" from KleinDocs
MyTopic.html
+
+ Created after removal of "Endpoint addresses" from KleinDocs
+ Endpoints.html
+
+
+ Created after removal of "Router addressing" from KleinDocs
+ Router-addressing.html
+
\ No newline at end of file
diff --git a/topics/JetKVM-addresses.md b/topics/JetKVM-addresses.md
new file mode 100644
index 0000000..fde9fe6
--- /dev/null
+++ b/topics/JetKVM-addresses.md
@@ -0,0 +1,32 @@
+
+
+# JetKVM addresses
+
+This page contains JetKVM information.
+## ___________________________
+
+### KleinKVM1
+{#kleinkvm1}
+```
+TYPE: JetKVM
+URL: https://kleinkvm1.kleinsense.nl/
+IP : 192.168.178.221
+MAC: 44:b7:d0:e2:d9:77
+LOC: bureau Rudi
+HW: JetKVM
+OS: Busybox
+
+```
+### KleinKVM2
+{#kleinkvm2}
+```
+TYPE: JetKVM
+URL: https://kleinkvm2.kleinsense.nl/
+IP : 192.168.178.222 or 192.168.3.222
+MAC: 44:b7:d0:
+LOC: bureau Darius
+HW: JetKVM
+OS: Busybox
+
+```
+Shortcut to pages overview
diff --git a/topics/KVMs.md b/topics/KVMs.md
new file mode 100644
index 0000000..1fed04b
--- /dev/null
+++ b/topics/KVMs.md
@@ -0,0 +1,3 @@
+# KVMs
+
+Start typing here...
\ No newline at end of file
diff --git a/topics/KleinOps/KleinOps_frontpage.md b/topics/KleinOps/KleinOps_frontpage.md
index e332b32..7547df7 100644
--- a/topics/KleinOps/KleinOps_frontpage.md
+++ b/topics/KleinOps/KleinOps_frontpage.md
@@ -5,4 +5,4 @@
KleinOps: the document archive for technical documentation.
-Shortcuts to pages overview
\ No newline at end of file
+Shortcut to pages overview
\ No newline at end of file
diff --git a/topics/KleinOps/apps/Gitea.md b/topics/KleinOps/apps/Gitea.md
index d8b4974..96c6ece 100644
--- a/topics/KleinOps/apps/Gitea.md
+++ b/topics/KleinOps/apps/Gitea.md
@@ -1,6 +1,6 @@
-# Gitea (KleinGit)
+# Gitea (VM, KleinGit)
Gitea enables the creation and management of repositories based on Git.
## ___________________
### Access through
diff --git a/topics/KleinOps/apps/Immich.md b/topics/KleinOps/apps/Immich.md
index 93bff4b..6946d3e 100644
--- a/topics/KleinOps/apps/Immich.md
+++ b/topics/KleinOps/apps/Immich.md
@@ -1,6 +1,6 @@
-# Immich (KleinNAS)
+# Immich (VMN, KleinNAS)
Self-hosted photo and video management. Runs on KleinNAS as a VM-based application offered by the TrueNAS repo.
## ___________________
diff --git a/topics/KleinOps/apps/Ollama.md b/topics/KleinOps/apps/Ollama.md
new file mode 100644
index 0000000..0d01807
--- /dev/null
+++ b/topics/KleinOps/apps/Ollama.md
@@ -0,0 +1,14 @@
+
+
+# Ollama (VM, KleinServer)
+
+Ollama is a lightweight, extensible framework for building and running language models on the local machine.
+## ___________________
+### Access through
+[](http://192.168.1.200:3099/)
+
+### External links
+[Ollama on Github](https://github.com/ollama/ollama)
+[Ollama models website](https://ollama.com)
+
+Shortcut to pages overview
\ No newline at end of file
diff --git a/topics/KleinOps/apps/Paperless-AI.md b/topics/KleinOps/apps/Paperless-AI.md
new file mode 100644
index 0000000..8948182
--- /dev/null
+++ b/topics/KleinOps/apps/Paperless-AI.md
@@ -0,0 +1,10 @@
+
+
+# Paperless-AI (VM, KleinServer)
+
+De AI-applicatie gebaseerd op de open source applicatie Paperless.
+## ___________________
+### Access through
+[](http://192.168.1.200:3099/)
+
+Shortcut to pages overview
\ No newline at end of file
diff --git a/topics/KleinOps/apps/Paperless.md b/topics/KleinOps/apps/Paperless-NGX.md
similarity index 90%
rename from topics/KleinOps/apps/Paperless.md
rename to topics/KleinOps/apps/Paperless-NGX.md
index 18b36da..44857ea 100644
--- a/topics/KleinOps/apps/Paperless.md
+++ b/topics/KleinOps/apps/Paperless-NGX.md
@@ -1,6 +1,6 @@
-# Paperless (KleinServer)
+# Paperless (VM, KleinServer)
Het documentsarchief gebaseerd op de open source applicatie Paperless.
## ___________________
diff --git a/topics/KleinOps/apps/Paperless-handleiding.md b/topics/KleinOps/apps/Paperless-ngx-handleiding.md
similarity index 97%
rename from topics/KleinOps/apps/Paperless-handleiding.md
rename to topics/KleinOps/apps/Paperless-ngx-handleiding.md
index 6a07516..d7a273f 100644
--- a/topics/KleinOps/apps/Paperless-handleiding.md
+++ b/topics/KleinOps/apps/Paperless-ngx-handleiding.md
@@ -47,5 +47,5 @@ de knop een document scannen vanaf Draadje en deze toevoegen in Paperless.
#### Via de scanner van Draadje
Scan een document als PDF in zoals je gewend bent en sleep het daarna in de Paperless-folder (Drive P:).
-Shortcuts to pages
+Shortcut to pages overview
diff --git a/topics/KleinOps/apps/Portainer.md b/topics/KleinOps/apps/Portainer.md
index b3718c8..a9f6729 100644
--- a/topics/KleinOps/apps/Portainer.md
+++ b/topics/KleinOps/apps/Portainer.md
@@ -1,6 +1,6 @@
-# Portainer (KleinServer)
+# Portainer (VM, KleinServer)
Portainer is our container management software to deploy, troubleshoot, and secure applications across our homelab.
## ___________________
### Access through
diff --git a/topics/KleinOps/apps/TrueNAS_Scale.md b/topics/KleinOps/apps/TrueNAS_Scale.md
index 7504edf..a6cb396 100644
--- a/topics/KleinOps/apps/TrueNAS_Scale.md
+++ b/topics/KleinOps/apps/TrueNAS_Scale.md
@@ -1,6 +1,6 @@
-# TrueNAS Scale (VM on ProxMox)
+# TrueNAS Scale (VM, pve)
TrueNAS® SCALE is an Open Source NAS Infrastructure solution. In addition to powerful scale-out storage capabilities,
SCALE adds Linux Containers and VMs (KVM)
## ___________________
diff --git a/topics/KleinOps/network/Endpoints.md b/topics/KleinOps/network/Endpoints.md
deleted file mode 100644
index 96e8027..0000000
--- a/topics/KleinOps/network/Endpoints.md
+++ /dev/null
@@ -1,37 +0,0 @@
-
-
-# Endpoint addresses
-
-This page contains most endpoints in use on our local network. (DUPLICATE OF APPS!!)
-## ___________________
-### OPNsense (KleinSense)
-[](https://opnsense.kleinsense.nl)
-[](http://192.168.1.200:8001/)
-### Wazuh (KleinServer)
-[](https://wazuh.kleinwizard.nl)
-[](https://192.168.1.2/)
-### Home Assistant (KleinWizard)
-[](https://kleinwizard.nl)
-[](http://192.168.178.53:8123/)
-### Netdata (KleinSense)
-[](https://netdata.kleinsense.nl)
-[](http://192.168.1.1:19999/)
-### Portainer (KleinServer)
-[](https://portainer.kleinsense.nl)
-[](https://192.168.1.200:9443/)
-### Gitea
-[](https://gitea.kleinsense.nl/)
-[](http://192.168.1.2:3000/)
-### Immich
-[](https://photo.kleinwizard.nl/photos)
-[](http://192.168.1.150:30041)
-### Truenas
-[](http://192.168.1.150)
-[](https://nas.kleinsense.nl)
-### Proxmox (pve, KleinPVE)
-[](http://192.168.1.3:8006/)
-### Paperless (KleinServer)
-[](https://paperless.kleinsense.nl)
-[](http://192.168.1.200:3098/)
-
-Shortcut to pages overview
\ No newline at end of file
diff --git a/topics/KleinOps/network/Switch-addresses.md b/topics/KleinOps/network/Switch-addresses.md
index 6d8d765..54b0531 100644
--- a/topics/KleinOps/network/Switch-addresses.md
+++ b/topics/KleinOps/network/Switch-addresses.md
@@ -54,4 +54,4 @@ MAC: 94:18:65:7a:5c:56
LOC: Bureau Rudi
```
-Shortcuts to pages overview
\ No newline at end of file
+Shortcut to pages overview
\ No newline at end of file
diff --git a/topics/KleinOps/routers/KleinHole.md b/topics/KleinOps/network/routers/KleinHole.md
similarity index 69%
rename from topics/KleinOps/routers/KleinHole.md
rename to topics/KleinOps/network/routers/KleinHole.md
index a7b1cdc..e38ee00 100644
--- a/topics/KleinOps/routers/KleinHole.md
+++ b/topics/KleinOps/network/routers/KleinHole.md
@@ -5,4 +5,4 @@
IP/MAC address information
-Shortcuts to pages overview
\ No newline at end of file
+Shortcut to pages overview
\ No newline at end of file
diff --git a/topics/KleinOps/routers/KleinSense.md b/topics/KleinOps/network/routers/KleinSense.md
similarity index 87%
rename from topics/KleinOps/routers/KleinSense.md
rename to topics/KleinOps/network/routers/KleinSense.md
index 6e1eaed..7dc9e64 100644
--- a/topics/KleinOps/routers/KleinSense.md
+++ b/topics/KleinOps/network/routers/KleinSense.md
@@ -17,4 +17,4 @@
```
https://domain/location/filename
```
-Shortcuts to pages overview
\ No newline at end of file
+Shortcut to pages overview
\ No newline at end of file
diff --git a/topics/KleinOps/routers/Routers_frontpage.md b/topics/KleinOps/network/routers/Routers_frontpage.md
similarity index 65%
rename from topics/KleinOps/routers/Routers_frontpage.md
rename to topics/KleinOps/network/routers/Routers_frontpage.md
index f37ae58..a32fc98 100644
--- a/topics/KleinOps/routers/Routers_frontpage.md
+++ b/topics/KleinOps/network/routers/Routers_frontpage.md
@@ -3,4 +3,4 @@
# Routers
This chapter gives more insight on the homelab routers
## ___________________
-Shortcuts to pages overview
\ No newline at end of file
+Shortcut to pages overview
\ No newline at end of file
diff --git a/topics/KleinOps/servers/KleinServer.md b/topics/KleinOps/network/servers/KleinServer.md
similarity index 98%
rename from topics/KleinOps/servers/KleinServer.md
rename to topics/KleinOps/network/servers/KleinServer.md
index be5e911..bfbea0a 100644
--- a/topics/KleinOps/servers/KleinServer.md
+++ b/topics/KleinOps/network/servers/KleinServer.md
@@ -7,7 +7,7 @@
### Address information
IP/MAC address information
-Shortcuts to pages
+Shortcut to pages overview
### Special users
@@ -115,4 +115,4 @@
| 55000 | python3 | |
| 56150 | anydesk | |
-Shortcuts to pages overview
+Shortcut to pages overview
diff --git a/topics/KleinOps/servers/Servers_frontpage.md b/topics/KleinOps/network/servers/Servers_frontpage.md
similarity index 51%
rename from topics/KleinOps/servers/Servers_frontpage.md
rename to topics/KleinOps/network/servers/Servers_frontpage.md
index 5304339..fd16101 100644
--- a/topics/KleinOps/servers/Servers_frontpage.md
+++ b/topics/KleinOps/network/servers/Servers_frontpage.md
@@ -3,4 +3,4 @@
# Servers
## ___________________
-Shortcuts to pages overview
\ No newline at end of file
+Shortcut to pages overview
\ No newline at end of file
diff --git a/topics/KleinOps/os/Linux/Linux.md b/topics/KleinOps/os/Linux/Linux.md
index 8c5a9a4..4bd424b 100644
--- a/topics/KleinOps/os/Linux/Linux.md
+++ b/topics/KleinOps/os/Linux/Linux.md
@@ -103,4 +103,4 @@ Contains Linux system management information.
| zip | for packaging and compressing (to archive) files. |
| uname | Show system information (arch, linux version) |
-Shortcuts to pages overview
\ No newline at end of file
+Shortcut to pages overview
\ No newline at end of file
diff --git a/topics/KleinOps/os/Linux/SSH-keys.md b/topics/KleinOps/os/Linux/SSH-keys.md
index 08490e1..25d96df 100644
--- a/topics/KleinOps/os/Linux/SSH-keys.md
+++ b/topics/KleinOps/os/Linux/SSH-keys.md
@@ -33,4 +33,4 @@ Solar-putty: Settings/Credentials/Private key:
id_ed25519__.ppk
```
-Shortcuts to pages overview
\ No newline at end of file
+Shortcut to pages overview
\ No newline at end of file
diff --git a/topics/KleinOps/os/OS_frontpage.md b/topics/KleinOps/os/OS_frontpage.md
index b7dbd76..92fcc73 100644
--- a/topics/KleinOps/os/OS_frontpage.md
+++ b/topics/KleinOps/os/OS_frontpage.md
@@ -5,4 +5,4 @@ Operating Systems pages.
Contains Windows and Linux system management information
## ___________________
-Shortcuts to pages overview
\ No newline at end of file
+Shortcut to pages overview
\ No newline at end of file
diff --git a/topics/KleinOps/os/Windows/Windows.md b/topics/KleinOps/os/Windows/Windows.md
index 912c947..510a895 100644
--- a/topics/KleinOps/os/Windows/Windows.md
+++ b/topics/KleinOps/os/Windows/Windows.md
@@ -21,4 +21,4 @@ Contains Windows system management information.
| OS build | 26100.1742 |
| Experience | Windows Feature Experience Pack 1000.26100.18.0 |
-Shortcuts to pages overview
\ No newline at end of file
+Shortcut to pages overview
\ No newline at end of file
diff --git a/topics/KleinOps/other/Dev-test.md b/topics/KleinOps/other/Dev-test.md
index 50ced54..72e0a58 100644
--- a/topics/KleinOps/other/Dev-test.md
+++ b/topics/KleinOps/other/Dev-test.md
@@ -8,4 +8,4 @@ block-beta
```
-Shortcuts to pages overview
\ No newline at end of file
+Shortcut to pages overview
\ No newline at end of file
diff --git a/topics/KleinOps/other/Other_frontpage.md b/topics/KleinOps/other/Other_frontpage.md
index 0541d78..7849d31 100644
--- a/topics/KleinOps/other/Other_frontpage.md
+++ b/topics/KleinOps/other/Other_frontpage.md
@@ -9,4 +9,4 @@
ddddd
-Shortcuts to pages
\ No newline at end of file
+Shortcut to pages overview
\ No newline at end of file
diff --git a/topics/KleinOps/other/ToDo.md b/topics/KleinOps/other/ToDo.md
index 158f93b..c952b65 100644
--- a/topics/KleinOps/other/ToDo.md
+++ b/topics/KleinOps/other/ToDo.md
@@ -5,4 +5,4 @@
- ☐ Document nginx
- ☐ SSH/keys
-Shortcuts to pages
\ No newline at end of file
+Shortcut to pages overview
\ No newline at end of file
diff --git a/topics/KleinOps/power_grid/EV/EV_frontpage.md b/topics/KleinOps/power_grid/EV/EV_frontpage.md
index 242e8cb..6e25af6 100644
--- a/topics/KleinOps/power_grid/EV/EV_frontpage.md
+++ b/topics/KleinOps/power_grid/EV/EV_frontpage.md
@@ -5,4 +5,4 @@
These pages provide information on our EV (and battery).
## ___________________
-Shortcuts to pages overview
\ No newline at end of file
+Shortcut to pages overview
\ No newline at end of file
diff --git a/topics/KleinOps/power_grid/home_automation/Energy-Sockets.md b/topics/KleinOps/power_grid/home_automation/Energy-Sockets.md
index 7295c90..ad16a8c 100644
--- a/topics/KleinOps/power_grid/home_automation/Energy-Sockets.md
+++ b/topics/KleinOps/power_grid/home_automation/Energy-Sockets.md
@@ -6,4 +6,4 @@ This page provide information on our Energy Sockets (Power meters).
## ___________________
-Shortcuts to pages overview
\ No newline at end of file
+Shortcut to pages overview
\ No newline at end of file
diff --git a/topics/KleinOps/power_grid/home_automation/HomeAssistant.md b/topics/KleinOps/power_grid/home_automation/HomeAssistant.md
index d11c5b0..063d025 100644
--- a/topics/KleinOps/power_grid/home_automation/HomeAssistant.md
+++ b/topics/KleinOps/power_grid/home_automation/HomeAssistant.md
@@ -5,4 +5,4 @@
Home Assistant is the main platform for our local home automation.
## ___________________
-Shortcuts to pages overview
\ No newline at end of file
+Shortcut to pages overview
\ No newline at end of file
diff --git a/topics/KleinOps/power_grid/home_automation/Home_automation_frontpage.md b/topics/KleinOps/power_grid/home_automation/Home_automation_frontpage.md
index b1f16b2..55e8e91 100644
--- a/topics/KleinOps/power_grid/home_automation/Home_automation_frontpage.md
+++ b/topics/KleinOps/power_grid/home_automation/Home_automation_frontpage.md
@@ -5,4 +5,4 @@
These pages provide information on our Power grid.
## ___________________
-Shortcuts to pages overview
\ No newline at end of file
+Shortcut to pages overview
\ No newline at end of file
diff --git a/topics/KleinOps/power_grid/solar/Solar_frontpage.md b/topics/KleinOps/power_grid/solar/Solar_frontpage.md
index 4225f7f..2bfb3da 100644
--- a/topics/KleinOps/power_grid/solar/Solar_frontpage.md
+++ b/topics/KleinOps/power_grid/solar/Solar_frontpage.md
@@ -5,4 +5,4 @@
These pages provide information on our solar system.
## ___________________
-Shortcuts to pages overview
\ No newline at end of file
+Shortcut to pages overview
\ No newline at end of file
diff --git a/topics/KleinOps/routers/Router-addressing.md b/topics/KleinOps/routers/Router-addressing.md
deleted file mode 100644
index 6c8291d..0000000
--- a/topics/KleinOps/routers/Router-addressing.md
+++ /dev/null
@@ -1,85 +0,0 @@
-
-
-# Router addressing
-{#router-addresses}
-This page contains address information about our routers en servers.
-## ___________________________
-
-
-### KleinFritz
-{#kleinfritz}
-```
-TYPE: Access point
-URL: http://kleinfritz.kleinnet
-IP: 192.168.0.1
-MAC: b0:f2:08:a9:17:75
-LOC: meterkast
-HW: FRITZ!Box 7590 AX
-OS: Fritz!OS
-```
-### KleinMore
-{#kleinmore}
-```
-TYPE: Access point
-URL: http://kleinmore.kleinnet
-IP: 192.168.3.254
-MAC: e8:df:70:a3:3c:45
-LOC: zolder
-HW: FRITZ!Box 7581
-OS: Fritz!OS
-
-```
-### KleinHole
-{#kleinhole}
-```
-TYPE: DNS server/Ad blocker
-URL: http://kleinhole.kleinnet/admin
-IP: 192.168.178.252/admin
-MAC: e4:5f:01:81:59:73
-LOC: meterkast
-HW: Raspberry Pi
-OS: PiHole
-```
-### KleinLess
-{#kleinless}
-```
-TYPE: Access point
-URL: http://kleinless.kleinnet
-IP : 192.168.178.253
-MAC: 5c:62:8b:cb:8c:04
-LOC: meterkast
-HW: tp-link AX10
-OS: Linux based
-```
-### KleinSense
-{#kleinsense}
-```
-TYPE: Router
-URL: http://kleinsense.kleinnet
-IP: 192.168.178.254
-MAC: 60:be:b4:10:27:2c
-LOC: meterkast
-HW:
-OS: OPNsense
-```
-### KleinWired
-{#kleinwired}
-```
-TYPE: Access point
-URL: http://kleinless.kleinnet
-IP: 192.168.178.249
-MAC: 94:83:c4:4c:1f:6e
-LOC: slaapkamer J&D
-```
-### KleinServer
-{#kleinserver}
-```
-TYPE: Linux server
-URL: http://kleinserver.kleinnet
-IP : 192.168.178.1
-MAC: f0:1f:af:d4:25:d4
-LOC: meterkast
-HW: Blade
-OS: Linux Mint
-```
-Shortcuts to pages overview
\ No newline at end of file
diff --git a/topics/KleinOps/security/Security_frontpage.md b/topics/KleinOps/security/Security_frontpage.md
index a738466..739c072 100644
--- a/topics/KleinOps/security/Security_frontpage.md
+++ b/topics/KleinOps/security/Security_frontpage.md
@@ -4,4 +4,4 @@
Contains security tooling, management and monitoring information
## ___________________
-Shortcuts to pages overview
+Shortcut to pages overview
diff --git a/topics/Switches.md b/topics/Switches.md
new file mode 100644
index 0000000..f4ee9ff
--- /dev/null
+++ b/topics/Switches.md
@@ -0,0 +1,3 @@
+# Switches
+
+Start typing here...
\ No newline at end of file