diff --git a/user.js b/user.js
index f68ac14..f7ebd81 100644
--- a/user.js
+++ b/user.js
@@ -287,6 +287,9 @@ user_pref("network.gio.supported-protocols", ""); // [HIDDEN PREF]
 // Disable proxy direct failover for system requests [FF91+]
 // user_pref("network.proxy.failover_direct", false);
 // -------------------------------------
+// Disable proxy bypass for system request failures [FF95+]
+// user_pref("network.proxy.allow_bypass", false); // [HIDDEN PREF]
+// -------------------------------------
 // Disable DNS-over-HTTPS (DoH) rollout [FF60+]
 user_pref("network.trr.mode", 5);
 user_pref("network.trr.uri", "");
@@ -499,9 +502,6 @@ user_pref("network.http.referer.XOriginPolicy", 2);
 // Control the amount of cross-origin information to send [FF52+]
 // 0=send full URI (default), 1=scheme+host+port+path, 2=scheme+host+port
 user_pref("network.http.referer.XOriginTrimmingPolicy", 2);
-// -------------------------------------
-// Enable the DNT (Do Not Track) HTTP header
-// user_pref("privacy.donottrackheader.enabled", true);
 //
 // >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 // CONTAINERS
@@ -548,23 +548,6 @@ user_pref("media.eme.enabled", false);
 user_pref("media.autoplay.blocking_policy", 2);
 //
 // >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-// WEB WORKERS
-// >>>>>>>>>>>>>>>>>>>>>
-//
-// Disable service workers [FF32, FF44-compat]
-user_pref("dom.serviceWorkers.enabled", false);
-// -------------------------------------
-// Disable Web Notifications
-// user_pref("dom.webnotifications.enabled", false); // [FF22+]
-// user_pref("dom.webnotifications.serviceworker.enabled", false); // [FF44+]
-// -------------------------------------
-// Disable Push Notifications [FF44+]
-user_pref("dom.push.enabled", false);
-user_pref("dom.push.userAgentID", "");
-user_pref("dom.push.connection.enabled", false);
-user_pref("dom.push.serverURL", "");
-//
-// >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 // DOM (DOCUMENT OBJECT MODEL)
 // >>>>>>>>>>>>>>>>>>>>>
 //
@@ -579,6 +562,14 @@ user_pref("dom.disable_open_during_load", true);
 // -------------------------------------
 // Limit events that can cause a popup [SETUP-WEB]
 user_pref("dom.popup_allowed_events", "click dblclick mousedown pointerdown");
+// -------------------------------------
+// Disable Web Notifications
+// user_pref("dom.webnotifications.enabled", false); // [FF22+]
+// user_pref("dom.webnotifications.serviceworker.enabled", false); // [FF44+]
+// -------------------------------------
+// Disable Push Notifications [FF44+]
+user_pref("dom.push.enabled", false);
+user_pref("dom.push.userAgentID", "");
 //
 // >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 // MISCELLANEOUS
@@ -656,42 +647,14 @@ user_pref("extensions.postDownloadThirdPartyPrompt", false);
 // user_pref("extensions.webextensions.restrictedDomains", "");
 //
 // >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-// PERSISTENT STORAGE
+// ETP (ENHANCED TRACKING PROTECTION)
 // >>>>>>>>>>>>>>>>>>>>>
 //
-// Disable or isolate 3rd-party cookies and site-data [SETUP-WEB]
-// 0 = Accept cookies and site data
-// 1 = (Block) All third-party cookies
-// 2 = (Block) All cookies
-// 3 = (Block) Cookies from unvisited websites
-// 4 = (Block) Cross-site tracking cookies (default)
-// 5 = (Isolate All) Cross-site cookies (TCP: Total Cookie Protection / dFPI: dynamic FPI) [1] (FF86+)
-user_pref("network.cookie.cookieBehavior", 1);
-user_pref("browser.contentblocking.category", "custom");
+// Enable Enhanced Tracking Protection's (ETP) Strict Mode [FF86+]
+user_pref("browser.contentblocking.category", "strict");
 // -------------------------------------
