diff --git a/home/nix/programs/firefox.nix b/home/nix/programs/firefox.nix
index 3935e18..61aba8c 100644
--- a/home/nix/programs/firefox.nix
+++ b/home/nix/programs/firefox.nix
@@ -14,8 +14,6 @@
   programs.firefox = {
     enable = true;
 
-    package = (nixGL pkgs.firefox);
-
     policies = {
       EnableTrackingProtection = {
         Value = true;
@@ -71,6 +69,7 @@
       };
 
       # Disable Password Manager
+      DisableMasterPasswordCreation = true;
       PasswordManagerEnabled = false;
       PrimaryPassword = false;
       OfferToSaveLogins = false;
@@ -197,6 +196,9 @@
           Value = "	about:home";
           Status = "locked";
         };
+        # autofill
+        "browser.autofill.enabled" = lock-false;
+        "browser.formfill.enable" = lock-false;
         # search enable
         "browser.urlbar.suggest.recentsearches" = lock-true;
         "browser.urlbar.suggest.bookmark" = lock-true;
@@ -231,13 +233,6 @@
         # graphics
         "dom.webgpu.enabled" = lock-true;
         "media.eme.enabled" = lock-true;
-        # tabs
-        "browser.tabs.inTitlebar" = {
-          Value = 0;
-          Status = "locked";
-        };
-        "browser.tabs.warnOnClose" = lock-true;
-        "browser.tabs.firefox-view" = lock-false;
         # user messaging
         "browser.newtabpage.activity-stream.feeds.section.topstories" = lock-false;
         "browser.newtabpage.activity-stream.feeds.snippets" = lock-false;
@@ -255,29 +250,38 @@
         "browser.safebrowsing.downloads.remote.block_uncommon" = lock-false;
         "browser.safebrowsing.downloads.remote.block_potentially_unwanted" = lock-false;
         # sidebar
-        "sidebar.revamp" = lock-true;
-        "sidebar.verticalTabs" = lock-true;
+        "browser.tabs.inTitlebar" = {
+          Value = 0;
+          Status = "locked";
+        };
+        "browser.tabs.warnOnClose" = lock-true;
+        "browser.tabs.firefox-view" = lock-false;
+              "sidebar.revamp" = {
+        Comment = "Preference not allowed for stability reasons.";
+        Status = "default";
+        Type = "boolean";
+        Value = true;
+      };
         "sidebar.main.tools" = {
           Value = "";
           Status = "locked";
         };
         "browser.tabs.closeTabByDblclick" = lock-true;
         "ui.key.menuAccessKeyFocuses" = lock-false;
+        # general settings
+        "general.autoScroll" = lock-false;
+        "general.smoothScroll" = lock-true;
+        "widget.gtk.overlay-scrollbars.enabled" = lock-false;
+        "accessibility.browsewithcaret" = lock-false;
+        "accessibility.typeaheadfind" = lock-false;
+        "media.hardwaremediakeys.enabled" = lock-true;
+        "browser.crashReports.unsubmittedCheck.autoSubmit2" = lock-false;
+        "browser.aboutConfig.showWarning" = lock-false;
       };
     };
 
     profiles = {
       "freya" = {
-        settings = {
-          # general settings
-          "general.autoScroll" = lock-false;
-          "general.smoothScroll" = lock-true;
-          "widget.gtk.overlay-scrollbars.enabled" = lock-false;
-          "accessibility.browsewithcaret" = lock-false;
-          "accessibility.typeaheadfind" = lock-false;
-          "media.hardwaremediakeys.enabled" = lock-true;
-          "browser.crashReports.unsubmittedCheck.autoSubmit2" = lock-false;
-        };
         search = {
           force = true;
           default = "DuckDuckGo";