Started rework of zens UI

.github/workflows/alpha.yml

@@ -134,9 +134,9 @@ jobs:
           ls .
           echo "version=$(pnpm gluon get version | xargs)" >> $GITHUB_OUTPUT
           if [[ $(pnpm gluon get version | xargs) == ${{ needs.build-data.outputs.version }} ]]; then
-            echo "Version matches"
+            echo ">>> Version matches"
           else
-            echo "Version mismatch"
+            echo ">>> Version mismatch"
             exit 1
           fi
 

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

@@ -1,5 +1,5 @@
 diff --git a/browser/components/customizableui/CustomizableUI.sys.mjs b/browser/components/customizableui/CustomizableUI.sys.mjs
-index 5b09402dc1e19e89dcdfc8b5b45a2004c8cec0e6..87c8322aad2f174023d1b3a6ce1555ca64e3e026 100644
+index 5b09402dc1e19e89dcdfc8b5b45a2004c8cec0e6..0f8d774c728087b96242f35fe038e1fef55e58b3 100644
 --- a/browser/components/customizableui/CustomizableUI.sys.mjs
 +++ b/browser/components/customizableui/CustomizableUI.sys.mjs
 @@ -25,7 +25,7 @@ ChromeUtils.defineLazyGetter(lazy, "gWidgetsBundle", function () {
@@ -7,7 +7,7 @@ index 5b09402dc1e19e89dcdfc8b5b45a2004c8cec0e6..87c8322aad2f174023d1b3a6ce1555ca
  });
  
 -const kDefaultThemeID = "default-theme@mozilla.org";
-+const kDefaultThemeID = "firefox-alpenglow@mozilla.org";
++const kDefaultThemeID = "firefox-compact-dark@mozilla.org";
  
  const kSpecialWidgetPfx = "customizableui-special-";
  

src/browser/locales/en-US/browser/appExtensionFields-ftl.patch

@@ -1,5 +1,5 @@
 diff --git a/browser/locales/en-US/browser/appExtensionFields.ftl b/browser/locales/en-US/browser/appExtensionFields.ftl
-index 09d7a076eccd4235fac66156770d8b9ae01a7d16..31c7632c9dce24f2e4e5135abfca96a47e961eed 100644
+index 09d7a076eccd4235fac66156770d8b9ae01a7d16..f32affde0d6f77dadd421ff68bf2050bda9f0cd0 100644
 --- a/browser/locales/en-US/browser/appExtensionFields.ftl
 +++ b/browser/locales/en-US/browser/appExtensionFields.ftl
 @@ -8,13 +8,13 @@
@@ -19,3 +19,14 @@ index 09d7a076eccd4235fac66156770d8b9ae01a7d16..31c7632c9dce24f2e4e5135abfca96a4
  extension-firefox-alpenglow-description=Use a colorful appearance for buttons, menus, and windows.
  
  ## Colorway Themes
+@@ -28,3 +28,9 @@ extension-colorways-balanced-name={ $colorway-name } — Balanced
+ # "Bold" is used in the sense of bravery or courage, not in the sense of
+ # emphasized text.
+ extension-colorways-bold-name={ $colorway-name } — Bold
++
++extension-firefox-compact-galaxy-name=Zen Galaxy
++extension-firefox-compact-galaxy-description=A theme with a dark color scheme and a nice galaxy touch!
++
++extension-firefox-compact-dream-name=Zen Dream
++extension-firefox-compact-dream-description=A theme with a light color scheme and a nice dream-y touch!
+\ No newline at end of file

src/browser/themes/BuiltInThemeConfig-sys-mjs.patch

