diff --git a/user.js b/user.js
index 808453f..d578920 100644
--- a/user.js
+++ b/user.js
@@ -334,14 +334,17 @@ user_pref("browser.discovery.enabled", false); // [DEFAULT: false]
 // -------------------------------------
 // Pref : Disable Crash Reports
 user_pref("breakpad.reportURL", "");
+user_pref("browser.tabs.crashReporting.email", ""); // [DESKTOP]
+user_pref("browser.tabs.crashReporting.emailMe", false); // [DESKTOP]
+user_pref("browser.tabs.crashReporting.includeURL", false); // [DESKTOP]
+user_pref("browser.tabs.crashReporting.requestEmail", false); // [DESKTOP]
 user_pref("browser.tabs.crashReporting.sendReport", false); // [DESKTOP]
 user_pref("browser.crashReports.unsubmittedCheck.enabled", false); // [DESKTOP]
 user_pref("toolkit.crashreporter.infoURL", ""); // [DESKTOP]
 // -------------------------------------
 // Pref : Disable automatic captive portal detection
-// https://en.wikipedia.org/wiki/Captive_portal
+// https://www.eff.org/deeplinks/2017/08/how-captive-portals-interfere-wireless-security-and-privacy
 // https://wiki.mozilla.org/Necko/CaptivePortal
-// https://trac.torproject.org/projects/tor/ticket/21790
 user_pref("captivedetect.canonicalURL", "");
 user_pref("network.captive-portal-service.enabled", false);
 user_pref("network.captive-portal-service.backoffFactor", "");
