diff --git a/build.sh b/build.sh
index f5249a6..2cc4ced 100755
--- a/build.sh
+++ b/build.sh
@@ -105,20 +105,19 @@ do_patches() {
     if [ $? -ne 0 ]; then exit 1; fi
 
     if [ "$srcdir" == "mozilla-unified" ]; then
-	echo "(todo)"
-#!    patch -p1 -i ../linux/context-menu.patch
-#!    if [ $? -ne 0 ]; then exit 1; fi
-#!    patch -p1 -i ../linux/megabar.patch
-#!    if [ $? -ne 0 ]; then exit 1; fi
-#!    patch -p1 -i ../linux/remove_addons.patch
-#!    if [ $? -ne 0 ]; then exit 1; fi
+	patch -p1 -i ../patches/nightly/context-menu2.patch
+	if [ $? -ne 0 ]; then exit 1; fi
+	patch -p1 -i ../patches/nightly/report-site-issue.patch
+	if [ $? -ne 0 ]; then exit 1; fi
+	patch -p1 -i ../patches/nightly/megabar2.patch
+	if [ $? -ne 0 ]; then exit 1; fi
     else
 	patch -p1 -i ../linux/context-menu.patch
 	if [ $? -ne 0 ]; then exit 1; fi
-	patch -p1 -i ../linux/megabar.patch
-	if [ $? -ne 0 ]; then exit 1; fi
 	patch -p1 -i ../linux/remove_addons.patch
 	if [ $? -ne 0 ]; then exit 1; fi
+	patch -p1 -i ../linux/megabar.patch
+	if [ $? -ne 0 ]; then exit 1; fi
     fi
 
     echo 'GNU sed patches...'
diff --git a/patches/nightly/context-menu2.patch b/patches/nightly/context-menu2.patch
new file mode 100644
index 0000000..5685f96
--- /dev/null
+++ b/patches/nightly/context-menu2.patch
@@ -0,0 +1,43 @@
+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
new file mode 100644
index 0000000..3cb2b7a
--- /dev/null
+++ b/patches/nightly/megabar2.patch
@@ -0,0 +1,245 @@
+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/report-site-issue.patch b/patches/nightly/report-site-issue.patch
new file mode 100644
index 0000000..dbf5cea
--- /dev/null
+++ b/patches/nightly/report-site-issue.patch
@@ -0,0 +1,123 @@
+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/librewolf-config.patch b/patches/permissive/librewolf-config.patch
index 2bd3274..46b5a4e 100644
--- a/patches/permissive/librewolf-config.patch
+++ b/patches/permissive/librewolf-config.patch
@@ -1,5 +1,5 @@
 diff --git a/librewolf.cfg b/librewolf.cfg
-index 1ad0cea..0d9df09 100644
+index 1ad0cea..7aa8d33 100644
 --- a/librewolf.cfg
 +++ b/librewolf.cfg
 @@ -389,7 +389,7 @@ defaultPref("extensions.ui.experiment.hidden", false);
@@ -11,6 +11,36 @@ index 1ad0cea..0d9df09 100644
  //lockPref("network.http.spdy.enabled", false);
  //lockPref("network.http.spdy.enabled.deps", false);
  //lockPref("network.http.spdy.enabled.http2", false);
+@@ -882,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%
+ 
+@@ -897,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
+ 
 @@ -932,7 +932,7 @@ lockPref("browser.newtabpage.activity-stream.fxaccounts.endpoint", "");
  // https://accounts.firefox.com/