diff --git a/bookmarks.json b/bookmarks.json
new file mode 100644
index 0000000..1d99604
--- /dev/null
+++ b/bookmarks.json
@@ -0,0 +1,193 @@
+[
+  { "name": "Mastodon", "url": "https://tech.lgbt", "tags": ["Social"] },
+  {
+    "name": "ABRP",
+    "url": "https://abetterrouteplanner.com/",
+    "tags": ["Travel"]
+  },
+  {
+    "name": "Forgejo",
+    "url": "https://git.xenia.me.uk",
+    "tags": ["Software", "Git", "Personal"]
+  },
+  {
+    "name": "GitHub",
+    "url": "https://github.com",
+    "tags": ["Software", "Git"]
+  },
+  {
+    "name": "CCFE GitLab",
+    "url": "https://git.ccfe.ac.uk",
+    "tags": ["Software", "Git", "Work"]
+  },
+  {
+    "name": "NixOS and Flakes",
+    "url": "https://nixos-and-flakes.thiscute.world/",
+    "tags": ["Software", "Documentation", "Nix"]
+  },
+  {
+    "name": "Home Manager",
+    "url": "https://nix-community.github.io/home-manager/options.xhtml",
+    "tags": ["Software", "Documentation", "Nix"]
+  },
+  {
+    "name": "Awesome Emacs",
+    "url": "https://github.com/emacs-tw/awesome-emacs",
+    "tags": ["Software", "Repositories"]
+  },
+  {
+    "name": "Awesome Wayland",
+    "url": "https://github.com/natpen/awesome-wayland",
+    "tags": ["Software", "Repositories"]
+  },
+  {
+    "name": "NixOS Wiki",
+    "url": "https://nixos.wiki",
+    "tags": ["Wiki"]
+  },
+  {
+    "name": "Arch Wiki",
+    "url": "https://wiki.archlinux.org",
+    "tags": ["Wiki"]
+  },
+  {
+    "name": "Homepage",
+    "url": "https://wiki.jetdata.eu/open/index.php?title=Main_Page",
+    "tags": ["Wiki", "OpenWiki"]
+  },
+  {
+    "name": "Diagnostic Coordinator",
+    "url": "https://wiki.jetdata.eu/open/index.php?title=Diagnostic_Coordinator_Wiki",
+    "tags": ["Wiki", "OpenWiki"]
+  },
+  {
+    "name": "Spectroscopy Group",
+    "url": "https://wiki.jetdata.eu/open/index.php?title=Spectroscopy_Group:index",
+    "tags": ["Wiki", "OpenWiki"]
+  },
+  {
+    "name": "KS5 Wiki",
+    "url": "https://wiki.jetdata.eu/open/index.php?title=CXS:Topic3",
+    "tags": ["Wiki", "OpenWiki"]
+  },
+  {
+    "name": "KT3 Journals",
+    "url": "https://wiki.jetdata.eu/open/index.php?title=KT3_Journals",
+    "tags": ["Wiki", "OpenWiki"]
+  },
+  {
+    "name": "Nucleus",
+    "url": "https://nucleus.ukaea.uk/",
+    "tags": ["Work"]
+  },
+  {
+    "name": "Marval",
+    "url": "https://marval.service.ukaea.uk/MSMSelfService/Index.aspx",
+    "tags": ["Work"]
+  },
+  {
+    "name": "U4BW",
+    "url": "https://ubw.unit4cloud.com/uk_aea_prod_web/Login/Login.aspx",
+    "tags": ["Work"]
+  },
+  {
+    "name": "UKAEA Pinboard",
+    "url": "https://pinboard.ukaea.uk/",
+    "tags": ["Work"]
+  },
+  {
+    "name": "OPEN-ADAS",
+    "url": "https://open.adas.ac.uk/",
+    "tags": ["Work"]
+  },
+  {
+    "name": "Homepage",
+    "url": "http://w3.jet.uk",
+    "tags": ["Work", "JET"]
+  },
+  {
+    "name": "Physics Summary",
+    "url": "https://users.euro-fusion.org/pages/physics-summary/LatestSession.php",
+    "tags": ["Work", "JET"]
+  },
+  {
+    "name": "JSPO Reports",
+    "url": "https://www.jspo.jet.uk/pages/operations/jpecreports_2023.html",
+    "tags": ["Work", "JET"]
+  },
+  {
+    "name": "DVCM Homepage",
+    "url": "https://dvcm.jetdata.eu/",
+    "tags": ["Work", "JET"]
+  },
+  {
+    "name": "JET Data Services",
+    "url": "https://data.jet.uk",
+    "tags": ["Work", "JET", "Data"]
+  },
+  {
+    "name": "PPF Query",
+    "url": "https://data.jet.uk/ppf/browse/ppfquery",
+    "tags": ["Work", "JET", "Data"]
+  },
+  {
+    "name": "ReqCo",
+    "url": "https://data.jet.uk/reqco/myrequests",
+    "tags": ["Work", "JET", "Data"]
+  },
+  {
+    "name": "Countdown Mimic",
+    "url": "http://webmimic.jet.uk/mc/codas/countdown",
+    "tags": ["Work", "JET", "Mimic"]
+  },
+  {
+    "name": "KS5 Mimic",
+    "url": "http://webmimic.jet.uk/DG/codas/ks5.mim.html",
+    "tags": ["Work", "JET", "Mimic"]
+  },
+  {
+    "name": "KT3 Mimic",
+    "url": "http://webmimic.jet.uk/DG/codas/kt3spec.mim.html",
+    "tags": ["Work", "JET", "Mimic"]
+  },
+  {
+    "name": "Users Page",
+    "url": "https://users.mastu.ukaea.uk/home",
+    "tags": ["Work", "MAST-U"]
+  },
+  {
+    "name": "Diagnostic Handbook",
+    "url": "https://intranet.ccfe.ac.uk/mastu-handbook",
+    "tags": ["Work", "MAST-U"]
+  },
+  {
+    "name": "Data Access and Tools",
+    "url": "https://users.mastu.ukaea.uk/data-access-and-tools",
+    "tags": ["Work", "MAST-U"]
+  },
+  {
+    "name": "Outlook Calendar",
+    "url": "https://outlook.office.com/calendar/view/workweek",
+    "tags": ["Work", "Office"]
+  },
+  {
+    "name": "Teams",
+    "url": "https://teams.microsoft.com/v2",
+    "tags": ["Work", "Office"]
+  },
+  {
+    "name": "OneDrive",
+    "url": "https://ukaeauk-my.sharepoint.com/personal/evie_litherland-smith_ukaea_uk/",
+    "tags": ["Work", "Office"]
+  },
+  {
+    "name": "Sharepoint",
+    "url": "https://ukaeauk.sharepoint.com/",
+    "tags": ["Work", "Office"]
+  },
+  {
+    "name": "NHS App",
+    "url": "https://www.nhsapp.service.nhs.uk/login",
+    "tags": ["Personal", "NHS"]
+  }
+]
diff --git a/flake.nix b/flake.nix
index 1f2a894..fc5b53b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -66,6 +66,7 @@
           package = packages.iosevka-custom-nerdfont;
         };
       };
