From 794534666f6dc38fa1a94dde8153bed92b90c319 Mon Sep 17 00:00:00 2001
From: Krzysztof Modras <chrmod@chrmod.net>
Date: Wed, 13 Apr 2022 20:34:40 +0200
Subject: [PATCH] 2022.4 (#601)

* Merge with Firefox 99
* Build: handle toolchains aliases
* Consolidating cleaning up preferences into single patch
---
 .workspace                                    |  6 +--
 build/Linux.dockerfile                        | 22 ++++-----
 build/MacOSARM.dockerfile                     | 26 +++++-----
 build/MacOSX.dockerfile                       | 28 +++++------
 build/Windows.dockerfile                      | 30 ++++++------
 build/WindowsARM.dockerfile                   | 30 ++++++------
 build/fetch-content                           |  5 +-
 fern/core/docker.js                           |  6 ++-
 l10n/de.json                                  |  2 +-
 l10n/en-US.json                               |  2 +-
 l10n/es-ES.json                               |  2 +-
 l10n/fr.json                                  |  2 +-
 l10n/hu.json                                  |  2 +-
 l10n/it.json                                  |  2 +-
 l10n/ja.json                                  |  2 +-
 l10n/ko.json                                  |  2 +-
 l10n/nl.json                                  |  2 +-
 l10n/pl.json                                  |  2 +-
 l10n/pt_BR.json                               |  2 +-
 l10n/ru.json                                  |  2 +-
 l10n/zh_CN.json                               |  2 +-
 l10n/zh_TW.json                               |  2 +-
 patches/.index                                | 37 +++++++-------
 patches/0001-Set-update-URL.patch             |  6 +--
 ...hange-new-tab-page-and-home-page-url.patch |  6 +--
 .../0003-Update-text-in-about-dialog.patch    |  2 +-
 ...acking-protection-panel-from-url-bar.patch | 20 ++++----
 ...Dashboard-link-from-right-burger-men.patch | 10 ++--
 ...Protection-Settings-from-preferences.patch |  2 +-
 ...rt-and-normandy-off-at-configure-tim.patch |  2 +-
 ...-Recommend-as-you-browse-preferences.patch | 10 ++--
 ...-bookmarks-to-Ghostery-specific-ones.patch | 46 ++++++++---------
 patches/0010-Clean-up-preferences.patch       | 49 +++++++++++++++++++
 ...Hide-Learn-More-links-in-preferences.patch | 23 ---------
 ...ort-Deceptive-Site-from-help-menubar.patch |  2 +-
 .../0012-Update-uninstaller-survey-URL.patch  |  4 +-
 ...service-url-to-be-overrided-by-prefs.patch | 25 +++++-----
 ...anual-override-of-search-engine-list.patch | 10 ++--
 patches/0016-Firefox-profile-import.patch     |  2 +-
 ...rary-Synced-Tabs-from-the-menu-panel.patch |  2 +-
 ...-Theme.patch => 0018-Ghostery-Theme.patch} | 34 ++++++-------
 ...irefox-Home-Content-from-preferences.patch | 27 ----------
 ...> 0019-Move-Ghostery-icon-to-UrlBar.patch} |  8 +--
 ...e-Lockwise-branding-in-about-logins.patch} |  4 +-
 ...brand-styling-on-new-private-window.patch} |  8 +--
 ... => 0022-Use-the-same-UA-as-Firefox.patch} |  6 +--
 ...tch => 0023-Fix-Windows-hidpi-issue.patch} |  2 +-
 ...-channel-to-be-configured-via-prefs.patch} |  6 +--
 ...> 0025-Update-text-on-about-license.patch} |  2 +-
 ...026-Hide-addon-recommendation-badge.patch} |  2 +-
 ...=> 0027-Disable-ion-pioneer-studies.patch} |  6 +--
 ...rn-more-link-on-network-error-pages.patch} |  2 +-
 ... => 0029-OpenURL-on-buildID-changes.patch} |  8 +--
 ...er.patch => 0030-Ignore-the-glinter.patch} |  4 +-
 ...New-Tab-with-Ghostery-New-Tab-Addon.patch} | 24 ++-------
 ...atch => 0032-Better-Fox-integration.patch} |  4 +-
 ...tes.patch => 0033-Default-top-sites.patch} |  2 +-
 ...isable-package-duplicates-detection.patch} |  4 +-
 58 files changed, 285 insertions(+), 307 deletions(-)
 create mode 100644 patches/0010-Clean-up-preferences.patch
 delete mode 100644 patches/0010-Hide-Learn-More-links-in-preferences.patch
 rename patches/{0019-Ghostery-Theme.patch => 0018-Ghostery-Theme.patch} (93%)
 delete mode 100644 patches/0018-Hide-Firefox-Home-Content-from-preferences.patch
 rename patches/{0020-Move-Ghostery-icon-to-UrlBar.patch => 0019-Move-Ghostery-icon-to-UrlBar.patch} (91%)
 rename patches/{0021-Remove-Lockwise-branding-in-about-logins.patch => 0020-Remove-Lockwise-branding-in-about-logins.patch} (98%)
 rename patches/{0022-Custom-brand-styling-on-new-private-window.patch => 0021-Custom-brand-styling-on-new-private-window.patch} (94%)
 rename patches/{0023-Use-the-same-UA-as-Firefox.patch => 0022-Use-the-same-UA-as-Firefox.patch} (86%)
 rename patches/{0024-Fix-Windows-hidpi-issue.patch => 0023-Fix-Windows-hidpi-issue.patch} (98%)
 rename patches/{0025-Allow-update-channel-to-be-configured-via-prefs.patch => 0024-Allow-update-channel-to-be-configured-via-prefs.patch} (89%)
 rename patches/{0026-Update-text-on-about-license.patch => 0025-Update-text-on-about-license.patch} (99%)
 rename patches/{0027-Hide-addon-recommendation-badge.patch => 0026-Hide-addon-recommendation-badge.patch} (99%)
 rename patches/{0028-Disable-ion-pioneer-studies.patch => 0027-Disable-ion-pioneer-studies.patch} (87%)
 rename patches/{0029-Hide-learn-more-link-on-network-error-pages.patch => 0028-Hide-learn-more-link-on-network-error-pages.patch} (98%)
 rename patches/{0030-OpenURL-on-buildID-changes.patch => 0029-OpenURL-on-buildID-changes.patch} (90%)
 rename patches/{0031-Ignore-the-glinter.patch => 0030-Ignore-the-glinter.patch} (93%)
 rename patches/{0032-Replace-New-Tab-with-Ghostery-New-Tab-Addon.patch => 0031-Replace-New-Tab-with-Ghostery-New-Tab-Addon.patch} (69%)
 rename patches/{0033-Better-Fox-integration.patch => 0032-Better-Fox-integration.patch} (96%)
 rename patches/{0034-Default-top-sites.patch => 0033-Default-top-sites.patch} (99%)
 rename patches/{0035-Disable-package-duplicates-detection.patch => 0034-Disable-package-duplicates-detection.patch} (94%)

diff --git a/.workspace b/.workspace
index 60efd41bb0..0b9fd66c0b 100644
--- a/.workspace
+++ b/.workspace
@@ -12,11 +12,11 @@
     "pictureinpicture",
     "report-site-issue"
   ],
-  "firefox": "97.0.2",
-  "app": "2022.3.1",
+  "firefox": "99.0",
+  "app": "2022.4",
   "s3bucket": "ghostery-user-agent-cache-public",
   "locales": {
     "de": "3aa060a4eb096bff283d9672f6983375367d5a6f",
     "fr": "bf61dd44e1c6b5292077ca980a4dc0e2c6a17f06"
   }
-}
+}
\ No newline at end of file
diff --git a/build/Linux.dockerfile b/build/Linux.dockerfile
index 5fca7cc63a..ce231f28ea 100644
--- a/build/Linux.dockerfile
+++ b/build/Linux.dockerfile
@@ -3,57 +3,57 @@ FROM ua-build-base
 ENV MOZ_AUTOMATION_PACKAGE_TESTS=1 \
     MOZ_ENABLE_FULL_SYMBOLS=1
 
-RUN wget -nv -O /builds/worker/fetches/binutils.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/96.0.1/linux64-binutils/binutils.tar.zst && \
+RUN wget -nv -O /builds/worker/fetches/binutils.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/99.0/linux64-binutils/binutils.tar.zst && \
     cd /builds/worker/fetches/ && \
     tar -xf binutils.tar.zst && \
     rm binutils.tar.zst
 
-RUN wget -nv -O /builds/worker/fetches/clang.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/96.0.1/linux64-clang-13/clang.tar.zst && \
+RUN wget -nv -O /builds/worker/fetches/clang.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/99.0/linux64-clang-13/clang.tar.zst && \
     cd /builds/worker/fetches/ && \
     tar -xf clang.tar.zst && \
     rm clang.tar.zst
 
-RUN wget -nv -O /builds/worker/fetches/rustc.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/96.0.1/linux64-rust-1.57/rustc.tar.zst && \
+RUN wget -nv -O /builds/worker/fetches/rustc.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/99.0/linux64-rust-1.59/rustc.tar.zst && \
     cd /builds/worker/fetches/ && \
     tar -xf rustc.tar.zst && \
     rm rustc.tar.zst
 
-RUN wget -nv -O /builds/worker/fetches/rust-size.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/96.0.1/linux64-rust-size/rust-size.tar.zst && \
+RUN wget -nv -O /builds/worker/fetches/rust-size.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/99.0/linux64-rust-size/rust-size.tar.zst && \
     cd /builds/worker/fetches/ && \
     tar -xf rust-size.tar.zst && \
     rm rust-size.tar.zst
 
-RUN wget -nv -O /builds/worker/fetches/cbindgen.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/96.0.1/linux64-cbindgen/cbindgen.tar.zst && \
+RUN wget -nv -O /builds/worker/fetches/cbindgen.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/99.0/linux64-cbindgen/cbindgen.tar.zst && \
     cd /builds/worker/fetches/ && \
     tar -xf cbindgen.tar.zst && \
     rm cbindgen.tar.zst
 
-RUN wget -nv -O /builds/worker/fetches/dump_syms.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/96.0.1/linux64-dump_syms/dump_syms.tar.zst && \
+RUN wget -nv -O /builds/worker/fetches/dump_syms.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/99.0/linux64-dump_syms/dump_syms.tar.zst && \
     cd /builds/worker/fetches/ && \
     tar -xf dump_syms.tar.zst && \
     rm dump_syms.tar.zst
 
-RUN wget -nv -O /builds/worker/fetches/sccache.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/96.0.1/linux64-sccache/sccache.tar.zst && \
+RUN wget -nv -O /builds/worker/fetches/sccache.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/99.0/linux64-sccache/sccache.tar.zst && \
     cd /builds/worker/fetches/ && \
     tar -xf sccache.tar.zst && \
     rm sccache.tar.zst
 
-RUN wget -nv -O /builds/worker/fetches/nasm.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/96.0.1/linux64-nasm/nasm.tar.zst && \
+RUN wget -nv -O /builds/worker/fetches/nasm.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/99.0/linux64-nasm/nasm.tar.zst && \
     cd /builds/worker/fetches/ && \
     tar -xf nasm.tar.zst && \
     rm nasm.tar.zst
 
-RUN wget -nv -O /builds/worker/fetches/node.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/96.0.1/linux64-node-12/node.tar.zst && \
+RUN wget -nv -O /builds/worker/fetches/node.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/99.0/linux64-node-12/node.tar.zst && \
     cd /builds/worker/fetches/ && \
     tar -xf node.tar.zst && \
     rm node.tar.zst
 
-RUN wget -nv -O /builds/worker/fetches/sysroot-x86_64-linux-gnu.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/96.0.1/sysroot-x86_64-linux-gnu/sysroot-x86_64-linux-gnu.tar.zst && \
+RUN wget -nv -O /builds/worker/fetches/sysroot-x86_64-linux-gnu.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/99.0/sysroot-x86_64-linux-gnu/sysroot-x86_64-linux-gnu.tar.zst && \
     cd /builds/worker/fetches/ && \
     tar -xf sysroot-x86_64-linux-gnu.tar.zst && \
     rm sysroot-x86_64-linux-gnu.tar.zst
 
-RUN wget -nv -O /builds/worker/fetches/sysroot-wasm32-wasi.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/96.0.1/sysroot-wasm32-wasi/sysroot-wasm32-wasi.tar.zst && \
+RUN wget -nv -O /builds/worker/fetches/sysroot-wasm32-wasi.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/99.0/sysroot-wasm32-wasi/sysroot-wasm32-wasi.tar.zst && \
     cd /builds/worker/fetches/ && \
     tar -xf sysroot-wasm32-wasi.tar.zst && \
     rm sysroot-wasm32-wasi.tar.zst
diff --git a/build/MacOSARM.dockerfile b/build/MacOSARM.dockerfile
index 342bb2077a..66a532b419 100644
--- a/build/MacOSARM.dockerfile
+++ b/build/MacOSARM.dockerfile
@@ -3,67 +3,67 @@ FROM ua-build-base
 ENV MOZ_AUTOMATION_PACKAGE_TESTS=1 \
     PERFHERDER_EXTRA_OPTIONS=aarch64
 
-RUN wget -nv -O /builds/worker/fetches/cctools.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/96.0.1/linux64-cctools-port-clang-13/cctools.tar.zst && \
+RUN wget -nv -O /builds/worker/fetches/cctools.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/99.0/linux64-cctools-port/cctools.tar.zst && \
     cd /builds/worker/fetches/ && \
     tar -xf cctools.tar.zst && \
     rm cctools.tar.zst
 
-RUN wget -nv -O /builds/worker/fetches/clang.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/96.0.1/linux64-clang-13-macosx-cross/clang.tar.zst && \
+RUN wget -nv -O /builds/worker/fetches/clang.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/99.0/linux64-clang-13/clang.tar.zst && \
     cd /builds/worker/fetches/ && \
     tar -xf clang.tar.zst && \
     rm clang.tar.zst
 
