Changed default theme and fixed import settings panel

src/browser/components/customizableui/CustomizableUI-sys-mjs.patch

@@ -1,7 +1,16 @@
 diff --git a/browser/components/customizableui/CustomizableUI.sys.mjs b/browser/components/customizableui/CustomizableUI.sys.mjs
-index d748b93a92455f6349b8199d2f27381f53fee01d..922822260abcb9ab6344db91730de620c7320888 100644
+index d748b93a92455f6349b8199d2f27381f53fee01d..10aea4cb79f77341c1a125bb1b3750a81794679c 100644
 --- a/browser/components/customizableui/CustomizableUI.sys.mjs
 +++ b/browser/components/customizableui/CustomizableUI.sys.mjs
+@@ -25,7 +25,7 @@ ChromeUtils.defineLazyGetter(lazy, "gWidgetsBundle", function () {
+   return Services.strings.createBundle(kUrl);
+ });
+ 
+-const kDefaultThemeID = "default-theme@mozilla.org";
++const kDefaultThemeID = "firefox-alpenglow@mozilla.org";
+ 
+ const kSpecialWidgetPfx = "customizableui-special-";
+ 
 @@ -249,14 +249,12 @@ var CustomizableUIInternal = {
        Services.policies.isAllowed("removeHomeButtonByDefault")
          ? null

src/browser/components/migration/MigrationUtils-sys-mjs.patch

@@ -0,0 +1,38 @@
+diff --git a/browser/components/migration/MigrationUtils.sys.mjs b/browser/components/migration/MigrationUtils.sys.mjs
+index 000b471ee6c93815dde61127b8974774d0abafb1..32ba8d40bab5e609fc76dfe97a952d5a7a300a71 100644
+--- a/browser/components/migration/MigrationUtils.sys.mjs
++++ b/browser/components/migration/MigrationUtils.sys.mjs
+@@ -576,12 +576,15 @@ class MigrationUtils {
+    *   True if the source selection page of the wizard should be skipped.
+    * @param {string} [aOptions.profileId]
+    *   An identifier for the profile to use when migrating.
++   * @param {boolean} [aOptions.zenBlocking=false]
++   *   True if the migration wizard should block the main thread.
+    * @returns {Promise<undefined>}
+    *   If an about:preferences tab can be opened, this will resolve when
+    *   that tab has been switched to. Otherwise, this will resolve
+    *   just after opening the top-level dialog window.
+    */
+   showMigrationWizard(aOpener, aOptions) {
++    let zenShouldBlock = aOptions.zenBlocking || false;
+     // When migration is kicked off from about:welcome, there are
+     // a few different behaviors that we want to test, controlled
+     // by a preference that is instrumented for Nimbus. The pref
+@@ -648,7 +651,7 @@ class MigrationUtils {
+         if (aboutWelcomeBehavior == "autoclose") {
+           return aOpener.openPreferences("general-migrate-autoclose");
+         } else if (aboutWelcomeBehavior == "standalone") {
+-          openStandaloneWindow(false /* blocking */);
++          openStandaloneWindow(zenShouldBlock /* blocking */);
+           return Promise.resolve();
+         }
+       }
+@@ -657,7 +660,7 @@ class MigrationUtils {
+ 
+     // If somehow we failed to open about:preferences, fall back to opening
+     // the top-level window.
+-    openStandaloneWindow(false /* blocking */);
++    openStandaloneWindow(zenShouldBlock /* blocking */);
+     return Promise.resolve();
+   }
+ 

src/browser/components/zen-welcome/welcome.css

@@ -88,10 +88,6 @@ p {
   margin-bottom: 30px;
 }
 
-button {
-  transform: scale(1.3);
-}
-
 .icon {
   -moz-context-properties: fill;
   fill: currentColor;
@@ -123,7 +119,7 @@ input[type='checkbox'] {
 }
 
 #importNext {
-  margin-left: 30px;
+  margin-left: 40px;
   color: var(--in-content-primary-button-background);
 }
 
@@ -171,3 +167,6 @@ input[type='checkbox'] {
 .page:not([hidden="true"]) > *:nth-child(4) { animation-delay: 0.3s; }
 .page:not([hidden="true"]) > *:nth-child(5) { animation-delay: 0.4s; }
 
+.card h3 {
+  margin-top: 10px;
+}

src/browser/components/zen-welcome/welcome.js

@@ -229,11 +229,10 @@ class Import extends Page {
     super(id)
 
     const importButton = document.getElementById('importBrowser')
-    importButton.addEventListener('click', () => {
-      MigrationUtils.showMigrationWizard(window, [
-        MigrationUtils.MIGRATION_ENTRYPOINT_NEWTAB,
-        null,
-      ])
+    importButton.addEventListener('click', async () => {
+      MigrationUtils.showMigrationWizard(window, {
+        zenBlocking: true,
+      });
       this.nextEl.click()
     })
   }