Add firefox monterey alt theme

lib-install.sh

@@ -628,7 +628,11 @@ install_firefox_theme() {
   if [[ "${monterey}" == 'true' ]]; then
     udo cp -rf "${FIREFOX_SRC_DIR}"/Monterey                                                  "${TARGET_DIR}"
     udo cp -rf "${FIREFOX_SRC_DIR}"/WhiteSur/{icons,titlebuttons}                             "${TARGET_DIR}"/Monterey
-    udo cp -rf "${FIREFOX_SRC_DIR}"/userChrome-Monterey.css                                   "${TARGET_DIR}"/userChrome.css
+    if [[ "${alttheme}" == 'true' ]]; then
+      udo cp -rf "${FIREFOX_SRC_DIR}"/userChrome-Monterey-alt.css                             "${TARGET_DIR}"/userChrome.css
+    else
+      udo cp -rf "${FIREFOX_SRC_DIR}"/userChrome-Monterey.css                                 "${TARGET_DIR}"/userChrome.css
+    fi
   else
     udo cp -rf "${FIREFOX_SRC_DIR}"/WhiteSur                                                  "${TARGET_DIR}"
     udo cp -rf "${FIREFOX_SRC_DIR}"/userChrome-WhiteSur.css                                   "${TARGET_DIR}"/userChrome.css

src/other/firefox/Monterey/parts/headerbar-urlbar-alt.css

@@ -0,0 +1,206 @@
+/* Header bar's URL bar */
+
+@namespace xul "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
+
+#urlbar {
+	--urlbar-height: 32px !important;
+	--urlbar-container-height: 32px !important;
+	--urlbar-toolbar-height: 32px !important;
+	--urlbar-inner-padding: 0 !important;
+}
+
+/* Center the URL bar */
+toolbarspring {
+	max-width: 10000px !important;
+}
+
+/* URL bar */
+#urlbar {
+	margin-top: -2px !important;
+	box-shadow: none !important;
+	background: var(--gnome-popover-background) !important;
+	border-radius: 8px !important;
+	border: 1px solid transparent !important;
+	padding: 0 0 !important;
+}
+#urlbar-background {
+	box-shadow: none !important;
+	border: 0 !important;
+	background: transparent !important;
+	border-radius: 8px !important;
+	padding: 0 0 !important;
+}
+
+#urlbar:-moz-window-inactive {
+	border-color: var(--gnome-inactive-headerbar-background) !important;
+}
+
+#urlbar #urlbar-input-container {
+	padding: 0 !important;
+}
+#urlbar[breakout][breakout-extend] {
+	left: 0 !important;
+	top: 0 !important;
+	width: 100% !important;
+	z-index: 5 !important;
+	padding: 0 0 !important;
+}
+#urlbar[breakout][breakout-extend][open] {
+	height: auto !important;
+	max-height: unset !important;
+}
+#urlbar[breakout][breakout-extend] #urlbar-input-container {
+	height: 32px !important;
+	max-height: 32px !important;
+	padding: 0 !important;
+}
+
+#urlbar[breakout][breakout-extend][open] #urlbar-background {
+	box-shadow: var(--gnome-urlbar-box-shadow) !important;
+}
+
+/* URL bar results */
+.urlbarView {
+	background: transparent !important;
+	color: var(--gnome-toolbar-color) !important;
+	margin: 0 !important;
+	width: 100% !important;
+}
+
+.urlbarView-body-outer {
+	--item-padding-start: 0 !important;
+	--item-padding-end: 0 !important;
+	max-height: 40vh !important;
+	overflow-x: auto;
+	padding: 0 8px !important;
+}
+
+.urlbarView-body-inner {
+	border: 0 !important;
+}
+
+.urlbarView-row-inner, .urlbarView-no-wrap  {
+	align-items: center !important;
+}
+.urlbarView-row-inner {
+	padding-block: 5px !important;
+	border-radius: 5px !important;
+}
+.urlbarView-action {
+	background: transparent !important;
+}
+/* Search engines buttons */
+.search-one-offs {
+	margin: 0 0 2px !important;
+	padding: 8px !important;
+	background: var(--gnome-popover-background) !important;
+	border-top: 1px solid var(--gnome-button-border-color) !important;
+	border-radius: 0 0 8px 8px !important;
+}
+
+.searchbar-engine-one-off-item {
+	--toolbarbutton-active-background: transparent !important;
+	--toolbarbutton-hover-background: transparent !important;
+	-moz-appearance: none !important;
+	background: var(--gnome-button-background) !important;
+	box-shadow: var(--gnome-button-box-shadow) !important;
+	border: 1px solid var(--gnome-button-border-color) !important;
+	border-left-width: 0 !important;
+	border-bottom-color: var(--gnome-button-border-accent-color) !important;
+	padding: 0 2px !important;
+	min-height: 34px !important;
+	min-width: 34px !important;
+	margin: 0 !important;
+}
+.searchbar-engine-one-off-item:hover, .searchbar-engine-one-off-item[selected] {
+	background: var(--gnome-button-hover-background) !important;
+	color: unset !important;
+}
+.searchbar-engine-one-off-item:first-child {
+	border-radius: 5px 0 0 5px;
+	border-left-width: 1px !important;
+}
+.searchbar-engine-one-off-item.last-engine, .searchbar-engine-one-off-item:last-child {
+	border-radius: 0 5px 5px 0;
+}
+
+#urlbar-anon-search-settings-compact {
+	border-left-width: 1px !important;
+	border-bottom: 1px solid var(--gnome-button-border-accent-color) !important;
+	border-radius: 5px;
+	margin-left: 6px !important;
+}
+
+/* URL bar and Search bar */
+#urlbar[focused] .urlbar-textbox-container {
+	margin: -1px !important;
+}
+#searchbar > .searchbar-textbox[focused] .searchbar-search-button {
+	margin-left: -1px !important;
+}
+#searchbar > .searchbar-textbox[focused] .search-go-button {
+	margin-right: -1px !important;
+}
+
+/* URL bar and Search bar's icons */
+.urlbar-icon-wrapper:hover,
+.urlbar-icon-wrapper[open],
+.urlbar-icon:hover:active,
+.urlbar-icon-wrapper:hover:active,
+.searchbar-search-button:hover .searchbar-search-icon,
+.searchbar-search-button[open] .searchbar-search-icon,
+.searchbar-search-button:hover:active .searchbar-search-icon {
+	background-color: transparent !important;
+	fill-opacity: 1 !important;
+}
+
+.urlbar-icon {
+	width: 16px !important;
+	height: 16px !important;
+	padding: 0 !important;
+	margin: 0 !important;
+}
+
+#identity-box {
+	margin: 3px 2px !important;
+	border-radius: 5px !important;
+}
+
+.urlbar-page-action, #urlbar-go-button, .search-go-button,
+#tracking-protection-icon-container {
+	margin: 3px 0 !important;
+	border-radius: 5px !important;
+}
+
+#identity-box:hover {
+	background: var(--gnome-headerbar-button-hover-background) !important;
+}
+
+#identity-box:active {
+	background: var(--gnome-headerbar-button-active-background) !important;
+}
+
+.identity-box-button {
+	border-radius: 5px !important;
+	background: none !important;
+}
+
+/* Search mode indicator */
+#urlbar-search-mode-indicator,
+#urlbar-label-box {
+	background: var(--gnome-headerbar-button-hover-background) !important;
+	border: none !important;
+	border-radius: 5px !important;
+	outline: 0 !important;
+	margin-top: 3px !important;
+	margin-bottom: 3px !important;
+}
+#urlbar-search-mode-indicator-title {
+	padding-inline: 4px !important;;
+}
+#urlbar-search-mode-indicator-close {
+	background-size: 12px 12px !important;
+	border-radius: 3px !important;
+	opacity: 0.8 !important;
+	fill: var(--gnome-toolbar-color) !important;
+}

