diff --git a/docker/containers/homepage/bookmarks.yaml b/docker/containers/homepage/bookmarks.yaml
index e9202f3..7ff43a8 100644
--- a/docker/containers/homepage/bookmarks.yaml
+++ b/docker/containers/homepage/bookmarks.yaml
@@ -19,14 +19,14 @@
         - abbr: HE
           icon: /images/1337x.png 
           href: https://1337x.st/user/HeVK/
+    - QxR's Torrents:
+        - abbr: QX
+          icon: /images/1337x.png 
+          href: https://1337x.st/user/QxR/
     - Local Syncthing:
         - abbr: LS
           icon: syncthing.png 
           href: http://127.0.0.1:8384
-    - Server Syncthing:
-        - abbr: SS
-          icon: syncthing.png 
-          href: http://10.0.0.121:8384
 - Services:
     - Gitlab:
         - abbr: GL
diff --git a/docker/containers/homepage/services.yaml b/docker/containers/homepage/services.yaml
index 311504d..7cbe493 100644
--- a/docker/containers/homepage/services.yaml
+++ b/docker/containers/homepage/services.yaml
@@ -1,16 +1,28 @@
 ---
-- Local Containers:
-    - pihole:
-        href: https://10.0.0.121:6346/admin
-        icon: pi-hole.png
-        description: DNS sinkhole to block ads
-        server: pihole
-        container: pihole
+- Media:
+    - Jellyfin:
+        href: http://10.0.0.103:8096/
+        icon: jellyfin.png
+        description: The Free Software Media System
+        ping: https://jellyfin.peterdominguez.art
         widget:
-          type: pihole
-          url: https://10.0.0.121:6346
-          version: 6 
-          key: "{{HOMEPAGE_VAR_FTLCONF_webserver_api_password}}"
+          type: jellyfin
+          url: http://10.0.0.103:8096
+          key: "{{HOMEPAGE_VAR_jellyfin_key}}" 
+          enableBlocks: true 
+          enableNowPlaying: true
+          enableUser: true
+          showEpisodeNumber: true 
+          expandOneStreamToTwoRows: false
+    - Kavita:
+        href: https://read.peterdominguez.art/
+        icon: kavita.png
+        description: Self-hosted digital library for many book formats
+        ping: https://read.peterdominguez.art
+        widget:
+          type: kavita
+          url: https://read.peterdominguez.art
+          key: "{{HOMEPAGE_VAR_kavita_key}}"
     - qBittorrent-nox:
         href: http://10.0.0.121:8080/
         icon: qbittorrent.png
@@ -33,6 +45,20 @@
           type: jackett
           url: http://10.0.0.121:9117
           password: "{{HOMEPAGE_VAR_jackett_password}}" 
+
+
+- Networking:
+    - pihole:
+        href: https://10.0.0.121:6346/admin
+        icon: pi-hole.png
+        description: DNS sinkhole to block ads
+        server: pihole
+        container: pihole
+        widget:
+          type: pihole
+          url: https://10.0.0.121:6346
+          version: 6 
+          key: "{{HOMEPAGE_VAR_FTLCONF_webserver_api_password}}"
     - Speed Test Tracker:
         href: http://10.0.0.121:9080/
         icon: speedtest-tracker.png
@@ -45,18 +71,6 @@
           version: 2
           key: "{{HOMEPAGE_VAR_KEY_SPEEDTEST}}"
           bitratePrecision: 3
-    - meTube:
-        href: http://10.0.0.121:8081
-        icon: metube.png
-        description: Self-hosted YouTube downloader
-        server: metube
-        container: metube
-    - Homepage:
-        href: http://10.0.0.121:3000
-        icon: homepage.png
-        description: A modern dashboard for your services
-        server: homepage
-        container: homepage
     - Flaresolverr:
         href: http://10.0.0.121:8191/
         icon: flaresolverr.png
@@ -69,22 +83,7 @@
         description: Validating, recursive, and caching DNS resolver
         server: unbound
         container: unbound
-
-- VPS Hosted Services:
-    - Jellyfin:
-        href: http://10.0.0.103:8096/
-        icon: jellyfin.png
-        description: The Free Software Media System
-        ping: https://jellyfin.peterdominguez.art
-        widget:
-          type: jellyfin
-          url: http://10.0.0.103:8096
-          key: "{{HOMEPAGE_VAR_jellyfin_key}}" 
-          enableBlocks: true 
-          enableNowPlaying: true
-          enableUser: true
-          showEpisodeNumber: true 
-          expandOneStreamToTwoRows: false
+- Tools:
     - Nextcloud:
         href: https://cloud.peterdominguez.art/
         icon: nextcloud.png
@@ -95,15 +94,6 @@
           url: https://cloud.peterdominguez.art
           username: "{{HOMEPAGE_VAR_nextcloud_username}}"
           password: "{{HOMEPAGE_VAR_nextcloud_password}}"
-    - Kavita:
-        href: https://read.peterdominguez.art/
-        icon: kavita.png
-        description: Self-hosted digital library for many book formats
-        ping: https://read.peterdominguez.art
-        widget:
-          type: kavita
-          url: https://read.peterdominguez.art
-          key: "{{HOMEPAGE_VAR_kavita_key}}"
     - FreshRSS:
         href: https://rss.peterdominguez.art/
         icon: freshrss.png
@@ -123,13 +113,30 @@
           type: gitea
           url: https://git.peterdominguez.art
           key: "{{HOMEPAGE_VAR_forgejo_key}}"
-    - Hugo:
-        href: https://peterdominguez.art
-        icon: hugo.png
-        description: Open-source static site generator
-        ping: https://peterdominguez.art
+    - Syncthing:
+        href: http://10.0.0.121:8384
+        icon: syncthing.png
+        description: Open source peer-to-peer file synchronization
+        ping: http://10.0.0.121:8384
     - SearXNG:
         href: https://search.peterdominguez.art/
         icon: searxng.png
         description: Privacy-respecting, hackable metasearch engine
         ping: https://search.peterdominguez.art
+    - Hugo:
+        href: https://peterdominguez.art
+        icon: hugo.png
+        description: Open-source static site generator
+        ping: https://peterdominguez.art
+    - meTube:
+        href: http://10.0.0.121:8081
+        icon: metube.png
+        description: Self-hosted YouTube downloader
+        server: metube
+        container: metube
+    - Homepage:
+        href: http://10.0.0.121:3000
+        icon: homepage.png
+        description: A modern dashboard for your services
+        server: homepage
+        container: homepage
diff --git a/docker/containers/homepage/settings.yaml b/docker/containers/homepage/settings.yaml
index 875a1cc..472c425 100644
--- a/docker/containers/homepage/settings.yaml
+++ b/docker/containers/homepage/settings.yaml
@@ -15,9 +15,12 @@ background:
   opacity: 60 # 0-100
 favicon: /images/moon.png
 layout:
-  Local Containers:
+  Media:
     style: row
     columns: 4
-  VPS Hosted Services:
+  Networking:
+    style: row
+    columns: 4
+  Tools:
     style: row
     columns: 4