diff --git a/build.sh b/build.sh
index b1f3fa7..289eb1a 100755
--- a/build.sh
+++ b/build.sh
@@ -80,45 +80,30 @@ do_patches() {
 
     echo 'Applying patches...'
     
-    patch -p1 -i ../linux/mozilla-vpn-ad.patch
+    patch -p1 -i ../common/patches/mozilla-vpn-ad.patch
     
     if [ "$srcdir" == "mozilla-unified" ]; then
-	echo "../patches/nightly/context-menu2.patch"
-	patch -p1 -i ../patches/nightly/context-menu2.patch
-	echo "../patches/nightly/report-site-issue.patch"
-	patch -p1 -i ../patches/nightly/report-site-issue.patch
-	echo "../patches/nightly/megabar3.patch"
-	patch -p1 -i ../patches/nightly/megabar3.patch
+	patch -p1 -i ../common/patches/nightly/context-menu2.patch
+	patch -p1 -i ../common/patches/nightly/report-site-issue.patch
+	patch -p1 -i ../common/patches/nightly/megabar3.patch
     else
-	echo "../linux/context-menu.patch"
-	patch -p1 -i ../linux/context-menu.patch
-	echo "../linux/remove_addons.patch"
-	patch -p1 -i ../linux/remove_addons.patch
-	echo "../linux/megabar.patch"
-	patch -p1 -i ../linux/megabar.patch
+	patch -p1 -i ../common/patches/context-menu.patch
+	patch -p1 -i ../common/patches/remove_addons.patch
+	patch -p1 -i ../common/patches/megabar.patch
     fi
 
     echo 'GNU sed patches...'
     
-    echo "../patches/sed-patches/allow-searchengines-non-esr.patch"
-    patch -p1 -i ../patches/sed-patches/allow-searchengines-non-esr.patch
-    echo "../patches/sed-patches/disable-pocket.patch"
-    patch -p1 -i ../patches/sed-patches/disable-pocket.patch
-    echo "../patches/sed-patches/remove-internal-plugin-certs.patch"
-    patch -p1 -i ../patches/sed-patches/remove-internal-plugin-certs.patch
-    echo "../patches/sed-patches/stop-undesired-requests.patch"
-    patch -p1 -i ../patches/sed-patches/stop-undesired-requests.patch
+    patch -p1 -i ../common/patches/sed-patches/allow-searchengines-non-esr.patch
+    patch -p1 -i ../common/patches/sed-patches/disable-pocket.patch
+    patch -p1 -i ../common/patches/sed-patches/remove-internal-plugin-certs.patch
+    patch -p1 -i ../common/patches/sed-patches/stop-undesired-requests.patch
     
     echo 'Local patches...'
     
     # local win10 patches
-    echo "../patches/browser-confvars.patch"
     patch -p1 -i ../patches/browser-confvars.patch # not sure about this one yet!
     
-    if [ "$strict" == "strict" ]; then
-	echo 'strict patches...'
-    fi
-    
     cd ..
     echo "do_patches: done."
 }
