diff --git a/home/nyxt/bookmarks.lisp b/home/nyxt/bookmarks.lisp
index c7a1387d..54b8c641 100644
--- a/home/nyxt/bookmarks.lisp
+++ b/home/nyxt/bookmarks.lisp
@@ -1,5 +1,8 @@
 (
  ;; Home
+ ( :url "https://mozilla.github.io/policy-templates/"
+   :title "Mozilla Policy Templates"
+   :tags ("Home"))
  ( :url "https://chromeenterprise.google/policies/"
    :title "Chrome Enterprise policy list and management | Documentation"
    :tags ("Home"))
diff --git a/home/waybar/default.nix b/home/waybar/default.nix
index 290d275c..4a0b44b6 100644
--- a/home/waybar/default.nix
+++ b/home/waybar/default.nix
@@ -38,9 +38,7 @@
           "(.*) - GNU Emacs at (.*)" = "  $1 [$2]";
           "Alacritty" = " ";
           "Nyxt - (.*)" = "󰀹  $1";
-          "(.*) - qutebrowser" = "󰀹  $1";
           "(.*) — Mozilla Firefox" = "󰈹  $1";
-          "(.*) - Chromium" = "󰊯  $1";
           ".*WebCord (.*)" = "󰙯  $1";
           "[Ss]team" = "󰓓 ";
           "(.*) - mpv" = "󰦟  $1";
diff --git a/system/chromium.nix b/system/chromium.nix
index 7ea49918..548d9818 100644
--- a/system/chromium.nix
+++ b/system/chromium.nix
@@ -1,13 +1,9 @@
-{pkgs, ...}: {
-  environment.systemPackages = [pkgs.ungoogled-chromium];
+{...}: {
   programs.chromium = {
     enable = true;
     defaultSearchProviderEnabled = true;
     defaultSearchProviderSearchURL = "https://search.atlas.engineer/searxng/search?q={searchTerms}";
     defaultSearchProviderSuggestURL = "https://duckduckgo.com/?q={searchTerms}";
-    # extensions = [
-    #   "cjpalhdlnbpafiamejdnhcphjbkeiagm" # ublock origin
-    # ];
     extraOpts = {
       "BrowserSignin" = 0;
       "ClearBrowsingDataOnExitList" = [
@@ -17,8 +13,8 @@
         "cached_images_and_files"
         "password_signin"
         "autofill"
-        # "site_settings"
-        # "hosted_app_data"
+        "site_settings"
+        "hosted_app_data"
       ];
       "DefaultBrowserSettingEnabled" = false;
       "DeviceAutoUpdateDisabled" = true;
diff --git a/system/firefox.nix b/system/firefox.nix
index 69e2cd2b..cb34de8f 100644
--- a/system/firefox.nix
+++ b/system/firefox.nix
@@ -3,25 +3,46 @@
     enable = true;
     languagePacks = ["en-GB"];
     policies = {
+      BlockAboutProfiles = true;
+      Containers = {
+        Default = [
+          {
+            name = "Personal";
+            icon = "fingerprint";
+            color = "purple";
+          }
+          {
+            name = "Work";
+            icon = "briefcase";
+            color = "blue";
+          }
+        ];
+      };
       Cookies = {
         Behavior = "reject-tracker-and-partition-foreign";
+        BehaviorPrivateBrowsing = "reject";
         Locked = true;
       };
+      DefaultDownloadDirectory = "\${home}/Downloads";
       DisableAppUpdate = true;
-      DisableBuiltinPDFViewer = true;
+      # DisableBuiltinPDFViewer = true;
       DisableFirefoxAccounts = true;
+      DisableFirefoxScreenshots = true;
       DisableFirefoxStudies = true;
+      DisableFormHistory = true;
+      DisablePocket = true;
       DisableProfileImport = true;
       DisableSetDesktopBackground = true;
       DisableSystemAddonUpdate = true;
       DisableTelemetry = true;
       DisplayBookmarksToolbar = "newtab";
       DisplayMenuBar = "default-off";
+      DontCheckDefaultBrowser = true;
       EnableTrackingProtection = {
         Value = true;
+        Locked = true;
         Cryptomining = true;
         Fingerprinting = true;
-        EmailTracking = true;
       };
       ExtensionSettings = {
         "queryamoid@kaply.com" = {
@@ -40,7 +61,7 @@
       };
       FirefoxHome = {
         Search = true;
-        TopSites = true;
+        TopSites = false;
         SponsoredTopSites = false;
         Highlights = false;
         Pocket = false;
@@ -48,7 +69,18 @@
         Snippets = false;
         Locked = true;
       };
+      FirefoxSuggest = {
+        WebSuggestions = false;
+        SponsoredSuggestions = false;
+        ImproveSuggest = false;
+        Locked = true;
+      };
+      HardwareAcceleration = true;
+      Homepage = {
+        Locked = true;
+      };
       ManagedBookmarks = [
+        # TODO update these
         {toplevel_name = "Managed Bookmarks";}
         {
           name = "Server";
@@ -114,12 +146,32 @@
           ];
         }
       ];
+      NewTabPage = false;
       NoDefaultBookmarks = true;
       OfferToSaveLogins = false;
       PasswordManagerEnabled = false;
+      PDFjs = {Enabled = false;};
+      Permissions = {
+        Autoplay = {
+          Default = "block-audio-video";
+        };
+      };
+      PictureInPicture = {Enabled = true;};
       PopupBlocking = {Default = true;};
+      Preferences = {};
       RequestedLocales = ["en-GB"];
-      SearchEngines = {Default = "DuckDuckGo";};
+      SanitizeOnShutdown = {
+        Cache = true;
+        Cookies = true;
+        Downloads = true;
+        FormData = true;
+        History = true;
+        Sessions = true;
+        SiteSettings = false;
+        OfflineApps = false;
+        Locked = true;
+      };
+      SearchBar = "unified";
       ShowHomeButton = false;
       StartDownloadsInTempDirectory = true;
     };
diff --git a/system/hyprland.nix b/system/hyprland.nix
index 5e73e9a0..69e8e52e 100644
--- a/system/hyprland.nix
+++ b/system/hyprland.nix
@@ -1,5 +1,5 @@
 {pkgs, ...}: {
-  imports = [./desktop.nix ./chromium.nix];
+  imports = [./desktop.nix ./firefox.nix ./chromium.nix];
   nixpkgs.config.chromium.commandLineArgs = "--enable-features=UseOzonePlatform --ozone-platform=wayland";
   environment = {
     sessionVariables = {
@@ -38,7 +38,7 @@
     emacs = ["emacsclient.desktop" "emacs.desktop"];
     # TODO add nyxt back to browser when I can fix opening
     # links in existing sessions
-    browser = ["chromium-browser.desktop"]; # nyxt.desktop
+    browser = ["firefox.desktop"]; # nyxt.desktop
     applications = {
       "inode/directory" = emacs;
       "inode/symlink" = emacs;