@@ -0,0 +1,39 @@
+diff --git a/browser/themes/BuiltInThemeConfig.sys.mjs b/browser/themes/BuiltInThemeConfig.sys.mjs
+index 7cfea4b705a1338b1eb5c4f255808aeac4bdb819..9a2d2e096db483f5b93fd39886bee5dda38ce9c4 100644
+--- a/browser/themes/BuiltInThemeConfig.sys.mjs
++++ b/browser/themes/BuiltInThemeConfig.sys.mjs
+@@ -22,22 +22,29 @@ export const BuiltInThemeConfig = new Map([
+   [
+     "firefox-compact-light@mozilla.org",
+     {
+-      version: "1.2",
++      version: "1.3",
+       path: "resource://builtin-themes/light/",
+     },
+   ],
+   [
+     "firefox-compact-dark@mozilla.org",
+     {
+-      version: "1.2",
++      version: "1.3",
+       path: "resource://builtin-themes/dark/",
+     },
+   ],
+   [
+-    "firefox-alpenglow@mozilla.org",
++    "firefox-compact-galaxy@mozilla.org",
+     {
+-      version: "1.4",
+-      path: "resource://builtin-themes/alpenglow/",
++      version: "1.3",
++      path: "resource://builtin-themes/galaxy/",
++    },
++  ],
++  [
++    "firefox-compact-dream@mozilla.org",
++    {
++      version: "1.3",
++      path: "resource://builtin-themes/dream/",
+     },
+   ],
+   [

src/browser/themes/BuiltInThemes-sys-mjs.patch

@@ -1,5 +1,5 @@
 diff --git a/browser/themes/BuiltInThemes.sys.mjs b/browser/themes/BuiltInThemes.sys.mjs
-index c2d5dd7a18895ae8b4afbf386f122e7899c48cda..2cb61e00cea76049ae71d791bf78d958f0093b7c 100644
+index c2d5dd7a18895ae8b4afbf386f122e7899c48cda..377d904bbf5adc92bf7cb0aa4c4c641794d828f3 100644
 --- a/browser/themes/BuiltInThemes.sys.mjs
 +++ b/browser/themes/BuiltInThemes.sys.mjs
 @@ -74,7 +74,7 @@ class _BuiltInThemes {
@@ -7,7 +7,7 @@ index c2d5dd7a18895ae8b4afbf386f122e7899c48cda..2cb61e00cea76049ae71d791bf78d958
      const activeThemeID = Services.prefs.getStringPref(
        kActiveThemePref,
 -      "default-theme@mozilla.org"
-+      "firefox-alpenglow@mozilla.org"
++      "firefox-compact-dark@mozilla.org"
      );
      let activeBuiltInTheme = this.builtInThemeMap.get(activeThemeID);
  
@@ -25,7 +25,7 @@ index c2d5dd7a18895ae8b4afbf386f122e7899c48cda..2cb61e00cea76049ae71d791bf78d958
      const activeThemeID = Services.prefs.getStringPref(
        kActiveThemePref,
 -      "default-theme@mozilla.org"
-+      "firefox-alpenglow@mozilla.org"
++      "firefox-compact-dark@mozilla.org"
      );
      const now = new Date();
      const expiredThemes = Array.from(this.builtInThemeMap.entries()).filter(

src/browser/themes/addons/alpenglow/manifest-json.patch

@@ -1,210 +0,0 @@
-diff --git a/browser/themes/addons/alpenglow/manifest.json b/browser/themes/addons/alpenglow/manifest.json
-index 05a25e13915edee3ba51ed1c1b5569faa70cd536..c41c3c51b507fd6fd123805231d79c947d755a2f 100644
---- a/browser/themes/addons/alpenglow/manifest.json
-+++ b/browser/themes/addons/alpenglow/manifest.json
-@@ -7,133 +7,94 @@
-     }
-   },
- 
--  "name": "Firefox Alpenglow",
--  "description": "Use a colorful appearance for buttons, menus, and windows.",
-+  "name": "Zen Universe (Light)",
-+  "description": "A theme with a light color scheme.",
-+  "author": "Zen",
-   "version": "1.4",
-   "icons": { "32": "icon.svg" },
- 
-   "theme": {
--    "images": {
--      "additional_backgrounds": [
--        "background-noodles-right.svg",
--        "background-noodles-left.svg",
--        "background-gradient.svg"
--      ]
--    },
--
--    "properties": {
--      "additional_backgrounds_alignment": [
--        "right top",
--        "left top",
--        "right top"
--      ],
--      "additional_backgrounds_tiling": ["no-repeat", "no-repeat", "repeat-x"],
--      "zap_gradient": "linear-gradient(90deg, #9059FF 0%, #FF4AA2 52.08%, #FFBD4F 100%)"
--    },
-     "colors": {
--      "frame": "hsla(240, 20%, 98%, 1)",
--      "toolbar": "hsla(0, 0%, 100%, .76)",
--      "button_background_active": "hsla(240, 26%, 11%, .16)",
--      "button_background_hover": "hsla(240, 26%, 11%, .08)",
--      "icons": "hsla(258, 66%, 48%, 1)",
--      "icons_attention": "hsla(180, 100%, 32%, 1)",
--      "toolbar_text": "hsla(261, 53%, 15%, 1)",
--      "toolbar_vertical_separator": "hsla(261, 53%, 15%, .2)",
--      "toolbar_field": "hsla(0, 0%, 100%, .8)",
--      "toolbar_field_focus": "hsla(261, 53%, 15%, .96)",
--      "toolbar_field_text": "hsla(261, 53%, 15%, 1)",
--      "toolbar_field_text_focus": "hsla(255, 100%, 94%, 1)",
--      "toolbar_field_border": "transparent",
--      "toolbar_field_border_focus": "hsla(265, 100%, 72%, 1)",
--      "toolbar_field_highlight": "hsla(265, 100%, 72%, .32)",
-+      "tab_background_text": "rgb(21,20,26)",
-+      "tab_selected": "#fff",
-+      "tab_text": "rgb(21,20,26)",
-+      "icons": "rgb(91,91,102)",
-+      "frame": "rgb(240, 240, 244)",
-+      "frame_inactive": "rgb(235, 235, 239)",
-+      "popup": "#fff",
-+      "popup_text": "rgb(21,20,26)",
-+      "popup_border": "rgb(240,240,244)",
-+      "popup_highlight": "#e0e0e6",
-+      "popup_highlight_text": "#15141a",
-+      "tab_line": "transparent",
-+      "toolbar": "#f9f9fb",
-       "toolbar_top_separator": "transparent",
--      "toolbar_bottom_separator": "hsla(261, 53%, 15%, .32)",
--      "bookmark_text": "hsla(261, 53%, 15%, 1)",
--      "tab_text": "hsla(261, 53%, 15%, 1)",
--      "tab_background_text": "hsla(261, 53%, 15%, 1)",
--      "tab_background_separator": "hsla(261, 53%, 15%, 1)",
--      "tab_line": "hsla(265, 100%, 72%, 1)",
--      "tab_loading": "hsla(265, 100%, 72%, 1)",
-+      "toolbar_bottom_separator": "#ccc",
-+      "toolbar_field": "rgb(240, 240, 244)",
-+      "toolbar_field_text": "rgb(21, 20, 26)",
-+      "toolbar_field_border": "transparent",
-+      "toolbar_field_focus": "white",
-+      "toolbar_text": "rgb(21,20,26)",
-       "ntp_background": "#F9F9FB",
--      "ntp_text": "hsla(261, 53%, 15%, 1)",
--      "popup": "hsla(254, 46%, 21%, 1)",
--      "popup_text": "hsla(255, 100%, 94%, 1)",
--      "popup_border": "hsla(255, 100%, 94%, .32)",
--      "popup_highlight": "hsla(255, 100%, 94%, .12)",
--      "popup_highlight_text": "hsla(0, 0%, 100%, 1)",
--      "sidebar": "hsla(240, 15%, 95%, 1)",
--      "sidebar_text": "hsla(261, 53%, 15%, 1)",
--      "sidebar_border": "hsla(261, 53%, 15%, .24)",
--      "sidebar_highlight": "hsla(265, 100%, 72%, 1)",
--      "sidebar_highlight_text": "hsla(0, 0%, 100%, 1)",
--      "focus_outline": "hsla(258, 65%, 48%, 1)"
--    }
--  },
--  "dark_theme": {
--    "images": {
--      "additional_backgrounds": [
--        "background-noodles-right-dark.svg",
--        "background-noodles-left-dark.svg",
--        "background-gradient-dark.svg"
--      ]
-+      "ntp_text": "rgb(21, 20, 26)",
-+      "popup_action_color": "rgb(91,91,102)",
-+      "button": "rgba(207,207,216,.33)",
-+      "button_hover": "rgba(207,207,216,.66)",
-+      "button_active": "rgb(207,207,216)",
-+      "button_primary": "#000",
-+      "button_primary_hover": "rgb(31, 31, 31)",
-+      "button_primary_active": "rgb(207,207,216)",
-+      "button_primary_color": "#fff",
-+      "input_color": "rgb(21,20,26)",
-+      "input_background": "#f0f0f4",
-+      "urlbar_popup_hover": "rgb(240,240,244)",
-+      "urlbar_popup_separator": "rgb(240,240,244)",
-+      "appmenu_update_icon_color": "#2AC3A2",
-+      "appmenu_info_icon_color": "#0090ED",
-+      "tab_icon_overlay_stroke": "rgb(255,255,255)",
-+      "tab_icon_overlay_fill": "rgb(91,91,102)"
-     },
--
-     "properties": {
--      "additional_backgrounds_alignment": [
--        "right top",
--        "left top",
--        "right top"
--      ],
--      "additional_backgrounds_tiling": ["no-repeat", "no-repeat", "repeat-x"],
--      "zap_gradient": "linear-gradient(90deg, #9059FF 0%, #FF4AA2 52.08%, #FFBD4F 100%)"
--    },
--    "colors": {
--      "frame": "hsla(240, 20%, 98%, 1)",
--      "toolbar": "hsla(254, 46%, 21%, .96)",
--      "button_background_active": "hsla(255, 100%, 94%, .24)",
--      "button_background_hover": "hsla(255, 100%, 94%, .12)",
--      "icons": "hsla(271, 100%, 77%, 1)",
--      "icons_attention": "hsla(157, 100%, 66%, 1)",
--      "toolbar_text": "hsla(255, 100%, 94%, 1)",
--      "toolbar_vertical_separator": "hsla(271, 100%, 77%, .4)",
--      "toolbar_field": "hsla(250, 43%, 25%, 1)",
--      "toolbar_field_focus": "hsla(250, 43%, 25%, .98)",
--      "toolbar_field_text": "hsla(255, 100%, 94%, 1)",
--      "toolbar_field_text_focus": "hsla(255, 100%, 94%, 1)",
--      "toolbar_field_border": "transparent",
--      "toolbar_field_border_focus": "hsla(265, 100%, 72%, 1)",
--      "toolbar_field_highlight": "hsla(265, 100%, 72%, .32)",
--      "toolbar_top_separator": "transparent",
--      "toolbar_bottom_separator": "hsla(245, 38%, 33%, .96)",
--      "bookmark_text": "hsla(255, 100%, 94%, 1)",
--      "tab_selected": "rgb(60, 31, 123)",
--      "tab_text": "hsla(255, 100%, 94%, 1)",
--      "tab_background_text": "hsla(255, 100%, 94%, 1)",
--      "tab_background_separator": "hsla(255, 100%, 94%, 1)",
--      "tab_line": "hsla(265, 100%, 72%, 1)",
--      "tab_loading": "hsla(265, 100%, 72%, 1)",
--      "ntp_background": "#2A2A2E",
--      "ntp_text": "hsla(255, 100%, 94%, 1)",
--      "popup": "hsla(250, 43%, 25%, 1)",
--      "popup_text": "hsla(255, 100%, 94%, 1)",
--      "popup_border": "hsla(255, 100%, 94%, .32)",
--      "popup_highlight": "hsla(255, 100%, 94%, .12)",
--      "popup_highlight_text": "hsla(0, 0%, 100%, 1)",
--      "sidebar": "hsla(250, 43%, 25%, 1)",
--      "sidebar_text": "hsla(255, 100%, 94%, 1)",
--      "sidebar_border": "hsla(255, 100%, 94%, .24)",
--      "sidebar_highlight": "hsla(259, 76%, 58%, 1)",
--      "sidebar_highlight_text": "hsla(0, 0%, 100%, 1)",
--      "focus_outline": "hsla(265, 100%, 72%, 1)"
-+      "color_scheme": "light",
-+      "panel_hover": "color-mix(in srgb, currentColor 12%, transparent)",
-+      "panel_active": "color-mix(in srgb, currentColor 20%, transparent)",
-+      "panel_active_darker": "color-mix(in srgb, currentColor 27%, transparent)",
-+      "toolbar_field_icon_opacity": "0.72",
-+      "input_border_color": "rgba(0, 0, 0, .3)",
-+      "zap_gradient": "linear-gradient(90deg, #9059FF 0%, #FF4AA2 52.08%, #FFBD4F 100%)",
-+      "zen_main_browser_background": "var(--zen-characteristic-gradient)"
-     }
-   },
- 
-   "theme_experiment": {
-+    "stylesheet": "experiment.css",
-     "colors": {
--      "focus_outline": "--focus-outline-color"
-+      "popup_action_color": "--urlbarView-action-color",
-+      "button": "--button-bgcolor",
-+      "button_hover": "--button-hover-bgcolor",
-+      "button_active": "--button-active-bgcolor",
-+      "button_primary": "--button-primary-bgcolor",
-+      "button_primary_hover": "--button-primary-hover-bgcolor",
-+      "button_primary_active": "--button-primary-active-bgcolor",
-+      "button_primary_color": "--button-primary-color",
-+      "input_background": "--input-bgcolor",
-+      "input_color": "--input-color",
-+      "input_border": "--input-border-color",
-+      "urlbar_popup_hover": "--urlbarView-hover-background",
-+      "urlbar_popup_separator": "--urlbarView-separator-color",
-+      "appmenu_update_icon_color": "--panel-banner-item-update-supported-bgcolor",
-+      "appmenu_info_icon_color": "--panel-banner-item-info-icon-bgcolor",
-+      "tab_icon_overlay_stroke": "--tab-icon-overlay-stroke",
-+      "tab_icon_overlay_fill": "--tab-icon-overlay-fill"
-     },
-     "properties": {
--      "zap_gradient": "--panel-separator-zap-gradient"
-+      "panel_hover": "--panel-item-hover-bgcolor",
-+      "panel_active": "--arrowpanel-dimmed-further",
-+      "panel_active_darker": "--panel-item-active-bgcolor",
-+      "toolbar_field_icon_opacity": "--urlbar-icon-fill-opacity",
-+      "input_border_color": "--input-border-color",
-+      "zap_gradient": "--panel-separator-zap-gradient",
-+      "zen_main_browser_background": "--zen-main-browser-background"
-     }
-   }
- }

src/browser/themes/addons/dark/manifest-json.patch

@@ -1,5 +1,5 @@
 diff --git a/browser/themes/addons/dark/manifest.json b/browser/themes/addons/dark/manifest.json
-index 544986d5e93c033f944cf301af79e0750864a32c..005ef991235fd30e2253b488cb76df54c5c82078 100644
+index 544986d5e93c033f944cf301af79e0750864a32c..41b15b8d1e1bb146ef0cf8357ab08d443f88b235 100644
 --- a/browser/themes/addons/dark/manifest.json
 +++ b/browser/themes/addons/dark/manifest.json
 @@ -7,10 +7,10 @@
@@ -47,17 +47,17 @@ index 544986d5e93c033f944cf301af79e0750864a32c..005ef991235fd30e2253b488cb76df54
        "toolbar_field_icon_opacity": "1",
 -      "zap_gradient": "linear-gradient(90deg, #9059FF 0%, #FF4AA2 52.08%, #FFBD4F 100%)"
 +      "zap_gradient": "linear-gradient(90deg, #9059FF 0%, #FF4AA2 52.08%, #FFBD4F 100%)",
-+      "zen_main_browser_background": "var(--zen-colors-secondary)"
++      "zen_main_browser_background": "var(--zen-themed-toolbar-bg)"
      }
    },
  