-RUN wget -nv -O /builds/worker/fetches/sysroot-wasm32-wasi.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/96.0.1/sysroot-wasm32-wasi/sysroot-wasm32-wasi.tar.zst && \
+RUN wget -nv -O /builds/worker/fetches/sysroot-wasm32-wasi.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/99.0/sysroot-wasm32-wasi/sysroot-wasm32-wasi.tar.zst && \
     cd /builds/worker/fetches/ && \
     tar -xf sysroot-wasm32-wasi.tar.zst && \
     rm sysroot-wasm32-wasi.tar.zst
 
-RUN wget -nv -O /builds/worker/fetches/binutils.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/96.0.1/linux64-binutils/binutils.tar.zst && \
+RUN wget -nv -O /builds/worker/fetches/binutils.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/99.0/linux64-binutils/binutils.tar.zst && \
     cd /builds/worker/fetches/ && \
     tar -xf binutils.tar.zst && \
     rm binutils.tar.zst
 
-RUN wget -nv -O /builds/worker/fetches/dump_syms.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/96.0.1/linux64-dump_syms/dump_syms.tar.zst && \
+RUN wget -nv -O /builds/worker/fetches/dump_syms.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/99.0/linux64-dump_syms/dump_syms.tar.zst && \
     cd /builds/worker/fetches/ && \
     tar -xf dump_syms.tar.zst && \
     rm dump_syms.tar.zst
 
-RUN wget -nv -O /builds/worker/fetches/hfsplus-tools.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/96.0.1/linux64-hfsplus/hfsplus-tools.tar.zst && \
+RUN wget -nv -O /builds/worker/fetches/hfsplus-tools.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/99.0/linux64-hfsplus/hfsplus-tools.tar.zst && \
     cd /builds/worker/fetches/ && \
     tar -xf hfsplus-tools.tar.zst && \
     rm hfsplus-tools.tar.zst
 
-RUN wget -nv -O /builds/worker/fetches/dmg.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/96.0.1/linux64-libdmg/dmg.tar.zst && \
+RUN wget -nv -O /builds/worker/fetches/dmg.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/99.0/linux64-libdmg/dmg.tar.zst && \
     cd /builds/worker/fetches/ && \
     tar -xf dmg.tar.zst && \
     rm dmg.tar.zst
 
-RUN wget -nv -O /builds/worker/fetches/rustc.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/96.0.1/linux64-rust-macos-1.57/rustc.tar.zst && \
+RUN wget -nv -O /builds/worker/fetches/rustc.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/99.0/linux64-rust-macos-1.59/rustc.tar.zst && \
     cd /builds/worker/fetches/ && \
     tar -xf rustc.tar.zst && \
     rm rustc.tar.zst
 
-RUN wget -nv -O /builds/worker/fetches/rust-size.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/96.0.1/linux64-rust-size/rust-size.tar.zst && \
+RUN wget -nv -O /builds/worker/fetches/rust-size.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/99.0/linux64-rust-size/rust-size.tar.zst && \
     cd /builds/worker/fetches/ && \
     tar -xf rust-size.tar.zst && \
     rm rust-size.tar.zst
 
-RUN wget -nv -O /builds/worker/fetches/cbindgen.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/96.0.1/linux64-cbindgen/cbindgen.tar.zst && \
+RUN wget -nv -O /builds/worker/fetches/cbindgen.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/99.0/linux64-cbindgen/cbindgen.tar.zst && \
     cd /builds/worker/fetches/ && \
     tar -xf cbindgen.tar.zst && \
     rm cbindgen.tar.zst
 
-RUN wget -nv -O /builds/worker/fetches/nasm.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/96.0.1/linux64-nasm/nasm.tar.zst && \
+RUN wget -nv -O /builds/worker/fetches/nasm.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/99.0/linux64-nasm/nasm.tar.zst && \
     cd /builds/worker/fetches/ && \
     tar -xf nasm.tar.zst && \
     rm nasm.tar.zst
 
-RUN wget -nv -O /builds/worker/fetches/node.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/96.0.1/linux64-node-12/node.tar.zst && \
+RUN wget -nv -O /builds/worker/fetches/node.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/99.0/linux64-node-12/node.tar.zst && \
     cd /builds/worker/fetches/ && \
     tar -xf node.tar.zst && \
     rm node.tar.zst
 
-RUN wget -nv -O /builds/worker/fetches/sysroot-x86_64-linux-gnu.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/96.0.1/sysroot-x86_64-linux-gnu/sysroot-x86_64-linux-gnu.tar.zst && \
+RUN wget -nv -O /builds/worker/fetches/sysroot-x86_64-linux-gnu.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/99.0/sysroot-x86_64-linux-gnu/sysroot-x86_64-linux-gnu.tar.zst && \
     cd /builds/worker/fetches/ && \
     tar -xf sysroot-x86_64-linux-gnu.tar.zst && \
     rm sysroot-x86_64-linux-gnu.tar.zst
diff --git a/build/MacOSX.dockerfile b/build/MacOSX.dockerfile
index 326ce249d0..82e75a6a82 100644
--- a/build/MacOSX.dockerfile
+++ b/build/MacOSX.dockerfile
@@ -2,72 +2,72 @@ FROM ua-build-base
 
 ENV MOZ_AUTOMATION_PACKAGE_TESTS=1
 
-RUN wget -nv -O /builds/worker/fetches/cctools.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/96.0.1/linux64-cctools-port-clang-13/cctools.tar.zst && \
+RUN wget -nv -O /builds/worker/fetches/cctools.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/99.0/linux64-cctools-port/cctools.tar.zst && \
     cd /builds/worker/fetches/ && \
     tar -xf cctools.tar.zst && \
     rm cctools.tar.zst
 
-RUN wget -nv -O /builds/worker/fetches/clang.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/96.0.1/linux64-clang-13-macosx-cross/clang.tar.zst && \
+RUN wget -nv -O /builds/worker/fetches/clang.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/99.0/linux64-clang-13/clang.tar.zst && \
     cd /builds/worker/fetches/ && \
     tar -xf clang.tar.zst && \
     rm clang.tar.zst
 
-RUN wget -nv -O /builds/worker/fetches/sccache.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/96.0.1/linux64-sccache/sccache.tar.zst && \
+RUN wget -nv -O /builds/worker/fetches/sccache.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/99.0/linux64-sccache/sccache.tar.zst && \
     cd /builds/worker/fetches/ && \
     tar -xf sccache.tar.zst && \
     rm sccache.tar.zst
 
-RUN wget -nv -O /builds/worker/fetches/sysroot-wasm32-wasi.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/96.0.1/sysroot-wasm32-wasi/sysroot-wasm32-wasi.tar.zst && \
+RUN wget -nv -O /builds/worker/fetches/sysroot-wasm32-wasi.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/99.0/sysroot-wasm32-wasi/sysroot-wasm32-wasi.tar.zst && \
     cd /builds/worker/fetches/ && \
     tar -xf sysroot-wasm32-wasi.tar.zst && \
     rm sysroot-wasm32-wasi.tar.zst
 
-RUN wget -nv -O /builds/worker/fetches/binutils.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/96.0.1/linux64-binutils/binutils.tar.zst && \
+RUN wget -nv -O /builds/worker/fetches/binutils.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/99.0/linux64-binutils/binutils.tar.zst && \
     cd /builds/worker/fetches/ && \
     tar -xf binutils.tar.zst && \
     rm binutils.tar.zst
 
-RUN wget -nv -O /builds/worker/fetches/dump_syms.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/96.0.1/linux64-dump_syms/dump_syms.tar.zst && \
+RUN wget -nv -O /builds/worker/fetches/dump_syms.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/99.0/linux64-dump_syms/dump_syms.tar.zst && \
     cd /builds/worker/fetches/ && \
     tar -xf dump_syms.tar.zst && \
     rm dump_syms.tar.zst
 
-RUN wget -nv -O /builds/worker/fetches/hfsplus-tools.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/96.0.1/linux64-hfsplus/hfsplus-tools.tar.zst && \
+RUN wget -nv -O /builds/worker/fetches/hfsplus-tools.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/99.0/linux64-hfsplus/hfsplus-tools.tar.zst && \
     cd /builds/worker/fetches/ && \
     tar -xf hfsplus-tools.tar.zst && \
     rm hfsplus-tools.tar.zst
 
-RUN wget -nv -O /builds/worker/fetches/dmg.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/96.0.1/linux64-libdmg/dmg.tar.zst && \
+RUN wget -nv -O /builds/worker/fetches/dmg.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/99.0/linux64-libdmg/dmg.tar.zst && \
     cd /builds/worker/fetches/ && \
     tar -xf dmg.tar.zst && \
     rm dmg.tar.zst
 
-RUN wget -nv -O /builds/worker/fetches/rustc.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/96.0.1/linux64-rust-macos-1.57/rustc.tar.zst && \
+RUN wget -nv -O /builds/worker/fetches/rustc.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/99.0/linux64-rust-macos-1.59/rustc.tar.zst && \
     cd /builds/worker/fetches/ && \
     tar -xf rustc.tar.zst && \
     rm rustc.tar.zst
 
-RUN wget -nv -O /builds/worker/fetches/rust-size.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/96.0.1/linux64-rust-size/rust-size.tar.zst && \
+RUN wget -nv -O /builds/worker/fetches/rust-size.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/99.0/linux64-rust-size/rust-size.tar.zst && \
     cd /builds/worker/fetches/ && \
     tar -xf rust-size.tar.zst && \
     rm rust-size.tar.zst
 
-RUN wget -nv -O /builds/worker/fetches/cbindgen.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/96.0.1/linux64-cbindgen/cbindgen.tar.zst && \
+RUN wget -nv -O /builds/worker/fetches/cbindgen.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/99.0/linux64-cbindgen/cbindgen.tar.zst && \
     cd /builds/worker/fetches/ && \
     tar -xf cbindgen.tar.zst && \
     rm cbindgen.tar.zst
 
-RUN wget -nv -O /builds/worker/fetches/nasm.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/96.0.1/linux64-nasm/nasm.tar.zst && \
+RUN wget -nv -O /builds/worker/fetches/nasm.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/99.0/linux64-nasm/nasm.tar.zst && \
     cd /builds/worker/fetches/ && \
     tar -xf nasm.tar.zst && \
     rm nasm.tar.zst
 
-RUN wget -nv -O /builds/worker/fetches/node.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/96.0.1/linux64-node-12/node.tar.zst && \
+RUN wget -nv -O /builds/worker/fetches/node.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/99.0/linux64-node-12/node.tar.zst && \
     cd /builds/worker/fetches/ && \
     tar -xf node.tar.zst && \
     rm node.tar.zst
 
-RUN wget -nv -O /builds/worker/fetches/sysroot-x86_64-linux-gnu.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/96.0.1/sysroot-x86_64-linux-gnu/sysroot-x86_64-linux-gnu.tar.zst && \
+RUN wget -nv -O /builds/worker/fetches/sysroot-x86_64-linux-gnu.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/99.0/sysroot-x86_64-linux-gnu/sysroot-x86_64-linux-gnu.tar.zst && \
     cd /builds/worker/fetches/ && \
     tar -xf sysroot-x86_64-linux-gnu.tar.zst && \
     rm sysroot-x86_64-linux-gnu.tar.zst
diff --git a/build/Windows.dockerfile b/build/Windows.dockerfile
index 9242c407dc..dbe3bee91d 100644
--- a/build/Windows.dockerfile
+++ b/build/Windows.dockerfile
@@ -12,77 +12,77 @@ RUN /builds/worker/bin/fetch-content static-url \
     unzip upx-3.95-win64.zip && \
     rm upx-3.95-win64.zip
 
-RUN wget -nv -O /builds/worker/fetches/binutils.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/96.0.1/linux64-binutils/binutils.tar.zst && \
+RUN wget -nv -O /builds/worker/fetches/binutils.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/99.0/linux64-binutils/binutils.tar.zst && \
     cd /builds/worker/fetches/ && \
     tar -xf binutils.tar.zst && \
     rm binutils.tar.zst
 
-RUN wget -nv -O /builds/worker/fetches/clang.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/96.0.1/linux64-clang-13-win-cross/clang.tar.zst && \
+RUN wget -nv -O /builds/worker/fetches/clang.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/99.0/linux64-clang-13/clang.tar.zst && \
     cd /builds/worker/fetches/ && \
     tar -xf clang.tar.zst && \
     rm clang.tar.zst
 
-RUN wget -nv -O /builds/worker/fetches/rustc.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/96.0.1/linux64-rust-cross-1.57/rustc.tar.zst && \
+RUN wget -nv -O /builds/worker/fetches/rustc.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/99.0/linux64-rust-cross-1.59/rustc.tar.zst && \
     cd /builds/worker/fetches/ && \
     tar -xf rustc.tar.zst && \
     rm rustc.tar.zst
 
-RUN wget -nv -O /builds/worker/fetches/rust-size.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/96.0.1/linux64-rust-size/rust-size.tar.zst && \
+RUN wget -nv -O /builds/worker/fetches/rust-size.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/99.0/linux64-rust-size/rust-size.tar.zst && \
     cd /builds/worker/fetches/ && \
     tar -xf rust-size.tar.zst && \
     rm rust-size.tar.zst
 
-RUN wget -nv -O /builds/worker/fetches/nasm.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/96.0.1/linux64-nasm/nasm.tar.zst && \
+RUN wget -nv -O /builds/worker/fetches/nasm.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/99.0/linux64-nasm/nasm.tar.zst && \
     cd /builds/worker/fetches/ && \
     tar -xf nasm.tar.zst && \
     rm nasm.tar.zst
 
-RUN wget -nv -O /builds/worker/fetches/node.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/96.0.1/linux64-node-12/node.tar.zst && \
+RUN wget -nv -O /builds/worker/fetches/node.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/99.0/linux64-node-12/node.tar.zst && \
     cd /builds/worker/fetches/ && \
     tar -xf node.tar.zst && \
     rm node.tar.zst
 
-RUN wget -nv -O /builds/worker/fetches/cbindgen.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/96.0.1/linux64-cbindgen/cbindgen.tar.zst && \
+RUN wget -nv -O /builds/worker/fetches/cbindgen.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/99.0/linux64-cbindgen/cbindgen.tar.zst && \
     cd /builds/worker/fetches/ && \
     tar -xf cbindgen.tar.zst && \
     rm cbindgen.tar.zst
 
