diff --git a/modules/home-manager/web/firefox/conf/extensions.nix b/modules/home-manager/web/firefox/conf/extensions.nix
index 23d833d..94957a0 100644
--- a/modules/home-manager/web/firefox/conf/extensions.nix
+++ b/modules/home-manager/web/firefox/conf/extensions.nix
@@ -20,4 +20,5 @@
 
 # Deacticate extensions auto-update
   "extensions.update.enabled" = false;
+  "extensions.update.autoUpdateDefault" = false;
 }
diff --git a/modules/home-manager/web/firefox/conf/theme.nix b/modules/home-manager/web/firefox/conf/theme.nix
index 94e8e94..4f61bfe 100644
--- a/modules/home-manager/web/firefox/conf/theme.nix
+++ b/modules/home-manager/web/firefox/conf/theme.nix
@@ -11,7 +11,7 @@
   "browser.newtabpage.activity-stream.showSponsoredTopSites" = false;
   "browser.newtabpage.activity-stream.showSponsored" = false;
 
-# Mozilla messages and recommandations
+# Mozilla messages and recommendations
   "browser.messaging-system.whatsNewPanel.enabled" = false;
   "browser.newtabpage.activity-stream.asrouter.userprefs.cfr.addons" = false;
   "browser.newtabpage.activity-stream.asrouter.userprefs.cfr.features" = false;
@@ -22,15 +22,50 @@
   "signon.rememberSignons" = false;
 
 # do not override status page
- "startup.homepage_override_url" = "";
- "startup.homepage_welcome_url" = "";
+  "startup.homepage_override_url" = "";
+  "startup.homepage_welcome_url" = "";
 
 # do not show bookmark page
- "browser.toolbars.bookmarks.visibility" = "never";
+  "browser.toolbars.bookmarks.visibility" = "never";
 
-# disable funsking malwares
- "browser.newtabpage.activity-stream.improvesearch.topSiteSearchShortcuts.havePinned" = "";
- "browser.newtabpage.activity-stream.improvesearch.topSiteSearchShortcuts.searchEngines" = "";
- "browser.newtabpage.activity-stream.improvesearch.topSiteSearchShortcuts" = false;
- "browser.newtabpage.pinned" = "";
+# disable fucking included malwares
+  "browser.newtabpage.activity-stream.improvesearch.topSiteSearchShortcuts.havePinned" = "";
+  "browser.newtabpage.activity-stream.improvesearch.topSiteSearchShortcuts.searchEngines" = "";
+  "browser.newtabpage.activity-stream.improvesearch.topSiteSearchShortcuts" = false;
+  "browser.newtabpage.pinned" = "";
+
+# Theme customization
+  "browser.uiCustomization.state" = builtins.toJSON {
+    currentVersion = 20;
+    newElementCount = 4;
+    dirtyAreaCache = ["nav-bar" "PersonalToolbar" "toolbar-menubar" "TabsToolbar" "widget-overflow-fixed-list"];
+    placements = {
+      PersonalToolbar = [];
+      TabsToolbar = [
+        "tabbrowser-tabs"
+        "ublock0_raymondhill_net-browser-action"
+        "addon_darkreader_org-browser-action"
+        "cookieautodelete_kennydo_com-browser-action"
+        "jid1-mnnxcxisbpnsxq_jetpack-browser-action"
+        "downloads-button"
+      ];
+      nav-bar = [
+        "back-button"
+        "forward-button"
+        "stop-reload-button"
+        "urlbar-container"
+        "unified-extensions-button"
+      ];
+      toolbar-menubar = ["menubar-items"];
+      unified-extensions-area = [
+        "browserpass_maximbaz_com-browser-action"
+        "gdpr_cavi_au_dk-browser-action"
+        "cookieautodelete_kennydo_com-browser-action"
+        "addon_darkreader_org-browser-action"
+        "jid1-bofifl9vbdl2zq_jetpack-browser-action"
+      ];
+      widget-overflow-fixed-list = [];
+    };
+    seen = ["save-to-pocket-button" "developer-button" "ublock0_raymondhill_net-browser-action" "_testpilot-containers-browser-action"];
+  };
 }
diff --git a/modules/home-manager/web/firefox/conf/tracking.nix b/modules/home-manager/web/firefox/conf/tracking.nix
index b4e4ae4..2b99b1c 100644
--- a/modules/home-manager/web/firefox/conf/tracking.nix
+++ b/modules/home-manager/web/firefox/conf/tracking.nix
@@ -9,17 +9,19 @@
   # Enable resistFingerprinting
   # But override CSSPrefersColorScheme to actovate theme detection
   # https://github.com/allo-/ffprofile/issues/56#issuecomment-2076293964
-  # privacy."privacy.resistFingerprinting" must be disable because replaced by
-  # "privacy.resistFingerprinting"
-  "privacy.fingerprintingProtection" = false;
-  "privacy.fingerprintingProtection.pbmode" = false;
+  "privacy.fingerprintingProtection" = true;
+  "privacy.fingerprintingProtection.pbmode" = true;
+  "privacy.fingerprintingProtection.overrides" = "+AllTargets,-CSSPrefersColorScheme";
 
-  "privacy.resistFingerprinting" = true;
-  "privacy.resistFingerprinting.pbmode" = true;
-  "privacy.resistFingerprinting.overrides" = "+AllTargets, -CSSPrefersColorScheme";
-  # "privacy.resistFingerprinting.letterboxing" = true;
-  "privacy.resistFingerprinting.block_mozAddonManager" = true;
-  "privacy.resistFingerprinting.randomDataOnCanvasExtract" = true;
+  # resistFingerprinting come from Tor Browser and have a significant impact on
+  # browsing o need to disable it for now, instead, activating privacy badger
+  # seems to be a better idea
+  # "privacy.resistFingerprinting" = true;
+  # "privacy.resistFingerprinting.pbmode" = true;
+  # "privacy.resistFingerprinting.overrides" = "+AllTargets,-CSSPrefersColorScheme";
+  # # "privacy.resistFingerprinting.letterboxing" = true;
+  # "privacy.resistFingerprinting.block_mozAddonManager" = true;
+  # "privacy.resistFingerprinting.randomDataOnCanvasExtract" = true;
 
   # Enable Mozilla Trackingprotection
   # Firefox has a builtin tracking protection
diff --git a/modules/home-manager/web/firefox/default.nix b/modules/home-manager/web/firefox/default.nix
index 5ae7bd9..466c310 100644
--- a/modules/home-manager/web/firefox/default.nix
+++ b/modules/home-manager/web/firefox/default.nix
@@ -18,6 +18,7 @@ in
           decentraleyes
           tridactyl
           ublock-origin
+          privacy-badger
         ];
       description = "Base Firefox Plugins to install";
     };