-@@ -83,7 +83,8 @@
+@@ -88,7 +88,8 @@
-       "appmenu_update_icon_color": "--panel-banner-item-update-supported-bgcolor",
-       "appmenu_info_icon_color": "--panel-banner-item-info-icon-bgcolor",
-       "tab_icon_overlay_stroke": "--tab-icon-overlay-stroke",
--      "tab_icon_overlay_fill": "--tab-icon-overlay-fill"
-+      "tab_icon_overlay_fill": "--tab-icon-overlay-fill",
-+      "zen_main_browser_background": "--zen-main-browser-background"
-     },
      "properties": {
        "panel_active": "--arrowpanel-dimmed-further",
+       "toolbar_field_icon_opacity": "--urlbar-icon-fill-opacity",
+-      "zap_gradient": "--panel-separator-zap-gradient"
++      "zap_gradient": "--panel-separator-zap-gradient",
++      "zen_main_browser_background": "--zen-main-browser-background"
+     }
+   }
+ }

src/browser/themes/addons/dream/experiment.css

@@ -0,0 +1,6 @@
+/* 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/. */
+
+/* Proton Light theme */
+@import url("chrome://browser/skin/light-dark-overrides.css");

src/browser/themes/addons/dream/icon.svg

@@ -0,0 +1,12 @@
+<!-- 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/. -->
+<svg width="63" height="62" viewBox="0 0 63 62" fill="none" xmlns="http://www.w3.org/2000/svg">
+  <circle cx="31.5" cy="31" r="31" fill="url(#paint0_linear)"/>
+  <defs>
+    <linearGradient id="paint0_linear" x1="11.4829" y1="51" x2="43.4829" y2="19" gradientUnits="userSpaceOnUse">
+      <stop stop-color="#F0F0F4"/>
+      <stop offset="1" stop-color="#F9F9FB"/>
+    </linearGradient>
+  </defs>
+</svg>