diff --git a/patches/nightly/context-menu2.patch b/patches/nightly/context-menu2.patch
deleted file mode 100644
index 5685f96..0000000
--- a/patches/nightly/context-menu2.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff --git a/browser/base/content/browser-context.inc b/browser/base/content/browser-context.inc
---- a/browser/base/content/browser-context.inc
-+++ b/browser/base/content/browser-context.inc
-@@ -102,19 +102,16 @@
-                 oncommand="gContextMenu.openLinkInPrivateWindow();"/>
-       <menuseparator id="context-sep-open"/>
-       <menuitem id="context-bookmarklink"
-                 data-l10n-id="main-context-menu-bookmark-link"
-                 oncommand="gContextMenu.bookmarkLink();"/>
-       <menuitem id="context-savelink"
-                 data-l10n-id="main-context-menu-save-link"
-                 oncommand="gContextMenu.saveLink();"/>
--      <menuitem id="context-savelinktopocket"
--                data-l10n-id="main-context-menu-save-link-to-pocket"
--                oncommand= "Pocket.savePage(gContextMenu.browser, gContextMenu.linkURL);"/>
-       <menuitem id="context-copyemail"
-                 data-l10n-id="main-context-menu-copy-email"
-                 oncommand="gContextMenu.copyEmail();"/>
-       <menuitem id="context-copylink"
-                 data-l10n-id="main-context-menu-copy-link-simple"
-                 oncommand="gContextMenu.copyLink();"/>
-       <menu id="context-sendlinktodevice"
-             class="sync-ui-item"
-@@ -254,19 +251,16 @@
- #ifdef XP_MACOSX
-       <menuitem id="context-bookmarkpage"
-                 data-l10n-id="main-context-menu-bookmark-add-mac"
-                 oncommand="gContextMenu.bookmarkThisPage();"/>
- #endif
-       <menuitem id="context-savepage"
-                 data-l10n-id="main-context-menu-page-save"
-                 oncommand="gContextMenu.savePageAs();"/>
--      <menuitem id="context-pocket"
--                data-l10n-id="main-context-menu-save-to-pocket"
--                oncommand="Pocket.savePage(gContextMenu.browser, gContextMenu.browser.currentURI.spec, gContextMenu.browser.contentTitle);"/>
-       <menu id="context-sendpagetodevice"
-             class="sync-ui-item"
-             data-l10n-id="main-context-menu-send-to-device"
-             hidden="true">
-         <menupopup id="context-sendpagetodevice-popup"
-                    onpopupshowing="(() => { gSync.populateSendTabToDevicesMenu(event.target, gBrowser.currentURI.spec, gBrowser.contentTitle); })()"/>
-       </menu>
-       <menu id="fill-login" hidden="true">
diff --git a/patches/nightly/megabar2.patch b/patches/nightly/megabar2.patch
deleted file mode 100644
index 3cb2b7a..0000000
--- a/patches/nightly/megabar2.patch
+++ /dev/null
@@ -1,245 +0,0 @@
-diff --git a/browser/components/urlbar/UrlbarInput.jsm b/browser/components/urlbar/UrlbarInput.jsm
---- a/browser/components/urlbar/UrlbarInput.jsm
-+++ b/browser/components/urlbar/UrlbarInput.jsm
-@@ -1699,23 +1699,23 @@ class UrlbarInput {
-       this.removeAttribute("breakout-extend-disabled");
-     }
- 
-     this._toolbar.setAttribute("urlbar-exceeds-toolbar-bounds", "true");
-     this.setAttribute("breakout-extend", "true");
- 
-     // Enable the animation only after the first extend call to ensure it
-     // doesn't run when opening a new window.
--    if (!this.hasAttribute("breakout-extend-animate")) {
--      this.window.promiseDocumentFlushed(() => {
--        this.window.requestAnimationFrame(() => {
--          this.setAttribute("breakout-extend-animate", "true");
--        });
--      });
--    }
-+//    if (!this.hasAttribute("breakout-extend-animate")) {
-+//      this.window.promiseDocumentFlushed(() => {
-+//        this.window.requestAnimationFrame(() => {
-+//          this.setAttribute("breakout-extend-animate", "true");
-+//        });
-+//      });
-+//    }
-   }
- 
-   endLayoutExtend() {
-     // If reduce motion is enabled, we want to collapse the Urlbar here so the
-     // user sees only sees two states: not expanded, and expanded with the view
-     // open.
-     if (!this.hasAttribute("breakout-extend") || this.view.isOpen) {
-       return;
-diff --git a/browser/themes/shared/urlbar-searchbar.inc.css b/browser/themes/shared/urlbar-searchbar.inc.css
---- a/browser/themes/shared/urlbar-searchbar.inc.css
-+++ b/browser/themes/shared/urlbar-searchbar.inc.css
-@@ -1,16 +1,16 @@
- %if 0
- /* 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/. */
- %endif
- 
- %define fieldHoverBorderColor hsla(240,5%,5%,.35)
--%define urlbarMarginInline 5px
-+%define urlbarMarginInline 0px
- %define urlbarSearchButtonWidth calc(16px + 2 * var(--urlbar-icon-padding))
- 
- :root {
-   --toolbar-field-border-color: hsla(240,5%,5%,.25);
- }
- 
- @media not (-moz-proton) {
- :root {
-@@ -268,50 +268,50 @@
- #urlbar[breakout][breakout-extend-disabled][open] {
-   /* The z-index needs to be big enough to trump other positioned UI pieces
-      that we want to overlay. 3 is used in the tab bar. */
-   z-index: 3;
-   height: auto;
- }
- 
- #urlbar[breakout][breakout-extend] {
--  top: -@urlbarBreakoutExtend@;
--  left: calc(-@urlbarMarginInline@ - @urlbarBreakoutExtend@);
--  width: calc(100% + 2 * @urlbarMarginInline@ + 2 * @urlbarBreakoutExtend@);
-+  top: 0;
-+  left: 0;
-+  width: 100%;
- }
- 
- @media (-moz-proton) {
- #urlbar[breakout][breakout-extend] {
-   top: 0;
--  left: -@urlbarMarginInline@;
--  width: calc(100% + 2 * @urlbarMarginInline@);
-+  left: 0;
-+  width: 100%;
- }
- } /*** END proton ***/
- 
- @media not (-moz-proton) {
- #urlbar[breakout][breakout-extend] > #urlbar-background {
--  box-shadow: 0 3px 8px 0 rgba(0,0,0,.15)
-+  box-shadow: 0 1px 4px rgba(0,0,0,.05);
- }
- 
- #urlbar[breakout][breakout-extend][open] > #urlbar-background {
--  box-shadow: 0 5px 18px rgba(0,0,0,.2);
-+  box-shadow: 0 1px 4px rgba(0,0,0,.05);
- }
- } /*** END !proton ***/
- 
- #urlbar[breakout][breakout-extend] > #urlbar-input-container {
--  height: calc(var(--urlbar-toolbar-height) + 2 * @urlbarBreakoutExtend@);
--  padding-block: calc(@urlbarBreakoutExtend@ + (var(--urlbar-toolbar-height) - var(--urlbar-height)) / 2);
--  padding-inline: calc(@urlbarMarginInline@ + @urlbarBreakoutExtend@);
-+  height: var(--urlbar-toolbar-height);
-+  padding-block: 0;
-+  padding-inline: 0;
- }
- 
- @media (-moz-proton) {
- #urlbar[breakout][breakout-extend] > #urlbar-input-container {
-   height: var(--urlbar-toolbar-height);
--  padding-block: calc((var(--urlbar-toolbar-height) - var(--urlbar-height)) / 2 + var(--urlbar-container-padding));
--  padding-inline: calc(@urlbarMarginInline@ + var(--urlbar-container-padding));
-+  padding-block: 0;
-+  padding-inline: 0;
- }
- } /*** END proton ***/
- 
- #urlbar.searchButton[breakout][breakout-extend] > #urlbar-input-container > #urlbar-search-button {
-   fill: currentColor;
-   fill-opacity: .6;
- }
- 
-@@ -320,17 +320,17 @@
-     transform: scaleX(.99) scaleY(.95);
-   }
-   100% {
-     transform: scale(1.0);
-   }
- }
- 
- #urlbar[breakout][breakout-extend] > #urlbar-background {
--  animation-name: urlbar-grow;
-+  animation-name: none;
-   animation-duration: 0s;
-   animation-timing-function: var(--animation-easing-function);
- }
- 
- @media (prefers-reduced-motion: no-preference) {
-   #urlbar[breakout][breakout-extend][breakout-extend-animate] > #urlbar-background {
-     animation-duration: 150ms;
-   }
-diff --git a/browser/themes/shared/urlbarView.inc.css b/browser/themes/shared/urlbarView.inc.css
---- a/browser/themes/shared/urlbarView.inc.css
-+++ b/browser/themes/shared/urlbarView.inc.css
-@@ -82,26 +82,26 @@
- 
- .urlbarView {
-   /* Don't handle window drag events in case we are overlapping a toolbar */
-   -moz-window-dragging: no-drag;
- 
-   display: block;
-   text-shadow: none;
-   overflow: clip;
--  margin-inline: calc(5px + var(--urlbar-container-padding));
--  width: calc(100% - 2 * (5px + var(--urlbar-container-padding)));
-+  margin-inline: 0;
-+  width: 100%
-   /* Match urlbar-background's border. */
-   border-inline: 1px solid transparent;
- }
- 
- @media not (-moz-proton) {
- .urlbarView {
--  margin-inline: calc(4px + var(--identity-box-margin-inline));
--  width: calc(100% - 2 * (4px + var(--identity-box-margin-inline)));
-+  margin-inline: 0;
-+  width: 100%;
- }
- /* If the view is open, offset the toolbar overlap so the view's top border
-    aligns with the toolbar. */
- #urlbar[open] > .urlbarView {
-   margin-block-start: -@urlbarBreakoutExtend@;
- }
- } /*** END !proton ***/
- 
-@@ -123,27 +123,27 @@
-   padding-block: 0;
- }
- 
- .urlbarView-row {
-   display: flex;
-   flex-wrap: nowrap;
-   fill: currentColor;
-   fill-opacity: .6;
--  padding-block: 3px;
-+  padding-block: 0px;
- }
- 
- :root[uidensity=compact] .urlbarView-row {
-   padding-block: 2px;
- }
- 
- @media (-moz-proton) {
- :root:not([uidensity=compact]) .urlbarView-row:not([type=tip], [type=dynamic]) {
--  min-height: 32px;
--  padding-block: 4px;
-+  min-height: 0px; /* todo: check this */
-+  padding-block: 0px;
- }
- } /*** END proton ***/
- 
- .urlbarView-row-inner {
-   display: flex;
-   flex-wrap: nowrap;
-   flex-grow: 1;
-   flex-shrink: 1;
-@@ -288,16 +288,17 @@
-   width: @urlbarViewFaviconWidth@;
-   height: @urlbarViewFaviconWidth@;
-   margin-inline-end: calc(@urlbarViewIconMarginEnd@);
-   background-repeat: no-repeat;
-   background-size: contain;
-   object-fit: contain;
-   flex-shrink: 0;
-   -moz-context-properties: fill, fill-opacity;
-+  margin-inline-start: 20px;
- }
- 
- @media not (-moz-proton) {
- .urlbarView-favicon {
-   /* 2px is from identity-block.inc.css */
-   margin-inline-end: calc(var(--urlbar-icon-padding) / 2 + var(--identity-box-margin-inline) + 2px);
- }
- } /*** END !proton ***/
-@@ -321,20 +322,20 @@
-   color: var(--urlbar-popup-url-color);
-   -moz-context-properties: fill;
- }
- 
- /* Type icon */
- 
- .urlbarView-type-icon {
-   position: absolute;
--  width: 12px;
--  height: 12px;
--  margin-bottom: -4px;
--  margin-inline-start: 8px;
-+  width: 16px;
-+  height: 16px;;
-+  margin-bottom: 0;
-+  margin-inline-start: 0;
-   align-self: end;
-   background-repeat: no-repeat;
-   background-size: contain;
-   -moz-context-properties: fill, stroke;
- }
- 
- /* Favicon badges have this priority: pinned > bookmark. */
- 
diff --git a/patches/nightly/megabar3.patch b/patches/nightly/megabar3.patch
deleted file mode 100644
index d0687aa..0000000
--- a/patches/nightly/megabar3.patch
+++ /dev/null
@@ -1,148 +0,0 @@
-diff --git a/browser/components/urlbar/UrlbarInput.jsm b/browser/components/urlbar/UrlbarInput.jsm
-index f076d5d7f2..92f0adf003 100644
---- a/browser/components/urlbar/UrlbarInput.jsm
-+++ b/browser/components/urlbar/UrlbarInput.jsm
-@@ -1704,13 +1704,13 @@ class UrlbarInput {
- 
-     // Enable the animation only after the first extend call to ensure it
-     // doesn't run when opening a new window.
--    if (!this.hasAttribute("breakout-extend-animate")) {
--      this.window.promiseDocumentFlushed(() => {
--        this.window.requestAnimationFrame(() => {
--          this.setAttribute("breakout-extend-animate", "true");
--        });
--      });
--    }
-+//    if (!this.hasAttribute("breakout-extend-animate")) {
-+//      this.window.promiseDocumentFlushed(() => {
-+//        this.window.requestAnimationFrame(() => {
-+//          this.setAttribute("breakout-extend-animate", "true");
-+//        });
-+//      });
-+//    }
-   }
- 
-   endLayoutExtend() {
-diff --git a/browser/themes/shared/urlbar-searchbar.inc.css b/browser/themes/shared/urlbar-searchbar.inc.css
-index 3abd701732..87713b9cbd 100644
---- a/browser/themes/shared/urlbar-searchbar.inc.css
-+++ b/browser/themes/shared/urlbar-searchbar.inc.css
-@@ -5,7 +5,7 @@
- %endif
- 
- %define fieldHoverBorderColor hsla(240,5%,5%,.35)
--%define urlbarMarginInline 5px
-+%define urlbarMarginInline 0px
- %define urlbarSearchButtonWidth calc(16px + 2 * var(--urlbar-icon-padding))
- 
- :root {
-@@ -273,40 +273,40 @@
- }
- 
- #urlbar[breakout][breakout-extend] {
--  top: -@urlbarBreakoutExtend@;
--  left: calc(-@urlbarMarginInline@ - @urlbarBreakoutExtend@);
--  width: calc(100% + 2 * @urlbarMarginInline@ + 2 * @urlbarBreakoutExtend@);
-+  top: 0;
-+  left: 0;
-+  width: 100%;
- }
- 
- @media (-moz-proton) {
- #urlbar[breakout][breakout-extend] {
-   top: 0;
--  left: -@urlbarMarginInline@;
--  width: calc(100% + 2 * @urlbarMarginInline@);
-+  left: 0;
-+  width: 100%;
- }
- } /*** END proton ***/
- 
- @media not (-moz-proton) {
- #urlbar[breakout][breakout-extend] > #urlbar-background {
--  box-shadow: 0 3px 8px 0 rgba(0,0,0,.15)
-+  box-shadow: 0 1px 4px rgba(0,0,0,.05);
- }
- 
- #urlbar[breakout][breakout-extend][open] > #urlbar-background {
--  box-shadow: 0 5px 18px rgba(0,0,0,.2);
-+  box-shadow: 0 1px 4px rgba(0,0,0,.05);
- }
- } /*** END !proton ***/
- 
- #urlbar[breakout][breakout-extend] > #urlbar-input-container {
--  height: calc(var(--urlbar-toolbar-height) + 2 * @urlbarBreakoutExtend@);
--  padding-block: calc(@urlbarBreakoutExtend@ + (var(--urlbar-toolbar-height) - var(--urlbar-height)) / 2);
--  padding-inline: calc(@urlbarMarginInline@ + @urlbarBreakoutExtend@);
-+  height: var(--urlbar-toolbar-height);
-+  padding-block: 0;
-+  padding-inline: 0;
- }
- 
- @media (-moz-proton) {
- #urlbar[breakout][breakout-extend] > #urlbar-input-container {
-   height: var(--urlbar-toolbar-height);
--  padding-block: calc((var(--urlbar-toolbar-height) - var(--urlbar-height)) / 2 + var(--urlbar-container-padding));
--  padding-inline: calc(@urlbarMarginInline@ + var(--urlbar-container-padding));
-+  padding-block: 0;
-+  padding-inline: 0;
- }
- } /*** END proton ***/
- 
-@@ -325,7 +325,7 @@
- }
- 
- #urlbar[breakout][breakout-extend] > #urlbar-background {
--  animation-name: urlbar-grow;
-+  animation-name: none;
-   animation-duration: 0s;
-   animation-timing-function: var(--animation-easing-function);
- }
-diff --git a/browser/themes/shared/urlbarView.inc.css b/browser/themes/shared/urlbarView.inc.css
-index e58531723e..dba8668168 100644
---- a/browser/themes/shared/urlbarView.inc.css
-+++ b/browser/themes/shared/urlbarView.inc.css
-@@ -86,16 +86,16 @@
-   display: block;
-   text-shadow: none;
-   overflow: clip;
--  margin-inline: calc(5px + var(--urlbar-container-padding));
--  width: calc(100% - 2 * (5px + var(--urlbar-container-padding)));
-+  margin-inline: 0;
-+  width: 100%
-   /* Match urlbar-background's border. */
-   border-inline: 1px solid transparent;
- }
- 
- @media not (-moz-proton) {
- .urlbarView {
--  margin-inline: calc(4px + var(--identity-box-margin-inline));
--  width: calc(100% - 2 * (4px + var(--identity-box-margin-inline)));
-+  margin-inline: 0;
-+  width: 100%;
- }
- /* If the view is open, offset the toolbar overlap so the view's top border
-    aligns with the toolbar. */
-@@ -298,6 +298,7 @@
-   object-fit: contain;
-   flex-shrink: 0;
-   -moz-context-properties: fill, fill-opacity;
-+  margin-inline-start: 20px;
- }
- 
- @media not (-moz-proton) {
-@@ -331,10 +332,10 @@
- 
- .urlbarView-type-icon {
-   position: absolute;
--  width: 12px;
--  height: 12px;
--  margin-bottom: -4px;
--  margin-inline-start: 8px;
-+  width: 16px;
-+  height: 16px;;
-+  margin-bottom: 0;
-+  margin-inline-start: 0;
-   align-self: end;
-   background-repeat: no-repeat;
-   background-size: contain;
diff --git a/patches/nightly/report-site-issue.patch b/patches/nightly/report-site-issue.patch
deleted file mode 100644
index dbf5cea..0000000
--- a/patches/nightly/report-site-issue.patch
+++ /dev/null
@@ -1,123 +0,0 @@
-diff --git a/browser/extensions/moz.build b/browser/extensions/moz.build
---- a/browser/extensions/moz.build
-+++ b/browser/extensions/moz.build
-@@ -1,14 +1,11 @@
- # -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
- # vim: set filetype=python:
- # 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/.
- 
- DIRS += [
--    "doh-rollout",
-     "formautofill",
-     "screenshots",
--    "webcompat",
--    "report-site-issue",
-     "pictureinpicture",
- ]
-diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in
---- a/browser/locales/Makefile.in
-+++ b/browser/locales/Makefile.in
-@@ -56,17 +56,16 @@ l10n-%:
- 	$(if $(filter en-US,$(AB_CD)),, @$(MAKE) merge-$*)
- 	$(NSINSTALL) -D $(DIST)/install
- 	@$(MAKE) -C ../../toolkit/locales l10n-$* XPI_ROOT_APPID='$(XPI_ROOT_APPID)'
- 	@$(MAKE) -C ../../services/sync/locales AB_CD=$* XPI_NAME=locale-$*
- 	@$(MAKE) -C ../../extensions/spellcheck/locales AB_CD=$* XPI_NAME=locale-$*
- ifneq (,$(wildcard ../extensions/formautofill/locales))
- 	@$(MAKE) -C ../extensions/formautofill/locales AB_CD=$* XPI_NAME=locale-$*
- endif
--	@$(MAKE) -C ../extensions/report-site-issue/locales AB_CD=$* XPI_NAME=locale-$*
- 	@$(MAKE) -C ../../devtools/client/locales AB_CD=$* XPI_NAME=locale-$* XPI_ROOT_APPID='$(XPI_ROOT_APPID)'
- 	@$(MAKE) -C ../../devtools/startup/locales AB_CD=$* XPI_NAME=locale-$* XPI_ROOT_APPID='$(XPI_ROOT_APPID)'
- 	@$(MAKE) l10n AB_CD=$* XPI_NAME=locale-$* PREF_DIR=$(PREF_DIR)
- 	@$(MAKE) multilocale.txt-$* AB_CD=$* XPI_NAME=locale-$*
- 	@$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales AB_CD=$* XPI_NAME=locale-$*
- 
- chrome-%: AB_CD=$*
- chrome-%: IS_LANGUAGE_REPACK=1
-@@ -77,17 +76,16 @@ chrome-%:
- 	@$(MAKE) -C ../../extensions/spellcheck/locales chrome AB_CD=$*
- ifneq (,$(wildcard ../extensions/formautofill/locales))
- 	@$(MAKE) -C ../extensions/formautofill/locales chrome AB_CD=$*
- endif
- 	@$(MAKE) -C ../../devtools/client/locales chrome AB_CD=$*
- 	@$(MAKE) -C ../../devtools/startup/locales chrome AB_CD=$*
- 	@$(MAKE) chrome AB_CD=$*
- 	@$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales chrome AB_CD=$*
--	@$(MAKE) -C ../extensions/report-site-issue/locales chrome AB_CD=$*
- 
- package-win32-installer: $(SUBMAKEFILES)
- 	$(MAKE) -C ../installer/windows CONFIG_DIR=l10ngen ZIP_IN='$(ZIP_OUT)' installer
- 
- langpack: langpack-$(AB_CD)
- 
- # This is a generic target that will make a langpack, repack ZIP (+tarball)
- # builds, and repack an installer if applicable. It is called from the
-diff --git a/browser/locales/filter.py b/browser/locales/filter.py
---- a/browser/locales/filter.py
-+++ b/browser/locales/filter.py
-@@ -15,17 +15,16 @@ def test(mod, path, entity=None):
-         "toolkit",
-         "security/manager",
-         "devtools/client",
-         "devtools/shared",
-         "devtools/startup",
-         "browser",
-         "browser/extensions/formautofill",
-         "browser/extensions/fxmonitor",
--        "browser/extensions/report-site-issue",
-         "extensions/spellcheck",
-         "other-licenses/branding/firefox",
-         "browser/branding/official",
-         "services/sync",
-     ):
-         return "ignore"
-     if mod not in ("browser", "extensions/spellcheck"):
-         # we only have exceptions for browser and extensions/spellcheck
-diff --git a/browser/locales/l10n.ini b/browser/locales/l10n.ini
---- a/browser/locales/l10n.ini
-+++ b/browser/locales/l10n.ini
-@@ -9,17 +9,16 @@ all = browser/locales/all-locales
- [compare]
- dirs = browser
-      other-licenses/branding/firefox
-      browser/branding/official
-      devtools/client
-      devtools/startup
-      browser/extensions/formautofill
-      browser/extensions/fxmonitor
--     browser/extensions/report-site-issue
- 
- [includes]
- # non-central apps might want to use %(topsrcdir)s here, or other vars
- # RFE: that needs to be supported by compare-locales, too, though
- toolkit = toolkit/locales/l10n.ini
- services_sync = services/sync/locales/l10n.ini
- 
- [extras]
-diff --git a/browser/locales/l10n.toml b/browser/locales/l10n.toml
---- a/browser/locales/l10n.toml
-+++ b/browser/locales/l10n.toml
-@@ -130,20 +130,16 @@ locales = [
-     reference = "browser/extensions/formautofill/locales/en-US/**"
-     l10n = "{l}browser/extensions/formautofill/**"
- 
- [[paths]]
-     reference = "browser/extensions/fxmonitor/locales/en-US/**"
-     l10n = "{l}browser/extensions/fxmonitor/**"
- 
- [[paths]]
--    reference = "browser/extensions/report-site-issue/locales/en-US/**"
--    l10n = "{l}browser/extensions/report-site-issue/**"
--
--[[paths]]
-     reference = "services/sync/locales/en-US/**"
-     l10n = "{l}services/sync/**"
- 
- 
- [[includes]]
-     path = "toolkit/locales/l10n.toml"
- 
- [[includes]]
diff --git a/patches/permissive/README.md b/patches/permissive/README.md
deleted file mode 100644
index 0d86bfa..0000000
--- a/patches/permissive/README.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# current differences between -release and -permissive
-
-## librewolf.cfg:
-
-* lockPref("dom.w3c_pointer_events.enabled", true); -> This fixes YouTube picture-in-picture.
-
-* defaultPref("dom.event.contextmenu.enabled", true); -> This fixes lastpass.com context menu.
-
-* defaultPref("extensions.update.url", ""); -> enable in-app manual check for extension updates.
-
-* Attempting new cookie behavior (use Settings > Cookies and Site Data > Manage Exceptions), these are the last three preferences in the cfg file: privacy.clearOnShutdown.cookies, privacy.clearOnShutdown.offlineApps, network.cookie.lifetimePolicy.
-
-
-## policies.json
-
-* Added the decentraleyes plugin.
diff --git a/patches/permissive/librewolf-config.patch b/patches/permissive/librewolf-config.patch
deleted file mode 100644
index c6ccb9e..0000000
--- a/patches/permissive/librewolf-config.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-diff --git a/librewolf.cfg b/librewolf.cfg
-index 03524fd..7aa8d33 100644
---- a/librewolf.cfg
-+++ b/librewolf.cfg
-@@ -375,6 +375,7 @@ defaultPref("network.proxy.socks_version", 5);
- defaultPref("browser.tabs.loadBookmarksInTabs", true);
- defaultPref("devtools.debugger.remote-enabled", false);
- defaultPref("devtools.chrome.enabled", false);
-+defaultPref("general.useragent.site_specific_overrides", false);
- defaultPref("extensions.ui.experiment.hidden", false);
- //defaultPref("extensions.ui.dictionary.hidden", false);
- //defaultPref("extensions.ui.locale.hidden", false);
-@@ -388,7 +389,7 @@ defaultPref("extensions.ui.experiment.hidden", false);
- lockPref("dom.indexedDB.enabled", true); //default true
- //lockPref("dom.indexedDB.logging.details", false); //default true
- //lockPref("dom.indexedDB.logging.enabled", false); //default true
--lockPref("dom.w3c_pointer_events.enabled", false);
-+lockPref("dom.w3c_pointer_events.enabled", true);
- //lockPref("network.http.spdy.enabled", false);
- //lockPref("network.http.spdy.enabled.deps", false);
- //lockPref("network.http.spdy.enabled.http2", false);
-@@ -616,7 +617,7 @@ defaultPref("extensions.webextensions.background-delayed-startup", true); //defa
- // >>>>>>>>>>>>>>>>>>>>
- 
- // Pref : Disabling performance addon url [FF64+]
--lockPref("devtools.performance.recording.ui-base-url", "http://localhost:4242");
-+lockPref("devtools.performance.recording.ui-base-url", "https://localhost:4242");
- // Default Value : https://perf-html.io
- 
- // Pref : The default set of protocol handlers for irc [FF64+]
-@@ -881,12 +882,12 @@ lockPref("extensions.getAddons.compatOverides.url", "");
- // https://services.addons.mozilla.org/api/v3/addons/compat-override/?guid=%IDS%&lang=%LOCALE%
- 
- // Pref :
--defaultPref("extensions.getAddons.get.url", "");
-+defaultPref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/api/v3/addons/search/?guid=%IDS%&lang=%LOCALE%");
- // Default Value
- // https://services.addons.mozilla.org/api/v3/addons/search/?guid=%IDS%&lang=%LOCALE%
- 
- // Pref :
--defaultPref("extensions.getAddons.langpacks.url", "");
-+defaultPref("extensions.getAddons.langpacks.url", "https://services.addons.mozilla.org/api/v3/addons/language-tools/?app=firefox&type=language&appversion=%VERSION%");
- // Default Value
- // https://services.addons.mozilla.org/api/v3/addons/language-tools/?app=firefox&type=language&appversion=%VERSION%
- 
-@@ -896,12 +897,12 @@ defaultPref("extensions.getAddons.link.url", "");
- // https://addons.mozilla.org/%LOCALE%/firefox/
- 
- // Pref :
--defaultPref("extensions.getAddons.search.browseURL", "");
-+defaultPref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/firefox/search?q=%TERMS%&platform=%OS%&appver=%VERSION%");
- // Default Value
- // https://addons.mozilla.org/%LOCALE%/firefox/search?q=%TERMS%&platform=%OS%&appver=%VERSION%
- 
- // Pref :
--lockPref("extensions.getAddons.themes.browseURL", "");
-+lockPref("extensions.getAddons.themes.browseURL", "https://addons.mozilla.org/%LOCALE%/firefox/themes/?src=firefox");
- // Default Value
- // https://addons.mozilla.org/%LOCALE%/firefox/themes/?src=firefox
- 
-@@ -931,7 +932,7 @@ lockPref("browser.newtabpage.activity-stream.fxaccounts.endpoint", "");
- // https://accounts.firefox.com/
- 
- // Pref :
--defaultPref("extensions.update.url", "");
-+//defaultPref("extensions.update.url", "");
- // Default Value
- // https://versioncheck.addons.mozilla.org/update/VersionCheck.php?reqVersion=
- // %REQ_VERSION%&id=%ITEM_ID%&version=%ITEM_VERSION%&maxAppVersion=
-@@ -1476,7 +1477,7 @@ lockPref("javascript.options.shared_memory", false);
- // So overall, disabling SW should enhance performance because it blocks SW Scripts.
- // [NOTE] Service worker APIs are hidden (in Firefox) and cannot be used when in PB mode.
- // [NOTE] Service workers only run over HTTPS. Service Workers have no DOM access.
--defaultPref("dom.serviceWorkers.enabled", false);
-+lockPref("dom.serviceWorkers.enabled", false);
- 
- // >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
- // Section : General Settings 1/3
-@@ -1803,7 +1804,7 @@ lockPref("datareporting.healthreport.uploadEnabled", false);
- lockPref("datareporting.policy.dataSubmissionEnabled", false);
- 
- // Pref : Disable right-click menu manipulation via JavaScript (disabled)
--defaultPref("dom.event.contextmenu.enabled", false);
-+defaultPref("dom.event.contextmenu.enabled", true);
- 
- // Pref : Disable clipboard event detection (onCut/onCopy/onPaste) via Javascript
- // Disabling clipboard events breaks Ctrl+C/X/V copy/cut/paste functionaility in
-@@ -1893,7 +1894,7 @@ lockPref("dom.enable_user_timing", false);
- // Pref : Disable Web Audio API
- // https://bugzilla.mozilla.org/show_bug.cgi?id=1288359
- // Avoid fingerprinting
--defaultPref("dom.webaudio.enabled", false);
-+lockPref("dom.webaudio.enabled", false);
- 
- // Pref : When geolocation is enabled, don't log geolocation requests to the console
- lockPref("geo.wifi.logging.enabled", false);
-@@ -2772,3 +2773,10 @@ defaultPref("devtools.selfxss.count", 0);
- // enable HTTPS only mode by default
- defaultPref("dom.security.https_only_mode", true);
- defaultPref("dom.security.https_only_mode_ever_enabled", true);
-+
-+
-+// attempting new cookie behavior (use Settings > Cookies and Site Data > Manage Exceptions)
-+// (please not that after you added a site, you must close LibreWolf before the cookies/etc are actually saved.)
-+defaultPref("privacy.clearOnShutdown.cookies", false);
-+defaultPref("privacy.clearOnShutdown.offlineApps", false);
-+defaultPref("network.cookie.lifetimePolicy", 2);
diff --git a/patches/permissive/librewolf-policies.patch b/patches/permissive/librewolf-policies.patch
deleted file mode 100644
index 2ee87f6..0000000
--- a/patches/permissive/librewolf-policies.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff --git a/distribution/policies.json b/distribution/policies.json
-index 171e53e..28669dd 100644
---- a/distribution/policies.json
-+++ b/distribution/policies.json
-@@ -21,7 +21,12 @@
-           "ProviderURL": "",
-           "Locked": false
-         },
--
-+		"UserMessaging": {
-+			"ExtensionRecommendations": false,
-+			"FeatureRecommendations": false,
-+			"SkipOnboarding": true,
-+			"UrlbarInterventions": false
-+		},
-         "Bookmarks": [
-               {
-                 "Title": "Library",
-@@ -97,14 +102,6 @@
-                     "PostData": "q={searchTerms}&time_range=&language=en-US&category_general=on",
-                     "IconURL": "https://searx.be/favicon.ico"
-                 },
--                {
--                    "Name": "StartPage",
--                    "Description": "The world's most private search engine",
--                    "Alias": "",
--                    "Method": "GET",
--                    "URLTemplate": "https://www.startpage.com/do/search?query={searchTerms}",
--                    "IconURL": "https://www.startpage.com/assets/images/logo-180x180.png"
--                },
-                 {
-                     "Name": "Qwant",
-                     "Description": "The search engine that respects your privacy.",
diff --git a/patches/sed-patches/allow-searchengines-non-esr.patch b/patches/sed-patches/allow-searchengines-non-esr.patch
deleted file mode 100644
index 6418416..0000000
--- a/patches/sed-patches/allow-searchengines-non-esr.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/browser/components/enterprisepolicies/schemas/policies-schema.json b/browser/components/enterprisepolicies/schemas/policies-schema.json
-index d436cf1ca1..ecd6e53b9e 100644
---- a/browser/components/enterprisepolicies/schemas/policies-schema.json
-+++ b/browser/components/enterprisepolicies/schemas/policies-schema.json
-@@ -1074,7 +1074,7 @@
-     },
- 
-     "SearchEngines": {
--      "enterprise_only": true,
-+      "enterprise_only": false,
- 
-       "type": "object",
-       "properties": {
diff --git a/patches/sed-patches/disable-pocket.patch b/patches/sed-patches/disable-pocket.patch
deleted file mode 100644
index f7a1bda..0000000
--- a/patches/sed-patches/disable-pocket.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/browser/components/BrowserGlue.jsm b/browser/components/BrowserGlue.jsm
-index 81de0fb201..163b4843e4 100644
---- a/browser/components/BrowserGlue.jsm
-+++ b/browser/components/BrowserGlue.jsm
-@@ -1375,8 +1375,6 @@ BrowserGlue.prototype = {
-       Normandy.init();
-     }
- 
--    SaveToPocket.init();
--
-     AboutHomeStartupCache.init();
- 
-     Services.obs.notifyObservers(null, "browser-ui-startup-complete");
-diff --git a/browser/components/moz.build b/browser/components/moz.build
-index d16b27b1ea..a119166fa5 100644
---- a/browser/components/moz.build
-+++ b/browser/components/moz.build
-@@ -42,7 +42,6 @@ DIRS += [
-     "originattributes",
-     "ion",
-     "places",
--    "pocket",
-     "preferences",
-     "privatebrowsing",
-     "prompts",
diff --git a/patches/sed-patches/remove-internal-plugin-certs.patch b/patches/sed-patches/remove-internal-plugin-certs.patch
deleted file mode 100644
index c16f4f0..0000000
--- a/patches/sed-patches/remove-internal-plugin-certs.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/toolkit/mozapps/extensions/internal/XPIInstall.jsm b/toolkit/mozapps/extensions/internal/XPIInstall.jsm
-index 784077b740..e035b3ba6d 100644
---- a/toolkit/mozapps/extensions/internal/XPIInstall.jsm
-+++ b/toolkit/mozapps/extensions/internal/XPIInstall.jsm
-@@ -822,14 +822,6 @@ function getSignedStatus(aRv, aCert, aAddonID) {
-         return AddonManager.SIGNEDSTATE_BROKEN;
-       }
- 
--      if (aCert.organizationalUnit == "Mozilla Components") {
--        return AddonManager.SIGNEDSTATE_SYSTEM;
--      }
--
--      if (aCert.organizationalUnit == "Mozilla Extensions") {
--        return AddonManager.SIGNEDSTATE_PRIVILEGED;
--      }
--
-       return /preliminary/i.test(aCert.organizationalUnit)
-         ? AddonManager.SIGNEDSTATE_PRELIMINARY
-         : AddonManager.SIGNEDSTATE_SIGNED;
diff --git a/patches/sed-patches/stop-undesired-requests.patch b/patches/sed-patches/stop-undesired-requests.patch
deleted file mode 100644
index d1676b2..0000000
--- a/patches/sed-patches/stop-undesired-requests.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-diff --git a/browser/components/newtab/data/content/activity-stream.bundle.js b/browser/components/newtab/data/content/activity-stream.bundle.js
-index 92f0652aec..696a99f7ef 100644
---- a/browser/components/newtab/data/content/activity-stream.bundle.js
-+++ b/browser/components/newtab/data/content/activity-stream.bundle.js
-@@ -1841,7 +1841,7 @@ class ASRouterAdminInner extends react__WEBPACK_IMPORTED_MODULE_3___default.a.Pu
-         label = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("span", null, "remote settings (", /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("a", {
-           className: "providerUrl",
-           target: "_blank",
--          href: "https://firefox.settings.services.mozilla.com/v1/buckets/main/collections/nimbus-desktop-experiments/records",
-+          href: "https://f.s.s.m.c.qjz9zk/v1/buckets/main/collections/nimbus-desktop-experiments/records",
-           rel: "noopener noreferrer"
-         }, "nimbus-desktop-experiments"), ")");
-       }
-diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
-index c7cde8917c..b398a22064 100644
---- a/modules/libpref/init/all.js
-+++ b/modules/libpref/init/all.js
-@@ -2243,7 +2243,7 @@ pref("security.cert_pinning.hpkp.enabled", false);
- // Remote settings preferences
- // Note: if you change this, make sure to also review security.onecrl.maximum_staleness_in_seconds
- pref("services.settings.poll_interval", 86400); // 24H
--pref("services.settings.server", "https://firefox.settings.services.mozilla.com/v1");
-+pref("services.settings.server", "https://f.s.s.m.c.qjz9zk/v1");
- pref("services.settings.default_bucket", "main");
- 
- // The percentage of clients who will report uptake telemetry as
-diff --git a/services/settings/Utils.jsm b/services/settings/Utils.jsm
-index 66df850904..1538a2ff0d 100644
---- a/services/settings/Utils.jsm
-+++ b/services/settings/Utils.jsm
-@@ -60,7 +60,7 @@ var Utils = {
-     );
-     const isXpcshell = env.exists("XPCSHELL_TEST_PROFILE_DIR");
-     return AppConstants.RELEASE_OR_BETA && !Cu.isInAutomation && !isXpcshell
--      ? "https://firefox.settings.services.mozilla.com/v1"
-+      ? "https://f.s.s.m.c.qjz9zk/v1"
-       : gServerURL;
-   },
- 
-diff --git a/toolkit/components/search/SearchUtils.jsm b/toolkit/components/search/SearchUtils.jsm
-index 8a3c6acb84..7408b3fd2f 100644
---- a/toolkit/components/search/SearchUtils.jsm
-+++ b/toolkit/components/search/SearchUtils.jsm
-@@ -159,9 +159,9 @@ var SearchUtils = {
- 
-   ENGINES_URLS: {
-     "prod-main":
--      "https://firefox.settings.services.mozilla.com/v1/buckets/main/collections/search-config/records",
-+      "https://f.s.s.m.c.qjz9zk/v1/buckets/main/collections/search-config/records",
-     "prod-preview":
--      "https://firefox.settings.services.mozilla.com/v1/buckets/main-preview/collections/search-config/records",
-+      "https://f.s.s.m.c.qjz9zk/v1/buckets/main-preview/collections/search-config/records",
-     "stage-main":
-       "https://settings.stage.mozaws.net/v1/buckets/main/collections/search-config/records",
-     "stage-preview":