src/other/firefox/Monterey/parts/headerbar-urlbar.css

@@ -156,9 +156,7 @@ toolbarspring {
 }
 
 /* URL bar and Search bar's icons */
-.urlbar-icon:hover,
 .urlbar-icon-wrapper:hover,
-.urlbar-icon[open],
 .urlbar-icon-wrapper[open],
 .urlbar-icon:hover:active,
 .urlbar-icon-wrapper:hover:active,
@@ -169,18 +167,22 @@ toolbarspring {
 	fill-opacity: 1 !important;
 }
 
-#page-action-buttons {
+.urlbar-icon {
-	padding: 2px 0 !important;
+	width: 16px !important;
+	height: 16px !important;
+	padding: 0 !important;
+	margin: 0 !important;
 }
 
-#tracking-protection-icon-container,
 #identity-box {
 	margin: 3px 2px !important;
 	border-radius: 5px !important;
 }
 
+.urlbar-page-action, #urlbar-go-button, .search-go-button,
 #tracking-protection-icon-container {
 	margin: 3px 0 !important;
+	border-radius: 5px !important;
 }
 
 #identity-box:hover {

src/other/firefox/Monterey/parts/headerbar.css

@@ -1,6 +1,4 @@
 /* Header bar */
-@import "headerbar-urlbar.css";
-@import "headerbar-private-urlbar.css";
 @namespace xul "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
 
 /* Headerbar */