src/browser/themes/addons/dream/manifest.json

@@ -0,0 +1,101 @@
+{
+  "manifest_version": 2,
+
+  "browser_specific_settings": {
+    "gecko": {
+      "id": "firefox-compact-dream@mozilla.org"
+    }
+  },
+
+  "name": "Zen Dream",
+  "description": "A theme with a light color scheme and a dream-y vibe.",
+  "author": "Zen",
+  "version": "1.3",
+
+  "icons": { "32": "icon.svg" },
+
+  "theme": {
+    "colors": {
+      "tab_background_text": "rgb(21,20,26)",
+      "tab_selected": "#fff",
+      "tab_text": "rgb(21,20,26)",
+      "icons": "rgb(91,91,102)",
+      "frame": "rgb(240, 240, 244)",
+      "frame_inactive": "rgb(235, 235, 239)",
+      "popup": "#fff",
+      "popup_text": "rgb(21,20,26)",
+      "popup_border": "rgb(240,240,244)",
+      "popup_highlight": "#e0e0e6",
+      "popup_highlight_text": "#15141a",
+      "tab_line": "transparent",
+      "toolbar": "#f9f9fb",
+      "toolbar_top_separator": "transparent",
+      "toolbar_bottom_separator": "#ccc",
+      "toolbar_field": "rgb(240, 240, 244)",
+      "toolbar_field_text": "rgb(21, 20, 26)",
+      "toolbar_field_border": "transparent",
+      "toolbar_field_focus": "white",
+      "toolbar_text": "rgb(21,20,26)",
+      "ntp_background": "#F9F9FB",
+      "ntp_text": "rgb(21, 20, 26)",
+      "popup_action_color": "rgb(91,91,102)",
+      "button": "rgba(207,207,216,.33)",
+      "button_hover": "rgba(207,207,216,.66)",
+      "button_active": "rgb(207,207,216)",
+      "button_primary": "#000",
+      "button_primary_hover": "rgb(31, 31, 31)",
+      "button_primary_active": "rgb(207,207,216)",
+      "button_primary_color": "#fff",
+      "input_color": "rgb(21,20,26)",
+      "input_background": "#f0f0f4",
+      "urlbar_popup_hover": "rgb(240,240,244)",
+      "urlbar_popup_separator": "rgb(240,240,244)",
+      "appmenu_update_icon_color": "#2AC3A2",
+      "appmenu_info_icon_color": "#0090ED",
+      "tab_icon_overlay_stroke": "rgb(255,255,255)",
+      "tab_icon_overlay_fill": "rgb(91,91,102)"
+    },
+    "properties": {
+      "color_scheme": "light",
+      "panel_hover": "color-mix(in srgb, currentColor 12%, transparent)",
+      "panel_active": "color-mix(in srgb, currentColor 20%, transparent)",
+      "panel_active_darker": "color-mix(in srgb, currentColor 27%, transparent)",
+      "toolbar_field_icon_opacity": "0.72",
+      "input_border_color": "rgba(0, 0, 0, .3)",
+      "zap_gradient": "linear-gradient(90deg, #9059FF 0%, #FF4AA2 52.08%, #FFBD4F 100%)",
+      "zen_main_browser_background": "radial-gradient(346.69% 165.29% at 50% 50%, rgba(63, 94, 204, 0.50) 0%, rgba(249, 249, 249, 0.23) 100%), #CBD0DF"
+    }
+  },
+
+  "theme_experiment": {
+    "stylesheet": "experiment.css",
+    "colors": {
+      "popup_action_color": "--urlbarView-action-color",
+      "button": "--button-bgcolor",
+      "button_hover": "--button-hover-bgcolor",
+      "button_active": "--button-active-bgcolor",
+      "button_primary": "--button-primary-bgcolor",
+      "button_primary_hover": "--button-primary-hover-bgcolor",
+      "button_primary_active": "--button-primary-active-bgcolor",
+      "button_primary_color": "--button-primary-color",
+      "input_background": "--input-bgcolor",
+      "input_color": "--input-color",
+      "input_border": "--input-border-color",
+      "urlbar_popup_hover": "--urlbarView-hover-background",
+      "urlbar_popup_separator": "--urlbarView-separator-color",
+      "appmenu_update_icon_color": "--panel-banner-item-update-supported-bgcolor",
+      "appmenu_info_icon_color": "--panel-banner-item-info-icon-bgcolor",
+      "tab_icon_overlay_stroke": "--tab-icon-overlay-stroke",
+      "tab_icon_overlay_fill": "--tab-icon-overlay-fill"
+    },
+    "properties": {
+      "panel_hover": "--panel-item-hover-bgcolor",
+      "panel_active": "--arrowpanel-dimmed-further",
+      "panel_active_darker": "--panel-item-active-bgcolor",
+      "toolbar_field_icon_opacity": "--urlbar-icon-fill-opacity",
+      "input_border_color": "--input-border-color",
+      "zap_gradient": "--panel-separator-zap-gradient",
+      "zen_main_browser_background": "--zen-main-browser-background"
+    }
+  }
+}

