diff --git a/.batchfile b/.batchfile
index bb0bf3c..2cf2502 100644
--- a/.batchfile
+++ b/.batchfile
@@ -1,46 +1,46 @@
-https://gitea.rknet.org/ansible/xoxys.bitwardenrs_docker;docs;content/cloud/bitwardenrs_docker
-https://gitea.rknet.org/ansible/xoxys.cacerts;docs;content/system/cacerts
-https://gitea.rknet.org/ansible/xoxys.certbot;docs;content/security/certbot
-https://gitea.rknet.org/ansible/xoxys.cups;docs;content/misc/cups
-https://gitea.rknet.org/ansible/xoxys.dnsmasq;docs;content/networking/dnsmasq
-https://gitea.rknet.org/ansible/xoxys.docker-engine;docs;content/system/docker-engine
-https://gitea.rknet.org/ansible/xoxys.droneci;docs;content/cloud/droneci
-https://gitea.rknet.org/ansible/xoxys.facts;docs;content/misc/facts
-https://gitea.rknet.org/ansible/xoxys.freshrss_docker;docs;content/cloud/freshrss_docker
-https://gitea.rknet.org/ansible/xoxys.gitea;docs;content/cloud/gitea
-https://gitea.rknet.org/ansible/xoxys.haveged;docs;content/security/haveged
-https://gitea.rknet.org/ansible/xoxys.homeassistant;docs;content/IoT/homeassistant
-https://gitea.rknet.org/ansible/xoxys.iptables;docs;content/security/iptables
-https://gitea.rknet.org/ansible/xoxys.jellyfin;docs;content/cloud/jellyfin
-https://gitea.rknet.org/ansible/xoxys.kanboard_docker;docs;content/cloud/kanboard_docker
-https://gitea.rknet.org/ansible/xoxys.kernel;docs;content/system/kernel
-https://gitea.rknet.org/ansible/xoxys.ldap_proxy;docs;content/system/ldap_proxy
-https://gitea.rknet.org/ansible/xoxys.lvm;docs;content/system/lvm
-https://gitea.rknet.org/ansible/xoxys.matrix;docs;content/cloud/matrix
-https://gitea.rknet.org/ansible/xoxys.mongodb;docs;content/database/mongodb
-https://gitea.rknet.org/ansible/xoxys.mosquitto;docs;content/IoT/mosquitto
-https://gitea.rknet.org/ansible/xoxys.motd;docs;content/system/motd
-https://gitea.rknet.org/ansible/xoxys.network;docs;content/networking/network
-https://gitea.rknet.org/ansible/xoxys.nginx;docs;content/system/nginx
-https://gitea.rknet.org/ansible/xoxys.nodejs;docs;content/programming/nodejs
-https://gitea.rknet.org/ansible/xoxys.ntp;docs;content/system/ntp
-https://gitea.rknet.org/ansible/xoxys.pam;docs;content/system/pam
-https://gitea.rknet.org/ansible/xoxys.postfix_relay;docs;content/system/postfix_relay
-https://gitea.rknet.org/ansible/xoxys.postgres;docs;content/database/postgres
-https://gitea.rknet.org/ansible/xoxys.python3;docs;content/programming/python3
-https://gitea.rknet.org/ansible/xoxys.radicale;docs;content/cloud/radicale
-https://gitea.rknet.org/ansible/xoxys.scan2mail;docs;content/misc/scan2mail
-https://gitea.rknet.org/ansible/xoxys.selinux;docs;content/security/selinux
-https://gitea.rknet.org/ansible/xoxys.sshd;docs;content/system/sshd
-https://gitea.rknet.org/ansible/xoxys.sudo;docs;content/security/sudo
-https://gitea.rknet.org/ansible/xoxys.ttrss_docker;docs;content/cloud/ttrss_docker
-https://gitea.rknet.org/ansible/xoxys.unifi;docs;content/networking/unifi
-https://gitea.rknet.org/ansible/xoxys.users;docs;content/system/users
-https://gitea.rknet.org/ansible/xoxys.vim;docs;content/system/vim
-https://gitea.rknet.org/ansible/xoxys.yum;docs;content/system/yum
-https://gitea.rknet.org/ansible/xoxys.zigbee2mqtt;docs;content/IoT/zigbee2mqtt
-https://gitea.rknet.org/ansible/xoxys.smb;docs;content/system/smb
-https://gitea.rknet.org/ansible/xoxys.logrotate;docs;content/system/logrotate
-https://gitea.rknet.org/ansible/xoxys.pve;docs;content/cloud/pve
-https://gitea.rknet.org/ansible/xoxys.ucs;docs;content/cloud/ucs
-https://gitea.rknet.org/ansible/xoxys.update;docs;content/misc/update
+https://gitea.rknet.org/ansible/xoxys.bitwardenrs_docker;docs;content/roles/cloud/bitwardenrs_docker
+https://gitea.rknet.org/ansible/xoxys.cacerts;docs;content/roles/system/cacerts
+https://gitea.rknet.org/ansible/xoxys.certbot;docs;content/roles/security/certbot
+https://gitea.rknet.org/ansible/xoxys.cups;docs;content/roles/misc/cups
+https://gitea.rknet.org/ansible/xoxys.dnsmasq;docs;content/roles/networking/dnsmasq
+https://gitea.rknet.org/ansible/xoxys.docker-engine;docs;content/roles/system/docker-engine
+https://gitea.rknet.org/ansible/xoxys.droneci;docs;content/roles/cloud/droneci
+https://gitea.rknet.org/ansible/xoxys.facts;docs;content/roles/misc/facts
+https://gitea.rknet.org/ansible/xoxys.freshrss_docker;docs;content/roles/cloud/freshrss_docker
+https://gitea.rknet.org/ansible/xoxys.gitea;docs;content/roles/cloud/gitea
+https://gitea.rknet.org/ansible/xoxys.haveged;docs;content/roles/security/haveged
+https://gitea.rknet.org/ansible/xoxys.homeassistant;docs;content/roles/iot/homeassistant
+https://gitea.rknet.org/ansible/xoxys.iptables;docs;content/roles/security/iptables
+https://gitea.rknet.org/ansible/xoxys.jellyfin;docs;content/roles/cloud/jellyfin
+https://gitea.rknet.org/ansible/xoxys.kanboard_docker;docs;content/roles/cloud/kanboard_docker
+https://gitea.rknet.org/ansible/xoxys.kernel;docs;content/roles/system/kernel
+https://gitea.rknet.org/ansible/xoxys.ldap_proxy;docs;content/roles/system/ldap_proxy
+https://gitea.rknet.org/ansible/xoxys.lvm;docs;content/roles/system/lvm
+https://gitea.rknet.org/ansible/xoxys.matrix;docs;content/roles/cloud/matrix
+https://gitea.rknet.org/ansible/xoxys.mongodb;docs;content/roles/database/mongodb
+https://gitea.rknet.org/ansible/xoxys.mosquitto;docs;content/roles/iot/mosquitto
+https://gitea.rknet.org/ansible/xoxys.motd;docs;content/roles/system/motd
+https://gitea.rknet.org/ansible/xoxys.network;docs;content/roles/networking/network
+https://gitea.rknet.org/ansible/xoxys.nginx;docs;content/roles/system/nginx
+https://gitea.rknet.org/ansible/xoxys.nodejs;docs;content/roles/programming/nodejs
+https://gitea.rknet.org/ansible/xoxys.ntp;docs;content/roles/system/ntp
+https://gitea.rknet.org/ansible/xoxys.pam;docs;content/roles/system/pam
+https://gitea.rknet.org/ansible/xoxys.postfix_relay;docs;content/roles/system/postfix_relay
+https://gitea.rknet.org/ansible/xoxys.postgres;docs;content/roles/database/postgres
+https://gitea.rknet.org/ansible/xoxys.python3;docs;content/roles/programming/python3
+https://gitea.rknet.org/ansible/xoxys.radicale;docs;content/roles/cloud/radicale
+https://gitea.rknet.org/ansible/xoxys.scan2mail;docs;content/roles/misc/scan2mail
+https://gitea.rknet.org/ansible/xoxys.selinux;docs;content/roles/security/selinux
+https://gitea.rknet.org/ansible/xoxys.sshd;docs;content/roles/system/sshd
+https://gitea.rknet.org/ansible/xoxys.sudo;docs;content/roles/security/sudo
+https://gitea.rknet.org/ansible/xoxys.ttrss_docker;docs;content/roles/cloud/ttrss_docker
+https://gitea.rknet.org/ansible/xoxys.unifi;docs;content/roles/networking/unifi
+https://gitea.rknet.org/ansible/xoxys.users;docs;content/roles/system/users
+https://gitea.rknet.org/ansible/xoxys.vim;docs;content/roles/system/vim
+https://gitea.rknet.org/ansible/xoxys.yum;docs;content/roles/system/yum
+https://gitea.rknet.org/ansible/xoxys.zigbee2mqtt;docs;content/roles/iot/zigbee2mqtt
+https://gitea.rknet.org/ansible/xoxys.smb;docs;content/roles/system/smb
+https://gitea.rknet.org/ansible/xoxys.logrotate;docs;content/roles/system/logrotate
+https://gitea.rknet.org/ansible/xoxys.pve;docs;content/roles/cloud/pve
+https://gitea.rknet.org/ansible/xoxys.ucs;docs;content/roles/cloud/ucs
+https://gitea.rknet.org/ansible/xoxys.update;docs;content/roles/misc/update
diff --git a/.gitignore b/.gitignore
index 5e911e4..9a01693 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
 public/
 resources/_gen/
