diff --git a/deb_patches/fix-armhf-webrtc-build.patch b/deb_patches/fix-armhf-webrtc-build.patch
deleted file mode 100644
index 5256fc7..0000000
--- a/deb_patches/fix-armhf-webrtc-build.patch
+++ /dev/null
@@ -1,65 +0,0 @@
---- a/third_party/libwebrtc/webrtc/system_wrappers/cpu_features_linux_gn/moz.build
-+++ b/third_party/libwebrtc/webrtc/system_wrappers/cpu_features_linux_gn/moz.build
-@@ -31,10 +31,6 @@ LOCAL_INCLUDES += [
- "/tools/profiler/public"
- ]
-
--UNIFIED_SOURCES += [
-- "/third_party/libwebrtc/webrtc/system_wrappers/source/cpu_features_linux.c"
--]
--
- if not CONFIG["MOZ_DEBUG"]:
-
- DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0"
-@@ -53,20 +49,36 @@ if CONFIG["CPU_ARCH"] == "aarch64":
- DEFINES["WEBRTC_ARCH_ARM64"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
--if CONFIG["CPU_ARCH"] == "arm":
--
-- CFLAGS += [
-- "-mfpu=neon"
-+ UNIFIED_SOURCES += [
-+ "/third_party/libwebrtc/webrtc/system_wrappers/source/cpu_features_linux.c"
- ]
-
-+if CONFIG["CPU_ARCH"] == "arm":
-+
- DEFINES["WEBRTC_ARCH_ARM"] = True
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
-+if CONFIG["CPU_ARCH"] == "ppc64":
-+
-+ UNIFIED_SOURCES += [
-+ "/third_party/libwebrtc/webrtc/system_wrappers/source/cpu_features_linux.c"
-+ ]
-+
- if CONFIG["CPU_ARCH"] == "x86":
-
- CFLAGS += [
- "-msse2"
- ]
-
-+ UNIFIED_SOURCES += [
-+ "/third_party/libwebrtc/webrtc/system_wrappers/source/cpu_features_linux.c"
-+ ]
-+
-+if CONFIG["CPU_ARCH"] == "x86_64":
-+
-+ UNIFIED_SOURCES += [
-+ "/third_party/libwebrtc/webrtc/system_wrappers/source/cpu_features_linux.c"
-+ ]
-+
- Library("cpu_features_linux_gn")
---- a/third_party/libwebrtc/webrtc/system_wrappers/BUILD.gn
-+++ b/third_party/libwebrtc/webrtc/system_wrappers/BUILD.gn
-@@ -187,7 +187,7 @@ if (is_android && !build_with_mozilla) {
- }
- }
-
--if (is_linux) {
-+if (is_linux && target_cpu != "arm") {
- rtc_static_library("cpu_features_linux") {
- sources = [
- "source/cpu_features_linux.c",
diff --git a/deb_patches/pref_pane.patch b/deb_patches/pref_pane.patch
new file mode 100644
index 0000000..a68748f
--- /dev/null
+++ b/deb_patches/pref_pane.patch
@@ -0,0 +1,764 @@
+diff --git a/browser/components/preferences/jar.mn b/browser/components/preferences/jar.mn
+index 4f3babe..97c7ec2 100644
+--- a/browser/components/preferences/jar.mn
++++ b/browser/components/preferences/jar.mn
+@@ -11,6 +11,7 @@ browser.jar:
+ content/browser/preferences/home.js
+ content/browser/preferences/search.js
+ content/browser/preferences/privacy.js
++ content/browser/preferences/librewolf.js
+ content/browser/preferences/containers.js
+ content/browser/preferences/sync.js
+ content/browser/preferences/experimental.js
+diff --git a/browser/components/preferences/librewolf.inc.xhtml b/browser/components/preferences/librewolf.inc.xhtml
+new file mode 100644
+index 0000000..b627417
+--- /dev/null
++++ b/browser/components/preferences/librewolf.inc.xhtml
+@@ -0,0 +1,206 @@
++# This Source Code Form is subject to the terms of the Mozilla Public
++# License, v. 2.0. If a copy of the MPL was not distributed with this
++# file, You can obtain one at http://mozilla.org/MPL/2.0/.
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
+diff --git a/browser/components/preferences/librewolf.js b/browser/components/preferences/librewolf.js
+new file mode 100644
+index 0000000..c460b8c
+--- /dev/null
++++ b/browser/components/preferences/librewolf.js
+@@ -0,0 +1,234 @@
++/* This Source Code Form is subject to the terms of the Mozilla Public
++ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
++ * You can obtain one at http://mozilla.org/MPL/2.0/. */
++
++/* import-globals-from extensionControlled.js */
++/* import-globals-from preferences.js */
++
++var { AppConstants } = ChromeUtils.import( "resource://gre/modules/AppConstants.jsm");
++XPCOMUtils.defineLazyGetter(this, "L10n", () => {
++ return new Localization([
++ "branding/brand.ftl",
++ "browser/preferences/preferences.ftl",
++ ]);
++});
++
++Preferences.addAll([
++ // IPv6
++ { id: "network.dns.disableIPv6", type: "bool" },
++ // WebGL
++ { id: "webgl.disabled", type: "bool" },
++ // RFP
++ { id: "privacy.resistFingerprinting", type: "bool" },
++ // Automatically Update Extensions
++ { id: "extensions.update.enabled", type: "bool" },
++ { id: "extensions.update.autoUpdateDefault", type: "bool" },
++ // Clipboard autocopy/paste
++ { id: "clipboard.autocopy", type: "bool" },
++ { id: "middlemouse.paste", type: "bool" },
++ // Harden
++ { id: "privacy.resistFingerprinting.letterboxing", type: "bool" },
++ // Google Safe Browsing
++ //{ id: "browser.safebrowsing.malware.enabled", type: "bool" }, // Already loaded
++ //{ id: "browser.safebrowsing.phishing.enabled", type: "bool" },
++ { id: "browser.safebrowsing.blockedURIs.enabled", type: "bool" },
++ { id: "browser.safebrowsing.provider.google4.gethashURL", type: "string" },
++ { id: "browser.safebrowsing.provider.google4.updateURL", type: "string" },
++ { id: "browser.safebrowsing.provider.google.gethashURL", type: "string" },
++ { id: "browser.safebrowsing.provider.google.updateURL", type: "string" },
++ /**** Prefs that require changing a lockPref ****/
++ // Google safe browsing check downloads
++ //{ id: "browser.safebrowsing.downloads.enabled", type: "bool" }, //Also already added
++ { id: "toolkit.legacyUserProfileCustomizations.stylesheets", type: "bool" },
++ // Canvas UI when blocked
++ { id: "privacy.resistFingerprinting.autoDeclineNoUserInputCanvasPrompts", type: "bool" },
++]);
++
++var gLibrewolfPane = {
++ _pane: null,
++
++ // called when the document is first parsed
++ init() {
++ this._pane = document.getElementById("paneLibrewolf");
++
++ // Set all event listeners on checkboxes
++ setBoolSyncListeners(
++ "librewolf-extension-update-checkbox",
++ ["extensions.update.autoUpdateDefault", "extensions.update.enabled"],
++ [true, true ],
++ );
++ setBoolSyncListeners(
++ "librewolf-ipv6-checkbox",
++ ["network.dns.disableIPv6"],
++ [false, ],
++ );
++ setBoolSyncListeners(
++ "librewolf-autocopy-checkbox",
++ ["clipboard.autocopy", "middlemouse.paste"],
++ [true, true ],
++ );
++ setBoolSyncListeners(
++ "librewolf-styling-checkbox",
++ ["toolkit.legacyUserProfileCustomizations.stylesheets"],
++ [true, ],
++ );
++
++ setBoolSyncListeners(
++ "librewolf-webgl-checkbox",
++ ["webgl.disabled"],
++ [false ],
++ );
++ setBoolSyncListeners(
++ "librewolf-rfp-checkbox",
++ ["privacy.resistFingerprinting"],
++ [true ],
++ );
++ setBoolSyncListeners(
++ "librewolf-auto-decline-canvas-checkbox",
++ ["privacy.resistFingerprinting.autoDeclineNoUserInputCanvasPrompts"],
++ [true ],
++ );
++
++ setBoolSyncListeners(
++ "librewolf-letterboxing-checkbox",
++ ["privacy.resistFingerprinting.letterboxing"],
++ [true ],
++ );
++
++ setSyncListeners(
++ "librewolf-goog-safe-checkbox",
++ [
++ "browser.safebrowsing.malware.enabled",
++ "browser.safebrowsing.phishing.enabled",
++ "browser.safebrowsing.blockedURIs.enabled",
++ "browser.safebrowsing.provider.google4.gethashURL",
++ "browser.safebrowsing.provider.google4.updateURL",
++ "browser.safebrowsing.provider.google.gethashURL",
++ "browser.safebrowsing.provider.google.updateURL",
++ ],
++ [
++ true,
++ true,
++ true,
++ "https://safebrowsing.googleapis.com/v4/fullHashes:find?$ct=application/x-protobuf&key=%GOOGLE_SAFEBROWSING_API_KEY%&$httpMethod=POST",
++ "https://safebrowsing.googleapis.com/v4/threatListUpdates:fetch?$ct=application/x-protobuf&key=%GOOGLE_SAFEBROWSING_API_KEY%&$httpMethod=POST",
++ "https://safebrowsing.google.com/safebrowsing/gethash?client=SAFEBROWSING_ID&appver=%MAJOR_VERSION%&pver=2.2",
++ "https://safebrowsing.google.com/safebrowsing/downloads?client=SAFEBROWSING_ID&appver=%MAJOR_VERSION%&pver=2.2&key=%GOOGLE_SAFEBROWSING_API_KEY%",
++ ],
++ [
++ false,
++ false,
++ false,
++ "",
++ "",
++ "",
++ "",
++ ]
++ );
++
++ // Set event listener on open profile directory button
++ setEventListener("librewolf-open-profile-button", "command", openProfileDirectory);
++ // Set event listener on open about:config button
++ setEventListener("librewolf-config-link", "click", openAboutConfig);
++
++ // Notify observers that the UI is now ready
++ Services.obs.notifyObservers(window, "librewolf-pane-loaded");
++ },
++};
++
++function openProfileDirectory() {
++ // Get the profile directory.
++ let currProfD = Services.dirsvc.get("ProfD", Ci.nsIFile);
++ let profileDir = currProfD.path;
++
++ // Show the profile directory.
++ let nsLocalFile = Components.Constructor(
++ "@mozilla.org/file/local;1",
++ "nsIFile",
++ "initWithPath"
++ );
++ new nsLocalFile(profileDir).reveal();
++}
++
++function openAboutConfig() {
++ window.open("about:config", "_blank");
++}
++
++function setBoolSyncListeners(checkboxid, opts, vals) {
++ setSyncFromPrefListener(checkboxid, () => readGenericBoolPrefs(opts, vals));
++ setSyncToPrefListener(checkboxid, () => writeGenericBoolPrefs(opts, vals, document.getElementById(checkboxid).checked));
++ for (let i = 1; i < opts.length; i++) {
++ Preferences.get(opts[i]).on("change", () => makeMasterCheckboxesReactive(checkboxid, () => readGenericBoolPrefs(opts, vals)));
++ }
++}
++function setSyncListeners(checkboxid, opts, onVals, offVals) {
++ setSyncFromPrefListener(checkboxid, () => readGenericPrefs(opts, onVals, offVals));
++ setSyncToPrefListener(checkboxid, () => writeGenericPrefs(opts, onVals, offVals, document.getElementById(checkboxid).checked));
++ for (let i = 1; i < opts.length; i++) {
++ Preferences.get(opts[i]).on("change", () => makeMasterCheckboxesReactive(checkboxid, () => readGenericPrefs(opts, onVals, offVals)));
++ }
++}
++
++function makeMasterCheckboxesReactive(checkboxid, func) {
++ let shouldBeChecked = func();
++ document.getElementById(checkboxid).checked = shouldBeChecked;
++}
++
++// Wrapper function in case something more is required (as I suspected in the first iteration of this)
++function getPref(pref) {
++ let retval = Preferences.get(pref);
++/* if (retval === undefined) {
++ return defaultValue;
++ } */
++ return retval._value;
++}
++// Returns true if all the preferences in prefs are equal to onVals, false otherwise TODO may need a third array for their default values because mozilla is dumb, after testing though pretty sure this was misinformation being spread by comments in default FF code that has long since been fixed
++function readGenericBoolPrefs(prefs, onVals) {
++ for (let i = 0; i < prefs.length; i++) {
++ if (getPref(prefs[i]) != onVals[i]) {
++ return false;
++ }
++ }
++ return true;
++}
++function writeGenericBoolPrefs(opts, vals, changeToOn) {
++ valsCopy = [...vals];
++ if (!changeToOn) {
++ for (let i = 0; i < vals.length; i++) {
++ valsCopy[i] = !vals[i];
++ }
++ }
++ // Start at 1 because returning sets the last one
++ for (let i = 1; i < vals.length; i++) {
++ Services.prefs.setBoolPref(opts[i], valsCopy[i]);
++ }
++ return valsCopy[0];
++}
++
++// Returns true if all the preferences in prefs are equal to onVals, false otherwise... currently the same as for Bool as offVals is ignored
++function readGenericPrefs(prefs, onVals, offVals) {
++ for (let i = 0; i < prefs.length; i ++) {
++ let temp = getPref(prefs[i]);
++ if (getPref(prefs[i]) != onVals[i]) {
++ return false;
++ }
++ }
++ return true;
++}
++function writeGenericPrefs(opts, onVals, offVals, changeToOn) {
++ let writeArr = (changeToOn) ? onVals : offVals;
++ for (let i = 1; i < opts.length; i++) {
++ let type = typeof(writeArr[i]);
++ if (type == "number") {
++ Services.prefs.setIntPref(opts[i], writeArr[i]);
++ } else if (type == "boolean") {
++ Services.prefs.setBoolPref(opts[i], writeArr[i]);
++ } else if (type == "string") {
++ Services.prefs.setCharPref(opts[i], writeArr[i]);
++ } else {
++ console.log("BADNESS 10000");
++ }
++ }
++ return writeArr[0];
++}
++
+diff --git a/browser/components/preferences/preferences.js b/browser/components/preferences/preferences.js
+index 91e9e46..763ab49 100644
+--- a/browser/components/preferences/preferences.js
++++ b/browser/components/preferences/preferences.js
+@@ -8,6 +8,7 @@
+ /* import-globals-from search.js */
+ /* import-globals-from containers.js */
+ /* import-globals-from privacy.js */
++/* import-globals-from librewolf.js */
+ /* import-globals-from sync.js */
+ /* import-globals-from experimental.js */
+ /* import-globals-from findInPage.js */
+@@ -117,6 +118,7 @@ function init_all() {
+ register_module("paneHome", gHomePane);
+ register_module("paneSearch", gSearchPane);
+ register_module("panePrivacy", gPrivacyPane);
++ register_module("paneLibrewolf", gLibrewolfPane);
+ register_module("paneContainers", gContainersPane);
+ if (Services.prefs.getBoolPref("browser.preferences.experimental")) {
+ // Set hidden based on previous load's hidden value.
+diff --git a/browser/components/preferences/preferences.xhtml b/browser/components/preferences/preferences.xhtml
+index aab4a9e..907a631 100644
+--- a/browser/components/preferences/preferences.xhtml
++++ b/browser/components/preferences/preferences.xhtml
+@@ -12,6 +12,7 @@
+
+
+
++
+
+
+
+@@ -128,6 +129,17 @@
+
+
+
++
++
++
++
++
+
++
++
++-->
++
++
++
+diff --git a/browser/themes/shared/preferences/librewolf.css b/browser/themes/shared/preferences/librewolf.css
+new file mode 100644
+index 0000000..aeb550c
+--- /dev/null
++++ b/browser/themes/shared/preferences/librewolf.css
+@@ -0,0 +1,16 @@
++.librewolf-collapse > input {
++ display: none;
++}
++.librewolf-collapse > input ~ .librewolf-collapsed {
++ display: none;
++ /* max-height: 0; */
++ transition: max-height 0.25s ease-in-out;
++}
++.librewolf-collapse > input:checked ~ .librewolf-collapsed {
++ display: block;
++ /* max-height: 20rem; */
++}
++.librewolf-warning {
++ display: inline;
++ font-size: 0.8em;
++}
+diff --git a/browser/themes/shared/preferences/preferences.inc.css b/browser/themes/shared/preferences/preferences.inc.css
+index 31bffd0..1f9fbcf 100644
+--- a/browser/themes/shared/preferences/preferences.inc.css
++++ b/browser/themes/shared/preferences/preferences.inc.css
+@@ -201,6 +201,10 @@ checkbox {
+ list-style-image: url("chrome://browser/skin/preferences/category-privacy-security.svg");
+ }
+
++#category-librewolf > .category-icon {
++ list-style-image: url("chrome://browser/skin/preferences/category-librewolf.svg");
++}
++
+ #category-sync > .category-icon {
+ list-style-image: url("chrome://browser/skin/preferences/category-sync.svg");
+ }
diff --git a/deb_patches/relax-cargo-dep.patch b/deb_patches/relax-cargo-dep.patch
deleted file mode 100644
index 46c3eff..0000000
--- a/deb_patches/relax-cargo-dep.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -r 246cfe5d5a05 build/moz.configure/rust.configure
---- a/build/moz.configure/rust.configure Sat Oct 02 16:40:36 2021 +0000
-+++ b/build/moz.configure/rust.configure Sun Oct 03 11:00:29 2021 +0200
-@@ -171,7 +171,7 @@
- )
- )
- rustc_min_version = Version(MINIMUM_RUST_VERSION)
-- cargo_min_version = rustc_min_version
-+ cargo_min_version = Version("1.51.0")
-
- version = rustc_info.version
- is_nightly = "nightly" in version.version
diff --git a/deb_patches/webrtc-fix-compiler-flags-for-armhf.patch b/deb_patches/webrtc-fix-compiler-flags-for-armhf.patch
index 5cd6658..15876d8 100644
--- a/deb_patches/webrtc-fix-compiler-flags-for-armhf.patch
+++ b/deb_patches/webrtc-fix-compiler-flags-for-armhf.patch
@@ -23,8 +23,8 @@
# For libyuv
gyp_vars['arm_version'] = int(CONFIG['ARM_ARCH'])
---- a/third_party/libwebrtc/webrtc/build/config/compiler/BUILD.gn
-+++ b/third_party/libwebrtc/webrtc/build/config/compiler/BUILD.gn
+--- a/third_party/libwebrtc/build/config/compiler/BUILD.gn
++++ b/third_party/libwebrtc/build/config/compiler/BUILD.gn
@@ -590,7 +590,6 @@ config("compiler_cpu_abi") {
if (!is_nacl) {
cflags += [
diff --git a/scripts/3_Configure_Source_Code.sh b/scripts/3_Configure_Source_Code.sh
index c5de20f..ea7872d 100755
--- a/scripts/3_Configure_Source_Code.sh
+++ b/scripts/3_Configure_Source_Code.sh
@@ -125,18 +125,16 @@ fi
# hopefully the magic sauce that makes things build on 16.04 and later on work "everywhere":
patch -Np1 -i "${CI_PROJECT_DIR}/deb_patches/armhf-reduce-linker-memory-use.patch"
-patch -Np1 -i "${CI_PROJECT_DIR}/deb_patches/fix-armhf-webrtc-build.patch"
patch -Np1 -i "${CI_PROJECT_DIR}/deb_patches/webrtc-fix-compiler-flags-for-armhf.patch"
patch -Np1 -i "${CI_PROJECT_DIR}/deb_patches/reduce-rust-debuginfo.patch"
patch -Np1 -i "${CI_PROJECT_DIR}/deb_patches/use-system-icupkg.patch"
-patch -Np1 -i "${CI_PROJECT_DIR}/deb_patches/relax-cargo-dep.patch"
# Remove some pre-installed addons that might be questionable
patch -Np1 -i ${_PATCHES_DIR}/remove_addons.patch
# Disable (some) megabar functionality
# Adapted from https://github.com/WesleyBranton/userChrome.css-Customizations
-patch -Np1 -i ${_PATCHES_DIR}/megabar.patch
+patch -Np1 -i ${_PATCHES_DIR}/deprecated/megabar.patch
# remove mozilla vpn ads
patch -Np1 -i ${_PATCHES_DIR}/mozilla-vpn-ad.patch
@@ -153,7 +151,6 @@ patch -Np1 -i "${_PATCHES_DIR}/sed-patches/disable-pocket.patch"
# More patches
patch -Np1 -i "${_PATCHES_DIR}/context-menu.patch"
-patch -Np1 -i "${_PATCHES_DIR}/browser-confvars.patch"
patch -Np1 -i "${_PATCHES_DIR}/urlbarprovider-interventions.patch"
# Remove Internal Plugin Certificates
@@ -173,9 +170,6 @@ patch -Np1 -i "${_PATCHES_DIR}/sed-patches/stop-undesired-requests.patch"
# deprecated / will be dropped soon
# patch -Np1 -i ${_PATCHES_DIR}/allow_dark_preference_with_rfp.patch
-# fix an URL in 'about' dialog
-patch -Np1 -i ${_PATCHES_DIR}/about-dialog.patch
-
# change some hardcoded directory strings that could lead to unnecessarily
# created directories
patch -Np1 -i ${_PATCHES_DIR}/mozilla_dirs.patch
@@ -185,10 +179,6 @@ patch -Np1 -i ${_PATCHES_DIR}/allow-ubo-private-mode.patch
# ui patches
-# show a warning saying that changing language is not allowed through the UI,
-# and that it requires to visit our FAQ, instead of telling the user to check his connection.
-patch -Np1 -i ${_PATCHES_DIR}/ui-patches/add-language-warning.patch
-
# remove references to firefox from the settings UI, change text in some of the links,
# explain that we force en-US and suggest enabling history near the session restore checkbox.
patch -Np1 -i ${_PATCHES_DIR}/ui-patches/pref-naming.patch
@@ -208,4 +198,7 @@ patch -Np1 -i ${_PATCHES_DIR}/ui-patches/remove-snippets-from-home.patch
# add warning that sanitizing exceptions are bypassed by the options in History > Clear History when LibreWolf closes > Settings
patch -Np1 -i ${_PATCHES_DIR}/ui-patches/sanitizing-description.patch
+# pref pane
+patch -Np1 -i "${CI_PROJECT_DIR}/deb_patches/pref_pane.patch"
+
rm -rf common
diff --git a/scripts/5_Configure_Binary_Tarball.sh b/scripts/5_Configure_Binary_Tarball.sh
index d1bdd09..da9c987 100755
--- a/scripts/5_Configure_Binary_Tarball.sh
+++ b/scripts/5_Configure_Binary_Tarball.sh
@@ -11,7 +11,7 @@ LAUNCHER_SCRIPT=$3;
CI_PROJECT_DIR=${CI_PROJECT_DIR:-$(realpath $(dirname $0)/../)}
_SCRIPT_FOLDER=$(realpath $(dirname $0));
_EXTRACTED_TARBALL_FOLDER=$_SCRIPT_FOLDER/librewolf;
-_SETTINGS_TAG=${SETTINGS_TAG:-'3.0'}
+_SETTINGS_TAG=${SETTINGS_TAG:-'5.1'}
_SETTINGS_REPO='https://gitlab.com/librewolf-community/settings.git';
# Extracts the binary tarball