diff --git a/.batchfile b/.batchfile
index d5eb278..e8a9af2 100644
--- a/.batchfile
+++ b/.batchfile
@@ -1,43 +1,41 @@
-https://gitea.rknet.org/ansible/xoxys.bitwardenrs_docker;docs;content/role/bitwardenrs_docker
-https://gitea.rknet.org/ansible/xoxys.cacerts;docs;content/role/cacerts
-https://gitea.rknet.org/ansible/xoxys.certbot;docs;content/role/certbot
-https://gitea.rknet.org/ansible/xoxys.cups;docs;content/role/cups
-https://gitea.rknet.org/ansible/xoxys.dnsmasq;docs;content/role/dnsmasq
-https://gitea.rknet.org/ansible/xoxys.docker-engine;docs;content/role/docker-engine
-https://gitea.rknet.org/ansible/xoxys.droneci;docs;content/role/droneci
-https://gitea.rknet.org/ansible/xoxys.facts;docs;content/role/facts
-https://gitea.rknet.org/ansible/xoxys.freshrss_docker;docs;content/role/freshrss_docker
-https://gitea.rknet.org/ansible/xoxys.gitea;docs;content/role/gitea
-https://gitea.rknet.org/ansible/xoxys.haveged;docs;content/role/haveged
-https://gitea.rknet.org/ansible/xoxys.homeassistant;docs;content/role/homeassistant
-https://gitea.rknet.org/ansible/xoxys.iptables;docs;content/role/iptables
-https://gitea.rknet.org/ansible/xoxys.jellyfin;docs;content/role/jellyfin
-https://gitea.rknet.org/ansible/xoxys.kanboard_docker;docs;content/role/kanboard_docker
-https://gitea.rknet.org/ansible/xoxys.kernel;docs;content/role/kernel
-https://gitea.rknet.org/ansible/xoxys.ldap_proxy;docs;content/role/ldap_proxy
-https://gitea.rknet.org/ansible/xoxys.lvm;docs;content/role/lvm
-https://gitea.rknet.org/ansible/xoxys.matrix;docs;content/role/matrix
-https://gitea.rknet.org/ansible/xoxys.mongodb;docs;content/role/mongodb
-https://gitea.rknet.org/ansible/xoxys.mosquitto;docs;content/role/mosquitto
-https://gitea.rknet.org/ansible/xoxys.motd;docs;content/role/motd
-https://gitea.rknet.org/ansible/xoxys.network;docs;content/role/network
-https://gitea.rknet.org/ansible/xoxys.nginx;docs;content/role/nginx
-https://gitea.rknet.org/ansible/xoxys.nodejs;docs;content/role/nodejs
-https://gitea.rknet.org/ansible/xoxys.ntp;docs;content/role/ntp
-https://gitea.rknet.org/ansible/xoxys.pam;docs;content/role/pam
-https://gitea.rknet.org/ansible/xoxys.postfix_relay;docs;content/role/postfix_relay
-https://gitea.rknet.org/ansible/xoxys.postgres;docs;content/role/postgres
-https://gitea.rknet.org/ansible/xoxys.pve;docs;content/role/pve
-https://gitea.rknet.org/ansible/xoxys.python3;docs;content/role/python3
-https://gitea.rknet.org/ansible/xoxys.radicale;docs;content/role/radicale
-https://gitea.rknet.org/ansible/xoxys.scan2mail;docs;content/role/scan2mail
-https://gitea.rknet.org/ansible/xoxys.selinux;docs;content/role/selinux
-https://gitea.rknet.org/ansible/xoxys.sshd;docs;content/role/sshd
-https://gitea.rknet.org/ansible/xoxys.sudo;docs;content/role/sudo
-https://gitea.rknet.org/ansible/xoxys.ttrss_docker;docs;content/role/ttrss_docker
-https://gitea.rknet.org/ansible/xoxys.ucs;docs;content/role/ucs
-https://gitea.rknet.org/ansible/xoxys.unifi;docs;content/role/unifi
-https://gitea.rknet.org/ansible/xoxys.users;docs;content/role/users
-https://gitea.rknet.org/ansible/xoxys.vim;docs;content/role/vim
-https://gitea.rknet.org/ansible/xoxys.yum;docs;content/role/yum
-https://gitea.rknet.org/ansible/xoxys.zigbee2mqtt;docs;content/role/zigbee2mqtt
+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/cloud/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/misc/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/misc/zigbee2mqtt
diff --git a/.batchfile-exclude b/.batchfile-exclude
index 151ca46..9c4af39 100644
--- a/.batchfile-exclude
+++ b/.batchfile-exclude
@@ -1 +1,3 @@
 https://gitea.rknet.org/ansible/xoxys.update;docs;content/role/update
+https://gitea.rknet.org/ansible/xoxys.pve;docs;content/role/pve
+https://gitea.rknet.org/ansible/xoxys.ucs;docs;content/role/ucs
diff --git a/config.yaml b/config.yaml
index fe2d798..2602d60 100644
--- a/config.yaml
+++ b/config.yaml
@@ -7,6 +7,7 @@ pygmentsCodeFences: true
 
 # Geekdoc configuration
 disablePathToLower: true
+pluralizeListTitles: false
 
 # Needed for mermaid/katex shortcodes
 markup:
@@ -21,4 +22,3 @@ params:
 
   geekdocDateFormat: "Jan 2, 2006"
   geekdocSearch: true
-