@@ -403,7 +406,7 @@ user_pref("browser.contentblocking.rejecttrackers.reportBreakage.enabled", false
 // -------------------------------------
 // Pref : Disable send content blocking log to about:protections
 // https://bugzilla.mozilla.org/show_bug.cgi?id=1549832
-user_pref("browser.contentblocking.database.enabled", false);
+user_pref("browser.contentblocking.database.enabled", false); // [DESKTOP]
 // -------------------------------------
 // Pref : Onboarding tour disable because of included telemetry
 // [NOTE] This setting is just in case it comeback
@@ -436,6 +439,7 @@ user_pref("layout.spellcheckDefault", 0); // [DESKTOP]
 // Pref : Disable Firefox internal page warnings
 user_pref("network.warnOnAboutNetworking", false);
 user_pref("general.warnOnAboutConfig", false);
+user_pref("browser.aboutConfig.showWarning", false);  // [DESKTOP]
 // -------------------------------------
 // Pref : Disable recent Highlights in the Library
 user_pref("browser.library.activity-stream.enabled", false); // [DESKTOP]
@@ -444,6 +448,7 @@ user_pref("browser.library.activity-stream.enabled", false); // [DESKTOP]
 user_pref("browser.tabs.warnOnClose", false);   // [DESKTOP]
 user_pref("browser.tabs.warnOnCloseOtherTabs", false); // [DESKTOP]
 user_pref("browser.tabs.warnOnOpen", false);  // [DESKTOP]
+user_pref("browser.warnOnQuit", false);  // [DESKTOP]
 // -------------------------------------
 // Pref : Disable warnings by entering full screen mode
 user_pref("full-screen-api.warning.delay", 0);
@@ -491,6 +496,7 @@ user_pref("dom.keyboardevent.keypress.hack.use_legacy_keycode_and_charcode", "")
 user_pref("startup.homepage_welcome_url", ""); // [DESKTOP]
 user_pref("startup.homepage_welcome_url.additional", ""); // [DESKTOP]
 user_pref("startup.homepage_override_url", ""); // [DESKTOP]
+user_pref("browser.search.param.yahoo-fr", ""); // [DESKTOP]
 // -------------------------------------
 // Pref : Devtools cleanup
 user_pref("devtools.devices.url", "");
@@ -520,6 +526,12 @@ user_pref("general.useragent.updates.enabled", false); // [FENNEC]
 user_pref("general.useragent.site_specific_overrides", false); // [DESKTOP]
 user_pref("general.useragent.updates.url", ""); // [FENNEC]
 // -------------------------------------
+// Pref : Decrease vendor useragent info leakage to Mozilla
+// https://github.com/pyllyukko/user.js/issues/299
+user_pref("general.useragent.vendor", ""); // [DESKTOP]
+user_pref("general.useragent.vendorComment", ""); // [DESKTOP]
+user_pref("general.useragent.vendorSub", ""); // [DESKTOP]
+// -------------------------------------
 // Pref : Disable mailnews
 user_pref("mailnews.messageid_browser.url", ""); // [DESKTOP]
 user_pref("mailnews.mx_service_url", ""); // [DESKTOP]
@@ -540,8 +552,16 @@ user_pref("_config.applied", true);
 user_pref("extensions.update.enabled", true);
 user_pref("extensions.autoupdate.enabled", true);
 // -------------------------------------
+// Pref : Decrease system information leakage to Mozilla extensions update servers
+user_pref("extensions.update.url", "https://versioncheck-bg.addons.mozilla.org/update/VersionCheck.php?reqVersion=%REQ_VERSION%&id=%ITEM_ID%&version=%ITEM_VERSION%&maxAppVersion=%ITEM_MAXAPPVERSION%&status=%ITEM_STATUS%&appID=%APP_ID%&appVersion=%APP_VERSION%&appOS=%APP_OS%&appABI=%APP_ABI%&locale=en-US&currentAppVersion=%CURRENT_APP_VERSION%&updateType=%UPDATE_TYPE%&compatMode=%COMPATIBILITY_MODE%"); // [URL SANITIZED]
+user_pref("extensions.update.background.url", "https://versioncheck-bg.addons.mozilla.org/update/VersionCheck.php?reqVersion=%REQ_VERSION%&id=%ITEM_ID%&version=%ITEM_VERSION%&maxAppVersion=%ITEM_MAXAPPVERSION%&status=%ITEM_STATUS%&appID=%APP_ID%&appVersion=%APP_VERSION%&appOS=%APP_OS%&appABI=%APP_ABI%&locale=en-US&currentAppVersion=%CURRENT_APP_VERSION%&updateType=%UPDATE_TYPE%&compatMode=%COMPATIBILITY_MODE%"); // [URL SANITIZED]
+// -------------------------------------
 // Pref : Decrease system information leakage to Mozilla addons update servers
-user_pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/android/search?q=%TERMS%"); // [URL SANITIZED]
+user_pref("extensions.getAddons.browseAddons", "https://addons.mozilla.org/en-US/firefox/collections/4757633/mob/?page=1&collection_sort=-popularity"); // [URL SANITIZED] // [FENNEC]
+user_pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/api/v3/addons/search/?guid=%IDS%&lang=en-US"); // [URL SANITIZED]
+user_pref("extensions.getAddons.link.url", "https://addons.mozilla.org/en-US/firefox/"); // [URL SANITIZED]
+user_pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/en-US/android/search?q=%TERMS%&platform=%OS%&appver=%VERSION%"); // [URL SANITIZED]
+user_pref("extensions.getAddons.compatOverides.url", "https://services.addons.mozilla.org/api/v3/addons/compat-override/?guid=%IDS%&lang=en-US"); // [URL SANITIZED]
 // -------------------------------------
 // Pref : Disable Web Compatibility Reporter
 // Web Compatibility Reporter adds a "Report Site Issue" button to send data to Mozilla
@@ -932,10 +952,10 @@ user_pref("dom.targetBlankNoOpener.enabled", true); // [DEFAULT: false]
 // Value taken from Tor Browser
 // https://bugzilla.mozilla.org/show_bug.cgi?id=583181
 user_pref("general.buildID.override", "20100101");
-user_pref("browser.startup.homepage_override.buildID", "20100101");
-user_pref("media.gmp-manager.buildID", "20190307010101"); // [DESKTOP]
-user_pref("extensions.lastAppBuildID", "20190307010101");
-user_pref("browser.sessionstore.upgradeBackup.latestBuildID", "20190307010101"); // [DESKTOP]
+user_pref("browser.startup.homepage_override.buildID", "20190307050101");
+user_pref("media.gmp-manager.buildID", "20190307050101"); // [DESKTOP]
+user_pref("extensions.lastAppBuildId", "20190307050101");
+user_pref("browser.sessionstore.upgradeBackup.latestBuildID", ""); // [DESKTOP]
 // -------------------------------------
 // Pref : Disable raw TCP socket support (mozTCPSocket)
 // https://trac.torproject.org/projects/tor/ticket/18863
@@ -1001,17 +1021,17 @@ user_pref("dom.imagecapture.enabled", false); // [DEFAULT: false]
 user_pref("gfx.offscreencanvas.enabled", false); // [DEFAULT: false]
 // -------------------------------------
 // Pref : Disable autoplay of HTML5 media
-// 0=Allowed, 1=Blocked, 2=Prompt
+// 0=Allow Audio and Video, 1=Block Audio, 5=Block Audio and Video
 // [NOTE] You can set exceptions under site permissions
-user_pref("media.autoplay.default", 1);
-user_pref("media.autoplay.allow-muted", false); // [DEFAULT: true]
+user_pref("media.autoplay.default", 5);
+user_pref("media.autoplay.allow-muted", false);
 user_pref("media.autoplay.block-event.enabled", true); // [DEFAULT: false]
 user_pref("media.autoplay.block-webaudio", true); // [DEFAULT: false]
 // -------------------------------------
 // Pref : Disable autoplay of HTML5 media if you interacted with the site
 user_pref("media.autoplay.enabled.user-gestures-needed", true); // [DEFAULT: true]
 // -------------------------------------
-// Pref : Disable audio autoplay in non-active tabs
+// Pref : Disable autoplay of HTML5 media in non-active tabs
 // https://www.ghacks.net/2016/11/14/firefox-51-blocks-automatic-audio-playback-in-non-active-tabs/
 user_pref("media.block-autoplay-until-in-foreground", true); // [DEFAULT: true]
 //
@@ -1186,6 +1206,11 @@ user_pref("remote.log.level", ""); // [DESKTOP]
 // "browser.safebrowsing.allowOverride" prevents selecting "ignore the risk" and visiting a harmful site anyway.
 user_pref("browser.safebrowsing.allowOverride", false); // [DESKTOP]
 user_pref("security.certerror.hideAddException", true); // [DESKTOP]
+// -------------------------------------
+// Pref : Disable safe mode
+// In case of a crash, we don't want to prompt for a safe-mode browser that has extensions disabled.
+// https://support.mozilla.org/en-US/questions/951221#answer-410562
+user_pref("toolkit.startup.max_resumed_crashes", -1); // [DESKTOP]
 //
 // >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 // Section : Block Implicit Outbound
@@ -1773,9 +1798,6 @@ user_pref("font.name.monospace.x-western", "Lucida Console"); // [DEFAULT: Couri
 // user_pref("gfx.downloadable_fonts.enabled", false);
 // user_pref("gfx.downloadable_fonts.fallback_delay", 0);
 // -------------------------------------
-// Pref : Disable WOFF2 (Web Open Font Format)
-user_pref("gfx.downloadable_fonts.woff2.enabled", false);
-// -------------------------------------
 // Pref : Disable CSS Font Loading API
 // [NOTE] Disabling fonts can uglify the web a fair bit.
 user_pref("layout.css.font-loading-api.enabled", false);
@@ -1811,12 +1833,6 @@ user_pref("plugin.defaultXpi.state", 0);
 // Pref : Disable scanning for plugins
 user_pref("plugin.scan.plid.all", false); // [WINDOWS] // [DESKTOP]
 // -------------------------------------
-// Pref : Enable plugins click-to-play
-// https://wiki.mozilla.org/Firefox/Click_To_Play
-// https://blog.mozilla.org/security/2012/10/11/click-to-play-plugins-blocklist-style/
-user_pref("plugins.click_to_play", true);
-user_pref("plugin.sessionPermissionNow.intervalInMinutes", 0);
-// -------------------------------------
 // Pref : Disable all GMP (Gecko Media Plugins)
 user_pref("media.gmp-provider.enabled", false);
 user_pref("media.gmp-manager.certs.1.issuerName", "");
@@ -2021,6 +2037,8 @@ user_pref("privacy.trackingprotection.socialtracking.enabled", false);
 // Pref : Disable PingCentre telemetry (used in several System Add-ons)
 // Currently blocked by 'datareporting.healthreport.uploadEnabled'
 user_pref("browser.ping-centre.telemetry", false); // [DESKTOP]
+user_pref("browser.ping-centre.production.endpoint", ""); // [DESKTOP]
+user_pref("browser.ping-centre.staging.endpoint", ""); // [DESKTOP]
 //
 // >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 // Section : System add-ons / Experiments
@@ -2032,7 +2050,7 @@ user_pref("browser.ping-centre.telemetry", false); // [DESKTOP]
 // https://dxr.mozilla.org/mozilla-central/source/toolkit/mozapps/extensions/AddonManager.jsm#1248-1257
 // [NOTE] Disabling system add-on updates prevents Mozilla from "hotfixing" your browser to patch critical problems (one possible use case from the documentation)
 // user_pref("extensions.systemAddon.update.enabled", false); // [DESKTOP]
-user_pref("extensions.systemAddon.update.url", "https://aus5.mozilla.org/update/3/SystemAddons/%VERSION%/%BUILD_ID%/%BUILD_TARGET%/%CHANNEL%/%OS_VERSION%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%/update.xml"); // [URL SANITIZED]
+user_pref("extensions.systemAddon.update.url", "https://aus5.mozilla.org/update/3/SystemAddons/%VERSION%/%BUILD_ID%/%BUILD_TARGET%/en-US/%CHANNEL%/%OS_VERSION%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%/update.xml"); // [URL SANITIZED]
 // -------------------------------------
 // Pref : Disable Normandy/Shield
 // Shield is an telemetry system (including Heartbeat) that can also push and test "recipes"
@@ -2065,6 +2083,8 @@ user_pref("extensions.formautofill.heuristics.enabled", false); // [DESKTOP]
 // user_pref("network.cookie.lifetimePolicy", 2);
 // -------------------------------------
 // Pref : Disable 3rd-party cookies and site-data
+// 0=(Allow) cookies and site data, 1=(Block) All third-party cookies, 2=(Block) All cookies, 3=(Block) Cookies from unvisited sites, 4=(Block) Third-party trackers
+// [NOTE] Value 4 is tied to the Tracking Protection lists
 // [NOTE] Can breaks payment gateways
 user_pref("network.cookie.cookieBehavior", 1);
 // -------------------------------------
@@ -2442,8 +2462,8 @@ user_pref("browser.urlbar.doubleClickSelectsAll", false); // [DESKTOP]
 //
 // >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 // Section : Deprecated / Removed / Legacy / Renamed
-// ESR60.x still uses all the following prefs
 // >>>>>>>>>>>>>>>>>>>>
+// ESR60.x still uses all the following prefs
 // -------------------------------------
 // FF52+
 // -------------------------------------
@@ -2725,6 +2745,8 @@ user_pref("lightweightThemes.update.enabled", false);
 // https://bugzilla.mozilla.org/1386214
 user_pref("security.csp.experimentalEnabled", true);
 // -------------------------------------
+// ESR68.x still uses all the following prefs
+// -------------------------------------
 // FF69+
 // -------------------------------------
 // Pref : Disable app from auto-update
@@ -2754,5 +2776,20 @@ user_pref("security.identitypopup.recordEventElemetry", false);
 // https://hg.mozilla.org/mozilla-central/rev/68aacb4ba7f9
 user_pref("services.sync.prefs.sync.browser.sessionstore.restore_on_demand", false);
 // -------------------------------------
+// Pref : Disable WOFF2 (Web Open Font Format)
+// https://bugzilla.mozilla.org/1556991
+// https://hg.mozilla.org/mozilla-central/rev/69d1b01b2847
+user_pref("gfx.downloadable_fonts.woff2.enabled", false);
+// -------------------------------------
+// Pref : Enable plugins click-to-play
+// https://bugzilla.mozilla.org/1519434
+// https://hg.mozilla.org/mozilla-central/rev/38fc0d299eb0
+user_pref("plugins.click_to_play", true);
+// -------------------------------------
+// Pref : Disable autoplay of HTML5 media
+// https://bugzilla.mozilla.org/1562331
+// https://hg.mozilla.org/mozilla-central/rev/3780202d7104
+user_pref("media.autoplay.allow-muted", false);
+// -------------------------------------
 // FF70+
 // -------------------------------------
\ No newline at end of file