src/other/firefox/Monterey/parts/popups.css

@@ -8,7 +8,7 @@ menupopup {
 	-moz-appearance: none !important;
 	background: var(--gnome-menu-background) !important;
 	border: 1px solid var(--gnome-menu-border-color) !important;
-	border-radius: 8px !important;
+	border-radius: 10px !important;
 	padding: 6px 0 !important;
 	color: var(--gnome-toolbar-color) !important;
 	box-shadow: 0 2px 5px rgba(0, 0, 0, 0.1), inset 0 0 0 1px rgba(255, 255, 255, 0.06) !important;
@@ -16,8 +16,9 @@ menupopup {
 
 #PlacesToolbar menupopup {
 	background: none !important;
-	padding: 1px 0 0 0 !important;
+	padding: 3px 6px 8px !important;
 	margin-top: 0 !important;
+	border: none !important;
 	box-shadow: none !important;
 }
 

src/other/firefox/Monterey/parts/tabsbar-alt.css

@@ -0,0 +1,302 @@
+/* Tabs bar  */
+
+@namespace xul "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
+
+:root {
+	--space-above-tabbar: 0 !important;
+}
+
+/* Fix tabs bar icon sizes */
+#TabsToolbar {
+	--toolbarbutton-inner-padding: var(--toolbarbutton-inner-padding) !important;
+}
+
+/* Tabs bar height */
+#tabbrowser-tabs,
+#tabbrowser-tabs arrowscrollbox {
+	height: initial !important;
+	min-height: initial !important;
+}
+
+tab > stack {
+	height: 32px !important;
+}
+
+.titlebar-spacer[type="pre-tabs"], .titlebar-spacer[type="post-tabs"] {
+	width: 8px !important;
+}
+
+.tabbrowser-tab {
+	margin: 0 4px !important;
+}
+
+.tabbrowser-tab,
+.tab-background {
+	border: none !important;
+	box-shadow: none !important;
+	border-radius: 8px !important;
+	height: 32px !important;
+	min-height: 32px !important;
+	max-height: 32px !important;
+	padding: 0 !important;
+	background-image: none !important;
+	margin-bottom: 6px !important;
+}
+
+.tabbrowser-tab:not([visuallyselected="true"], [multiselected]), .tabbrowser-tab:-moz-lwtheme {
+	color: var(--gnome-tabbar-tab-color) !important;
+}
+
+.tabbrowser-tab .tab-background:not([selected=true]) {
+	color: var(--gnome-tabbar-tab-active-color) !important;
+}
+
+.tab-background {
+	transition: background 200ms !important;
+}
+
+.tab-background:not([selected=true]) {
+	background: var(--gnome-tabbar-tab-background) !important;
+}
+
+.tab-background:not([selected=true]):-moz-window-inactive {
+	background: var(--gnome-inactive-tabbar-tab-background) !important;
+}
+
+/* Tab hover */
+#TabsToolbar .tabbrowser-tab:hover > .tab-stack > .tab-background:not([selected=true]) {
+	background: var(--gnome-tabbar-tab-hover-background) !important;
+}
+
+/* Active tab */
+.tab-background[selected=true] {
+	background: var(--gnome-tabbar-tab-active-background) !important;
+}
+
+.tab-background[selected=true]:-moz-window-inactive {
+	background: var(--gnome-inactive-tabbar-tab-active-background) !important;
+}
+
+/* Center all inside tab */
+.tab-content {
+	display: flex;
+	flex-direction: row;
+	justify-content: center;
+	align-items: center;
+	margin-top: -1px;
+	min-width: 100% !important;
+	padding: 0 10px !important;
+}
+
+.tabbrowser-tab[class*="identity-color-"][pinned] {
+	display: flex;
+}
+
+.tab-background {
+	transition: all 200ms;
+}
+
+/* Prevent tab icons size breaking */
+.tab-icon-image, .tab-icon-sound, .tab-throbber, .tab-throbber-fallback, .tab-close-button {
+	min-width: 16px;
+}
+
+/* Adjust tab label width */
+.tab-label-container {
+	min-width: 0 !important;
+}
+
+/* Put tab close button and icon sound to the right */
+.tab-icon-sound[soundplaying="true"], .tab-icon-sound[muted="true"],
+.tab-icon-sound[activemedia-blocked="true"] {
+	margin-left: auto !important;
+}
+/*.tabbrowser-tab:not([soundplaying]):not([muted]):not([activemedia-blocked]) .tab-close-button {*/
+/*	margin-left: auto !important;*/
+/*}*/
+.tab-icon-sound {
+	margin-right: 6px;
+}
+
+/* Force tab favicon to the center */
+.tab-throbber, .tab-throbber-fallback,
+.tabbrowser-tab:not([busy]) .tab-icon-image,
+.tabbrowser-tab:not([class*="identity-color-"]) .tab-icon-stack {
+	margin-left: auto !important;
+}
+
+/* separate class for multi-tab alignment*/
+.tabbrowser-tab[class*="identity-color-"] > .tab-stack > .tab-content > .tab-icon-stack {
+	margin-left: auto !important;
+}
+
+/* If tab favicon is not present, force tab label to the center */
+.tabbrowser-tab .tab-label-container {
+	margin-left: 0 !important;
+	margin-right: auto !important;
+}
+
+.tabbrowser-tab:not([image]):not([busy]):not([progress]) .tab-label-container {
+	margin-left: auto !important;
+}
+
+/* If tab close button is not present, don't force favicon to the center */
+#tabbrowser-tabs[closebuttons="activetab"] .tabbrowser-tab:not([selected="true"]) .tab-throbber,
+#tabbrowser-tabs[closebuttons="activetab"] .tabbrowser-tab:not([selected="true"]) .tab-throbber-fallback,
+#tabbrowser-tabs[closebuttons="activetab"] .tabbrowser-tab:not([selected="true"]):not([busy]) .tab-icon-image,
+#tabbrowser-tabs[closebuttons="activetab"] .tabbrowser-tab:not([selected="true"]):not([image]) .tab-label-container,
+#tabbrowser-tabs[closebuttons="activetab"] .tabbrowser-tab:not([selected="true"]) .tab-icon-stack {
+	margin-left: 0 !important;
+}
+
+/* Fix website with no favicon centred text */
+.tabbrowser-tab:not([image]) .tab-icon-overlay:not([pinned], [sharing], [crashed]) .tab-icon-stack {
+	margin-left: 0 !important
+}
+
+.tabbrowser-tab:not([image], [busy]) .tab-icon-stack {
+	margin-left: 0 !important
+}
+
+@media (-moz-proton) {
+	/* Firefox v89 beta tab fix */
+	.tab-background {
+		margin-block: 0 !important;
+	}
+
+	/*Align personal bookmarks v89 */
+	#personal-bookmarks {
+		-moz-box-align: center !important;
+	}
+
+	/* fix misc spacing between tabs */
+	.tabbrowser-tab {
+		padding-inline: 0px !important;
+	}
+
+	.tabbrowser-tab[selected="true"]>.tab-stack>.tab-background {
+		margin-left: 0px !important;
+		margin-right: 0px !important;
+	}
+
+	/* centre text when audio is playing */
+	.tabbrowser-tab:is([soundplaying]) .tab-label-container {
+		margin-left: 0 !important;
+		margin-right: auto !important
+	}
+}
+
+.close-icon {
+	height: 16px !important;
+	padding: 0 !important;
+	width: 16px !important;
+}
+
+.tab-close-button {
+	-moz-appearance: none !important;
+	margin-inline-end: 0 !important;
+	border: none !important;
+	box-sizing: content-box; /* Avoid deformation on flexbox */
+	border-radius: 3px !important;
+	list-style-image: url("../icons/window-close-symbolic.svg") !important;
+	height: 16px;
+	opacity: .3;
+	padding: 0;
+	width: 16px;
+}
+
+.tabbrowser-tab > .tab-stack > .tab-content > .tab-close-button {
+	visibility: hidden;
+}
+
+.tabbrowser-tab:hover > .tab-stack > .tab-content > .tab-close-button {
+	visibility: visible;
+}
+
+@media (prefers-color-scheme: dark) {
+	.tab-close-button {
+		list-style-image: url("../icons/window-close-symbolic-light.svg") !important;
+	}
+}
+:root:-moz-window-inactive .tab-close-button:not(#hack) {
+	opacity: .18 !important;
+}
+:root:not(:-moz-window-inactive) .tab-close-button:hover {
+	background-color: var(--gnome-button-hover-color) !important;
+	border: none !important;
+	opacity: 1;
+}
+:root:not(:-moz-window-inactive) .tab-close-button:active {
+	background-color: var(--gnome-button-active-color) !important;
+}
+
+.tab-close-button:active:not(:hover) {
+	background-image: none !important;
+	box-shadow: none !important;
+}
+
+/* Tab close button etc. positioning */
+.tab-throbber, .tab-icon-image, .tab-sharing-icon-overlay, .tab-icon-sound, .tab-close-button {
+	margin-top: 0 !important;
+}
+
+/* Remove blue line above tabs */
+.tab-line {
+	display: none;
+}
+
+/* Remove tab separators */
+.tabbrowser-tab::after,
+.tabbrowser-tab::before {
+	border-color: transparent !important;
+	border-image: none !important;
+}
+
+/* Full width tabs */
+.tabbrowser-tab:not([style^="max-width"]):not([pinned]),
+.tabbrowser-tab[style^="max-width: 100px !important;"]:not([pinned]) {
+	max-width: 100% !important;
+}
+
+.tabbrowser-tab:not([style^="max-width"]):not([pinned]):not([fadein]),
+.tabbrowser-tab[style^="max-width: 100px !important;"]:not([pinned]):not([fadein]) {
+	max-width: .1px !important;
+}
+
+/* Remove container bottom line indicator */
+.tabbrowser-tab[usercontextid] > .tab-stack > .tab-background > .tab-bottom-line {
+	display: none;
+}
+
+#TabsToolbar #alltabs-button {
+	padding: 0 0 !important;
+	visibility: collapse !important;
+}
+
+#TabsToolbar .toolbarbutton-1,
+#tabs-newtab-button, #TabsToolbar #new-tab-button {
+	margin: 0 2px !important;
+	padding: 0 10px !important;
+	max-height: 32px !important;
+	min-height: 32px !important;
+}
+
+#TabsToolbar .toolbarbutton-1 image,
+#tabs-newtab-button image, #TabsToolbar #new-tab-button image {
+	margin: 0 !important;
+	padding: 0 !important;
+	height: 16px !important;
+	width: 16px !important;
+}
+
+#TabsToolbar #scrollbutton-up, #TabsToolbar #scrollbutton-down {
+	max-height: 32px !important;
+	min-height: 32px !important;
+}
+
+#TabsToolbar #scrollbutton-up image, #TabsToolbar #scrollbutton-down image {
+	margin: 0 !important;
+	padding: 0 !important;
+	height: 16px !important;
+	width: 16px !important;
+}

