diff --git a/hosts/midas/default.nix b/hosts/midas/default.nix
index 85422585..f93f0267 100644
--- a/hosts/midas/default.nix
+++ b/hosts/midas/default.nix
@@ -13,6 +13,7 @@
 
   networking = {
     hostName = "midas";
+    domain = "mx.nixfox.ca";
     hostId = "38ba3f57";
   };
 
diff --git a/modules/home/programs/gui/librewolf/default.nix b/modules/home/programs/gui/librewolf/default.nix
index 9db6e348..cc47b036 100644
--- a/modules/home/programs/gui/librewolf/default.nix
+++ b/modules/home/programs/gui/librewolf/default.nix
@@ -52,7 +52,7 @@
             "NixPKGs"
             "MyNixOS"
             "YouTube"
-	    "Spotify"
+            "Spotify"
           ];
           engines = {
             "Ecosia" = {
@@ -107,53 +107,43 @@
             };
           };
         };
-        commonBookmarks = [
-          {
-            name = "NixFox";
-            url = "https://nixfox.ca";
-          }
-          {
-            name = "Corn";
-            url = "https://freecorn1854.win";
-          }
-          {
-            name = "Luna";
-            url = "https://www.lunamoonlight.xyz";
-          }
-          {
-            name = "Kernel";
-            url = "https://www.kernel.org";
-          }
-        ];
         commonSettings = {
-          "general.autoScroll" = true;
+          # Generic
+          "browser.download.useDownloadDir" = true;
+          "browser.shell.checkDefaultBrowser" = false;
+          "browser.startup.page" = 3;
+          "browser.urlbar.speculativeConnect.enabled" = false;
 
+          # Hardware tweaks
+          "clipboard.autocopy" = false;
+          "general.autoScroll" = true;
+          "middlemouse.paste" = false;
+          "toolkit.tabbox.switchByScrolling" = true;
+          "webgl.disabled" = false;
+
+          # Fonts
           "font.name.serif.x-western" = config.look.fonts.main;
           "font.name.sans-serif.x-western" = config.look.fonts.main;
           "font.name.monospace.x-western" = config.look.fonts.nerd;
 
-          "browser.uidensity" = 1;
-          "browser.compactmode.show" = true;
-          "browser.send_pings" = false;
-          "browser.shell.checkDefaultBrowser" = false;
-          "browser.toolbars.bookmarks.visibility" = "never";
-          "browser.contentblocking.category" = "strict";
-          "browser.helperApps.deleteTempFileOnExit" = true;
-          "browser.search.separatePrivateDefault" = false;
-          "browser.download.useDownloadDir" = true;
+          # Theming and visibility
           "browser.aboutConfig.showWarning" = false;
-          "browser.startup.page" = 3;
+          "browser.compactmode.show" = true;
+          "browser.tabs.inTitlebar" = 0;
           "browser.theme.content-theme" = 0;
           "browser.theme.toolbar-theme" = 0;
-          "browser.newtabpage.enabled" = false;
-          "browser.newtabpage.activity-stream.showSponsoredTopSites" = false;
+          "browser.toolbars.bookmarks.visibility" = "never";
+          "browser.uidensity" = 1;
+          "extensions.activeThemeID" = "firefox-compact-dark@mozilla.org";
+          "toolkit.legacyUserProfileCustomizations.stylesheets" = true;
+
+          # New tab
           "browser.newtabpage.activity-stream.asrouter.userprefs.cfr.addons" = false;
           "browser.newtabpage.activity-stream.asrouter.userprefs.cfr.features" = false;
-          "browser.tabs.inTitlebar" = 0;
-          "browser.tabs.closeWindowWithLastTab" = false;
-          "browser.urlbar.speculativeConnect.enabled" = false;
-          "browser.discovery.enabled" = false;
+          "browser.newtabpage.activity-stream.showSponsoredTopSites" = false;
+          "browser.newtabpage.enabled" = false;
 
+          # Safe browsing
           "browser.safebrowsing.downloads.enabled" = false;
           "browser.safebrowsing.downloads.remote.enabled" = false;
           "browser.safebrowsing.downloads.remote.block_uncommon" = false;
@@ -166,57 +156,59 @@
           "browser.safebrowsing.provider.google.gethashURL" = false;
           "browser.safebrowsing.provider.google.updateURL" = false;
 
+          # Extensions
           "extensions.pocket.enabled" = false;
-          "extensions.autoDisableScopes" = 0;
-          "extensions.activeThemeID" = "firefox-compact-dark@mozilla.org";
           "extensions.formautofill.addresses.enabled" = false;
           "extensions.formautofill.creditCards.enabled" = false;
           "extensions.getAddons.showPane" = false;
-          "extensions.webservice.discoverURL" = "";
-          "extensions.getAddons.discovery.api_url" = "";
           "extensions.htmlaboutaddons.discover.enabled" = false;
           "extensions.htmlaboutaddons.recommendations.enabled" = false;
 
-          "toolkit.legacyUserProfileCustomizations.stylesheets" = true;
-          "toolkit.tabbox.switchByScrolling" = true;
+          # Force extensions to work
+          "extensions.autoDisableScopes" = 0;
+          "extensions.enabledScopes" = 15;
 
+          # Privacy
           "privacy.resistFingerprinting" = true;
-          "privacy.resistFingerprinting.autoDeclineNoUserInputCanvasPrompts" = true;
+          "privacy.firstparty.isolate" = true;
           "privacy.fingerprintingProtection" = true;
           "privacy.globalprivacycontrol.enabled" = true;
           "privacy.globalprivacycontrol.functionality.enabled" = true;
           "privacy.clearOnShutdown.cookies" = false;
           "privacy.clearOnShutdown_v2.cookiesAndStorage" = false;
 
+          # Tracking URL blocking
           "urlclassifier.trackingSkipURLs" = "*.reddit.com, *.twitter.com, *.twimg.com, *.tiktok.com";
           "urlclassifier.features.socialtracking.skipURLs" = "*.instagram.com, *.twitter.com, *.twimg.com";
 
-          "network.trr.mode" = 3;
-          "network.trr.uri" = "https://wikimedia-dns.org/dns-query";
+          # Network tracking
+          "browser.contentblocking.category" = "strict";
           "network.cookie.cookieBehavior" = 1;
           "network.cookie.sameSite.noneRequiresSecure" = true;
           "network.http.referer.XOriginPolicy" = 2;
           "network.http.referer.XOriginTrimmingPolicy" = 2;
           "network.http.referer.trimmingPolicy" = 2;
+          "network.trr.mode" = 3;
+          "network.trr.uri" = "https://wikimedia-dns.org/dns-query";
 
-          "dom.private-attribution.submission.enabled" = false;
-          "dom.battery.enabled" = false;
+          # HTTPS upgrading
           "dom.security.https_only_mode" = true;
-          "dom.security.https_only_mode.upgrade_local" = true;
           "dom.security.https_only_mode_ever_enabled" = true;
           "dom.security.https_only_mode_ever_enabled_pbm" = true;
 
-          "clipboard.autocopy" = false;
-          "middlemouse.paste" = false;
-
-          "identity.fxaccounts.enabled" = false;
-          "datareporting.healthreport.uploadEnabled" = false;
-          "svg.context-properties.content.enabled" = true;
-          "services.sync.engine.addresses.available" = false;
+          # Sensors
           "device.sensors.motion.enabled" = false;
+          "dom.battery.enabled" = false;
+          "dom.private-attribution.submission.enabled" = false;
+
+          # Telemetry
+          "browser.discovery.enabled" = false;
+          "browser.send_pings" = false;
+          "datareporting.healthreport.uploadEnabled" = false;
+          "identity.fxaccounts.enabled" = false;
           "security.OCSP.require" = true;
-          "gnomeTheme.hideSingleTab" = true;
-          "webgl.disabled" = false;
+          "services.sync.engine.addresses.available" = false;
+          "svg.context-properties.content.enabled" = true;
         };
       in {
         Main = {
@@ -224,7 +216,6 @@
           isDefault = true;
           extensions = commonExtensions;
           search = commonSearch;
-          bookmarks = commonBookmarks;
           settings = commonSettings;
           userChrome = ''
             ${themeMain}
@@ -236,7 +227,6 @@
           id = 1;
           extensions = commonExtensions;
           search = commonSearch;
-          bookmarks = commonBookmarks;
           settings = commonSettings;
           userChrome = ''
             ${themeAlt}