src/browser/themes/addons/dream/preview.svg

@@ -0,0 +1,36 @@
+<!-- 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/. -->
+<svg width="680" height="92" fill="none" xmlns="http://www.w3.org/2000/svg">
+  <rect width="680" height="92" fill="#F0F0F4" />
+  <g filter="url(#filter0_dd)">
+    <rect x="28" y="5" width="166" height="34" rx="4" fill="white" />
+  </g>
+  <rect x="51" y="20" width="121" height="4" rx="2" fill="#15141A" />
+  <rect x="221" y="20" width="121" height="4" rx="2" fill="#15141A" />
+  <rect y="44" width="680" height="48" fill="#F9F9FB" />
+  <circle cx="24" cy="68" r="6.25" stroke="#5B5B66" stroke-width="1.5" />
+  <circle cx="60" cy="68" r="6.25" stroke="#5B5B66" stroke-width="1.5" />
+  <line x1="663" y1="73.75" x2="649" y2="73.75" stroke="#5B5B66" stroke-width="1.5" />
+  <line x1="663" y1="67.75" x2="649" y2="67.75" stroke="#5B5B66" stroke-width="1.5" />
+  <line x1="663" y1="61.75" x2="649" y2="61.75" stroke="#5B5B66" stroke-width="1.5" />
+  <rect x="114" y="52" width="488" height="32" rx="4" fill="#F0F0F4" />
+  <circle cx="130" cy="68" r="6.25" stroke="#5B5B66" stroke-width="1.5" />
+  <rect x="146" y="66" width="308" height="4" rx="2" fill="#5B5B66" />
+  <defs>
+    <filter id="filter0_dd" x="24" y="1" width="174" height="42" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+      <feFlood flood-opacity="0" result="BackgroundImageFix" />
+      <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" />
+      <feOffset />
+      <feGaussianBlur stdDeviation="2" />
+      <feColorMatrix type="matrix" values="0 0 0 0 0.501961 0 0 0 0 0.501961 0 0 0 0 0.556863 0 0 0 0.5 0" />
+      <feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow" />
+      <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" />
+      <feOffset />
+      <feGaussianBlur stdDeviation="0.5" />
+      <feColorMatrix type="matrix" values="0 0 0 0 0.501961 0 0 0 0 0.501961 0 0 0 0 0.556863 0 0 0 0.9 0" />
+      <feBlend mode="normal" in2="effect1_dropShadow" result="effect2_dropShadow" />
+      <feBlend mode="normal" in="SourceGraphic" in2="effect2_dropShadow" result="shape" />
+    </filter>
+  </defs>
+</svg>