-content/**/
 themes/
diff --git a/content/roles/_index.md b/content/roles/_index.md
new file mode 100644
index 0000000..836dded
--- /dev/null
+++ b/content/roles/_index.md
@@ -0,0 +1,5 @@
+---
+title: Roles
+---
+
+{{< toc-tree >}}
diff --git a/content/roles/cloud/_index.md b/content/roles/cloud/_index.md
new file mode 100644
index 0000000..62b583a
--- /dev/null
+++ b/content/roles/cloud/_index.md
@@ -0,0 +1,6 @@
+---
+title: Cloud
+geekdocFlatSection: true
+---
+
+{{< toc-tree >}}
diff --git a/content/roles/database/_index.md b/content/roles/database/_index.md
new file mode 100644
index 0000000..c6ef084
--- /dev/null
+++ b/content/roles/database/_index.md
@@ -0,0 +1,6 @@
+---
+title: Database
+geekdocFlatSection: true
+---
+
+{{< toc-tree >}}
diff --git a/content/roles/iot/_index.md b/content/roles/iot/_index.md
new file mode 100644
index 0000000..9bc1db4
--- /dev/null
+++ b/content/roles/iot/_index.md
@@ -0,0 +1,6 @@
+---
+title: IoT
+geekdocFlatSection: true
+---
+
+{{< toc-tree >}}
diff --git a/content/roles/misc/_index.md b/content/roles/misc/_index.md
new file mode 100644
index 0000000..31abdc3
--- /dev/null
+++ b/content/roles/misc/_index.md
@@ -0,0 +1,6 @@
+---
+title: Misc
+geekdocFlatSection: true
+---
+
+{{< toc-tree >}}
diff --git a/content/roles/networking/_index.md b/content/roles/networking/_index.md
new file mode 100644
index 0000000..4b37b1f
--- /dev/null
+++ b/content/roles/networking/_index.md
@@ -0,0 +1,6 @@
+---
+title: Networking
+geekdocFlatSection: true
+---
+
+{{< toc-tree >}}
diff --git a/content/roles/programming/_index.md b/content/roles/programming/_index.md
new file mode 100644
index 0000000..558a528
--- /dev/null
+++ b/content/roles/programming/_index.md
@@ -0,0 +1,6 @@
+---
+title: Programming
+geekdocFlatSection: true
+---
+
+{{< toc-tree >}}
diff --git a/content/roles/security/_index.md b/content/roles/security/_index.md
new file mode 100644
index 0000000..929ace7
--- /dev/null
+++ b/content/roles/security/_index.md
@@ -0,0 +1,6 @@
+---
+title: Security
+geekdocFlatSection: true
+---
+
+{{< toc-tree >}}
diff --git a/content/roles/system/_index.md b/content/roles/system/_index.md
new file mode 100644
index 0000000..ea239bc
--- /dev/null
+++ b/content/roles/system/_index.md
@@ -0,0 +1,6 @@
+---
+title: System
+geekdocFlatSection: true
+---
+
+{{< toc-tree >}}