src/other/firefox/Monterey/parts/toolbox-alt.css

@@ -0,0 +1,91 @@
+/* Toolbox, a container for all toolbars (toolbox#navigator-toolbox):
+ * - menu bar (toolbar#toolbar-menubar)
+ * - tab bar (toolbar#TabsToolbar)
+ * - header bar (toolbar#nav-bar)
+ * - bookmark bar (toolbar#PersonalToolbar)
+ * - add-ons can add their own toolbars (toolbar) */
+
+@namespace xul "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
+
+#nav-bar, #PersonalToolbar, #toolbar-menubar, #TabsToolbar {
+	border: 0 !important;
+	color: var(--gnome-toolbar-color);
+	background: var(--gnome-toolbar-background) !important;
+	border-bottom: none !important;
+}
+
+findbar {
+	border: 0 !important;
+	background: var(--gnome-findbar-background) !important;
+	border-bottom: 1px solid var(--gnome-toolbar-border-color) !important;
+}
+
+#nav-bar:-moz-window-inactive,
+#PersonalToolbar:-moz-window-inactive,
+#toolbar-menubar:-moz-window-inactive,
+#TabsToolbar:-moz-window-inactive,
+findbar:-moz-window-inactive {
+	background: var(--gnome-inactive-toolbar-background) !important;
+}
+
+/* Toolbox colors */
+#navigator-toolbox {
+	border: 0 !important;
+	background: none !important;
+}
+
+.toolbarbutton-icon {
+	color: var(--gnome-toolbar-color);
+	fill: var(--gnome-toolbar-color);
+}
+
+#titlebar {
+	min-height: 0 !important
+	max-height: 36px !important;
+}
+
+#nav-bar {
+	border: none !important;
+	box-shadow: none !important;
+	border-top-width: 0px !important;
+	border-bottom-width: 0px !important;
+}
+
+/* allow to drag headerbar empty space */
+:root[tabsintitlebar] #nav-bar .chromeclass-location {
+	-moz-window-dragging: drag !important;
+}
+
+#toolbar-menubar:not([inactive=true]) {
+	margin-bottom: 0 !important;
+}
+
+/* Reorder toolbars */
+#navigator-toolbox #nav-bar, findbar {
+	-moz-box-ordinal-group: 0;
+}
+#navigator-toolbox #PersonalToolbar {
+	-moz-box-ordinal-group: 1;
+}
+#navigator-toolbox #titlebar {
+	-moz-box-ordinal-group: 2;
+}
+#navigator-toolbox toolbar {
+	-moz-box-ordinal-group: 10;
+}
+#navigator-toolbox #TabsToolbar {
+	-moz-box-ordinal-group: 100;
+}
+
+#PersonalToolbar {
+	padding: 0 4px !important;
+	height: 32px !important;
+}
+
+/* bookmark-item */
+toolbarbutton.bookmark-item {
+	padding: 0 4px; !important;
+	margin: 0 2px !important;
+	border-radius: 3px !important;
+	max-height: 20px !important;
+}