-// Enable Enhanced Tracking Protection (ETP) in all windows
-user_pref("privacy.trackingprotection.enabled", false);
-user_pref("privacy.trackingprotection.origin_telemetry.enabled", false);
-user_pref("privacy.trackingprotection.annotate_channels", false);
-user_pref("privacy.trackingprotection.lower_network_priority", false);
-user_pref("privacy.trackingprotection.pbmode.enabled", false);
-user_pref("privacy.trackingprotection.cryptomining.enabled", false);
-user_pref("privacy.trackingprotection.fingerprinting.enabled", false);
-user_pref("privacy.trackingprotection.socialtracking.enabled", false);
-user_pref("privacy.trackingprotection.testing.report_blocked_node", false);
-user_pref("privacy.socialtracking.block_cookies.enabled", false);
-// -------------------------------------
-// Disable service worker cache and cache storage
-// user_pref("dom.caches.enabled", false);
-// -------------------------------------
-// Disable Storage API [FF51+]
-// user_pref("dom.storageManager.enabled", false);
-// -------------------------------------
-// Disable Storage Access API [FF65+]
-// user_pref("dom.storage_access.enabled", false);
-// -------------------------------------
-// Enable Local Storage Next Generation (LSNG) [FF65+]
-user_pref("dom.storage.next_gen", true); // [DEFAULT: true FF92+]
+// Enable state partitioning of service workers [FF96+]
+user_pref("privacy.partition.serviceWorkers", true);
 //
 // >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 // SHUTDOWN & SANITIZING
@@ -746,20 +709,6 @@ user_pref("privacy.cpd.cookies", false);
 user_pref("privacy.sanitize.timeSpan", 0);
 //
 // >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-// FPI (FIRST PARTY ISOLATION)
-// >>>>>>>>>>>>>>>>>>>>>
-//
-// Enable First Party Isolation [FF51+]
-user_pref("privacy.firstparty.isolate", true);
-// -------------------------------------
-// Enforce FPI restriction for window.opener [FF54+]
-// user_pref("privacy.firstparty.isolate.restrict_opener_access", true); // [DEFAULT: true]
-// user_pref("privacy.firstparty.isolate.block_post_message", true);
-// -------------------------------------
-// Enable scheme with FPI [FF78+]
-// user_pref("privacy.firstparty.isolate.use_site", true);
-//
-// >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 // RFP (RESIST FINGERPRINTING)
 // >>>>>>>>>>>>>>>>>>>>>
 //
@@ -913,6 +862,12 @@ user_pref("dom.targetBlankNoOpener.enabled", true); // [DEFAULT: true]
 // Enforce "window.name" protection [FF82+]
 user_pref("privacy.window.name.update.enabled", true); // [DEFAULT: true]
 // -------------------------------------
+// Enforce Local Storage Next Generation (LSNG) [FF65+]
+user_pref("dom.storage.next_gen", true); // [DEFAULT: true FF92+]
+// -------------------------------------
+// Enforce no First Party Isolation [FF51+]
+user_pref("privacy.firstparty.isolate", false); // [DEFAULT: false]
+// -------------------------------------
 // PrefsCleaner: reset previously active items removed from arkenfox FF92+
 // placeholder
 //
@@ -987,9 +942,22 @@ user_pref("security.ssl3.rsa_aes_256_sha", false); // no PFS
 // Disable System Add-on updates
 user_pref("extensions.systemAddon.update.enabled", false); // [FF62+]
 user_pref("extensions.systemAddon.update.url", ""); // [FF44+]
+// -------------------------------------
+// Enable the DNT (Do Not Track) HTTP header
+// user_pref("privacy.donottrackheader.enabled", true);
+// -------------------------------------
+// Customize ETP settings
+// user_pref("network.cookie.cookieBehavior", 5);
+// user_pref("privacy.trackingprotection.enabled", true);
+// user_pref("privacy.trackingprotection.socialtracking.enabled", true);
+// user_pref("privacy.trackingprotection.cryptomining.enabled", true); // [DEFAULT: true]
+// user_pref("privacy.trackingprotection.fingerprinting.enabled", true); // [DEFAULT: true]
+// -------------------------------------
+// Disable service workers [FF32, FF44-compat]
+// user_pref("dom.serviceWorkers.enabled", false);
 //
 // >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-// DON'T BOTHER: NON-RFP
+// DON'T BOTHER: FINGERPRINTING
 // >>>>>>>>>>>>>>>>>>>>>
 //
 // Disable APIs