+      bookmarks = builtins.fromJSON (builtins.readFile ./bookmarks.json);
     };
     defaultModules = {
       username ? "pixelifytica",
diff --git a/programs/firefox/bookmarks/bookmarks.json b/programs/firefox/bookmarks/bookmarks.json
deleted file mode 100644
index 5e8da49..0000000
--- a/programs/firefox/bookmarks/bookmarks.json
+++ /dev/null
@@ -1,203 +0,0 @@
-[
-  {
-    "name": "Social",
-    "bookmarks": [{ "name": "Mastodon", "url": "https://tech.lgbt" }]
-  },
-  {
-    "name": "Travel",
-    "bookmarks": [{ "name": "ABRP", "url": "https://abetterrouteplanner.com/" }]
-  },
-  {
-    "name": "Software",
-    "bookmarks": [
-      {
-        "name": "Git",
-        "bookmarks": [
-          {
-            "name": "Forgejo",
-            "url": "https://git.xenia.me.uk",
-            "tags": ["personal"]
-          },
-          { "name": "GitHub", "url": "https://github.com" },
-          {
-            "name": "CCFE GitLab",
-            "url": "https://git.ccfe.ac.uk",
-            "tags": ["work"]
-          }
-        ]
-      },
-      {
-        "name": "Documentation",
-        "bookmarks": [
-          {
-            "name": "Nix",
-            "bookmarks": [
-              {
-                "name": "NixOS and Flakes",
-                "url": "https://nixos-and-flakes.thiscute.world/"
-              },
-              {
-                "name": "Home Manager",
-                "url": "https://nix-community.github.io/home-manager/options.xhtml"
-              }
-            ]
-          },
-          { "name": "Emacs", "bookmarks": [] },
-          { "name": "Python", "bookmarks": [] },
-          { "name": "Lua", "bookmarks": [] }
-        ]
-      },
-      {
-        "name": "Repositories",
-        "bookmarks": [
-          {
-            "name": "Awesome Emacs",
-            "url": "https://github.com/emacs-tw/awesome-emacs"
-          },
-          {
-            "name": "Awesome Wayland",
-            "url": "https://github.com/natpen/awesome-wayland"
-          }
-        ]
-      }
-    ]
-  },
-  {
-    "name": "Wikis",
-    "bookmarks": [
-      {
-        "name": "NixOS Wiki",
-        "url": "https://nixos.wiki"
-      },
-      { "name": "Arch Wiki", "url": "https://wiki.archlinux.org" },
-      {
-        "name": "OpenWiki",
-        "bookmarks": [
-          {
-            "name": "Homepage",
-            "url": "https://wiki.jetdata.eu/open/index.php?title=Main_Page"
-          },
-          {
-            "name": "Diagnostic Coordinator",
-            "url": "https://wiki.jetdata.eu/open/index.php?title=Diagnostic_Coordinator_Wiki"
-          },
-          {
-            "name": "Spectroscopy Group",
-            "url": "https://wiki.jetdata.eu/open/index.php?title=Spectroscopy_Group:index"
-          },
-          {
-            "name": "KS5",
-            "url": "https://wiki.jetdata.eu/open/index.php?title=CXS:Topic3"
-          },
-          {
-            "name": "KT3",
-            "url": "https://wiki.jetdata.eu/open/index.php?title=KT3_Journals"
-          }
-        ]
-      }
-    ]
-  },
-  {
-    "name": "Work",
-    "bookmarks": [
-      { "name": "Nucleus", "url": "https://nucleus.ukaea.uk/" },
-      {
-        "name": "Marval",
-        "url": "https://marval.service.ukaea.uk/MSMSelfService/Index.aspx"
-      },
-      {
-        "name": "U4BW",
-        "url": "https://ubw.unit4cloud.com/uk_aea_prod_web/Login/Login.aspx"
-      },
-      { "name": "UKAEA Pinboard", "url": "https://pinboard.ukaea.uk/" },
-      { "name": "OPEN-ADAS", "url": "https://open.adas.ac.uk/" },
-      {
-        "name": "JET",
-        "bookmarks": [
-          { "name": "Homepage", "url": "http://w3.jet.uk" },
-          {
-            "name": "Physics Summary",
-            "url": "https://users.euro-fusion.org/pages/physics-summary/LatestSession.php"
-          },
-          {
-            "name": "JSPO Reports",
-            "url": "https://www.jspo.jet.uk/pages/operations/jpecreports_2023.html"
-          },
-          { "name": "DVCM Homepage", "url": "https://dvcm.jetdata.eu/" },
-          {
-            "name": "Data",
-            "bookmarks": [
-              {
-                "name": "JET Data Services",
-                "url": "https://data.jet.uk"
-              },
-              {
-                "name": "PPF Query",
-                "url": "https://data.jet.uk/ppf/browse/ppfquery"
-              },
-              {
-                "name": "ReqCo",
-                "url": "https://data.jet.uk/reqco/myrequests"
-              }
-            ]
-          },
-          {
-            "name": "Mimics",
-            "bookmarks": [
-              {
-                "name": "Countdown",
-                "url": "http://webmimic.jet.uk/mc/codas/countdown"
-              },
-              {
-                "name": "KS5",
-                "url": "http://webmimic.jet.uk/DG/codas/ks5.mim.html"
-              },
-              {
-                "name": "KT3",
-                "url": "http://webmimic.jet.uk/DG/codas/kt3spec.mim.html"
-              }
-            ]
-          }
-        ]
-      },
-      {
-        "name": "MAST-U",
-        "bookmarks": [
-          { "name": "Users Page", "url": "https://users.mastu.ukaea.uk/home" },
-          {
-            "name": "Diagnostic Handbook",
-            "url": "https://intranet.ccfe.ac.uk/mastu-handbook"
-          },
-          {
-            "name": "Data Access and Tools",
-            "url": "https://users.mastu.ukaea.uk/data-access-and-tools"
-          }
-        ]
-      },
-      {
-        "name": "Office",
-        "bookmarks": [
-          {
-            "name": "Outlook Calendar",
-            "url": "https://outlook.office.com/calendar/view/workweek"
-          },
-          {
-            "name": "Teams",
-            "url": "https://teams.microsoft.com/v2"
-          },
-          {
-            "name": "OneDrive",
-            "url": "https://ukaeauk-my.sharepoint.com/personal/evie_litherland-smith_ukaea_uk/"
-          },
-          { "name": "Sharepoint", "url": "https://ukaeauk.sharepoint.com/" }
-        ]
-      }
-    ]
-  },
-  {
-    "name": "Miscellaneous",
-    "bookmarks": [
-      { "name": "NHS App", "url": "https://www.nhsapp.service.nhs.uk/login" }
-    ]
-  }
-]
diff --git a/programs/firefox/bookmarks/default.nix b/programs/firefox/bookmarks/default.nix
deleted file mode 100644
index 2dd1c34..0000000
--- a/programs/firefox/bookmarks/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-lib: let
-  withTag = {
-    bookmarks,
-    tags,
-  }: (
-    map (x:
-      if (builtins.hasAttr "bookmarks" x)
-      then {
-        inherit (x) name;
-        toolbar = false;
-        bookmarks = withTag {
-          inherit (x) bookmarks;
-          tags = [(builtins.toString x.name)] ++ tags;
-        };
-      }
-      else {
-        inherit (x) name url;
-        tags = (x.tags or []) ++ tags;
-      })
-    bookmarks
-  );
-in (
-  withTag {
-    bookmarks = builtins.fromJSON (builtins.readFile ./bookmarks.json);
-    tags = [];
-  }
-)
diff --git a/programs/firefox/default.nix b/programs/firefox/default.nix
index 209e00b..586f3ff 100644
--- a/programs/firefox/default.nix
+++ b/programs/firefox/default.nix
@@ -1,6 +1,7 @@
 {
   lib,
   pkgs,
+  bookmarks,
   ...
 }: {
   programs = {
@@ -94,6 +95,7 @@
         StartDownloadsInTempDirectory = true;
       };
       profiles.default = {
+        inherit bookmarks;
         settings = {
           "app.shield.optoutstudies.enabled" = false;
           "browser.bookmarks.addedImportButton" = false;
@@ -126,13 +128,6 @@
             }
           ];
         };
-        bookmarks = [
-          {
-            name = "toplevel";
-            toolbar = true;
-            bookmarks = import ./bookmarks/default.nix lib;
-          }
-        ];
         search = rec {
           default = "DuckDuckGo";
           privateDefault = default;