src/other/firefox/Monterey/theme-alt.css

@@ -0,0 +1,26 @@
+@import "parts/toolbox-alt.css";
+@import "parts/buttons.css";
+@import "parts/entries.css";
+@import "parts/controls.css";
+@import "parts/headerbar-urlbar-alt.css";
+@import "parts/headerbar-private-urlbar.css";
+@import "parts/headerbar.css";
+@import "parts/csd.css";
+@import "parts/titlebutton-light.css";
+@import "parts/titlebutton-dark.css";
+@import "parts/popups.css";
+@import "parts/tabsbar-alt.css";
+@import "parts/findbar.css";
+@import "parts/dialogs.css";
+@import "parts/remove-white-flash.css";
+@import "parts/custom-icons.css";
+@import "parts/icons.css";
+@import "colors/light.css";
+@import "colors/dark.css";
+@namespace xul "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
+
+/* Set theme version text in customization panel */
+#customization-footer::before {
+	content: "Firefox Monterey theme";
+	padding: 10px;
+}

src/other/firefox/Monterey/theme.css

@@ -2,6 +2,8 @@
 @import "parts/buttons.css";
 @import "parts/entries.css";
 @import "parts/controls.css";
+@import "parts/headerbar-urlbar-alt.css";
+@import "parts/headerbar-private-urlbar.css";
 @import "parts/headerbar.css";
 @import "parts/csd.css";
 @import "parts/titlebutton-light.css";