-RUN wget -nv -O /builds/worker/fetches/sccache.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/96.0.1/linux64-sccache/sccache.tar.zst && \
+RUN wget -nv -O /builds/worker/fetches/sccache.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/99.0/linux64-sccache/sccache.tar.zst && \
     cd /builds/worker/fetches/ && \
     tar -xf sccache.tar.zst && \
     rm sccache.tar.zst
 
-RUN wget -nv -O /builds/worker/fetches/dump_syms.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/96.0.1/linux64-dump_syms/dump_syms.tar.zst && \
+RUN wget -nv -O /builds/worker/fetches/dump_syms.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/99.0/linux64-dump_syms/dump_syms.tar.zst && \
     cd /builds/worker/fetches/ && \
     tar -xf dump_syms.tar.zst && \
     rm dump_syms.tar.zst
 
-RUN wget -nv -O /builds/worker/fetches/wine.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/96.0.1/linux64-wine/wine.tar.zst && \
+RUN wget -nv -O /builds/worker/fetches/wine.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/99.0/linux64-wine/wine.tar.zst && \
     cd /builds/worker/fetches/ && \
     tar -xf wine.tar.zst && \
     rm wine.tar.zst
 
-RUN wget -nv -O /builds/worker/fetches/liblowercase.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/96.0.1/linux64-liblowercase/liblowercase.tar.zst && \
+RUN wget -nv -O /builds/worker/fetches/liblowercase.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/99.0/linux64-liblowercase/liblowercase.tar.zst && \
     cd /builds/worker/fetches/ && \
     tar -xf liblowercase.tar.zst && \
     rm liblowercase.tar.zst
 
-RUN wget -nv -O /builds/worker/fetches/winchecksec.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/96.0.1/linux64-winchecksec/winchecksec.tar.zst && \
+RUN wget -nv -O /builds/worker/fetches/winchecksec.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/99.0/linux64-winchecksec/winchecksec.tar.zst && \
     cd /builds/worker/fetches/ && \
     tar -xf winchecksec.tar.zst && \
     rm winchecksec.tar.zst
 
-RUN wget -nv -O /builds/worker/fetches/nsis.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/96.0.1/nsis/nsis.tar.zst && \
+RUN wget -nv -O /builds/worker/fetches/nsis.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/99.0/nsis/nsis.tar.zst && \
     cd /builds/worker/fetches/ && \
     tar -xf nsis.tar.zst && \
     rm nsis.tar.zst
 
-RUN wget -nv -O /builds/worker/fetches/sysroot-x86_64-linux-gnu.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/96.0.1/sysroot-x86_64-linux-gnu/sysroot-x86_64-linux-gnu.tar.zst && \
+RUN wget -nv -O /builds/worker/fetches/sysroot-x86_64-linux-gnu.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/99.0/sysroot-x86_64-linux-gnu/sysroot-x86_64-linux-gnu.tar.zst && \
     cd /builds/worker/fetches/ && \
     tar -xf sysroot-x86_64-linux-gnu.tar.zst && \
     rm sysroot-x86_64-linux-gnu.tar.zst
 
-RUN wget -nv -O /builds/worker/fetches/sysroot-wasm32-wasi.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/96.0.1/sysroot-wasm32-wasi/sysroot-wasm32-wasi.tar.zst && \
+RUN wget -nv -O /builds/worker/fetches/sysroot-wasm32-wasi.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/99.0/sysroot-wasm32-wasi/sysroot-wasm32-wasi.tar.zst && \
     cd /builds/worker/fetches/ && \
     tar -xf sysroot-wasm32-wasi.tar.zst && \
     rm sysroot-wasm32-wasi.tar.zst
diff --git a/build/WindowsARM.dockerfile b/build/WindowsARM.dockerfile
index dc2eaff724..eb514c87f8 100644
--- a/build/WindowsARM.dockerfile
+++ b/build/WindowsARM.dockerfile
@@ -13,77 +13,77 @@ RUN /builds/worker/bin/fetch-content static-url \
     unzip upx-3.95-win64.zip && \
     rm upx-3.95-win64.zip
 
-RUN wget -nv -O /builds/worker/fetches/binutils.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/96.0.1/linux64-binutils/binutils.tar.zst && \
+RUN wget -nv -O /builds/worker/fetches/binutils.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/99.0/linux64-binutils/binutils.tar.zst && \
     cd /builds/worker/fetches/ && \
     tar -xf binutils.tar.zst && \
     rm binutils.tar.zst
 
-RUN wget -nv -O /builds/worker/fetches/clang.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/96.0.1/linux64-clang-13-win-cross/clang.tar.zst && \
+RUN wget -nv -O /builds/worker/fetches/clang.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/99.0/linux64-clang-13/clang.tar.zst && \
     cd /builds/worker/fetches/ && \
     tar -xf clang.tar.zst && \
     rm clang.tar.zst
 
-RUN wget -nv -O /builds/worker/fetches/rustc.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/96.0.1/linux64-rust-cross-1.57/rustc.tar.zst && \
+RUN wget -nv -O /builds/worker/fetches/rustc.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/99.0/linux64-rust-cross-1.59/rustc.tar.zst && \
     cd /builds/worker/fetches/ && \
     tar -xf rustc.tar.zst && \
     rm rustc.tar.zst
 
-RUN wget -nv -O /builds/worker/fetches/rust-size.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/96.0.1/linux64-rust-size/rust-size.tar.zst && \
+RUN wget -nv -O /builds/worker/fetches/rust-size.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/99.0/linux64-rust-size/rust-size.tar.zst && \
     cd /builds/worker/fetches/ && \
     tar -xf rust-size.tar.zst && \
     rm rust-size.tar.zst
 
-RUN wget -nv -O /builds/worker/fetches/nasm.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/96.0.1/linux64-nasm/nasm.tar.zst && \
+RUN wget -nv -O /builds/worker/fetches/nasm.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/99.0/linux64-nasm/nasm.tar.zst && \
     cd /builds/worker/fetches/ && \
     tar -xf nasm.tar.zst && \
     rm nasm.tar.zst
 
-RUN wget -nv -O /builds/worker/fetches/node.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/96.0.1/linux64-node-12/node.tar.zst && \
+RUN wget -nv -O /builds/worker/fetches/node.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/99.0/linux64-node-12/node.tar.zst && \
     cd /builds/worker/fetches/ && \
     tar -xf node.tar.zst && \
     rm node.tar.zst
 
-RUN wget -nv -O /builds/worker/fetches/cbindgen.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/96.0.1/linux64-cbindgen/cbindgen.tar.zst && \
+RUN wget -nv -O /builds/worker/fetches/cbindgen.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/99.0/linux64-cbindgen/cbindgen.tar.zst && \
     cd /builds/worker/fetches/ && \
     tar -xf cbindgen.tar.zst && \
     rm cbindgen.tar.zst
 
-RUN wget -nv -O /builds/worker/fetches/sccache.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/96.0.1/linux64-sccache/sccache.tar.zst && \
+RUN wget -nv -O /builds/worker/fetches/sccache.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/99.0/linux64-sccache/sccache.tar.zst && \
     cd /builds/worker/fetches/ && \
     tar -xf sccache.tar.zst && \
     rm sccache.tar.zst
 
-RUN wget -nv -O /builds/worker/fetches/dump_syms.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/96.0.1/linux64-dump_syms/dump_syms.tar.zst && \
+RUN wget -nv -O /builds/worker/fetches/dump_syms.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/99.0/linux64-dump_syms/dump_syms.tar.zst && \
     cd /builds/worker/fetches/ && \
     tar -xf dump_syms.tar.zst && \
     rm dump_syms.tar.zst
 
-RUN wget -nv -O /builds/worker/fetches/wine.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/96.0.1/linux64-wine/wine.tar.zst && \
+RUN wget -nv -O /builds/worker/fetches/wine.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/99.0/linux64-wine/wine.tar.zst && \
     cd /builds/worker/fetches/ && \
     tar -xf wine.tar.zst && \
     rm wine.tar.zst
 
-RUN wget -nv -O /builds/worker/fetches/liblowercase.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/96.0.1/linux64-liblowercase/liblowercase.tar.zst && \
+RUN wget -nv -O /builds/worker/fetches/liblowercase.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/99.0/linux64-liblowercase/liblowercase.tar.zst && \
     cd /builds/worker/fetches/ && \
     tar -xf liblowercase.tar.zst && \
     rm liblowercase.tar.zst
 
-RUN wget -nv -O /builds/worker/fetches/winchecksec.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/96.0.1/linux64-winchecksec/winchecksec.tar.zst && \
+RUN wget -nv -O /builds/worker/fetches/winchecksec.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/99.0/linux64-winchecksec/winchecksec.tar.zst && \
     cd /builds/worker/fetches/ && \
     tar -xf winchecksec.tar.zst && \
     rm winchecksec.tar.zst
 
-RUN wget -nv -O /builds/worker/fetches/nsis.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/96.0.1/nsis/nsis.tar.zst && \
+RUN wget -nv -O /builds/worker/fetches/nsis.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/99.0/nsis/nsis.tar.zst && \
     cd /builds/worker/fetches/ && \
     tar -xf nsis.tar.zst && \
     rm nsis.tar.zst
 
-RUN wget -nv -O /builds/worker/fetches/sysroot-x86_64-linux-gnu.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/96.0.1/sysroot-x86_64-linux-gnu/sysroot-x86_64-linux-gnu.tar.zst && \
+RUN wget -nv -O /builds/worker/fetches/sysroot-x86_64-linux-gnu.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/99.0/sysroot-x86_64-linux-gnu/sysroot-x86_64-linux-gnu.tar.zst && \
     cd /builds/worker/fetches/ && \
     tar -xf sysroot-x86_64-linux-gnu.tar.zst && \
     rm sysroot-x86_64-linux-gnu.tar.zst
 
-RUN wget -nv -O /builds/worker/fetches/sysroot-wasm32-wasi.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/96.0.1/sysroot-wasm32-wasi/sysroot-wasm32-wasi.tar.zst && \
+RUN wget -nv -O /builds/worker/fetches/sysroot-wasm32-wasi.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/99.0/sysroot-wasm32-wasi/sysroot-wasm32-wasi.tar.zst && \
     cd /builds/worker/fetches/ && \
     tar -xf sysroot-wasm32-wasi.tar.zst && \
     rm sysroot-wasm32-wasi.tar.zst