src/browser/themes/addons/galaxy/experiment.css

@@ -0,0 +1,6 @@
+/* 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/. */
+
+/* Proton Dark theme */
+@import url("chrome://browser/skin/light-dark-overrides.css");

src/browser/themes/addons/galaxy/icon.svg

@@ -0,0 +1,12 @@
+<!-- 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/. -->
+<svg width="63" height="62" viewBox="0 0 63 62" fill="none" xmlns="http://www.w3.org/2000/svg">
+  <circle cx="31.5" cy="31" r="31" fill="url(#paint0_linear)"/>
+  <defs>
+    <linearGradient id="paint0_linear" x1="44.4829" y1="19" x2="10.4829" y2="53" gradientUnits="userSpaceOnUse">
+      <stop stop-color="#42414D"/>
+      <stop offset="1" stop-color="#1C1B22"/>
+    </linearGradient>
+  </defs>
+</svg>

src/browser/themes/addons/galaxy/manifest.json

@@ -0,0 +1,95 @@
+{
+  "manifest_version": 2,
+
+  "browser_specific_settings": {
+    "gecko": {
+      "id": "firefox-compact-galaxy@mozilla.org"
+    }
+  },
+
+  "name": "Zen Galaxy",
+  "description": "A theme with a dark color scheme and galaxy effects.",
+  "author": "Zen",
+  "version": "1.3",
+
+  "icons": { "32": "icon.svg" },
+
+  "theme": {
+    "colors": {
+      "tab_background_text": "#fbfbfe",
+      "tab_selected": "rgb(66,65,77)",
+      "tab_text": "rgb(251,251,254)",
+      "icons": "rgb(251,251,254)",
+      "frame": "rgb(28, 27, 34)",
+      "frame_inactive": "rgb(31, 30, 37)",
+      "popup": "rgb(66,65,77)",
+      "popup_text": "rgb(251,251,254)",
+      "popup_border": "rgb(82,82,94)",
+      "popup_highlight": "rgb(43,42,51)",
+      "tab_line": "transparent",
+      "toolbar": "rgb(43,42,51)",
+      "toolbar_top_separator": "transparent",
+      "toolbar_bottom_separator": "hsl(240, 5%, 5%)",
+      "toolbar_field": "rgb(28,27,34)",
+      "toolbar_field_border": "transparent",
+      "toolbar_field_text": "rgb(251,251,254)",
+      "toolbar_field_focus": "rgb(66,65,77)",
+      "toolbar_text": "rgb(251, 251, 254)",
+      "ntp_background": "rgb(43, 42, 51)",
+      "ntp_card_background": "rgb(66,65,77)",
+      "ntp_text": "rgb(251, 251, 254)",
+      "sidebar_text": "rgb(249, 249, 250)",
+      "sidebar_border": "rgba(255, 255, 255, 0.1)",
+      "button": "rgba(0, 0, 0, .33)",
+      "button_hover": "rgba(207, 207, 216, .20)",
+      "button_active": "rgba(207, 207, 216, .40)",
+      "button_primary": "#fff",
+      "button_primary_hover": "rgb(207, 207, 216)",
+      "button_primary_active": "rgb(207, 207, 216)",
+      "button_primary_color": "#000",
+      "input_background": "#42414D",
+      "input_color": "rgb(251,251,254)",
+      "input_border": "#fff",
+      "urlbar_popup_separator": "rgb(82,82,94)",
+      "appmenu_update_icon_color": "#54FFBD",
+      "appmenu_info_icon_color": "#80EBFF",
+      "tab_icon_overlay_stroke": "rgb(66,65,77)",
+      "tab_icon_overlay_fill": "rgb(251,251,254)"
+    },
+    "properties": {
+      "color_scheme": "dark",
+      "panel_active": "color-mix(in srgb, currentColor 14%, transparent)",
+      "toolbar_field_icon_opacity": "1",
+      "zap_gradient": "linear-gradient(90deg, #9059FF 0%, #FF4AA2 52.08%, #FFBD4F 100%)",
+      "zen_main_browser_background": "radial-gradient(236.2% 84.03% at 50% 50%, rgba(68, 0, 255, 0.20) 0%, rgba(63, 0, 0, 0.20) 100%), var(--zen-colors-primary, #1B1E27)"
+    }
+  },
+
+  "theme_experiment": {
+    "stylesheet": "experiment.css",
+    "colors": {
+      "button": "--button-bgcolor",
+      "button_hover": "--button-hover-bgcolor",
+      "button_active": "--button-active-bgcolor",
+      "button_primary": "--button-primary-bgcolor",
+      "button_primary_hover": "--button-primary-hover-bgcolor",
+      "button_primary_active": "--button-primary-active-bgcolor",
+      "button_primary_color": "--button-primary-color",
+      "input_background": "--input-bgcolor",
+      "input_color": "--input-color",
+      "input_border": "--input-border-color",
+      "urlbar_popup_separator": "--urlbarView-separator-color",
+      "zoom_controls": "--zoom-controls-bgcolor",
+      "appmenu_update_icon_color": "--panel-banner-item-update-supported-bgcolor",
+      "appmenu_info_icon_color": "--panel-banner-item-info-icon-bgcolor",
+      "tab_icon_overlay_stroke": "--tab-icon-overlay-stroke",
+      "tab_icon_overlay_fill": "--tab-icon-overlay-fill"
+    },
+    "properties": {
+      "panel_active": "--arrowpanel-dimmed-further",
+      "toolbar_field_icon_opacity": "--urlbar-icon-fill-opacity",
+      "zap_gradient": "--panel-separator-zap-gradient",
+      "zen_main_browser_background": "--zen-main-browser-background"
+    }
+  }
+}

src/browser/themes/addons/galaxy/preview.svg