src/other/firefox/WhiteSur/parts/headerbar-urlbar.css

@@ -143,9 +143,7 @@ toolbarspring {
 }
 
 /* URL bar and Search bar's icons */
-.urlbar-icon:hover,
 .urlbar-icon-wrapper:hover,
-.urlbar-icon[open],
 .urlbar-icon-wrapper[open],
 .urlbar-icon:hover:active,
 .urlbar-icon-wrapper:hover:active,
@@ -156,18 +154,22 @@ toolbarspring {
 	fill-opacity: 1 !important;
 }
 
-#page-action-buttons {
+.urlbar-icon {
-	padding: 2px 0 !important;
+	width: 16px !important;
+	height: 16px !important;
+	padding: 0 !important;
+	margin: 0 !important;
 }
 
-#tracking-protection-icon-container,
 #identity-box {
 	margin: 3px 2px !important;
 	border-radius: 5px !important;
 }
 
+.urlbar-page-action, #urlbar-go-button, .search-go-button,
 #tracking-protection-icon-container {
 	margin: 3px 0 !important;
+	border-radius: 5px !important;
 }
 
 #identity-box:hover {

src/other/firefox/WhiteSur/parts/popups.css

@@ -16,8 +16,9 @@ menupopup {
 
 #PlacesToolbar menupopup {
 	background: none !important;
-	padding: 1px 0 0 0 !important;
+	padding: 3px 6px 8px !important;
 	margin-top: 0 !important;
+	border: none !important;
 	box-shadow: none !important;
 }
 