diff --git a/build/fetch-content b/build/fetch-content
index 06dec2e291..80a427026c 100755
--- a/build/fetch-content
+++ b/build/fetch-content
@@ -578,7 +578,10 @@ def git_checkout_archive(
 
         subprocess.run(["git", "clone", "-n", repo, str(git_dir)], check=True, env=env)
 
-        subprocess.run(["git", "checkout", commit], cwd=str(git_dir), check=True)
+        # Always use a detached head so that git prints out what it checked out.
+        subprocess.run(
+            ["git", "checkout", "--detach", commit], cwd=str(git_dir), check=True
+        )
 
         # When including the .git, we want --depth 1, but a direct clone would not
         # necessarily be able to give us the right commit.
diff --git a/fern/core/docker.js b/fern/core/docker.js
index 6463540c42..fb9eebc8ba 100644
--- a/fern/core/docker.js
+++ b/fern/core/docker.js
@@ -61,7 +61,10 @@ async function loadToolchains(root) {
         }
 
         if (v.run["toolchain-alias"] !== undefined) {
-          toolchains.set(v.run["toolchain-alias"], v);
+          const aliases = v.run["toolchain-alias"];
+          for (const alias of Array.isArray(aliases) ? aliases : [aliases]) {
+            toolchains.set(alias, v);
+          }
           v.name = k;
         }
 
@@ -247,7 +250,6 @@ async function generate(artifactBaseDir) {
   const workspace = await loadWorkspace();
   const s3bucket = workspace["s3bucket"];
   const ffVersion = workspace["firefox"];
-
   buildInfos.forEach((job, i) => {
     for (const key of job.fetches.toolchain) {
       if (
diff --git a/l10n/de.json b/l10n/de.json
index 676c0ecd60..20b5b2c63c 100644
--- a/l10n/de.json
+++ b/l10n/de.json
@@ -130,7 +130,7 @@
       "string": "Im privaten Ghostery-Surfmodus bleiben Ihre Aktivitäten vor anderen Benutzern dieses Geräts verborgen. Folgende Daten werden am Ende der Sitzung automatisch aus Ghostery Dawn gelöscht: <em>Browserverlauf</em>, <em>Suchverlauf</em>, <em>Cookies</em> und <em>Download-Verlauf</em>. Dateien, die Sie auf Ihr Gerät herunterladen, und Seiten, die Sie mit einem Lesezeichen markieren, werden jedoch gespeichert."
     }
   },
-  "browser/profile/bookmarks.inc": {
+  "browser/browser/profile/default-bookmarks.ftl": {
     "ghostery_heading": {
       "string": "Ghostery",
       "context": "Ghostery links folder name"
diff --git a/l10n/en-US.json b/l10n/en-US.json
index 6b4cead672..a5ce3bf1b9 100644
--- a/l10n/en-US.json
+++ b/l10n/en-US.json
@@ -130,7 +130,7 @@
       "string": "In Ghostery’s private browsing mode, your activity will be kept confidential from others who use this device. The following will be automatically erased from Ghostery Dawn at the end of this session: <em>Browsing history</em><em>Search history</em><em>Cookies</em><em>Download history</em>However, files you download will be retained by your device and pages you bookmark will be saved."
     }
   },
-  "browser/profile/bookmarks.inc": {
+  "browser/browser/profile/default-bookmarks.ftl": {
     "ghostery_heading": {
       "string": "Ghostery",
       "context": "Ghostery links folder name"
diff --git a/l10n/es-ES.json b/l10n/es-ES.json
index f872b29059..fe52d3b338 100644
--- a/l10n/es-ES.json
+++ b/l10n/es-ES.json
@@ -130,7 +130,7 @@
       "string": "In Ghostery’s private browsing mode, your activity will be kept confidential from others who use this device. The following will be automatically erased from Ghostery Dawn at the end of this session: <em>Browsing history</em><em>Search history</em><em>Cookies</em><em>Download history</em>However, files you download will be retained by your device and pages you bookmark will be saved."
     }
   },
-  "browser/profile/bookmarks.inc": {
+  "browser/browser/profile/default-bookmarks.ftl": {
     "ghostery_heading": {
       "string": "Ghostery",
       "context": "Ghostery links folder name"
diff --git a/l10n/fr.json b/l10n/fr.json
index f693fab93a..a8227e2a62 100644
--- a/l10n/fr.json
+++ b/l10n/fr.json
@@ -130,7 +130,7 @@
       "string": "En mode de navigation privée Ghostery, votre activité ne sera pas connue des autres utilisateurs de l'appareil. Les éléments suivants seront automatiquement supprimés de Ghostery Dawn en fin de session : <em>Historique de navigation</em><em>Historique de recherche</em><em>Cookies</em><em>Historique de téléchargement</em>Cependant, les fichiers que vous avez téléchargés seront conservés par votre appareil et les pages pour lesquelles vous avez créé un signet seront enregistrées."
     }
   },
-  "browser/profile/bookmarks.inc": {
+  "browser/browser/profile/default-bookmarks.ftl": {
     "ghostery_heading": {
       "string": "Ghostery",
       "context": "Ghostery links folder name"
diff --git a/l10n/hu.json b/l10n/hu.json
index 6ca4146627..12ebbfaa27 100644
--- a/l10n/hu.json
+++ b/l10n/hu.json
@@ -130,7 +130,7 @@
       "string": "In Ghostery’s private browsing mode, your activity will be kept confidential from others who use this device. The following will be automatically erased from Ghostery Dawn at the end of this session: <em>Browsing history</em><em>Search history</em><em>Cookies</em><em>Download history</em>However, files you download will be retained by your device and pages you bookmark will be saved."
     }
   },
-  "browser/profile/bookmarks.inc": {
+  "browser/browser/profile/default-bookmarks.ftl": {
     "ghostery_heading": {
       "string": "Ghostery",
       "context": "Ghostery links folder name"
diff --git a/l10n/it.json b/l10n/it.json
index 7f1202df49..f4c4ea1a19 100644
--- a/l10n/it.json
+++ b/l10n/it.json
@@ -130,7 +130,7 @@
       "string": "In Ghostery’s private browsing mode, your activity will be kept confidential from others who use this device. The following will be automatically erased from Ghostery Dawn at the end of this session: <em>Browsing history</em><em>Search history</em><em>Cookies</em><em>Download history</em>However, files you download will be retained by your device and pages you bookmark will be saved."
     }
   },
-  "browser/profile/bookmarks.inc": {
+  "browser/browser/profile/default-bookmarks.ftl": {
     "ghostery_heading": {
       "string": "Ghostery",
       "context": "Ghostery links folder name"
diff --git a/l10n/ja.json b/l10n/ja.json
index 2fbcd1700f..6932e7ffb5 100644
--- a/l10n/ja.json
+++ b/l10n/ja.json
@@ -130,7 +130,7 @@
       "string": "In Ghostery’s private browsing mode, your activity will be kept confidential from others who use this device. The following will be automatically erased from Ghostery Dawn at the end of this session: <em>Browsing history</em><em>Search history</em><em>Cookies</em><em>Download history</em>However, files you download will be retained by your device and pages you bookmark will be saved."
     }
   },
-  "browser/profile/bookmarks.inc": {
+  "browser/browser/profile/default-bookmarks.ftl": {
     "ghostery_heading": {
       "string": "Ghostery",
       "context": "Ghostery links folder name"
diff --git a/l10n/ko.json b/l10n/ko.json
index c559e78649..a15ca7fe7f 100644
--- a/l10n/ko.json
+++ b/l10n/ko.json
@@ -130,7 +130,7 @@
       "string": "In Ghostery’s private browsing mode, your activity will be kept confidential from others who use this device. The following will be automatically erased from Ghostery Dawn at the end of this session: <em>Browsing history</em><em>Search history</em><em>Cookies</em><em>Download history</em>However, files you download will be retained by your device and pages you bookmark will be saved."
     }
   },
-  "browser/profile/bookmarks.inc": {
+  "browser/browser/profile/default-bookmarks.ftl": {
     "ghostery_heading": {
       "string": "Ghostery",
       "context": "Ghostery links folder name"
diff --git a/l10n/nl.json b/l10n/nl.json
index 0c90cf6e3f..d480569445 100644
--- a/l10n/nl.json
+++ b/l10n/nl.json
@@ -130,7 +130,7 @@
       "string": "In Ghostery’s private browsing mode, your activity will be kept confidential from others who use this device. The following will be automatically erased from Ghostery Dawn at the end of this session: <em>Browsing history</em><em>Search history</em><em>Cookies</em><em>Download history</em>However, files you download will be retained by your device and pages you bookmark will be saved."
     }
   },
-  "browser/profile/bookmarks.inc": {
+  "browser/browser/profile/default-bookmarks.ftl": {
     "ghostery_heading": {
       "string": "Ghostery",
       "context": "Ghostery links folder name"
diff --git a/l10n/pl.json b/l10n/pl.json
index 1898458369..4f318e7955 100644
--- a/l10n/pl.json
+++ b/l10n/pl.json
@@ -130,7 +130,7 @@
       "string": "In Ghostery’s private browsing mode, your activity will be kept confidential from others who use this device. The following will be automatically erased from Ghostery Dawn at the end of this session: <em>Browsing history</em><em>Search history</em><em>Cookies</em><em>Download history</em>However, files you download will be retained by your device and pages you bookmark will be saved."
     }
   },
-  "browser/profile/bookmarks.inc": {
+  "browser/browser/profile/default-bookmarks.ftl": {
     "ghostery_heading": {
       "string": "Ghostery",
       "context": "Ghostery links folder name"
diff --git a/l10n/pt_BR.json b/l10n/pt_BR.json
index 3110e13f33..9a080738df 100644
--- a/l10n/pt_BR.json
+++ b/l10n/pt_BR.json
@@ -130,7 +130,7 @@
       "string": "In Ghostery’s private browsing mode, your activity will be kept confidential from others who use this device. The following will be automatically erased from Ghostery Dawn at the end of this session: <em>Browsing history</em><em>Search history</em><em>Cookies</em><em>Download history</em>However, files you download will be retained by your device and pages you bookmark will be saved."
     }
   },
-  "browser/profile/bookmarks.inc": {
+  "browser/browser/profile/default-bookmarks.ftl": {
     "ghostery_heading": {
       "string": "Ghostery",
       "context": "Ghostery links folder name"
diff --git a/l10n/ru.json b/l10n/ru.json
index 214fdd869e..18accb21e1 100644
--- a/l10n/ru.json
+++ b/l10n/ru.json
@@ -130,7 +130,7 @@
       "string": "In Ghostery’s private browsing mode, your activity will be kept confidential from others who use this device. The following will be automatically erased from Ghostery Dawn at the end of this session: <em>Browsing history</em><em>Search history</em><em>Cookies</em><em>Download history</em>However, files you download will be retained by your device and pages you bookmark will be saved."
     }
   },
-  "browser/profile/bookmarks.inc": {
+  "browser/browser/profile/default-bookmarks.ftl": {
     "ghostery_heading": {
       "string": "Ghostery",
       "context": "Ghostery links folder name"
diff --git a/l10n/zh_CN.json b/l10n/zh_CN.json
index 3dd15a5983..2bda5c5bf8 100644
--- a/l10n/zh_CN.json
+++ b/l10n/zh_CN.json
@@ -130,7 +130,7 @@
       "string": "In Ghostery’s private browsing mode, your activity will be kept confidential from others who use this device. The following will be automatically erased from Ghostery Dawn at the end of this session: <em>Browsing history</em><em>Search history</em><em>Cookies</em><em>Download history</em>However, files you download will be retained by your device and pages you bookmark will be saved."
     }
   },
-  "browser/profile/bookmarks.inc": {
+  "browser/browser/profile/default-bookmarks.ftl": {
     "ghostery_heading": {
       "string": "Ghostery",
       "context": "Ghostery links folder name"
diff --git a/l10n/zh_TW.json b/l10n/zh_TW.json
index 9130c304a2..26578e8158 100644
--- a/l10n/zh_TW.json
+++ b/l10n/zh_TW.json
@@ -130,7 +130,7 @@
       "string": "In Ghostery’s private browsing mode, your activity will be kept confidential from others who use this device. The following will be automatically erased from Ghostery Dawn at the end of this session: <em>Browsing history</em><em>Search history</em><em>Cookies</em><em>Download history</em>However, files you download will be retained by your device and pages you bookmark will be saved."
     }
   },
-  "browser/profile/bookmarks.inc": {
+  "browser/browser/profile/default-bookmarks.ftl": {
     "ghostery_heading": {
       "string": "Ghostery",
       "context": "Ghostery links folder name"
diff --git a/patches/.index b/patches/.index
index 4071b8ccca..8356b2e890 100644
--- a/patches/.index
+++ b/patches/.index
@@ -7,7 +7,7 @@
 0007-Force-healthreport-and-normandy-off-at-configure-tim.patch
 0008-Hide-Recommend-as-you-browse-preferences.patch
 0009-Update-default-bookmarks-to-Ghostery-specific-ones.patch
-0010-Hide-Learn-More-links-in-preferences.patch
+0010-Clean-up-preferences.patch
 0011-Remove-Report-Deceptive-Site-from-help-menubar.patch
 0012-Update-uninstaller-survey-URL.patch
 0013-Update-strings-for-windows-module-manifest.patch
@@ -15,21 +15,20 @@
 0015-Manual-override-of-search-engine-list.patch
 0016-Firefox-profile-import.patch
 0017-Hide-Library-Synced-Tabs-from-the-menu-panel.patch
-0018-Hide-Firefox-Home-Content-from-preferences.patch
-0019-Ghostery-Theme.patch
-0020-Move-Ghostery-icon-to-UrlBar.patch
-0021-Remove-Lockwise-branding-in-about-logins.patch
-0022-Custom-brand-styling-on-new-private-window.patch
-0023-Use-the-same-UA-as-Firefox.patch
-0024-Fix-Windows-hidpi-issue.patch
-0025-Allow-update-channel-to-be-configured-via-prefs.patch
-0026-Update-text-on-about-license.patch
-0027-Hide-addon-recommendation-badge.patch
-0028-Disable-ion-pioneer-studies.patch
-0029-Hide-learn-more-link-on-network-error-pages.patch
-0030-OpenURL-on-buildID-changes.patch
-0031-Ignore-the-glinter.patch
-0032-Replace-New-Tab-with-Ghostery-New-Tab-Addon.patch
-0033-Better-Fox-integration.patch
-0034-Default-top-sites.patch
-0035-Disable-package-duplicates-detection.patch
\ No newline at end of file
+0018-Ghostery-Theme.patch
+0019-Move-Ghostery-icon-to-UrlBar.patch
+0020-Remove-Lockwise-branding-in-about-logins.patch
+0021-Custom-brand-styling-on-new-private-window.patch
+0022-Use-the-same-UA-as-Firefox.patch
+0023-Fix-Windows-hidpi-issue.patch
+0024-Allow-update-channel-to-be-configured-via-prefs.patch
+0025-Update-text-on-about-license.patch
+0026-Hide-addon-recommendation-badge.patch
+0027-Disable-ion-pioneer-studies.patch
+0028-Hide-learn-more-link-on-network-error-pages.patch
+0029-OpenURL-on-buildID-changes.patch
+0030-Ignore-the-glinter.patch
+0031-Replace-New-Tab-with-Ghostery-New-Tab-Addon.patch
+0032-Better-Fox-integration.patch
+0033-Default-top-sites.patch
+0034-Disable-package-duplicates-detection.patch
\ No newline at end of file
diff --git a/patches/0001-Set-update-URL.patch b/patches/0001-Set-update-URL.patch
index 082b39efe2..06803b1557 100644
--- a/patches/0001-Set-update-URL.patch
+++ b/patches/0001-Set-update-URL.patch
@@ -7,10 +7,10 @@ Subject: Set update URL
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/build/moz.build b/build/moz.build
-index 10d0e9aa6e..db731adff0 100644
+index 671e77e97b..1fee26d1bb 100644
 --- a/build/moz.build
 +++ b/build/moz.build
-@@ -88,7 +88,7 @@ if CONFIG["MOZ_APP_BASENAME"]:
+@@ -91,7 +91,7 @@ if CONFIG["MOZ_APP_BASENAME"]:
          if CONFIG[var]:
              appini_defines[var] = True
  
@@ -20,5 +20,5 @@ index 10d0e9aa6e..db731adff0 100644
          appini_defines["MOZ_APPUPDATE_HOST"] = CONFIG["MOZ_APPUPDATE_HOST"]
  
 -- 
-2.34.1
+2.35.1
 
diff --git a/patches/0002-Change-new-tab-page-and-home-page-url.patch b/patches/0002-Change-new-tab-page-and-home-page-url.patch
index 1f6f25290b..a357018861 100644
--- a/patches/0002-Change-new-tab-page-and-home-page-url.patch
+++ b/patches/0002-Change-new-tab-page-and-home-page-url.patch
@@ -9,10 +9,10 @@ Subject: Change new tab page and home page url
  3 files changed, 3 insertions(+), 16 deletions(-)
 
 diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
-index af088110a4..d58c7eac69 100644
+index af9c349671..356ab7191c 100644
 --- a/browser/app/profile/firefox.js
 +++ b/browser/app/profile/firefox.js
-@@ -267,7 +267,7 @@ pref("browser.shell.setDefaultBrowserUserChoice", true);
+@@ -281,7 +281,7 @@ pref("browser.shell.setDefaultPDFHandler", false);
  // 0 = blank, 1 = home (browser.startup.homepage), 2 = last visited page, 3 = resume previous browser session
  // The behavior of option 3 is detailed at: http://wiki.mozilla.org/Session_Restore
  pref("browser.startup.page",                1);
@@ -61,5 +61,5 @@ index f73b0f3e6c..6535b4ae13 100644
    "browser.startup.homepage_override.extensionControlled";
  const kHomePageIgnoreListId = "homepage-urls";
 -- 
-2.34.1
+2.35.1
 
diff --git a/patches/0003-Update-text-in-about-dialog.patch b/patches/0003-Update-text-in-about-dialog.patch
index 835aa0cb1d..ebeef5868f 100644
--- a/patches/0003-Update-text-in-about-dialog.patch
+++ b/patches/0003-Update-text-in-about-dialog.patch
@@ -41,5 +41,5 @@ index 90a568a17d..75d5a23a02 100644
        <description id="trademark" data-l10n-id="trademarkInfo"></description>
      </vbox>
 -- 
-2.34.1
+2.35.1
 
diff --git a/patches/0004-Remove-tracking-protection-panel-from-url-bar.patch b/patches/0004-Remove-tracking-protection-panel-from-url-bar.patch
index c713af356b..649723042c 100644
--- a/patches/0004-Remove-tracking-protection-panel-from-url-bar.patch
+++ b/patches/0004-Remove-tracking-protection-panel-from-url-bar.patch
@@ -9,7 +9,7 @@ Subject: Remove tracking protection panel from url bar
  3 files changed, 15 insertions(+), 15 deletions(-)
 
 diff --git a/browser/base/content/browser-siteIdentity.js b/browser/base/content/browser-siteIdentity.js
-index fceae6718a..d01fbd52e9 100644
+index a0987058af..a88ab960ec 100644
 --- a/browser/base/content/browser-siteIdentity.js
 +++ b/browser/base/content/browser-siteIdentity.js
 @@ -901,10 +901,10 @@ var gIdentityHandler = {
@@ -28,10 +28,10 @@ index fceae6718a..d01fbd52e9 100644
  
    /**
 diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
-index 6debc9a530..f7fafb361b 100644
+index f42dca1f56..4c74607566 100644
 --- a/browser/base/content/browser.js
 +++ b/browser/base/content/browser.js
-@@ -1911,7 +1911,7 @@ var gBrowserInit = {
+@@ -1929,7 +1929,7 @@ var gBrowserInit = {
  
      BookmarkingUI.init();
      BrowserSearch.delayedStartupInit();
@@ -40,7 +40,7 @@ index 6debc9a530..f7fafb361b 100644
      HomePage.delayedStartup().catch(Cu.reportError);
  
      let safeMode = document.getElementById("helpSafeMode");
-@@ -2495,7 +2495,7 @@ var gBrowserInit = {
+@@ -2505,7 +2505,7 @@ var gBrowserInit = {
        Services.prefs.removeObserver(ctrlTab.prefName, ctrlTab);
        ctrlTab.uninit();
        gBrowserThumbnails.uninit();
@@ -49,7 +49,7 @@ index 6debc9a530..f7fafb361b 100644
        FullZoom.destroy();
  
        Services.obs.removeObserver(gIdentityHandler, "perm-changed");
-@@ -5264,7 +5264,7 @@ var XULBrowserWindow = {
+@@ -5206,7 +5206,7 @@ var XULBrowserWindow = {
      const nsIWebProgressListener = Ci.nsIWebProgressListener;
  
      let browser = gBrowser.selectedBrowser;
@@ -58,7 +58,7 @@ index 6debc9a530..f7fafb361b 100644
  
      if (
        aStateFlags & nsIWebProgressListener.STATE_START &&
-@@ -5457,7 +5457,7 @@ var XULBrowserWindow = {
+@@ -5400,7 +5400,7 @@ var XULBrowserWindow = {
  
      gPermissionPanel.onLocationChange();
  
@@ -67,7 +67,7 @@ index 6debc9a530..f7fafb361b 100644
  
      BrowserPageActions.onLocationChange();
  
-@@ -5647,12 +5647,12 @@ var XULBrowserWindow = {
+@@ -5590,12 +5590,12 @@ var XULBrowserWindow = {
        );
      }
  
@@ -87,10 +87,10 @@ index 6debc9a530..f7fafb361b 100644
      // We need the state of the previous content blocking event, so update
      // event after onContentBlockingEvent is called.
 diff --git a/browser/base/content/browser.xhtml b/browser/base/content/browser.xhtml
-index 71480fc2f6..b7b6e968db 100644
+index 2c20aab751..e8f216d483 100644
 --- a/browser/base/content/browser.xhtml
 +++ b/browser/base/content/browser.xhtml
-@@ -65,7 +65,7 @@
+@@ -66,7 +66,7 @@
    <link rel="localization" href="browser/browserContext.ftl"/>
    <link rel="localization" href="browser/browserSets.ftl"/>
    <link rel="localization" href="browser/menubar.ftl"/>
@@ -100,5 +100,5 @@ index 71480fc2f6..b7b6e968db 100644
    <link rel="localization" href="browser/panelUI.ftl"/>
    <link rel="localization" href="preview/interventions.ftl"/>
 -- 
-2.34.1
+2.35.1
 
diff --git a/patches/0005-Hide-Protection-Dashboard-link-from-right-burger-men.patch b/patches/0005-Hide-Protection-Dashboard-link-from-right-burger-men.patch
index beb523e174..312f0bf543 100644
--- a/patches/0005-Hide-Protection-Dashboard-link-from-right-burger-men.patch
+++ b/patches/0005-Hide-Protection-Dashboard-link-from-right-burger-men.patch
@@ -8,7 +8,7 @@ Subject: Hide Protection Dashboard link from right burger menu
  2 files changed, 4 insertions(+)
 
 diff --git a/browser/base/content/appmenu-viewcache.inc.xhtml b/browser/base/content/appmenu-viewcache.inc.xhtml
-index 266c0e5a47..f001bef60e 100644
+index 29269b96ee..b700c48ef0 100644
 --- a/browser/base/content/appmenu-viewcache.inc.xhtml
 +++ b/browser/base/content/appmenu-viewcache.inc.xhtml
 @@ -25,6 +25,7 @@
@@ -28,10 +28,10 @@ index 266c0e5a47..f001bef60e 100644
                       class="subviewbutton"
                       data-l10n-id="appmenuitem-new-tab"
 diff --git a/browser/base/content/navigator-toolbox.inc.xhtml b/browser/base/content/navigator-toolbox.inc.xhtml
-index 74104ac893..ceeb5318b9 100644
+index 256ee8ee74..c58c5f4316 100644
 --- a/browser/base/content/navigator-toolbox.inc.xhtml
 +++ b/browser/base/content/navigator-toolbox.inc.xhtml
-@@ -171,6 +171,7 @@
+@@ -175,6 +175,7 @@
                   class="chromeclass-toolbar-additional"/>
              <!-- Use onclick instead of normal popup= syntax since the popup
                   code fires onmousedown, and hence eats our favicon drag events. -->
@@ -39,7 +39,7 @@ index 74104ac893..ceeb5318b9 100644
              <box id="tracking-protection-icon-container" align="center"
                   role="button"
                   onclick="gProtectionsHandler.handleProtectionsButtonEvent(event);"
-@@ -185,6 +186,7 @@
+@@ -189,6 +190,7 @@
                  <description id="tracking-protection-icon-tooltip-label" class="tooltip-label"/>
                </tooltip>
              </box>
@@ -48,5 +48,5 @@ index 74104ac893..ceeb5318b9 100644
                   pageproxystate="invalid"
                   ondragstart="gIdentityHandler.onDragStart(event);">
 -- 
-2.34.1
+2.35.1
 
diff --git a/patches/0006-Remove-Tracking-Protection-Settings-from-preferences.patch b/patches/0006-Remove-Tracking-Protection-Settings-from-preferences.patch
index e4275a106f..3dea03dd1f 100644
--- a/patches/0006-Remove-Tracking-Protection-Settings-from-preferences.patch
+++ b/patches/0006-Remove-Tracking-Protection-Settings-from-preferences.patch
@@ -21,5 +21,5 @@ index 30927d3137..f9bcba3b49 100644
  /* Override styling that sets descriptions as grey */
  #trackingGroup description.indent,
 -- 
-2.34.1
+2.35.1
 
diff --git a/patches/0007-Force-healthreport-and-normandy-off-at-configure-tim.patch b/patches/0007-Force-healthreport-and-normandy-off-at-configure-tim.patch
index 422f70ee19..4e34e00ff8 100644
--- a/patches/0007-Force-healthreport-and-normandy-off-at-configure-tim.patch
+++ b/patches/0007-Force-healthreport-and-normandy-off-at-configure-tim.patch
@@ -25,5 +25,5 @@ index 8653bcbb16..935af4065a 100644
  with only_when(target_is_linux & compile_environment):
      option(env="MOZ_NO_PIE_COMPAT", help="Enable non-PIE wrapper")
 -- 
-2.34.1
+2.35.1
 
diff --git a/patches/0008-Hide-Recommend-as-you-browse-preferences.patch b/patches/0008-Hide-Recommend-as-you-browse-preferences.patch
index 36ca4cc9c1..f7a5f88bd7 100644
--- a/patches/0008-Hide-Recommend-as-you-browse-preferences.patch
+++ b/patches/0008-Hide-Recommend-as-you-browse-preferences.patch
@@ -8,10 +8,10 @@ Subject: Hide "Recommend as you browse" preferences
  2 files changed, 9 insertions(+), 9 deletions(-)
 
 diff --git a/browser/components/preferences/main.inc.xhtml b/browser/components/preferences/main.inc.xhtml
-index c537a22888..9b9afbee75 100644
+index 9d17b7be8c..6d8fc8f67f 100644
 --- a/browser/components/preferences/main.inc.xhtml
 +++ b/browser/components/preferences/main.inc.xhtml
-@@ -674,13 +674,13 @@
+@@ -683,13 +683,13 @@
              preference="media.hardwaremediakeys.enabled"/>
      <label id="mediaControlLearnMore" class="learnMore" data-l10n-id="browsing-media-control-learn-more" is="text-link"/>
    </hbox>
@@ -28,10 +28,10 @@ index c537a22888..9b9afbee75 100644
      <checkbox id="cfrRecommendations-features"
              class="tail-with-learn-more"
 diff --git a/browser/components/preferences/main.js b/browser/components/preferences/main.js
-index ceee50df37..3f42f53240 100644
+index ffab8ce2bf..e191fa744f 100644
 --- a/browser/components/preferences/main.js
 +++ b/browser/components/preferences/main.js
-@@ -336,13 +336,13 @@ var gMainPane = {
+@@ -341,13 +341,13 @@ var gMainPane = {
      // listener for future menu changes.
      gMainPane.initDefaultZoomValues();
  
@@ -53,5 +53,5 @@ index ceee50df37..3f42f53240 100644
      if (
        Services.prefs.getBoolPref(
 -- 
-2.34.1
+2.35.1
 
diff --git a/patches/0009-Update-default-bookmarks-to-Ghostery-specific-ones.patch b/patches/0009-Update-default-bookmarks-to-Ghostery-specific-ones.patch
index c1024acdf0..a975402499 100644
--- a/patches/0009-Update-default-bookmarks-to-Ghostery-specific-ones.patch
+++ b/patches/0009-Update-default-bookmarks-to-Ghostery-specific-ones.patch
@@ -4,14 +4,14 @@ Subject: Update default bookmarks to Ghostery-specific ones
 
 Fix bookmarks
 ---
- browser/locales/generic/profile/bookmarks.html.in | 12 ++++++------
+ browser/base/content/default-bookmarks.html | 12 ++++++------
  1 file changed, 6 insertions(+), 6 deletions(-)
 
-diff --git a/browser/locales/generic/profile/bookmarks.html.in b/browser/locales/generic/profile/bookmarks.html.in
-index c5ac0b45d9..af8f4e1d98 100644
---- a/browser/locales/generic/profile/bookmarks.html.in
-+++ b/browser/locales/generic/profile/bookmarks.html.in
-@@ -10,6 +10,8 @@
+diff --git a/browser/base/content/default-bookmarks.html b/browser/base/content/default-bookmarks.html
+index b2d18d3098..c297da3a1b 100644
+--- a/browser/base/content/default-bookmarks.html
++++ b/browser/base/content/default-bookmarks.html
+@@ -9,6 +9,8 @@
  #define mdn_icon data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAIAAAD8GO2jAAABgElEQVR4AWPouPiRpmjUAjgatSBj+aG0OVuyVhymsgWl2y475zXySikwwIC4lpFDVk3avG0BrXP9mmeV7bhCvgXuxW3M7JwMeAGfpByZFpjHFzAQB2KmrSfZAtuMKgaiAZ+MUuLc7SRY4FbYwkA60HAJiJm8uubQAwIWeJV1MlAAOAREHDJrcFqQMG+ngIK6oKyykLwqAyMjeXZwiUjgtKD+yGMIwyGzmoGBTAs4hcXrgObgi4OiVkpCiUtYov7YU5wW1B194t0ww69ldvjktYouwWRYIGdkQ1Q+iJ28hp2Xn7B5zKzIPAlNw6S52wlbkL3mJJecOq+CBqeIJC6TjUJTMlcdz9lwLmriSuPgJBVbj/D+5SSXRequQVhNN4nIoEJhV77jKgs7B6bprJw85XtuU8GCpNlbSS3gSA4ii4QiTAvElDWpWeH41kxg5eZDSypUrtFKd1zTcA1EpHRDS5rUyQEts+VN7JjYOGR0TWhY6RdsOhc/Y9NoswUJjVoAAE+h555Rgcg2AAAAAElFTkSuQmCC
  
  #define addon_icon data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAMAAABEpIrGAAABOFBMVEUAAAAAzdwAydcAyNgA//8AzOYAydcAyNgAyNgA2NgAytoAzNkAytgAydgA29sA0egAyNgAyNgA//8AyNgAydgA//8Ay9cAydcAytkAz90Ay9gA1eoAydgAytsAyNgAytgAydkAydgAydgAyNgAydgAyNcAy9oAydgA//8AytsAy9kAytkAyNgAydgAydkAy9kAzP8AydgAydgAydgAz98AzN0AyNcAyNsAydcAydgAydgAydcAytgAytcAydcAydcAytcAydcAyNcAydcAy9gAztgAydcAydgAzOAAydcAyNgAyNgAytwAyNcAyNgAy9wAyNcAyNcAyNgAydgAyNcAydcAydgA0uEAydkAyNgAyeQA4+MAyNgAydkAzN0AyNsA1f8AyNgAydgAydcA1eMAydgAydcAyNdj6PGJAAAAZ3RSTlMAJFpBAQqm8qwNPiiPygcLv8QEw5cDQMA1JU4MwiuDbl/+6+m4+0XLAj9KePz9cjYFvervEA/IDsfFr+xcgeaOYIDo+ica1OMZ9bXlHe73LM3M35itxs8Rf5ATCbFeHjgGttC5ErzO3WvwaAAAAWxJREFUOMt9kudCwkAQhFcITQWCoaggiBqxoaixYUVsYMMGCmLXff838LIXCJAL84fvmCHsTg4AYMDhlIDkcnu8Po4w6BjiIA0joj+gY1BmGKLEiMIwHNFR9xGjuh8jpMQoYZjRGBGOA8QTHDEUB4hynABwcEqCT8GW2DNSnCYBnJzSoSk0NT2jcphlM/rRXpk5NkRgfmFxSWBml6MrOWNlWBUEEmDKtyYIrGttP66gSP4Nww8mUKzNLd5/zHaJbb1Tl9xnzR2WcGM/5QE8BLvJvf0Dc4HDo8IxUVECL5Vywv7s9Mzwz/WLcFHSsWy8w0sa9+qa/JtbOlUY3mnGLbjnCz9Q4JEfnhCrNb5nXi3w754p8MIPKVWpt6psGJ+vFJBbBUO3GlozzYdsSmCV1NlntiTnegNvPQ29Wx7h7fKrEUvg47PD/6oLpgh8m7//AZEav4b/J/bbb75SAzvR3crY+6y8fLGsQV9ZSvwHF4LQIhDjT+8AAAAASUVORK5CYII=
@@ -20,25 +20,25 @@ index c5ac0b45d9..af8f4e1d98 100644
  <!-- 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/. -->
-@@ -23,14 +25,12 @@
-     <dd>@bookmarks_toolbarfolder_description@
+@@ -31,14 +33,12 @@
+     <dd data-l10n-id="default-bookmarks-toolbarfolder-description">default-bookmarks-toolbarfolder-description</dd>
  #ifndef NIGHTLY_BUILD
-         <dl>
--            <p><dt><a href="https://www.mozilla.org/@AB_CD@/firefox/central/" icon="@firefox_icon@">@getting_started@</a></dt>
-         </dl>
--    <p><dt><h3>@firefox_heading@</h3></dt>
-+    <p><dt><h3>@ghostery_heading@</h3></dt>
          <dl><p>
--            <dt><a href="https://support.mozilla.org/@AB_CD@/products/firefox" icon="@firefox_icon@">@firefox_get_help@</a>
--            <dt><a href="https://support.mozilla.org/@AB_CD@/kb/customize-firefox-controls-buttons-and-toolbars?utm_source=firefox-browser&utm_medium=default-bookmarks&utm_campaign=customize" icon="@firefox_icon@">@firefox_customize@</a>
--            <dt><a href="https://www.mozilla.org/@AB_CD@/contribute/" icon="@mozilla_icon@">@firefox_community@</a>
--            <dt><a href="https://www.mozilla.org/@AB_CD@/about/" icon="@mozilla_icon@">@firefox_about@</a>
-+            <dt><a href="https://www.ghostery.com/support/" icon="@ghostery_icon@">@ghostery_help@</a>
-+            <dt><a href="https://www.ghostery.com/pricing/" icon="@ghostery_icon@">@ghostery_plans@</a>
-+            <dt><a href="https://www.ghostery.com/about-ghostery/" icon="@ghostery_icon@">@ghostery_about_us@</a>
-         </dl>
+-            <dt><a href="https://www.mozilla.org/firefox/central/" icon="@firefox_icon@" data-l10n-id="default-bookmarks-getting-started">default-bookmarks-getting-started</a></dt>
+         </dl><p>
+-    <dt><h3 data-l10n-id="default-bookmarks-firefox-heading">default-bookmarks-firefox-heading</h3></dt>
++    <dt><h3 data-l10n-id="ghostery_heading">ghostery_heading</h3></dt>
+         <dl><p>
+-            <dt><a href="https://support.mozilla.org/products/firefox" icon="@firefox_icon@" data-l10n-id="default-bookmarks-firefox-get-help">default-bookmarks-firefox-get-help</a></dt>
+-            <dt><a href="https://support.mozilla.org/kb/customize-firefox-controls-buttons-and-toolbars?utm_source=firefox-browser&utm_medium=default-bookmarks&utm_campaign=customize" icon="@firefox_icon@" data-l10n-id="default-bookmarks-firefox-customize">default-bookmarks-firefox-customize</a></dt>
+-            <dt><a href="https://www.mozilla.org/contribute/" icon="@mozilla_icon@" data-l10n-id="default-bookmarks-firefox-community">default-bookmarks-firefox-community</a></dt>
+-            <dt><a href="https://www.mozilla.org/about/" icon="@mozilla_icon@" data-l10n-id="default-bookmarks-firefox-about">default-bookmarks-firefox-about</a></dt>
++            <dt><a href="https://www.ghostery.com/support/" icon="@ghostery_icon@" data-l10n-id="ghostery_help">ghostery_help</a></dt>
++            <dt><a href="https://www.ghostery.com/pricing/" icon="@ghostery_icon@" data-l10n-id="ghostery_plans">ghostery_plans</a></dt>
++            <dt><a href="https://www.ghostery.com/ghostery-manifesto/" icon="@ghostery_icon@" data-l10n-id="ghostery_about_us">ghostery_about_us</a></dt>
+         </dl><p>
  #else
-         <dl>
+         <dl><p>
 -- 
-2.34.1
+2.35.1
 
diff --git a/patches/0010-Clean-up-preferences.patch b/patches/0010-Clean-up-preferences.patch
new file mode 100644
index 0000000000..d4edd1a157
--- /dev/null
+++ b/patches/0010-Clean-up-preferences.patch
@@ -0,0 +1,49 @@
+From: Sam Macbeth <sam@cliqz.com>
+Date: Tue, 22 Sep 2020 11:50:13 +0200
+Subject: Clean up preferences
+
+---
+ browser/themes/shared/preferences/preferences.css | 13 +++++++++++++
+ 1 file changed, 13 insertions(+)
+
+diff --git a/browser/themes/shared/preferences/preferences.css b/browser/themes/shared/preferences/preferences.css
+index 8b110d3eed..56eec39892 100644
+--- a/browser/themes/shared/preferences/preferences.css
++++ b/browser/themes/shared/preferences/preferences.css
+@@ -25,6 +25,10 @@ body {
+   }
+ }
+ 
++#homeContentsGroup {
++  display: none;
++}
++
+ #preferences-root {
+   text-rendering: optimizeLegibility;
+ }
+@@ -152,6 +156,7 @@ checkbox {
+ }
+ 
+ .learnMore {
++  display: none;
+   margin-inline-start: 0;
+   font-weight: normal;
+   white-space: nowrap;
+@@ -1214,6 +1219,14 @@ richlistitem .text-link:hover {
+   margin-inline-start: 6px;
+ }
+ 
++#category-more-from-mozilla {
++  display: none;
++}
++
++#category-home {
++  display: none;
++}
++
+ #moreFromMozillaCategory-header .title {
+   margin-block-end: 4px;
+ }
+-- 
+2.35.1
+
diff --git a/patches/0010-Hide-Learn-More-links-in-preferences.patch b/patches/0010-Hide-Learn-More-links-in-preferences.patch
deleted file mode 100644
index ddc524a83e..0000000000
--- a/patches/0010-Hide-Learn-More-links-in-preferences.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Sam Macbeth <sam@cliqz.com>
-Date: Tue, 22 Sep 2020 11:50:13 +0200
-Subject: Hide 'Learn More' links in preferences
-
----
- browser/themes/shared/preferences/preferences.inc.css | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/browser/themes/shared/preferences/preferences.inc.css b/browser/themes/shared/preferences/preferences.inc.css
-index 7e8c894a13..40da704406 100644
---- a/browser/themes/shared/preferences/preferences.inc.css
-+++ b/browser/themes/shared/preferences/preferences.inc.css
-@@ -134,6 +134,7 @@ checkbox {
- }
- 
- .learnMore {
-+  display: none;
-   margin-inline-start: 0;
-   font-weight: normal;
-   white-space: nowrap;
--- 
-2.34.1
-
diff --git a/patches/0011-Remove-Report-Deceptive-Site-from-help-menubar.patch b/patches/0011-Remove-Report-Deceptive-Site-from-help-menubar.patch
index 85d7e2dd6f..1d1c94ce96 100644
--- a/patches/0011-Remove-Report-Deceptive-Site-from-help-menubar.patch
+++ b/patches/0011-Remove-Report-Deceptive-Site-from-help-menubar.patch
@@ -19,5 +19,5 @@ index 01d8063ffb..831569ffdb 100644
  
    /**
 -- 
-2.34.1
+2.35.1
 
diff --git a/patches/0012-Update-uninstaller-survey-URL.patch b/patches/0012-Update-uninstaller-survey-URL.patch
index 51a618e2ab..77a3d92ab5 100644
--- a/patches/0012-Update-uninstaller-survey-URL.patch
+++ b/patches/0012-Update-uninstaller-survey-URL.patch
@@ -7,7 +7,7 @@ Subject: Update uninstaller survey URL
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/browser/installer/windows/nsis/uninstaller.nsi b/browser/installer/windows/nsis/uninstaller.nsi
-index 724d780143..e2878a43d9 100755
+index 05988982a1..600a8e568f 100755
 --- a/browser/installer/windows/nsis/uninstaller.nsi
 +++ b/browser/installer/windows/nsis/uninstaller.nsi
 @@ -150,7 +150,7 @@ OutFile "helper.exe"
@@ -20,5 +20,5 @@ index 724d780143..e2878a43d9 100755
  ; Support for the profile refresh feature
  !define URLProfileRefreshHelp "https://support.mozilla.org/kb/refresh-firefox-reset-add-ons-and-settings"
 -- 
-2.34.1
+2.35.1
 
diff --git a/patches/0014-Allow-setting-service-url-to-be-overrided-by-prefs.patch b/patches/0014-Allow-setting-service-url-to-be-overrided-by-prefs.patch
index 224ecc0db9..bd0610aeb8 100644
--- a/patches/0014-Allow-setting-service-url-to-be-overrided-by-prefs.patch
+++ b/patches/0014-Allow-setting-service-url-to-be-overrided-by-prefs.patch
@@ -3,27 +3,24 @@ Date: Wed, 23 Sep 2020 17:02:37 +0200
 Subject: Allow setting service url to be overrided by prefs
 
 ---
- services/settings/Utils.jsm | 7 +------
- 1 file changed, 1 insertion(+), 6 deletions(-)
+ services/settings/Utils.jsm | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
 
 diff --git a/services/settings/Utils.jsm b/services/settings/Utils.jsm
-index bf3545250c..7a205a1d9b 100644
+index f91e5dcb67..db0d7948be 100644
 --- a/services/settings/Utils.jsm
 +++ b/services/settings/Utils.jsm
-@@ -63,12 +63,7 @@ var Utils = {
-     );
-     const isXpcshell = env.exists("XPCSHELL_TEST_PROFILE_DIR");
-     const isNotThunderbird = AppConstants.MOZ_APP_NAME != "thunderbird";
--    return AppConstants.RELEASE_OR_BETA &&
--      !Cu.isInAutomation &&
--      !isXpcshell &&
--      isNotThunderbird
--      ? "https://firefox.settings.services.mozilla.com/v1"
--      : gServerURL;
+@@ -88,9 +88,7 @@ function _isUndefined(value) {
+ 
+ var Utils = {
+   get SERVER_URL() {
+-    return allowServerURLOverride
+-      ? gServerURL
+-      : "https://firefox.settings.services.mozilla.com/v1";
 +    return gServerURL;
    },
  
    CHANGES_PATH: "/buckets/monitor/collections/changes/changeset",
 -- 
-2.34.1
+2.35.1
 
diff --git a/patches/0015-Manual-override-of-search-engine-list.patch b/patches/0015-Manual-override-of-search-engine-list.patch
index 448dc32958..e1a68c0db3 100644
--- a/patches/0015-Manual-override-of-search-engine-list.patch
+++ b/patches/0015-Manual-override-of-search-engine-list.patch
@@ -776,11 +776,11 @@ index aeca0ef128..f4c669c147 100644
    "channelPref": {
      "message": "google_channel_row"
 diff --git a/browser/components/search/extensions/google/manifest.json b/browser/components/search/extensions/google/manifest.json
-index d62049705a..6a65689e7d 100644
+index 6cd4d2a423..5e5f2b960f 100644
 --- a/browser/components/search/extensions/google/manifest.json
 +++ b/browser/components/search/extensions/google/manifest.json
 @@ -5,7 +5,7 @@
-   "version": "1.1",
+   "version": "1.2",
    "applications": {
      "gecko": {
 -      "id": "google@search.mozilla.org"
@@ -1035,10 +1035,10 @@ index 0000000000..4348f01068
 +  }
 +}
 diff --git a/toolkit/components/search/SearchEngineSelector.jsm b/toolkit/components/search/SearchEngineSelector.jsm
-index c880b8ca05..93d5ed43b3 100644
+index 7a9697f1f4..12535a404a 100644
 --- a/toolkit/components/search/SearchEngineSelector.jsm
 +++ b/toolkit/components/search/SearchEngineSelector.jsm
-@@ -94,6 +94,112 @@ class SearchEngineSelector {
+@@ -95,6 +95,112 @@ class SearchEngineSelector {
      this._changeListener = listener;
    }
  
@@ -1152,5 +1152,5 @@ index c880b8ca05..93d5ed43b3 100644
     * Handles getting the configuration from remote settings.
     */
 -- 
-2.34.1
+2.35.1
 
diff --git a/patches/0016-Firefox-profile-import.patch b/patches/0016-Firefox-profile-import.patch
index 194eab1ba9..41c8de1768 100644
--- a/patches/0016-Firefox-profile-import.patch
+++ b/patches/0016-Firefox-profile-import.patch
@@ -412,5 +412,5 @@ index 0dbf8f66c6..9c7a1ab207 100644
      if CONFIG["ENABLE_TESTS"]:
          DIRS += [
 -- 
-2.34.1
+2.35.1
 
diff --git a/patches/0017-Hide-Library-Synced-Tabs-from-the-menu-panel.patch b/patches/0017-Hide-Library-Synced-Tabs-from-the-menu-panel.patch
index ed43bf5b7a..41acd7e48b 100644
--- a/patches/0017-Hide-Library-Synced-Tabs-from-the-menu-panel.patch
+++ b/patches/0017-Hide-Library-Synced-Tabs-from-the-menu-panel.patch
@@ -20,5 +20,5 @@ index 4629e5e868..ed7132d3ca 100644
 +  display: none;
 +}
 -- 
-2.34.1
+2.35.1
 
diff --git a/patches/0019-Ghostery-Theme.patch b/patches/0018-Ghostery-Theme.patch
similarity index 93%
rename from patches/0019-Ghostery-Theme.patch
rename to patches/0018-Ghostery-Theme.patch
index c3b266980f..036f6194eb 100644
--- a/patches/0019-Ghostery-Theme.patch
+++ b/patches/0018-Ghostery-Theme.patch
@@ -8,18 +8,18 @@ X
 ---
  toolkit/modules/LightweightThemeConsumer.jsm  |   2 +-
  .../extensions/default-theme/experiment10.css | 257 ++++++++++++++++++
- .../extensions/default-theme/manifest.json    |  53 +---
+ .../extensions/default-theme/manifest.json    |  49 +---
  .../extensions/internal/XPIProvider.jsm       |  20 +-
  toolkit/mozapps/extensions/jar.mn             |   1 +
- 5 files changed, 290 insertions(+), 43 deletions(-)
+ 5 files changed, 289 insertions(+), 40 deletions(-)
  create mode 100644 toolkit/mozapps/extensions/default-theme/experiment10.css
 
 diff --git a/toolkit/modules/LightweightThemeConsumer.jsm b/toolkit/modules/LightweightThemeConsumer.jsm
-index 11775cbadb..a1fedb8552 100644
+index cbf84ffe39..0ee18c3024 100644
 --- a/toolkit/modules/LightweightThemeConsumer.jsm
 +++ b/toolkit/modules/LightweightThemeConsumer.jsm
-@@ -24,7 +24,7 @@ ChromeUtils.defineModuleGetter(
-   "resource:///modules/ThemeVariableMap.jsm"
+@@ -29,7 +29,7 @@ ChromeUtils.defineModuleGetter(
+   "resource://gre/modules/PrivateBrowsingUtils.jsm"
  );
  
 -const DEFAULT_THEME_ID = "default-theme@mozilla.org";
@@ -291,10 +291,10 @@ index 0000000000..4aac8cba8e
 +  margin-inline-end: -6px !important;
 +}
 diff --git a/toolkit/mozapps/extensions/default-theme/manifest.json b/toolkit/mozapps/extensions/default-theme/manifest.json
-index a095bbea50..501556c651 100644
+index 5f62671c5f..151b48adf7 100644
 --- a/toolkit/mozapps/extensions/default-theme/manifest.json
 +++ b/toolkit/mozapps/extensions/default-theme/manifest.json
-@@ -7,20 +7,17 @@
+@@ -7,17 +7,14 @@
      }
    },
  
@@ -315,11 +315,7 @@ index a095bbea50..501556c651 100644
 -  "dark_theme": {
      "colors": {
        "tab_background_text": "#fbfbfe",
--      "tab_selected": "rgb(66,65,77)",
-+      "tab_selected": "#36393F",
-       "tab_text": "rgb(251,251,254)",
-       "icons": "rgb(251,251,254)",
-       "frame": "#1c1b22",
+       "tab_selected": "rgb(66,65,77)",
 @@ -28,12 +25,12 @@
        "popup_text": "rgb(251,251,254)",
        "popup_border": "rgb(82,82,94)",
@@ -339,7 +335,7 @@ index a095bbea50..501556c651 100644
        "toolbar_field_text": "rgb(251,251,254)",
        "toolbar_field_focus": "rgb(66,65,77)",
        "toolbar_text": "rgb(251, 251, 254)",
-@@ -71,32 +68,6 @@
+@@ -69,30 +66,6 @@
    },
  
    "theme_experiment": {
@@ -355,8 +351,6 @@ index a095bbea50..501556c651 100644
 -      "input_background": "--input-bgcolor",
 -      "input_color": "--input-color",
 -      "input_border": "--input-border-color",
--      "input_border_error": "--input-error-border-color",
--      "zoom_controls": "--zoom-controls-bgcolor",
 -      "autocomplete_popup_separator": "--autocomplete-popup-separator-color",
 -      "appmenu_update_icon_color": "--panel-banner-item-update-supported-bgcolor",
 -      "appmenu_info_icon_color": "--panel-banner-item-info-icon-bgcolor",
@@ -374,10 +368,10 @@ index a095bbea50..501556c651 100644
    }
  }
 diff --git a/toolkit/mozapps/extensions/internal/XPIProvider.jsm b/toolkit/mozapps/extensions/internal/XPIProvider.jsm
-index 30122508ba..76e0f35ce8 100644
+index 50b85a7b5c..9bf1f8b2f1 100644
 --- a/toolkit/mozapps/extensions/internal/XPIProvider.jsm
 +++ b/toolkit/mozapps/extensions/internal/XPIProvider.jsm
-@@ -2500,7 +2500,7 @@ var XPIProvider = {
+@@ -2510,7 +2510,7 @@ var XPIProvider = {
        }
        this.maybeInstallBuiltinAddon(
          "default-theme@mozilla.org",
@@ -386,7 +380,7 @@ index 30122508ba..76e0f35ce8 100644
          "resource://default-theme/"
        );
  
-@@ -2679,6 +2679,10 @@ var XPIProvider = {
+@@ -2689,6 +2689,10 @@ var XPIProvider = {
        logger.error("startup failed", e);
        AddonManagerPrivate.recordException("XPI", "startup failed", e);
      }
@@ -397,7 +391,7 @@ index 30122508ba..76e0f35ce8 100644
    },
  
    /**
-@@ -2952,6 +2956,20 @@ var XPIProvider = {
+@@ -2962,6 +2966,20 @@ var XPIProvider = {
      return installed;
    },
  
@@ -429,5 +423,5 @@ index 58f25876f2..d8d8008b39 100644
 +  content/mozapps/extensions/default-theme/experiment10.css      (default-theme/experiment10.css)
  #endif
 -- 
-2.34.1
+2.35.1
 
diff --git a/patches/0018-Hide-Firefox-Home-Content-from-preferences.patch b/patches/0018-Hide-Firefox-Home-Content-from-preferences.patch
deleted file mode 100644
index 7a90a4e49d..0000000000
--- a/patches/0018-Hide-Firefox-Home-Content-from-preferences.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From: Sam Macbeth <sam@cliqz.com>
-Date: Thu, 24 Sep 2020 17:06:30 +0200
-Subject: Hide 'Firefox Home Content' from preferences
-
----
- browser/themes/shared/preferences/preferences.inc.css | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/browser/themes/shared/preferences/preferences.inc.css b/browser/themes/shared/preferences/preferences.inc.css
-index e7bb32d8a5..0040eaa77e 100644
---- a/browser/themes/shared/preferences/preferences.inc.css
-+++ b/browser/themes/shared/preferences/preferences.inc.css
-@@ -5,6 +5,11 @@
- %endif
- @namespace html "http://www.w3.org/1999/xhtml";
- 
-+/* Hide Firefox Home Content preferences section */
-+#homeContentsGroup {
-+  display: none;
-+}
-+
- #preferences-root {
-   text-rendering: optimizeLegibility;
- }
--- 
-2.34.1
-
diff --git a/patches/0020-Move-Ghostery-icon-to-UrlBar.patch b/patches/0019-Move-Ghostery-icon-to-UrlBar.patch
similarity index 91%
rename from patches/0020-Move-Ghostery-icon-to-UrlBar.patch
rename to patches/0019-Move-Ghostery-icon-to-UrlBar.patch
index 5428154701..8e4767980e 100644
--- a/patches/0020-Move-Ghostery-icon-to-UrlBar.patch
+++ b/patches/0019-Move-Ghostery-icon-to-UrlBar.patch
@@ -7,10 +7,10 @@ Subject: Move Ghostery icon to UrlBar
  1 file changed, 12 insertions(+), 1 deletion(-)
 
 diff --git a/browser/components/customizableui/CustomizableUI.jsm b/browser/components/customizableui/CustomizableUI.jsm
-index 8255ed4505..eadeb3a07a 100644
+index 799017f427..031deb3fc2 100644
 --- a/browser/components/customizableui/CustomizableUI.jsm
 +++ b/browser/components/customizableui/CustomizableUI.jsm
-@@ -1100,7 +1100,12 @@ var CustomizableUIInternal = {
+@@ -1102,7 +1102,12 @@ var CustomizableUIInternal = {
          if (widget) {
            widget.currentArea = aArea;
          }
@@ -24,7 +24,7 @@ index 8255ed4505..eadeb3a07a 100644
          if (gResetting) {
            this.notifyListeners("onWidgetReset", node, container);
          } else if (gUndoResetting) {
-@@ -1533,6 +1538,12 @@ var CustomizableUIInternal = {
+@@ -1535,6 +1540,12 @@ var CustomizableUIInternal = {
        this.ensureButtonContextMenu(widgetNode, aAreaNode);
      }
  
@@ -38,5 +38,5 @@ index 8255ed4505..eadeb3a07a 100644
        widgetNode,
        aAreaNode
 -- 
-2.34.1
+2.35.1
 
diff --git a/patches/0021-Remove-Lockwise-branding-in-about-logins.patch b/patches/0020-Remove-Lockwise-branding-in-about-logins.patch
similarity index 98%
rename from patches/0021-Remove-Lockwise-branding-in-about-logins.patch
rename to patches/0020-Remove-Lockwise-branding-in-about-logins.patch
index 4d8c7ca6fb..1b3eb75811 100644
--- a/patches/0021-Remove-Lockwise-branding-in-about-logins.patch
+++ b/patches/0020-Remove-Lockwise-branding-in-about-logins.patch
@@ -9,7 +9,7 @@ Subject: Remove Lockwise branding in about:logins
  3 files changed, 10 insertions(+)
 
 diff --git a/browser/components/aboutlogins/content/aboutLogins.html b/browser/components/aboutlogins/content/aboutLogins.html
-index 74c852feba..042cacf596 100644
+index 3f8a99410e..0032217128 100644
 --- a/browser/components/aboutlogins/content/aboutLogins.html
 +++ b/browser/components/aboutlogins/content/aboutLogins.html
 @@ -240,6 +240,7 @@
@@ -72,5 +72,5 @@ index f9bcba3b49..610f531b0b 100644
    --section-highlight-background-color: color-mix(in srgb, var(--in-content-accent-color) 20%, transparent);
  }
 -- 
-2.34.1
+2.35.1
 
diff --git a/patches/0022-Custom-brand-styling-on-new-private-window.patch b/patches/0021-Custom-brand-styling-on-new-private-window.patch
similarity index 94%
rename from patches/0022-Custom-brand-styling-on-new-private-window.patch
rename to patches/0021-Custom-brand-styling-on-new-private-window.patch
index 091c6ae34c..8a89100e2b 100644
--- a/patches/0022-Custom-brand-styling-on-new-private-window.patch
+++ b/patches/0021-Custom-brand-styling-on-new-private-window.patch
@@ -8,7 +8,7 @@ Subject: Custom brand styling on new private window
  2 files changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/browser/components/privatebrowsing/content/aboutPrivateBrowsing.html b/browser/components/privatebrowsing/content/aboutPrivateBrowsing.html
-index 10ee1d8f95..5d1a44547d 100644
+index ec0c5f2121..0a91c1dcf7 100644
 --- a/browser/components/privatebrowsing/content/aboutPrivateBrowsing.html
 +++ b/browser/components/privatebrowsing/content/aboutPrivateBrowsing.html
 @@ -13,6 +13,7 @@
@@ -20,10 +20,10 @@ index 10ee1d8f95..5d1a44547d 100644
      <link rel="localization" href="browser/branding/brandings.ftl"/>
      <link rel="localization" href="browser/aboutPrivateBrowsing.ftl"/>
 diff --git a/browser/themes/shared/tabs.inc.css b/browser/themes/shared/tabs.inc.css
-index bd615298e7..1a7237a5f1 100644
+index d3b4d3fe8f..fc5729c672 100644
 --- a/browser/themes/shared/tabs.inc.css
 +++ b/browser/themes/shared/tabs.inc.css
-@@ -24,7 +24,7 @@
+@@ -19,7 +19,7 @@
    :root {
      /* --tabpanel-background-color matches $in-content-page-background in newtab
         (browser/components/newtab/content-src/styles/_variables.scss) */
@@ -33,5 +33,5 @@ index bd615298e7..1a7237a5f1 100644
  }
  
 -- 
-2.34.1
+2.35.1
 
diff --git a/patches/0023-Use-the-same-UA-as-Firefox.patch b/patches/0022-Use-the-same-UA-as-Firefox.patch
similarity index 86%
rename from patches/0023-Use-the-same-UA-as-Firefox.patch
rename to patches/0022-Use-the-same-UA-as-Firefox.patch
index 6d1b1fe07c..c6dd870c64 100644
--- a/patches/0023-Use-the-same-UA-as-Firefox.patch
+++ b/patches/0022-Use-the-same-UA-as-Firefox.patch
@@ -7,10 +7,10 @@ Subject: Use the same UA as Firefox
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/netwerk/protocol/http/nsHttpHandler.cpp b/netwerk/protocol/http/nsHttpHandler.cpp
-index 6b3a1e2da0..1d24469ba1 100644
+index 09f4e79c26..2dd48fa687 100644
 --- a/netwerk/protocol/http/nsHttpHandler.cpp
 +++ b/netwerk/protocol/http/nsHttpHandler.cpp
-@@ -814,7 +814,7 @@ void nsHttpHandler::BuildUserAgent() {
+@@ -874,7 +874,7 @@ void nsHttpHandler::BuildUserAgent() {
    mUserAgent += '/';
    mUserAgent += mProductSub;
  
@@ -20,5 +20,5 @@ index 6b3a1e2da0..1d24469ba1 100644
      // "Firefox/x.y" (compatibility) app token
      mUserAgent += ' ';
 -- 
-2.34.1
+2.35.1
 
diff --git a/patches/0024-Fix-Windows-hidpi-issue.patch b/patches/0023-Fix-Windows-hidpi-issue.patch
similarity index 98%
rename from patches/0024-Fix-Windows-hidpi-issue.patch
rename to patches/0023-Fix-Windows-hidpi-issue.patch
index df7b374217..3731396247 100644
--- a/patches/0024-Fix-Windows-hidpi-issue.patch
+++ b/patches/0023-Fix-Windows-hidpi-issue.patch
@@ -20,5 +20,5 @@ index a5d418e812..c406b79850 100644
  IDI_DOCUMENT ICON DOCUMENT_ICO
  IDI_APPLICATION ICON FIREFOX_ICO
 -- 
-2.34.1
+2.35.1
 
diff --git a/patches/0025-Allow-update-channel-to-be-configured-via-prefs.patch b/patches/0024-Allow-update-channel-to-be-configured-via-prefs.patch
similarity index 89%
rename from patches/0025-Allow-update-channel-to-be-configured-via-prefs.patch
rename to patches/0024-Allow-update-channel-to-be-configured-via-prefs.patch
index a338b3b37a..a60e7718e7 100644
--- a/patches/0025-Allow-update-channel-to-be-configured-via-prefs.patch
+++ b/patches/0024-Allow-update-channel-to-be-configured-via-prefs.patch
@@ -7,10 +7,10 @@ Subject: Allow update channel to be configured via prefs
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/toolkit/modules/UpdateUtils.jsm b/toolkit/modules/UpdateUtils.jsm
-index 360217be87..743158be71 100644
+index fc90a09b18..0ca5c47c0a 100644
 --- a/toolkit/modules/UpdateUtils.jsm
 +++ b/toolkit/modules/UpdateUtils.jsm
-@@ -44,7 +44,7 @@ var UpdateUtils = {
+@@ -43,7 +43,7 @@ var UpdateUtils = {
     *        Whether or not to include the partner bits. Default: true.
     */
    getUpdateChannel(aIncludePartners = true) {
@@ -20,5 +20,5 @@ index 360217be87..743158be71 100644
        "app.update.channel",
        AppConstants.MOZ_UPDATE_CHANNEL
 -- 
-2.34.1
+2.35.1
 
diff --git a/patches/0026-Update-text-on-about-license.patch b/patches/0025-Update-text-on-about-license.patch
similarity index 99%
rename from patches/0026-Update-text-on-about-license.patch
rename to patches/0025-Update-text-on-about-license.patch
index 402f4163c0..36b29b2498 100644
--- a/patches/0026-Update-text-on-about-license.patch
+++ b/patches/0025-Update-text-on-about-license.patch
@@ -18,5 +18,5 @@ index e7a158c792..7edf9e496c 100644
 +    <a href="http://www.ghostery.com/">Ghostery</a> under the Mozilla
      Public License 2.0 (MPL). <a href="about:rights">Know your rights</a>.</p>
 -- 
-2.34.1
+2.35.1
 
diff --git a/patches/0027-Hide-addon-recommendation-badge.patch b/patches/0026-Hide-addon-recommendation-badge.patch
similarity index 99%
rename from patches/0027-Hide-addon-recommendation-badge.patch
rename to patches/0026-Hide-addon-recommendation-badge.patch
index 5b1798dc05..1162a6116a 100644
--- a/patches/0027-Hide-addon-recommendation-badge.patch
+++ b/patches/0026-Hide-addon-recommendation-badge.patch
@@ -20,5 +20,5 @@ index a82e034737..5e0a37d280 100644
  
  .addon-badge-line {
 -- 
-2.34.1
+2.35.1
 
diff --git a/patches/0028-Disable-ion-pioneer-studies.patch b/patches/0027-Disable-ion-pioneer-studies.patch
similarity index 87%
rename from patches/0028-Disable-ion-pioneer-studies.patch
rename to patches/0027-Disable-ion-pioneer-studies.patch
index c3ef036f60..5e7e4b2af2 100644
--- a/patches/0028-Disable-ion-pioneer-studies.patch
+++ b/patches/0027-Disable-ion-pioneer-studies.patch
@@ -8,10 +8,10 @@ fix #358
  1 file changed, 2 insertions(+)
 
 diff --git a/browser/components/BrowserGlue.jsm b/browser/components/BrowserGlue.jsm
-index 7f69db89e8..a46fa8605b 100644
+index fde5776868..4892a7af09 100644
 --- a/browser/components/BrowserGlue.jsm
 +++ b/browser/components/BrowserGlue.jsm
-@@ -2313,8 +2313,10 @@ BrowserGlue.prototype = {
+@@ -2362,8 +2362,10 @@ BrowserGlue.prototype = {
      this._monitorScreenshotsPref();
      this._monitorWebcompatReporterPref();
      this._monitorHTTPSOnlyPref();
@@ -23,5 +23,5 @@ index 7f69db89e8..a46fa8605b 100644
  
      if (AppConstants.NIGHTLY_BUILD) {
 -- 
-2.34.1
+2.35.1
 
diff --git a/patches/0029-Hide-learn-more-link-on-network-error-pages.patch b/patches/0028-Hide-learn-more-link-on-network-error-pages.patch
similarity index 98%
rename from patches/0029-Hide-learn-more-link-on-network-error-pages.patch
rename to patches/0028-Hide-learn-more-link-on-network-error-pages.patch
index f31bcae5a4..e99b785ef7 100644
--- a/patches/0029-Hide-learn-more-link-on-network-error-pages.patch
+++ b/patches/0028-Hide-learn-more-link-on-network-error-pages.patch
@@ -22,5 +22,5 @@ index 73f9d2760a..d2974dbfdb 100644
    --warning-color: #ffa436;
  }
 -- 
-2.34.1
+2.35.1
 
diff --git a/patches/0030-OpenURL-on-buildID-changes.patch b/patches/0029-OpenURL-on-buildID-changes.patch
similarity index 90%
rename from patches/0030-OpenURL-on-buildID-changes.patch
rename to patches/0029-OpenURL-on-buildID-changes.patch
index 6107760ff5..7b380ffe91 100644
--- a/patches/0030-OpenURL-on-buildID-changes.patch
+++ b/patches/0029-OpenURL-on-buildID-changes.patch
@@ -7,10 +7,10 @@ Subject: OpenURL on buildID changes
  1 file changed, 2 insertions(+), 8 deletions(-)
 
 diff --git a/browser/components/BrowserContentHandler.jsm b/browser/components/BrowserContentHandler.jsm
-index 5b6b5db42d..a443814336 100644
+index 1f57e16413..a1e50cc260 100644
 --- a/browser/components/BrowserContentHandler.jsm
 +++ b/browser/components/BrowserContentHandler.jsm
-@@ -646,13 +646,13 @@ nsBrowserContentHandler.prototype = {
+@@ -658,13 +658,13 @@ nsBrowserContentHandler.prototype = {
              // we may open the startPage in addition to restoring the session.
              willRestoreSession = SessionStartup.isAutomaticRestoreEnabled();
  
@@ -26,7 +26,7 @@ index 5b6b5db42d..a443814336 100644
              ) {
                overridePage = getPostUpdateOverridePage(update, overridePage);
                // Send the update ping to signal that the update was successful.
-@@ -661,12 +661,6 @@ nsBrowserContentHandler.prototype = {
+@@ -673,12 +673,6 @@ nsBrowserContentHandler.prototype = {
  
              overridePage = overridePage.replace("%OLD_VERSION%", old_mstone);
              break;
@@ -40,5 +40,5 @@ index 5b6b5db42d..a443814336 100644
        }
      } catch (ex) {}
 -- 
-2.34.1
+2.35.1
 
diff --git a/patches/0031-Ignore-the-glinter.patch b/patches/0030-Ignore-the-glinter.patch
similarity index 93%
rename from patches/0031-Ignore-the-glinter.patch
rename to patches/0030-Ignore-the-glinter.patch
index adbc910a71..c7e1b6c27a 100644
--- a/patches/0031-Ignore-the-glinter.patch
+++ b/patches/0030-Ignore-the-glinter.patch
@@ -7,7 +7,7 @@ Subject: Ignore the glinter
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/third_party/python/glean_parser/glean_parser/lint.py b/third_party/python/glean_parser/glean_parser/lint.py
-index 79f729a938..109114b708 100644
+index 814f5adcf2..f9bab46662 100644
 --- a/third_party/python/glean_parser/glean_parser/lint.py
 +++ b/third_party/python/glean_parser/glean_parser/lint.py
 @@ -482,7 +482,7 @@ def lint_metrics(
@@ -20,5 +20,5 @@ index 79f729a938..109114b708 100644
  
  def lint_yaml_files(
 -- 
-2.34.1
+2.35.1
 
diff --git a/patches/0032-Replace-New-Tab-with-Ghostery-New-Tab-Addon.patch b/patches/0031-Replace-New-Tab-with-Ghostery-New-Tab-Addon.patch
similarity index 69%
rename from patches/0032-Replace-New-Tab-with-Ghostery-New-Tab-Addon.patch
rename to patches/0031-Replace-New-Tab-with-Ghostery-New-Tab-Addon.patch
index daaaa1c05b..025fa46d07 100644
--- a/patches/0032-Replace-New-Tab-with-Ghostery-New-Tab-Addon.patch
+++ b/patches/0031-Replace-New-Tab-with-Ghostery-New-Tab-Addon.patch
@@ -5,8 +5,7 @@ Subject: Replace New Tab with Ghostery New Tab Addon
 ---
  browser/components/extensions/parent/ext-url-overrides.js | 2 +-
  browser/components/urlbar/UrlbarInput.jsm                 | 7 +++++++
- browser/themes/shared/preferences/preferences.inc.css     | 4 ++++
- 3 files changed, 12 insertions(+), 1 deletion(-)
+ 2 files changed, 8 insertions(+), 1 deletion(-)
 
 diff --git a/browser/components/extensions/parent/ext-url-overrides.js b/browser/components/extensions/parent/ext-url-overrides.js
 index af2c367e1f..5447fd1a2a 100644
@@ -22,10 +21,10 @@ index af2c367e1f..5447fd1a2a 100644
      let policy = ExtensionParent.WebExtensionPolicy.getByID(extensionId);
      Services.prefs.setBoolPref(
 diff --git a/browser/components/urlbar/UrlbarInput.jsm b/browser/components/urlbar/UrlbarInput.jsm
-index d6af2c41eb..656e119066 100644
+index 250b6f65ce..4804223698 100644
 --- a/browser/components/urlbar/UrlbarInput.jsm
 +++ b/browser/components/urlbar/UrlbarInput.jsm
-@@ -357,6 +357,13 @@ class UrlbarInput {
+@@ -358,6 +358,13 @@ class UrlbarInput {
  
        valid =
          !this.window.isBlankPageURL(uri.spec) || uri.schemeIs("moz-extension");
@@ -39,21 +38,6 @@ index d6af2c41eb..656e119066 100644
      } else if (
        this.window.isInitialPage(value) &&
        BrowserUIUtils.checkEmptyPageOrigin(this.window.gBrowser.selectedBrowser)
-diff --git a/browser/themes/shared/preferences/preferences.inc.css b/browser/themes/shared/preferences/preferences.inc.css
-index 0040eaa77e..f0f56eaf3f 100644
---- a/browser/themes/shared/preferences/preferences.inc.css
-+++ b/browser/themes/shared/preferences/preferences.inc.css
-@@ -1194,6 +1194,10 @@ richlistitem .text-link:hover {
-   margin-inline-start: 6px;
- }
- 
-+#category-home {
-+  display: none;
-+}
-+
- #moreFromMozillaCategory-header .subtitle {
-   color: var(--in-content-deemphasized-text);
-   margin: 4px 0 10px;
 -- 
-2.34.1
+2.35.1
 
diff --git a/patches/0033-Better-Fox-integration.patch b/patches/0032-Better-Fox-integration.patch
similarity index 96%
rename from patches/0033-Better-Fox-integration.patch
rename to patches/0032-Better-Fox-integration.patch
index 9f486bcf50..3983faadee 100644
--- a/patches/0033-Better-Fox-integration.patch
+++ b/patches/0032-Better-Fox-integration.patch
@@ -21,7 +21,7 @@ index 908553b8b9..b1951ed4bc 100644
          FINAL_TARGET_FILES['..'] += [
              'firefox.VisualElementsManifest.xml',
 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
-index 0d2ff9dff2..0416968d10 100644
+index 73a41dc25b..61c86ef7e5 100644
 --- a/browser/installer/package-manifest.in
 +++ b/browser/installer/package-manifest.in
 @@ -268,6 +268,7 @@
@@ -33,5 +33,5 @@ index 0d2ff9dff2..0416968d10 100644
  @RESPATH@/defaults/autoconfig/prefcalls.js
  @RESPATH@/browser/defaults/permissions
 -- 
-2.34.1
+2.35.1
 
diff --git a/patches/0034-Default-top-sites.patch b/patches/0033-Default-top-sites.patch
similarity index 99%
rename from patches/0034-Default-top-sites.patch
rename to patches/0033-Default-top-sites.patch
index e53ed4451d..6b30715703 100644
--- a/patches/0034-Default-top-sites.patch
+++ b/patches/0033-Default-top-sites.patch
@@ -468,5 +468,5 @@ index 9bb9ef66ce..9494826954 100644
  this.EXPORTED_SYMBOLS = ["DEFAULT_SITES"];
  
 -- 
-2.34.1
+2.35.1
 
diff --git a/patches/0035-Disable-package-duplicates-detection.patch b/patches/0034-Disable-package-duplicates-detection.patch
similarity index 94%
rename from patches/0035-Disable-package-duplicates-detection.patch
rename to patches/0034-Disable-package-duplicates-detection.patch
index 89a0b8b11d..afc02c7ae1 100644
--- a/patches/0035-Disable-package-duplicates-detection.patch
+++ b/patches/0034-Disable-package-duplicates-detection.patch
@@ -7,7 +7,7 @@ Subject: Disable package duplicates detection
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/toolkit/mozapps/installer/packager.mk b/toolkit/mozapps/installer/packager.mk
-index 04c0a229ce..701e842cb5 100644
+index 0ae27b95d5..57c0cdafd3 100644
 --- a/toolkit/mozapps/installer/packager.mk
 +++ b/toolkit/mozapps/installer/packager.mk
 @@ -15,8 +15,8 @@ endif
@@ -22,5 +22,5 @@ index 04c0a229ce..701e842cb5 100644
  
  export USE_ELF_HACK
 -- 
-2.34.1
+2.35.1