diff --git a/services.xml b/services.xml
index 4e49a81..716cded 100644
--- a/services.xml
+++ b/services.xml
@@ -1,7 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
   services.xml - simple list of services for the homepage
-  Fields:
+  
+  Structure:
+    - Use <group> elements to organize services into categories
+    - Each group has a 'name' attribute for the category title
+    - Services without a group will appear in "Other Services"
+  
+  Service Fields:
     - id: unique identifier (optional)
     - name: display name (required)
     - proto: protocol - http or https (optional, default: http)
@@ -20,18 +26,32 @@
     - Set check-health="false" to disable automatic checking
 -->
 <services>
-  <service id="portainer" name="Portainer" proto="https" port="9443" logo="portainer.svg" />
-  <service id="portainer-http" name="Portainer (HTTP)" proto="http" port="8000" logo="portainer.svg" />
-  <service id="homeassistant" name="Home Assistant" proto="http" port="8123" logo="homeassistant.svg" />
-  <service id="jellyfin" name="Jellyfin" proto="http" port="8096" logo="jellyfin.svg" host="jellyfin.spatulaa.com" />
-  <service id="nextcloud" name="Nextcloud" proto="http" port="8080" logo="nextcloud.svg" host="cloud.spatulaa.com" />
-  <service id="filebrowser" name="FileBrowser" proto="http" port="8986" logo="filebrowser.svg" />
-  <service id="gitea" name="Gitea" proto="http" port="3000" logo="gitea.svg" host="git.spatulaa.com" />
-  <service id="uptime-kuma" name="Uptime Kuma" proto="http" port="3001" logo="uptime-kuma.svg" />
-  <service id="picoshare" name="Picoshare" proto="http" port="4001" logo="picoshare.svg" />
-  <service id="transmission" name="Transmission" proto="http" port="9091" logo="transmission.svg" />
-  <service id="tdarr" name="Tdarr" proto="http" port="8265" logo="tdarr.svg" />
-  <service id="kiwix" name="Kiwix" proto="http" port="666" logo="kiwix.svg" />
-  <service id="aurcache-repo" name="Aurcache" proto="http" port="888" logo="aurcache.svg" />
-  <service id="jellyseer" name="Jellyseer" proto="http" port="5055" logo="jellyfin.svg" host="jellyseer.spatulaa.com" />
+  <group name="Management">
+    <service id="portainer" name="Portainer" proto="https" port="9443" logo="portainer.svg" />
+    <service id="portainer-http" name="Portainer (HTTP)" proto="http" port="8000" logo="portainer.svg" />
+    <service id="uptime-kuma" name="Uptime Kuma" proto="http" port="3001" logo="uptime-kuma.svg" />
+  </group>
+
+  <group name="Media">
+    <service id="jellyfin" name="Jellyfin" proto="http" port="8096" logo="jellyfin.svg" host="jellyfin.spatulaa.com" />
+    <service id="jellyseer" name="Jellyseer" proto="http" port="5055" logo="jellyfin.svg" host="jellyseer.spatulaa.com" />
+    <service id="transmission" name="Transmission" proto="http" port="9091" logo="transmission.svg" />
+    <service id="tdarr" name="Tdarr" proto="http" port="8265" logo="tdarr.svg" />
+  </group>
+
+  <group name="Storage & Files">
+    <service id="nextcloud" name="Nextcloud" proto="http" port="8080" logo="nextcloud.svg" host="cloud.spatulaa.com" />
+    <service id="filebrowser" name="FileBrowser" proto="http" port="8986" logo="filebrowser.svg" />
+    <service id="picoshare" name="Picoshare" proto="http" port="4001" logo="picoshare.svg" />
+  </group>
+
+  <group name="Development">
+    <service id="gitea" name="Gitea" proto="http" port="3000" logo="gitea.svg" host="git.spatulaa.com" />
+  </group>
+
+  <group name="Other Services">
+    <service id="homeassistant" name="Home Assistant" proto="http" port="8123" logo="homeassistant.svg" />
+    <service id="kiwix" name="Kiwix" proto="http" port="666" logo="kiwix.svg" />
+    <service id="aurcache-repo" name="Aurcache" proto="http" port="888" logo="aurcache.svg" />
+  </group>
 </services>