@@ -0,0 +1,18 @@
+<!-- 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/. -->
+<svg width="680" height="92" viewBox="0 0 680 92" fill="none" xmlns="http://www.w3.org/2000/svg">
+  <rect width="680" height="92" fill="#1C1B22" />
+  <rect x="28" y="5" width="166" height="34" rx="4" fill="#42414D" />
+  <rect x="51" y="20" width="121" height="4" rx="2" fill="#FBFBFE" />
+  <rect x="221" y="20" width="121" height="4" rx="2" fill="#B8B7BB" />
+  <rect y="44" width="680" height="48" fill="#2B2A33" />
+  <circle cx="24" cy="68" r="6.25" stroke="#FBFBFE" stroke-width="1.5" />
+  <circle cx="60" cy="68" r="6.25" stroke="#FBFBFE" stroke-width="1.5" />
+  <line x1="663" y1="73.75" x2="649" y2="73.75" stroke="#FBFBFE" stroke-width="1.5" />
+  <line x1="663" y1="67.75" x2="649" y2="67.75" stroke="#FBFBFE" stroke-width="1.5" />
+  <line x1="663" y1="61.75" x2="649" y2="61.75" stroke="#FBFBFE" stroke-width="1.5" />
+  <rect x="114" y="52" width="488" height="32" rx="4" fill="#1C1B22" />
+  <circle cx="130" cy="68" r="6.25" stroke="white" stroke-width="1.5" />
+  <rect x="146" y="66" width="308" height="4" rx="2" fill="white" />
+</svg>

src/browser/themes/addons/jar-mn.patch