src/other/firefox/userChrome-Monterey-alt.css

@@ -0,0 +1,42 @@
+/*------------------------USAGE----------------------------
+ * Remove "/*" at the begining of "@import" line to ENABLE.
+ * Add "/*" at the begining of "@import" line to DISABLE.
+ */
+
+@import "Monterey/theme-alt.css"; /**/
+
+/*--------------Configure common theme features--------------*/
+
+/* Move tab close button to left. */
+/*@import "Monterey/left-tab-close-button.css"; /**/
+
+/* Hide the tab bar when only one tab is open (GNOMISH)
+ * You should move the new tab button somewhere else for this to work, because by
+ * default it is on the tab bar too. */
+@import "Monterey/hide-single-tab.css"; /**/
+
+/* Limit the URL bar's autocompletion popup's width to the URL bar's width (GNOMISH)
+ * This feature is included by default for Firefox 70+ */
+/*@import "Monterey/matching-autocomplete-width.css"; /**/
+
+/* Rounded window even when it gets maximized */
+/*@import "Monterey/rounded-window-maximized.css"; /**/
+
+/* Active tab high contrast */
+/*@import "Monterey/active-tab-contrast.css"; /**/
+
+/* Use system theme icons instead of Adwaita icons included by theme [BUGGED] */
+/*@import "Monterey/system-icons.css"; /**/
+
+/* Allow drag window from headerbar buttons (GNOMISH) [BUGGED] */
+/* It can activate button action, with unpleasant behavior. */
+/*@import "Monterey/drag-window-headerbar-buttons.css"; /**/
+
+/* Make all tab icons look kinda like symbolic icons */
+/*@import "Monterey/symbolic-tab-icons.css"; /**/
+
+/* Hide window buttons (close/min/max) in maximized windows */
+/*@import "Monterey/hide-window-buttons.css"; /**/
+
+/* Import your custom stylesheet */
+@import "customChrome.css"; /**/

tweaks.sh

@@ -87,6 +87,12 @@ while [[ $# -gt 0 ]]; do
             name="Monterey"
             shift 1
             ;;
+          alt)
+            monterey="true"
+            alttheme="true"
+            name="Monterey"
+            shift 1
+            ;;
         esac
       done