diff --git a/config/mozilla.cfg b/config/mozilla.cfg
index 37b8428..cd50b8e 100644
--- a/config/mozilla.cfg
+++ b/config/mozilla.cfg
@@ -307,10 +307,16 @@ lockPref("network.gio.supported-protocols", ""); // [HIDDEN PREF]
 // Disable proxy bypass for system request failures [FF95+]
 // lockPref("network.proxy.allow_bypass", false);
 // -------------------------------------
-// Disable DNS-over-HTTPS (DoH) rollout [FF60+]
+// Disable DNS-over-HTTPS (DoH)[FF60+]
 defaultPref("network.trr.mode", 5);
-defaultPref("network.trr.uri", "");
 defaultPref("network.trr.confirmationNS", "");
+// -------------------------------------
+// Disable skipping DoH when parental controls are enabled [FF70+]
+defaultPref("network.dns.skipTRR-when-parental-control-enabled", false);
+// -------------------------------------
+// Disable skipping DoH when parental controls are enabled
+defaultPref("network.trr.uri", "");
+defaultPref("network.trr.custom_uri", "");
 //
 // >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 // LOCATION BAR / SEARCH BAR / SUGGESTIONS / HISTORY / FORMS
@@ -421,12 +427,6 @@ defaultPref("security.OCSP.require", false);
 //
 // CERTS / HPKP (HTTP Public Key Pinning)
 //
-// Disable Windows 8.1's Microsoft Family Safety cert [FF50+] [WINDOWS]
-// 0=disable detecting Family Safety mode and importing the root
-// 1=only attempt to detect Family Safety mode (don't import the root)
-// 2=detect Family Safety mode and import the root
-lockPref("security.family_safety.mode", 0);
-// -------------------------------------
 // Enable strict PKP (Public Key Pinning)
 // 0=disabled, 1=allow user MiTM (default; such as your antivirus), 2=strict
 defaultPref("security.cert_pinning.enforcement_level", 2);
@@ -700,9 +700,6 @@ lockPref("privacy.resistFingerprinting.block_mozAddonManager", true); // [HIDDEN
 // Experimental RFP [FF91+]
 // lockPref("privacy.resistFingerprinting.exemptedDomains", "*.example.invalid");
 // -------------------------------------
-// Set RFP's font visibility level [FF94+]
-// lockPref("layout.css.font-visibility.resistFingerprinting", 1); // [DEFAULT: 1]
-// -------------------------------------
 // Disable using system colors
 lockPref("browser.display.use_system_colors", false); // [DEFAULT: false NON-WINDOWS]
 // -------------------------------------
@@ -844,6 +841,9 @@ defaultPref("browser.eme.ui.enabled", false);
 // Control when to send a cross-origin referer
 // * 0=always (default), 1=only if base domains match, 2=only if hosts match
 // defaultPref("network.http.referer.XOriginPolicy", 2);
+// -------------------------------------
+// Set DoH bootstrap address [FF89+]
+// defaultPref("network.trr.bootstrapAddr", "10.0.0.1") // [HIDDEN PREF]
 //
 // >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 // DON'T TOUCH
@@ -991,9 +991,8 @@ defaultPref("privacy.query_stripping.strip_list", "__hsfp __hssc __hstc __s _hse
 // Disable service workers
 // lockPref("dom.serviceWorkers.enabled", false);
 // -------------------------------------
-// Disable Web Notifications
-// lockPref("dom.webnotifications.enabled", false); // [FF22+]
-// lockPref("dom.webnotifications.serviceworker.enabled", false); // [FF44+]
+// Disable Web Notifications [FF22+]
+// lockPref("dom.webnotifications.enabled", false);
 // -------------------------------------
 // Disable Push Notifications [FF44+]
 defaultPref("dom.push.enabled", false);
@@ -1160,4 +1159,19 @@ defaultPref("network.cookie.lifetimePolicy", 2);
 //
 // Disable offline cache (appCache)
 // defaultPref("browser.cache.offline.enable", false);
-//
\ No newline at end of file
+//
+// ESR115.x still uses all the following prefs
+//
+// FF116
+//
+// Set RFP's font visibility level [FF94+]
+// defaultPref("layout.css.font-visibility.resistFingerprinting", 1); // [DEFAULT: 1]
+//
+// FF117
+//
+// Disable Windows Microsoft Family Safety cert [FF50+] [WINDOWS]
+defaultPref("security.family_safety.mode", 0);
+// -------------------------------------
+// Disable service worker Web Notifications [FF44+]
+// defaultPref("dom.webnotifications.serviceworker.enabled", false);
+//