@@ -0,0 +1,22 @@
+diff --git a/browser/themes/addons/jar.mn b/browser/themes/addons/jar.mn
+index 69bb3000d6d2d249d1d77262dc2a0057d0318308..bbed04a6b6f11c582e17e08201db260b9ed496b7 100644
+--- a/browser/themes/addons/jar.mn
++++ b/browser/themes/addons/jar.mn
+@@ -5,8 +5,8 @@
+ browser.jar:
+ %  resource builtin-themes %content/builtin-themes/
+ 
+-  content/builtin-themes/alpenglow                 (alpenglow/*.svg)
+-  content/builtin-themes/alpenglow/manifest.json   (alpenglow/manifest.json)
++#  content/builtin-themes/alpenglow                 (alpenglow/*.svg)
++#  content/builtin-themes/alpenglow/manifest.json   (alpenglow/manifest.json)
+ 
+   content/builtin-themes/dark                      (dark/*.svg)
+   content/builtin-themes/dark                      (dark/*.css)
+@@ -100,3 +100,5 @@ browser.jar:
+   content/builtin-themes/colorways/2022innovator/balanced/manifest.json       (colorways/2022-independent-voices/innovator/balanced/manifest.json)
+   content/builtin-themes/colorways/2022innovator/bold                         (colorways/2022-independent-voices/innovator/bold/*.svg)
+   content/builtin-themes/colorways/2022innovator/bold/manifest.json           (colorways/2022-independent-voices/innovator/bold/manifest.json)
++
++#include zen-addons.inc.mn
+\ No newline at end of file

src/browser/themes/addons/light/manifest-json.patch

@@ -1,5 +1,5 @@
 diff --git a/browser/themes/addons/light/manifest.json b/browser/themes/addons/light/manifest.json
-index 7385970fa8e3ff9659b72cfb238003958220fb0d..f1fce740db32e7dcf8553619888844e4ef442297 100644
+index 7385970fa8e3ff9659b72cfb238003958220fb0d..9c069db212d73769526ce9bf0fc6d62ab5881a5d 100644
 --- a/browser/themes/addons/light/manifest.json
 +++ b/browser/themes/addons/light/manifest.json
 @@ -7,10 +7,10 @@
@@ -42,17 +42,17 @@ index 7385970fa8e3ff9659b72cfb238003958220fb0d..f1fce740db32e7dcf8553619888844e4
 -      "zap_gradient": "linear-gradient(90deg, #9059FF 0%, #FF4AA2 52.08%, #FFBD4F 100%)"
 +      "input_border_color": "rgba(0, 0, 0, .3)",
 +      "zap_gradient": "linear-gradient(90deg, #9059FF 0%, #FF4AA2 52.08%, #FFBD4F 100%)",
-+      "zen_main_browser_background": "var(--zen-colors-secondary)"
++      "zen_main_browser_background": "var(--zen-themed-toolbar-bg)"
      }
    },
  
-@@ -85,7 +86,8 @@
+@@ -93,7 +94,8 @@
-       "appmenu_update_icon_color": "--panel-banner-item-update-supported-bgcolor",
+       "panel_active_darker": "--panel-item-active-bgcolor",
-       "appmenu_info_icon_color": "--panel-banner-item-info-icon-bgcolor",
+       "toolbar_field_icon_opacity": "--urlbar-icon-fill-opacity",
-       "tab_icon_overlay_stroke": "--tab-icon-overlay-stroke",
+       "input_border_color": "--input-border-color",
--      "tab_icon_overlay_fill": "--tab-icon-overlay-fill"
+-      "zap_gradient": "--panel-separator-zap-gradient"
-+      "tab_icon_overlay_fill": "--tab-icon-overlay-fill",
++      "zap_gradient": "--panel-separator-zap-gradient",
 +      "zen_main_browser_background": "--zen-main-browser-background"
-     },
+     }
-     "properties": {
+   }
-       "panel_hover": "--panel-item-hover-bgcolor",
+ }

src/browser/themes/addons/zen-addons.inc.mn

@@ -0,0 +1,8 @@
+
+  content/builtin-themes/galaxy                      (galaxy/*.svg)
+  content/builtin-themes/galaxy                      (galaxy/*.css)
+  content/builtin-themes/galaxy/manifest.json        (galaxy/manifest.json)
+
+  content/builtin-themes/dream                      (dream/*.svg)
+  content/builtin-themes/dream                      (dream/*.css)
+  content/builtin-themes/dream/manifest.json        (dream/manifest.json)

src/browser/themes/shared/zen-browser-shared.css

@@ -18,15 +18,17 @@
   --fp-contextmenu-separator-vertical: calc(4px - var(--fp-contextmenu-menuitem-border-width));
   --fp-contextmenu-separator-horizontal: 0;
   --fp-contextmenu-bgcolor: light-dark(Menu, rgb(43 42 51 / 0.95));
-  --toolbar-bgcolor: var(--zen-colors-tertiary) !important;
+  --toolbar-bgcolor: transparent !important;
 
   --input-bgcolor: var(--zen-colors-tertiary) !important;
   --input-border-color: var(--zen-input-border-color) !important;
+  --zen-themed-toolbar-bg: var(--zen-colors-tertiary);
 }
 
 @media not (-moz-bool-pref: "zen.theme.toolbar-themed") {
   :root {
     --toolbar-bgcolor: light-dark(white, #1b1b1b) !important;
+    --zen-themed-toolbar-bg: var(--toolbar-bgcolor);
   }
 }
 
@@ -463,3 +465,7 @@ panelmultiview {
 #urlbar[breakout]:not([breakout-extend="true"]) {
   top: unset;
 }
+
+#zen-main-app-wrapper {
+  background: var(--zen-main-browser-background);
+}

src/toolkit/content/zen-xul.css

@@ -2,7 +2,7 @@
 @import url("zen-fullscreen-override.css");
 
 :root {
-  --zen-main-browser-background: var(--zen-colors-secondary); 
+  --zen-main-browser-background: red; 
   --zen-appcontent-separator-from-window-single: 7px;
   --zen-appcontent-separator-from-window: var(--zen-appcontent-separator-from-window-single);
   --zen-appcontent-border-radius: var(--zen-panel-radius);

src/toolkit/mozapps/extensions/internal/AddonSettings-sys-mjs.patch

@@ -1,5 +1,5 @@
 diff --git a/toolkit/mozapps/extensions/internal/AddonSettings.sys.mjs b/toolkit/mozapps/extensions/internal/AddonSettings.sys.mjs
-index 09bb0adc97170edb414d8da91c61ec2232aa64c6..26a2d92ea0b8dbd4dccde5f341649df057029abe 100644
+index 09bb0adc97170edb414d8da91c61ec2232aa64c6..8d6fbe2b2322e4d1ccd9de3b338edfbfb4e6448f 100644
 --- a/toolkit/mozapps/extensions/internal/AddonSettings.sys.mjs
 +++ b/toolkit/mozapps/extensions/internal/AddonSettings.sys.mjs
 @@ -119,7 +119,7 @@ if (
@@ -7,7 +7,7 @@ index 09bb0adc97170edb414d8da91c61ec2232aa64c6..26a2d92ea0b8dbd4dccde5f341649df0
    makeConstant("DEFAULT_THEME_ID", "firefox-compact-dark@mozilla.org");
  } else {
 -  makeConstant("DEFAULT_THEME_ID", "default-theme@mozilla.org");
-+  makeConstant("DEFAULT_THEME_ID", "firefox-alpenglow@mozilla.org");
++  makeConstant("DEFAULT_THEME_ID", "firefox-compact-dark@mozilla.org");
  }
  
  // SCOPES_SIDELOAD is a bitflag for what scopes we will load new extensions from when we scan the directories.

src/toolkit/mozapps/extensions/internal/XPIDatabase-sys-mjs.patch

@@ -1,5 +1,5 @@
 diff --git a/toolkit/mozapps/extensions/internal/XPIDatabase.sys.mjs b/toolkit/mozapps/extensions/internal/XPIDatabase.sys.mjs
-index 5d1d2c19706b747b149271ea71fabb25f0eca5d1..d0b8a3c37a61a62287d2fa9dab6f90bdd33c786f 100644
+index af0b02444a47cee2a26d859086d52dff5dd3067c..68f382a4d2cf375858f3988b35e1a24b7ed9a761 100644
 --- a/toolkit/mozapps/extensions/internal/XPIDatabase.sys.mjs
 +++ b/toolkit/mozapps/extensions/internal/XPIDatabase.sys.mjs
 @@ -140,7 +140,7 @@ const KEY_APP_GLOBAL = "app-global";
@@ -7,7 +7,7 @@ index 5d1d2c19706b747b149271ea71fabb25f0eca5d1..d0b8a3c37a61a62287d2fa9dab6f90bd
  const KEY_APP_TEMPORARY = "app-temporary";
  
 -const DEFAULT_THEME_ID = "default-theme@mozilla.org";
-+const DEFAULT_THEME_ID = "firefox-alpenglow@mozilla.org";
++const DEFAULT_THEME_ID = "firefox-compact-dark@mozilla.org";
  
  // Properties to cache and reload when an addon installation is pending
  const PENDING_INSTALL_METADATA = [

src/toolkit/mozapps/extensions/internal/XPIProvider-sys-mjs.patch

@@ -1,15 +1,13 @@
 diff --git a/toolkit/mozapps/extensions/internal/XPIProvider.sys.mjs b/toolkit/mozapps/extensions/internal/XPIProvider.sys.mjs
-index d5ffd06d112726767c465815a28e85aac881fbdb..687646de83c6e13370e5e32495921a67a00a88ad 100644
+index 12d4fa1172f4f19df63521fac2bc6f065ae455df..981e3c2e22e59447343cd4b35411041656b2b7ed 100644
 --- a/toolkit/mozapps/extensions/internal/XPIProvider.sys.mjs
 +++ b/toolkit/mozapps/extensions/internal/XPIProvider.sys.mjs
-@@ -2546,8 +2546,8 @@ export var XPIProvider = {
+@@ -2546,7 +2546,7 @@ export var XPIProvider = {
          );
        }
        this.maybeInstallBuiltinAddon(
 -        "default-theme@mozilla.org",
--        "1.3",
++        "firefox-compact-dark@mozilla.org",
-+        "firefox-alpenglow@mozilla.org",
+         "1.3",
-+        "1.4",
          "resource://default-theme/"
        );
-