diff --git a/system/firefox.nix b/system/firefox.nix
index d1993c60..c66696fb 100644
--- a/system/firefox.nix
+++ b/system/firefox.nix
@@ -74,12 +74,8 @@
       ManagedBookmarks = [
         { toplevel_name = "Standard Bookmarks"; }
         {
-          name = "NextCloud";
-          url = "https://cloud.xenia.me.uk/";
-        }
-        {
-          name = "ntfy.sh";
-          url = "https://ntfy.xenia.me.uk";
+          name = "Config Repo";
+          url = "https://git.xenia.me.uk/xenia/nixos";
         }
         {
           name = "WhatsApp Web";
@@ -89,6 +85,35 @@
           name = "Discord";
           url = "https://discord.com/app";
         }
+        {
+          name = "Server";
+          children = [
+            {
+              name = "NextCloud";
+              url = "https://cloud.xenia.me.uk/";
+            }
+            {
+              name = "Gitea";
+              url = "https://git.xenia.me.uk";
+            }
+            {
+              name = "Grafana Dashboard";
+              url = "https://status.xenia.me.uk";
+            }
+            {
+              name = "ntfy.sh";
+              url = "https://ntfy.xenia.me.uk";
+            }
+            {
+              name = "AdGuard Home";
+              url = "https://guard.xenia.me.uk";
+            }
+            {
+              name = "Traefik";
+              url = "https://traefik.xenia.me.uk";
+            }
+          ];
+        }
         {
           name = "Wikis";
           children = [
@@ -129,15 +154,15 @@
               name = "Mozilla Policy Templates";
               url = "https://mozilla.github.io/policy-templates/";
             }
+            {
+              name = "AdGuard Home Docs";
+              url = "https://github.com/AdguardTeam/AdGuardHome/wiki";
+            }
           ];
         }
         {
-          name = "Repos";
+          name = "Dev";
           children = [
-            {
-              name = "Gitea";
-              url = "https://git.xenia.me.uk";
-            }
             {
               name = "GitHub";
               url = "https://github.com";
@@ -146,36 +171,6 @@
               name = "GitLab";
               url = "https://gitlab.com";
             }
-            {
-              name = "Config Repo";
-              url = "https://git.xenia.me.uk/xenia/nixos";
-            }
-            {
-              name = "Awesome Hyprland";
-              url = "https://github.com/hyprland-community/awesome-hyprland";
-            }
-          ];
-        }
-        {
-          name = "Work";
-          children = [
-            {
-              name = "Nucleus";
-              url = "https://nucleus.ukaea.uk";
-            }
-            {
-              name = "Office365";
-              url = "https://www.office.com";
-            }
-            {
-              name = "Physics Summary";
-              url =
-                "https://users.euro-fusion.org/pages/physics-summary/LatestSession.php";
-            }
-            {
-              name = "Main Page";
-              url = "https://wiki.jetdata.eu/open/index.php?title=Main_Page";
-            }
           ];
         }
       ];