Fixed #982

README.md

@@ -257,13 +257,15 @@ Usage:  `./tweaks.sh [OPTIONS...]`
 
  [Others]... options
 
-  -f, --firefox         [monterey|alt|adaptive]   Options:
+  -f, --firefox         [(monterey/flat)|alt|adaptive]   Without options default WhiteSur theme will install...   Options:
 
-      1. monterey       [3+3,3+4,3+5,4+3,4+4,4+5,5+3,5+4,5+5]   Topbar buttons number: 'a+b'   a: left side buttons number, b: right side buttons number
+      1. monterey       [3+3|3+4|3+5|4+3|4+4|4+5|5+3|5+4|5+5]   Topbar buttons number: 'a+b'   a: left side buttons number, b: right side buttons number
 
-      2. alt            Monterey alt version
+      2. flat           Monterey alt version    Flat round tabs...
 
-      3. adaptive       Adaptive color version   You need install adaptive-tab-bar-colour plugin first   https://addons.mozilla.org/firefox/addon/adaptive-tab-bar-colour/
+      3. alt            Alt windows button version    Alt window button style like gtk theme
+
+      4. adaptive       Adaptive color version   You need install adaptive-tab-bar-colour plugin first   https://addons.mozilla.org/firefox/addon/adaptive-tab-bar-colour/
 
   -e, --edit-firefox [default|monterey|alt|adaptive]
    Edit 'WhiteSur' theme for Firefox settings and also connect the theme to the current Firefox profiles. 

shell/lib-core.sh

@@ -113,9 +113,6 @@ nautilus_style="${NAUTILUS_STYLE_VARIANTS[0]}"
 background="blank"
 compact="true"
 colorscheme=""
-firefoxtheme="$THEME_NAME"
-left_button="3"
-right_button="3"
 
 #--Ambigous arguments checking and overriding default values--#
 declare -A has_set=([-b]="false" [-s]="false" [-p]="false" [-P]="false" [-d]="false" [-n]="false" [-a]="false" [-o]="false" [-c]="false" [-i]="false" [-t]="false" [-N]="false")
@@ -398,7 +395,7 @@ helpify() {
 }
 
 sec_title() {
-  printf "  ${c_blue}%s ${c_green}%s ${c_magenta}%s\n\n" "${1}" "${2}" "${3}"
+  printf "  ${c_blue}%s ${c_green}%s ${c_magenta}%s ${c_cyan}%s\n\n${c_default}" "${1}" "${2}" "${3}" "${4}"
 }
 
 sec_helpify() {

shell/lib-install.sh

@@ -680,48 +680,26 @@ install_firefox_theme() {
   udo mkdir -p                                                                                "${TARGET_DIR}"
   udo cp -rf "${FIREFOX_SRC_DIR}"/customChrome.css                                            "${TARGET_DIR}"
 
-  if [[ "${theme_name}" == 'Monterey' ]]; then
+  mkdir -p                                                                                    "${TARGET_DIR}"
-    udo cp -rf "${FIREFOX_SRC_DIR}"/Monterey                                                  "${TARGET_DIR}"
+  cp -rf "${FIREFOX_SRC_DIR}/${theme_name}"                                                   "${TARGET_DIR}"
-    udo cp -rf "${FIREFOX_SRC_DIR}"/common/{icons,titlebuttons,pages}                         "${TARGET_DIR}"/Monterey
+  [[ -f "${TARGET_DIR}"/customChrome.css ]] && mv "${TARGET_DIR}"/customChrome.css            "${TARGET_DIR}"/customChrome.css.bak
-    udo cp -rf "${FIREFOX_SRC_DIR}"/common/*.css                                              "${TARGET_DIR}"/Monterey
+  cp -rf "${FIREFOX_SRC_DIR}"/customChrome.css                                                "${TARGET_DIR}"
-    udo cp -rf "${FIREFOX_SRC_DIR}"/common/parts/*.css                                        "${TARGET_DIR}"/Monterey/parts
+  cp -rf "${FIREFOX_SRC_DIR}"/common/{icons,titlebuttons,pages}                               "${TARGET_DIR}/${theme_name}"
+  cp -rf "${FIREFOX_SRC_DIR}"/common/*.css                                                    "${TARGET_DIR}/${theme_name}"
+  cp -rf "${FIREFOX_SRC_DIR}"/common/parts/*.css                                              "${TARGET_DIR}/${theme_name}"/parts
+  [[ -f "${TARGET_DIR}"/userChrome.css ]] && mv "${TARGET_DIR}"/userChrome.css                "${TARGET_DIR}"/userChrome.css.bak
+  cp -rf "${FIREFOX_SRC_DIR}"/userChrome-"${theme_name}${adaptive}".css                       "${TARGET_DIR}"/userChrome.css
+  [[ -f "${TARGET_DIR}"/userContent.css ]] && mv "${TARGET_DIR}"/userContent.css              "${TARGET_DIR}"/userContent.css.bak
+  cp -rf "${FIREFOX_SRC_DIR}"/userContent-"${theme_name}${adaptive}".css                      "${TARGET_DIR}"/userContent.css
 
-    if [[ "${adaptive}" == 'true' ]]; then
+  if [[ "${firefoxtheme}" == 'Flat' && "${theme_name}" == 'Monterey' ]]; then
-      udo cp -rf "${FIREFOX_SRC_DIR}"/userContent-Monterey-adaptive.css                       "${TARGET_DIR}"/userContent.css
+    cp -rf "${FIREFOX_SRC_DIR}"/userChrome-Monterey-alt"${adaptive}".css                      "${TARGET_DIR}"/userChrome.css
-    else
+    cp -rf "${FIREFOX_SRC_DIR}"/WhiteSur/parts/headerbar-urlbar.css                           "${TARGET_DIR}"/Monterey/parts/headerbar-urlbar-alt.css
-      udo cp -rf "${FIREFOX_SRC_DIR}"/userContent-Monterey.css                                "${TARGET_DIR}"/userContent.css
+  fi
-    fi
 
-    if [[ "${firefoxtheme}" == 'Alt' ]]; then
+  if [[ "${window}" == "alt" ]]; then
-      if [[ "${adaptive}" == 'true' ]]; then
+    sed -i "s|titlebutton-light|titlebutton-light-alt|" "${TARGET_DIR}/${theme_name}"/theme*.css
-        udo cp -rf "${FIREFOX_SRC_DIR}"/userChrome-Monterey-alt-adaptive.css                  "${TARGET_DIR}"/userChrome.css
+    sed -i "s|titlebutton-dark|titlebutton-dark-alt|" "${TARGET_DIR}/${theme_name}"/theme*.css
-      else
-        udo cp -rf "${FIREFOX_SRC_DIR}"/userChrome-Monterey-alt.css                           "${TARGET_DIR}"/userChrome.css
-      fi
-      udo cp -rf "${FIREFOX_SRC_DIR}"/WhiteSur/parts/headerbar-urlbar.css                     "${TARGET_DIR}"/Monterey/parts/headerbar-urlbar-alt.css
-    else
-      if [[ "${adaptive}" == 'true' ]]; then
-        udo cp -rf "${FIREFOX_SRC_DIR}"/userChrome-Monterey-adaptive.css                      "${TARGET_DIR}"/userChrome.css
-      else
-        udo cp -rf "${FIREFOX_SRC_DIR}"/userChrome-Monterey.css                               "${TARGET_DIR}"/userChrome.css
-      fi
-
-      sed -i "s/left_header_button_3/left_header_button_${left_button}/g"                     "${TARGET_DIR}"/userChrome.css
-      sed -i "s/right_header_button_3/right_header_button_${right_button}/g"                  "${TARGET_DIR}"/userChrome.css
-    fi
-  else
-    udo cp -rf "${FIREFOX_SRC_DIR}"/WhiteSur                                                  "${TARGET_DIR}"
-    udo cp -rf "${FIREFOX_SRC_DIR}"/common/{icons,titlebuttons,pages}                         "${TARGET_DIR}"/WhiteSur
-    udo cp -rf "${FIREFOX_SRC_DIR}"/common/*.css                                              "${TARGET_DIR}"/WhiteSur
-    udo cp -rf "${FIREFOX_SRC_DIR}"/common/parts/*.css                                        "${TARGET_DIR}"/WhiteSur/parts
-
-    if [[ "${adaptive}" == 'true' ]]; then
-      udo cp -rf "${FIREFOX_SRC_DIR}"/userChrome-WhiteSur-adaptive.css                        "${TARGET_DIR}"/userChrome.css
-      udo cp -rf "${FIREFOX_SRC_DIR}"/userContent-WhiteSur-adaptive.css                       "${TARGET_DIR}"/userContent.css
-    else
-      udo cp -rf "${FIREFOX_SRC_DIR}"/userChrome-WhiteSur.css                                 "${TARGET_DIR}"/userChrome.css
-      udo cp -rf "${FIREFOX_SRC_DIR}"/userContent-WhiteSur.css                                "${TARGET_DIR}"/userContent.css
-    fi
   fi
 
   config_firefox

src/assets/gtk/windows-assets/windows-assets.svg

@@ -2,25 +2,21 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
 <svg
-   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="240"
    height="270"
    id="svg9892"
    version="1.1"
-   inkscape:version="0.92.4 5da689c313, 2019-01-14"
+   inkscape:version="1.3.2 (091e20ef0f, 2023-11-25)"
-   sodipodi:docname="windows-assets.svg">
+   sodipodi:docname="windows-assets.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
   <defs
      id="mojave_theme">
     <linearGradient
        id="header_button_img_dark"
-       osb:paint="gradient">
+       inkscape:swatch="gradient">
       <stop
          id="stop1959"
          offset="0"
@@ -32,7 +28,7 @@
     </linearGradient>
     <linearGradient
        id="header_button_img"
-       osb:paint="gradient">
+       inkscape:swatch="gradient">
       <stop
          style="stop-color:#f1f1f1;stop-opacity:1"
          offset="0"
@@ -44,7 +40,7 @@
     </linearGradient>
     <linearGradient
        id="theme_darker_color"
-       osb:paint="solid">
+       inkscape:swatch="solid">
       <stop
          style="stop-color:#4d4d4d;stop-opacity:1;"
          offset="0"
@@ -52,7 +48,7 @@
     </linearGradient>
     <linearGradient
        id="button_active"
-       osb:paint="gradient">
+       inkscape:swatch="gradient">
       <stop
          style="stop-color:#3d6ffc;stop-opacity:1"
          offset="0"
@@ -64,7 +60,7 @@
     </linearGradient>
     <linearGradient
        id="unchecked_highlight"
-       osb:paint="solid">
+       inkscape:swatch="solid">
       <stop
          style="stop-color:#5f5f5f;stop-opacity:1;"
          offset="0"
@@ -72,7 +68,7 @@
     </linearGradient>
     <linearGradient
        id="dark_unchecked_bg"
-       osb:paint="gradient">
+       inkscape:swatch="gradient">
       <stop
          id="stop1615"
          offset="0"
@@ -84,7 +80,7 @@
     </linearGradient>
     <linearGradient
        id="hightlight"
-       osb:paint="solid">
+       inkscape:swatch="solid">
       <stop
          style="stop-color:#5887fc;stop-opacity:1;"
          offset="0"
@@ -92,7 +88,7 @@
     </linearGradient>
     <linearGradient
        id="dark_checked_bg"
-       osb:paint="gradient">
+       inkscape:swatch="gradient">
       <stop
          style="stop-color:#3458c0;stop-opacity:1"
          offset="0"
@@ -104,7 +100,7 @@
     </linearGradient>
     <linearGradient
        id="selected_fg_color"
-       osb:paint="solid">
+       inkscape:swatch="solid">
       <stop
          style="stop-color:#ffffffgit;stop-opacity:1;"
          offset="0"
@@ -112,7 +108,7 @@
     </linearGradient>
     <linearGradient
        id="selected_bg_color"
-       osb:paint="solid">
+       inkscape:swatch="solid">
       <stop
          style="stop-color:#5683fa;stop-opacity:1;"
          offset="0"
@@ -126,17 +122,17 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="1.4390728"
+     inkscape:zoom="1.0175781"
-     inkscape:cx="174.05714"
+     inkscape:cx="278.11132"
-     inkscape:cy="115.84359"
+     inkscape:cy="133.65067"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="true"
      showborder="true"
-     inkscape:window-width="1366"
+     inkscape:window-width="1920"
-     inkscape:window-height="702"
+     inkscape:window-height="1016"
      inkscape:window-x="0"
-     inkscape:window-y="36"
+     inkscape:window-y="28"
      inkscape:window-maximized="1"
      inkscape:snap-nodes="false"
      inkscape:snap-bbox="true"
@@ -155,7 +151,8 @@
      inkscape:pagecheckerboard="true"
      inkscape:showpageshadow="false"
      inkscape:snap-others="false"
-     inkscape:object-paths="false">
+     inkscape:object-paths="false"
+     inkscape:deskcolor="#d1d1d1">
     <inkscape:grid
        type="xygrid"
        id="grid10919"
@@ -164,20 +161,11 @@
        enabled="true"
        snapvisiblegridlinesonly="true"
        originx="8.000005"
-       originy="-1062" />
+       originy="-1062"
+       spacingy="1"
+       spacingx="1"
+       units="px" />
   </sodipodi:namedview>
-  <metadata
-     id="metadata9897">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
   <g
      inkscape:groupmode="layer"
      id="layer3"
@@ -211,20 +199,6 @@
      id="layer1"
      style="display:inline"
      transform="translate(8.000005,279.63782)">
-    <g
-       inkscape:label="#g10801"
-       transform="matrix(1.9947791,0,0,1.9939719,354.38167,165.09433)"
-       id="sjhgfjsgf" />
-    <g
-       id="g4816-7"
-       transform="translate(-888.87744,-514.39281)" />
-    <g
-       id="g4816-6-6"
-       transform="translate(-829.87744,-514.39281)" />
-    <g
-       id="g3981-6-4-9-3"
-       transform="rotate(45,1540.4502,361.70955)"
-       style="opacity:0.85;fill:#1a1a1a;fill-opacity:1" />
     <g
        id="titlebutton-close-small-dark"
        inkscape:label="#g1637"

src/other/firefox/common/parts/titlebutton-dark-alt.css

@@ -0,0 +1,128 @@
+@media (prefers-color-scheme: dark) {
+:root[tabsintitlebar] #titlebar .titlebar-close,
+:root[tabsintitlebar] #titlebar #titlebar-close {
+	background: url("../titlebuttons/titlebutton-close-dark.svg") no-repeat;
+	background-size: contain;
+}
+:root[tabsintitlebar] #titlebar .titlebar-max,
+:root[tabsintitlebar] #titlebar #titlebar-max {
+	background: url("../titlebuttons/titlebutton-maximize-dark.svg") no-repeat;
+	background-size: contain;
+}
+:root[tabsintitlebar] #titlebar .titlebar-min,
+:root[tabsintitlebar] #titlebar #titlebar-min {
+	background: url("../titlebuttons/titlebutton-minimize-dark.svg") no-repeat;
+	background-size: contain;
+}
+:root[tabsintitlebar] #titlebar .titlebar-restore,
+:root[tabsintitlebar] #titlebar #titlebar-restore,
+:root[tabsintitlebar][sizemode="maximized"] #titlebar .titlebar-max,
+:root[tabsintitlebar][sizemode="maximized"] #titlebar #titlebar-max {
+	background: url("../titlebuttons/titlebutton-maximize-dark.svg") no-repeat;
+	background-size: contain;
+}
+:root[tabsintitlebar] #titlebar .titlebar-close:hover,
+:root[tabsintitlebar] #titlebar #titlebar-close:hover {
+	background: url("../titlebuttons/titlebutton-close-hover-dark-alt.svg") no-repeat;
+	background-size: contain;
+}
+:root[tabsintitlebar] #titlebar .titlebar-max:hover,
+:root[tabsintitlebar] #titlebar #titlebar-max:hover {
+	background: url("../titlebuttons/titlebutton-maximize-hover-dark-alt.svg") no-repeat;
+	background-size: contain;
+}
+:root[tabsintitlebar] #titlebar .titlebar-min:hover,
+:root[tabsintitlebar] #titlebar #titlebar-min:hover {
+	background: url("../titlebuttons/titlebutton-minimize-hover-dark.svg") no-repeat;
+	background-size: contain;
+}
+:root[tabsintitlebar] #titlebar .titlebar-restore:hover,
+:root[tabsintitlebar] #titlebar #titlebar-restore:hover,
+:root[tabsintitlebar][sizemode="maximized"] #titlebar .titlebar-max:hover,
+:root[tabsintitlebar][sizemode="maximized"] #titlebar #titlebar-max:hover {
+	background: url("../titlebuttons/titlebutton-unmaximize-hover-dark-alt.svg") no-repeat;
+	background-size: contain;
+}
+:root[tabsintitlebar] #titlebar .titlebar-close:active,
+:root[tabsintitlebar] #titlebar #titlebar-close:active {
+	background: url("../titlebuttons/titlebutton-close-active-dark-alt.svg") no-repeat;
+	background-size: contain;
+}
+:root[tabsintitlebar] #titlebar .titlebar-max:active,
+:root[tabsintitlebar] #titlebar #titlebar-max:active {
+	background: url("../titlebuttons/titlebutton-maximize-active-dark-alt.svg") no-repeat;
+	background-size: contain;
+}
+:root[tabsintitlebar] #titlebar .titlebar-min:active,
+:root[tabsintitlebar] #titlebar #titlebar-min:active {
+	background: url("../titlebuttons/titlebutton-minimize-active-dark.svg") no-repeat;
+	background-size: contain;
+}
+:root[tabsintitlebar] #titlebar .titlebar-restore:active,
+:root[tabsintitlebar] #titlebar #titlebar-restore:active,
+:root[tabsintitlebar][sizemode="maximized"] #titlebar .titlebar-max:active,
+:root[tabsintitlebar][sizemode="maximized"] #titlebar #titlebar-max:active {
+	background: url("../titlebuttons/titlebutton-unmaximize-active-dark-alt.svg") no-repeat;
+	background-size: contain;
+}
+:root[tabsintitlebar] #titlebar:-moz-window-inactive .titlebar-close,
+:root[tabsintitlebar] #titlebar:-moz-window-inactive #titlebar-close {
+	background: url("../titlebuttons/titlebutton-backdrop-dark.svg") no-repeat;
+	background-size: contain;
+}
+:root[tabsintitlebar] #titlebar:-moz-window-inactive .titlebar-max,
+:root[tabsintitlebar] #titlebar:-moz-window-inactive #titlebar-max {
+	background: url("../titlebuttons/titlebutton-backdrop-dark.svg") no-repeat;
+	background-size: contain;
+}
+:root[tabsintitlebar] #titlebar:-moz-window-inactive .titlebar-min,
+:root[tabsintitlebar] #titlebar:-moz-window-inactive #titlebar-min {
+	background: url("../titlebuttons/titlebutton-backdrop-dark.svg") no-repeat;
+	background-size: contain;
+}
+:root[tabsintitlebar] #titlebar:-moz-window-inactive .titlebar-restore,
+:root[tabsintitlebar] #titlebar:-moz-window-inactive #titlebar-restore,
+:root[tabsintitlebar][sizemode="maximized"] #titlebar:-moz-window-inactive .titlebar-max,
+:root[tabsintitlebar][sizemode="maximized"] #titlebar:-moz-window-inactive #titlebar-max {
+	background: url("../titlebuttons/titlebutton-backdrop-dark.svg") no-repeat;
+	background-size: contain;
+}
+:root[tabsintitlebar] #titlebar:-moz-window-inactive .titlebar-close:hover,
+:root[tabsintitlebar] #titlebar:-moz-window-inactive #titlebar-close:hover {
+	background: url("../titlebuttons/titlebutton-close-backdrop-dark-alt.svg") no-repeat;
+	background-size: contain;
+}
+:root[tabsintitlebar] #titlebar:-moz-window-inactive .titlebar-max:hover,
+:root[tabsintitlebar] #titlebar:-moz-window-inactive #titlebar-max:hover {
+	background: url("../titlebuttons/titlebutton-maximize-backdrop-dark-alt.svg") no-repeat;
+	background-size: contain;
+}
+:root[tabsintitlebar] #titlebar:-moz-window-inactive .titlebar-min:hover,
+:root[tabsintitlebar] #titlebar:-moz-window-inactive #titlebar-min:hover {
+	background: url("../titlebuttons/titlebutton-minimize-backdrop-dark.svg") no-repeat;
+	background-size: contain;
+}
+:root[tabsintitlebar] #titlebar:-moz-window-inactive .titlebar-restore:hover,
+:root[tabsintitlebar] #titlebar:-moz-window-inactive #titlebar-restore:hover,
+:root[tabsintitlebar][sizemode="maximized"] #titlebar:-moz-window-inactive .titlebar-max:hover,
+:root[tabsintitlebar][sizemode="maximized"] #titlebar:-moz-window-inactive #titlebar-max:hover {
+	background: url("../titlebuttons/titlebutton-unmaximize-backdrop-dark-alt.svg") no-repeat;
+	background-size: contain;
+}
+:root[tabsintitlebar][inFullscreen] #window-controls #restore-button {
+	background: url("../titlebuttons/titlebutton-unmaximize-dark.svg") no-repeat;
+	background-size: contain;
+}
+:root[tabsintitlebar][inFullscreen] #window-controls #restore-button:hover {
+	background: url("../titlebuttons/titlebutton-unmaximize-hover-dark-alt.svg") no-repeat;
+	background-size: contain;
+}
+:root[tabsintitlebar][inFullscreen] #window-controls #restore-button:active {
+	background: url("../titlebuttons/titlebutton-unmaximize-active-dark-alt.svg") no-repeat;
+	background-size: contain;
+}
+:root[tabsintitlebar][inFullscreen] #window-controls:-moz-window-inactive #restore-button {
+	background: url("../titlebuttons/titlebutton-backdrop-dark.svg") no-repeat;
+	background-size: contain;
+}
+}

src/other/firefox/common/parts/titlebutton-dark.css

@@ -110,7 +110,7 @@
 	background-size: contain;
 }
 :root[tabsintitlebar][inFullscreen] #window-controls #restore-button {
-	background: url("../titlebuttons/titlebutton-maximize-dark.svg") no-repeat;
+	background: url("../titlebuttons/titlebutton-unmaximize-dark.svg") no-repeat;
 	background-size: contain;
 }
 :root[tabsintitlebar][inFullscreen] #window-controls #restore-button:hover {

src/other/firefox/common/parts/titlebutton-light-alt.css

@@ -0,0 +1,129 @@
+:root[tabsintitlebar] #titlebar .titlebar-close,
+:root[tabsintitlebar] #titlebar #titlebar-close {
+	background: url("../titlebuttons/titlebutton-close.svg") no-repeat;
+	background-size: contain;
+}
+:root[tabsintitlebar] #titlebar .titlebar-max,
+:root[tabsintitlebar] #titlebar #titlebar-max {
+	background: url("../titlebuttons/titlebutton-maximize.svg") no-repeat;
+	background-size: contain;
+}
+:root[tabsintitlebar] #titlebar .titlebar-min,
+:root[tabsintitlebar] #titlebar #titlebar-min {
+	background: url("../titlebuttons/titlebutton-minimize.svg") no-repeat;
+	background-size: contain;
+}
+:root[tabsintitlebar] #titlebar .titlebar-restore,
+:root[tabsintitlebar] #titlebar #titlebar-restore,
+:root[tabsintitlebar][sizemode="maximized"] #titlebar .titlebar-max,
+:root[tabsintitlebar][sizemode="maximized"] #titlebar #titlebar-max {
+	background: url("../titlebuttons/titlebutton-maximize.svg") no-repeat;
+	background-size: contain;
+}
+:root[tabsintitlebar] #titlebar .titlebar-close:hover,
+:root[tabsintitlebar] #titlebar #titlebar-close:hover {
+	background: url("../titlebuttons/titlebutton-close-hover-alt.svg") no-repeat;
+	background-color: transparent !important;
+	background-size: contain;
+}
+:root[tabsintitlebar] #titlebar .titlebar-max:hover,
+:root[tabsintitlebar] #titlebar #titlebar-max:hover {
+	background: url("../titlebuttons/titlebutton-maximize-hover-alt.svg") no-repeat;
+	background-color: transparent !important;
+	background-size: contain;
+}
+:root[tabsintitlebar] #titlebar .titlebar-min:hover,
+:root[tabsintitlebar] #titlebar #titlebar-min:hover {
+	background: url("../titlebuttons/titlebutton-minimize-hover.svg") no-repeat;
+	background-color: transparent !important;
+	background-size: contain;
+}
+:root[tabsintitlebar] #titlebar .titlebar-restore:hover,
+:root[tabsintitlebar] #titlebar #titlebar-restore:hover,
+:root[tabsintitlebar][sizemode="maximized"] #titlebar .titlebar-max:hover,
+:root[tabsintitlebar][sizemode="maximized"] #titlebar #titlebar-max:hover {
+	background: url("../titlebuttons/titlebutton-unmaximize-hover-alt.svg") no-repeat;
+	background-size: contain;
+}
+:root[tabsintitlebar] #titlebar .titlebar-close:active,
+:root[tabsintitlebar] #titlebar #titlebar-close:active {
+	background: url("../titlebuttons/titlebutton-close-active-alt.svg") no-repeat;
+	background-size: contain;
+}
+:root[tabsintitlebar] #titlebar .titlebar-max:active,
+:root[tabsintitlebar] #titlebar #titlebar-max:active {
+	background: url("../titlebuttons/titlebutton-maximize-active-alt.svg") no-repeat;
+	background-size: contain;
+}
+:root[tabsintitlebar] #titlebar .titlebar-min:active,
+:root[tabsintitlebar] #titlebar #titlebar-min:active {
+	background: url("../titlebuttons/titlebutton-minimize-active.svg") no-repeat;
+	background-size: contain;
+}
+:root[tabsintitlebar] #titlebar .titlebar-restore:active,
+:root[tabsintitlebar] #titlebar #titlebar-restore:active,
+:root[tabsintitlebar][sizemode="maximized"] #titlebar .titlebar-max:active,
+:root[tabsintitlebar][sizemode="maximized"] #titlebar #titlebar-max:active {
+	background: url("../titlebuttons/titlebutton-unmaximize-active-alt.svg") no-repeat;
+	background-size: contain;
+}
+:root[tabsintitlebar] #titlebar:-moz-window-inactive .titlebar-close,
+:root[tabsintitlebar] #titlebar:-moz-window-inactive #titlebar-close {
+	background: url("../titlebuttons/titlebutton-backdrop.svg") no-repeat;
+	background-size: contain;
+}
+:root[tabsintitlebar] #titlebar:-moz-window-inactive .titlebar-max,
+:root[tabsintitlebar] #titlebar:-moz-window-inactive #titlebar-max {
+	background: url("../titlebuttons/titlebutton-backdrop.svg") no-repeat;
+	background-size: contain;
+}
+:root[tabsintitlebar] #titlebar:-moz-window-inactive .titlebar-min,
+:root[tabsintitlebar] #titlebar:-moz-window-inactive #titlebar-min {
+	background: url("../titlebuttons/titlebutton-backdrop.svg") no-repeat;
+	background-size: contain;
+}
+:root[tabsintitlebar] #titlebar:-moz-window-inactive .titlebar-restore,
+:root[tabsintitlebar] #titlebar:-moz-window-inactive #titlebar-restore,
+:root[tabsintitlebar][sizemode="maximized"] #titlebar:-moz-window-inactive .titlebar-max,
+:root[tabsintitlebar][sizemode="maximized"] #titlebar:-moz-window-inactive #titlebar-max {
+	background: url("../titlebuttons/titlebutton-backdrop.svg") no-repeat;
+	background-size: contain;
+}
+:root[tabsintitlebar] #titlebar:-moz-window-inactive  .titlebar-close:hover,
+:root[tabsintitlebar] #titlebar:-moz-window-inactive #titlebar-close:hover {
+	background: url("../titlebuttons/titlebutton-close-backdrop-alt.svg") no-repeat;
+	background-size: contain;
+}
+:root[tabsintitlebar] #titlebar:-moz-window-inactive .titlebar-max:hover,
+:root[tabsintitlebar] #titlebar:-moz-window-inactive #titlebar-max:hover {
+	background: url("../titlebuttons/titlebutton-maximize-backdrop-alt.svg") no-repeat;
+	background-size: contain;
+}
+:root[tabsintitlebar] #titlebar:-moz-window-inactive .titlebar-min:hover,
+:root[tabsintitlebar] #titlebar:-moz-window-inactive #titlebar-min:hover {
+	background: url("../titlebuttons/titlebutton-minimize-backdrop.svg") no-repeat;
+	background-size: contain;
+}
+:root[tabsintitlebar] #titlebar:-moz-window-inactive .titlebar-restore:hover,
+:root[tabsintitlebar] #titlebar:-moz-window-inactive #titlebar-restore:hover,
+:root[tabsintitlebar][sizemode="maximized"] #titlebar:-moz-window-inactive .titlebar-max:hover,
+:root[tabsintitlebar][sizemode="maximized"] #titlebar:-moz-window-inactive #titlebar-max:hover {
+	background: url("../titlebuttons/titlebutton-unmaximize-backdrop-alt.svg") no-repeat;
+	background-size: contain;
+}
+:root[tabsintitlebar][inFullscreen] #window-controls #restore-button {
+	background: url("../titlebuttons/titlebutton-maximize.svg") no-repeat;
+	background-size: contain;
+}
+:root[tabsintitlebar][inFullscreen] #window-controls #restore-button:hover {
+	background: url("../titlebuttons/titlebutton-unmaximize-hover-alt.svg") no-repeat;
+	background-size: contain;
+}
+:root[tabsintitlebar][inFullscreen] #window-controls #restore-button:active {
+	background: url("../titlebuttons/titlebutton-unmaximize-active-alt.svg") no-repeat;
+	background-size: contain;
+}
+:root[tabsintitlebar][inFullscreen] #window-controls:-moz-window-inactive #restore-button {
+	background: url("../titlebuttons/titlebutton-backdrop.svg") no-repeat;
+	background-size: contain;
+}

src/other/firefox/common/parts/titlebutton-light.css

@@ -112,7 +112,7 @@
 	background-size: contain;
 }
 :root[tabsintitlebar][inFullscreen] #window-controls #restore-button {
-	background: url("../titlebuttons/titlebutton-maximize.svg") no-repeat;
+	background: url("../titlebuttons/titlebutton-unmaximize.svg") no-repeat;
 	background-size: contain;
 }
 :root[tabsintitlebar][inFullscreen] #window-controls #restore-button:hover {

src/other/firefox/common/titlebuttons/titlebutton-close-active-alt.svg

@@ -0,0 +1,11 @@
+<svg width="16" height="16" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <g id="titlebutton-close-active-alt" transform="translate(-293 216.64)">
+  <rect x="293" y="-216.64" width="16" height="16" ry="1.6931e-5" opacity="0" stroke-width=".47432" style="paint-order:markers stroke fill"/>
+  <g transform="translate(294 -215.64)" enable-background="new">
+   <g transform="translate(-5 -1033.4)" fill-rule="evenodd">
+    <path d="m12 1047.4c3.8659 0 6.9999-3.134 6.9999-7s-3.134-7-6.9999-7c-3.866 0-7.0001 3.134-7.0001 7s3.134 7 7.0001 7" fill="#cb4e43"/>
+    <path d="m12 1043.4c1.6568 0 3-1.3432 3-3.0001 0-1.6568-1.3431-3-3-3-1.6569 0-3 1.3432-3 3 0 1.6569 1.3431 3.0001 3 3.0001" fill="#000000" opacity=".5"/>
+   </g>
+  </g>
+ </g>
+</svg>

src/other/firefox/common/titlebuttons/titlebutton-close-active-dark-alt.svg

@@ -0,0 +1,12 @@
+<svg width="16" height="16" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <g id="titlebutton-close-active-alt-dark" transform="translate(-293 216.64)">
+  <rect x="293" y="-216.64" width="16" height="16" ry="1.6931e-5" opacity="0" stroke-width=".47432" style="paint-order:markers stroke fill"/>
+  <g transform="translate(294 -215.64)" enable-background="new">
+   <g transform="translate(-5 -1033.4)" fill-rule="evenodd">
+    <path d="m12 1047.4c3.8659 0 6.9999-3.134 6.9999-7s-3.134-7-6.9999-7c-3.866 0-7.0001 3.134-7.0001 7s3.134 7 7.0001 7" fill="#e9524a"/>
+    <path d="m12 1043.4c1.6568 0 3-1.3432 3-3.0001 0-1.6568-1.3431-3-3-3-1.6569 0-3 1.3432-3 3 0 1.6569 1.3431 3.0001 3 3.0001" fill="#000000" opacity=".5"/>
+    <path d="m12 1047.4c3.8659 0 6.9999-3.134 6.9999-7s-3.134-7-6.9999-7c-3.866 0-7.0001 3.134-7.0001 7s3.134 7 7.0001 7" fill="#000000" opacity=".2"/>
+   </g>
+  </g>
+ </g>
+</svg>

src/other/firefox/common/titlebuttons/titlebutton-close-backdrop-alt.svg

@@ -0,0 +1,12 @@
+<svg width="16" height="16" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <g id="titlebutton-close-backdrop-hover-alt" transform="translate(-293 216.64)">
+  <rect x="293" y="-216.64" width="16" height="16" ry="1.6931e-5" opacity="0" stroke-width=".47432" style="paint-order:markers stroke fill"/>
+  <g transform="translate(294 -215.64)" enable-background="new">
+   <g transform="translate(-5 -1033.4)" fill-rule="evenodd">
+    <path d="m12 1047.4c3.8659 0 6.9999-3.134 6.9999-7s-3.134-7-6.9999-7c-3.866 0-7.0001 3.134-7.0001 7s3.134 7 7.0001 7" fill="#bababa"/>
+    <path d="m12 1046.9c3.5898 0 6.4999-2.9103 6.4999-6.5001 0-3.5899-2.9102-6.5-6.4999-6.5-3.5899 0-6.5001 2.9101-6.5001 6.5 0 3.5898 2.9102 6.5001 6.5001 6.5001" fill="#cecece"/>
+    <path d="m12 1043.4c1.6568 0 3-1.3432 3-3.0001 0-1.6568-1.3431-3-3-3-1.6569 0-3 1.3432-3 3 0 1.6569 1.3431 3.0001 3 3.0001" fill="#000000" opacity=".5"/>
+   </g>
+  </g>
+ </g>
+</svg>

src/other/firefox/common/titlebuttons/titlebutton-close-backdrop-dark-alt.svg

@@ -0,0 +1,11 @@
+<svg width="16" height="16" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <g id="titlebutton-close-backdrop-hover-alt-dark" transform="translate(-293 216.64)">
+  <rect x="293" y="-216.64" width="16" height="16" ry="1.6931e-5" opacity="0" stroke-width=".47432" style="paint-order:markers stroke fill"/>
+  <g transform="translate(294 -215.64)" enable-background="new">
+   <g transform="translate(-5 -1033.4)" fill-rule="evenodd">
+    <path d="m12 1047.4c3.8659 0 6.9999-3.134 6.9999-7s-3.134-7-6.9999-7c-3.866 0-7.0001 3.134-7.0001 7s3.134 7 7.0001 7" fill="#5d5d5d"/>
+    <path d="m12 1043.4c1.6568 0 3-1.3432 3-3.0001 0-1.6568-1.3431-3-3-3-1.6569 0-3 1.3432-3 3 0 1.6569 1.3431 3.0001 3 3.0001" fill="#000000" opacity=".5"/>
+   </g>
+  </g>
+ </g>
+</svg>

src/other/firefox/common/titlebuttons/titlebutton-close-hover-alt.svg

@@ -0,0 +1,12 @@
+<svg width="16" height="16" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <g id="titlebutton-close-hover-alt" transform="translate(-293 216.64)">
+  <rect x="293" y="-216.64" width="16" height="16" ry="1.6931e-5" opacity="0" stroke-width=".47432" style="paint-order:markers stroke fill"/>
+  <g transform="translate(294 -215.64)" enable-background="new">
+   <g transform="translate(-5 -1033.4)" fill-rule="evenodd">
+    <path d="m12 1047.4c3.8659 0 6.9999-3.134 6.9999-7s-3.134-7-6.9999-7c-3.866 0-7.0001 3.134-7.0001 7s3.134 7 7.0001 7" fill="#cb4e43"/>
+    <path d="m12 1046.9c3.5898 0 6.4999-2.9103 6.4999-6.5001 0-3.5899-2.9102-6.5-6.4999-6.5-3.5899 0-6.5001 2.9101-6.5001 6.5 0 3.5898 2.9102 6.5001 6.5001 6.5001" fill="#fe6254"/>
+    <path d="m12 1043.4c1.6568 0 3-1.3432 3-3.0001 0-1.6568-1.3431-3-3-3-1.6569 0-3 1.3432-3 3 0 1.6569 1.3431 3.0001 3 3.0001" fill="#000000" opacity=".5"/>
+   </g>
+  </g>
+ </g>
+</svg>

src/other/firefox/common/titlebuttons/titlebutton-close-hover-dark-alt.svg

@@ -0,0 +1,11 @@
+<svg width="16" height="16" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <g id="titlebutton-close-hover-alt-dark" transform="translate(-293 216.64)">
+  <rect x="293" y="-216.64" width="16" height="16" ry="1.6931e-5" opacity="0" stroke-width=".47432" style="paint-order:markers stroke fill"/>
+  <g transform="translate(294 -215.64)" enable-background="new">
+   <g transform="translate(-5 -1033.4)" fill-rule="evenodd">
+    <path d="m12 1047.4c3.8659 0 6.9999-3.134 6.9999-7s-3.134-7-6.9999-7c-3.866 0-7.0001 3.134-7.0001 7s3.134 7 7.0001 7" fill="#e9524a"/>
+    <path d="m12 1043.4c1.6568 0 3-1.3432 3-3.0001 0-1.6568-1.3431-3-3-3-1.6569 0-3 1.3432-3 3 0 1.6569 1.3431 3.0001 3 3.0001" fill="#000000" opacity=".5"/>
+   </g>
+  </g>
+ </g>
+</svg>

src/other/firefox/common/titlebuttons/titlebutton-maximize-active-alt.svg

@@ -0,0 +1,11 @@
+<svg width="16" height="16" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <g id="titlebutton-maximize-active-alt" transform="translate(-253 216.64)">
+  <rect x="253" y="-216.64" width="16" height="16" ry="1.6931e-5" opacity="0" stroke-width=".47432" style="paint-order:markers stroke fill"/>
+  <g transform="translate(254 -215.64)" enable-background="new">
+   <g transform="translate(-5 -1033.4)">
+    <path d="m12 1047.4c3.8659 0 6.9999-3.134 6.9999-7s-3.134-7-6.9999-7c-3.866 0-7.0001 3.134-7.0001 7s3.134 7 7.0001 7" fill="#20a932" fill-rule="evenodd"/>
+    <path transform="translate(-378 969.36)" d="m390 66.998c-0.554 0-1 0.446-1 1v2h-2c-0.554 0-1 0.446-1 1s0.446 1 1 1h2v2c0 0.554 0.446 1 1 1s1-0.446 1-1v-2h2c0.554 0 1-0.446 1-1s-0.446-1-1-1h-2v-2c0-0.554-0.446-1-1-1z" fill="#000000" opacity=".5"/>
+   </g>
+  </g>
+ </g>
+</svg>

src/other/firefox/common/titlebuttons/titlebutton-maximize-active-dark-alt.svg

@@ -0,0 +1,12 @@
+<svg width="16" height="16" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <g id="titlebutton-maximize-active-alt-dark" transform="translate(-253 216.64)">
+  <rect x="253" y="-216.64" width="16" height="16" ry="1.6931e-5" opacity="0" stroke-width=".47432" style="paint-order:markers stroke fill"/>
+  <g transform="translate(254 -215.64)" enable-background="new">
+   <g transform="translate(-5 -1033.4)">
+    <path d="m12 1047.4c3.8659 0 6.9999-3.134 6.9999-7s-3.134-7-6.9999-7c-3.866 0-7.0001 3.134-7.0001 7s3.134 7 7.0001 7" fill="#59c837" fill-rule="evenodd"/>
+    <path transform="translate(-378 969.36)" d="m390 66.998c-0.554 0-1 0.446-1 1v2h-2c-0.554 0-1 0.446-1 1s0.446 1 1 1h2v2c0 0.554 0.446 1 1 1s1-0.446 1-1v-2h2c0.554 0 1-0.446 1-1s-0.446-1-1-1h-2v-2c0-0.554-0.446-1-1-1z" fill="#000000" opacity=".5"/>
+    <path d="m12 1047.4c3.8659 0 6.9999-3.134 6.9999-7s-3.134-7-6.9999-7c-3.866 0-7.0001 3.134-7.0001 7s3.134 7 7.0001 7" fill="#000000" fill-rule="evenodd" opacity=".2"/>
+   </g>
+  </g>
+ </g>
+</svg>

src/other/firefox/common/titlebuttons/titlebutton-maximize-hover-alt.svg

@@ -0,0 +1,12 @@
+<svg width="16" height="16" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <g id="titlebutton-maximize-hover-alt" transform="translate(-253 216.64)">
+  <rect x="253" y="-216.64" width="16" height="16" ry="1.6931e-5" opacity="0" stroke-width=".47432" style="paint-order:markers stroke fill"/>
+  <g transform="translate(254 -215.64)" enable-background="new">
+   <g transform="translate(-5 -1033.4)">
+    <path d="m12 1047.4c3.8659 0 6.9999-3.134 6.9999-7s-3.134-7-6.9999-7c-3.866 0-7.0001 3.134-7.0001 7s3.134 7 7.0001 7" fill="#20a932" fill-rule="evenodd"/>
+    <path d="m12 1046.9c3.5898 0 6.4999-2.9103 6.4999-6.5001 0-3.5899-2.9102-6.5-6.4999-6.5-3.5899 0-6.5001 2.9101-6.5001 6.5 0 3.5898 2.9102 6.5001 6.5001 6.5001" fill="#28d33f" fill-rule="evenodd"/>
+    <path transform="translate(-378 969.36)" d="m390 66.998c-0.554 0-1 0.446-1 1v2h-2c-0.554 0-1 0.446-1 1s0.446 1 1 1h2v2c0 0.554 0.446 1 1 1s1-0.446 1-1v-2h2c0.554 0 1-0.446 1-1s-0.446-1-1-1h-2v-2c0-0.554-0.446-1-1-1z" fill="#000000" opacity=".5"/>
+   </g>
+  </g>
+ </g>
+</svg>

src/other/firefox/common/titlebuttons/titlebutton-maximize-hover-dark-alt.svg

@@ -0,0 +1,11 @@
+<svg width="16" height="16" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <g id="titlebutton-maximize-hover-alt-dark" transform="translate(-253 216.64)">
+  <rect x="253" y="-216.64" width="16" height="16" ry="1.6931e-5" opacity="0" stroke-width=".47432" style="paint-order:markers stroke fill"/>
+  <g transform="translate(254 -215.64)" enable-background="new">
+   <g transform="translate(-5 -1033.4)">
+    <path d="m12 1047.4c3.8659 0 6.9999-3.134 6.9999-7s-3.134-7-6.9999-7c-3.866 0-7.0001 3.134-7.0001 7s3.134 7 7.0001 7" fill="#59c837" fill-rule="evenodd"/>
+    <path transform="translate(-378 969.36)" d="m390 66.998c-0.554 0-1 0.446-1 1v2h-2c-0.554 0-1 0.446-1 1s0.446 1 1 1h2v2c0 0.554 0.446 1 1 1s1-0.446 1-1v-2h2c0.554 0 1-0.446 1-1s-0.446-1-1-1h-2v-2c0-0.554-0.446-1-1-1z" fill="#000000" opacity=".5"/>
+   </g>
+  </g>
+ </g>
+</svg>

src/other/firefox/common/titlebuttons/titlebutton-unmaximize-active-alt.svg

@@ -0,0 +1,11 @@
+<svg width="16" height="16" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <g id="titlebutton-maximize-active-alt" transform="translate(-253 216.64)">
+  <rect x="253" y="-216.64" width="16" height="16" ry="1.6931e-5" opacity="0" stroke-width=".47432" style="paint-order:markers stroke fill"/>
+  <g transform="translate(254 -215.64)" enable-background="new">
+   <g transform="translate(-5 -1033.4)">
+    <path d="m12 1047.4c3.8659 0 6.9999-3.134 6.9999-7s-3.134-7-6.9999-7c-3.866 0-7.0001 3.134-7.0001 7s3.134 7 7.0001 7" fill="#20a932" fill-rule="evenodd"/>
+    <path transform="translate(-378 969.36)" d="m390 66.998c-0.554 0-1 0.446-1 1v2h-2c-0.554 0-1 0.446-1 1s0.446 1 1 1h2v2c0 0.554 0.446 1 1 1s1-0.446 1-1v-2h2c0.554 0 1-0.446 1-1s-0.446-1-1-1h-2v-2c0-0.554-0.446-1-1-1z" fill="#000000" opacity=".5"/>
+   </g>
+  </g>
+ </g>
+</svg>

src/other/firefox/common/titlebuttons/titlebutton-unmaximize-active-dark-alt.svg

@@ -0,0 +1,12 @@
+<svg width="16" height="16" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <g id="titlebutton-maximize-active-alt-dark" transform="translate(-253 216.64)">
+  <rect x="253" y="-216.64" width="16" height="16" ry="1.6931e-5" opacity="0" stroke-width=".47432" style="paint-order:markers stroke fill"/>
+  <g transform="translate(254 -215.64)" enable-background="new">
+   <g transform="translate(-5 -1033.4)">
+    <path d="m12 1047.4c3.8659 0 6.9999-3.134 6.9999-7s-3.134-7-6.9999-7c-3.866 0-7.0001 3.134-7.0001 7s3.134 7 7.0001 7" fill="#59c837" fill-rule="evenodd"/>
+    <path transform="translate(-378 969.36)" d="m390 66.998c-0.554 0-1 0.446-1 1v2h-2c-0.554 0-1 0.446-1 1s0.446 1 1 1h2v2c0 0.554 0.446 1 1 1s1-0.446 1-1v-2h2c0.554 0 1-0.446 1-1s-0.446-1-1-1h-2v-2c0-0.554-0.446-1-1-1z" fill="#000000" opacity=".5"/>
+    <path d="m12 1047.4c3.8659 0 6.9999-3.134 6.9999-7s-3.134-7-6.9999-7c-3.866 0-7.0001 3.134-7.0001 7s3.134 7 7.0001 7" fill="#000000" fill-rule="evenodd" opacity=".2"/>
+   </g>
+  </g>
+ </g>
+</svg>

src/other/firefox/common/titlebuttons/titlebutton-unmaximize-hover-alt.svg

@@ -0,0 +1,12 @@
+<svg width="16" height="16" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <g id="titlebutton-maximize-hover-alt" transform="translate(-253 216.64)">
+  <rect x="253" y="-216.64" width="16" height="16" ry="1.6931e-5" opacity="0" stroke-width=".47432" style="paint-order:markers stroke fill"/>
+  <g transform="translate(254 -215.64)" enable-background="new">
+   <g transform="translate(-5 -1033.4)">
+    <path d="m12 1047.4c3.8659 0 6.9999-3.134 6.9999-7s-3.134-7-6.9999-7c-3.866 0-7.0001 3.134-7.0001 7s3.134 7 7.0001 7" fill="#20a932" fill-rule="evenodd"/>
+    <path d="m12 1046.9c3.5898 0 6.4999-2.9103 6.4999-6.5001 0-3.5899-2.9102-6.5-6.4999-6.5-3.5899 0-6.5001 2.9101-6.5001 6.5 0 3.5898 2.9102 6.5001 6.5001 6.5001" fill="#28d33f" fill-rule="evenodd"/>
+    <path transform="translate(-378 969.36)" d="m390 66.998c-0.554 0-1 0.446-1 1v2h-2c-0.554 0-1 0.446-1 1s0.446 1 1 1h2v2c0 0.554 0.446 1 1 1s1-0.446 1-1v-2h2c0.554 0 1-0.446 1-1s-0.446-1-1-1h-2v-2c0-0.554-0.446-1-1-1z" fill="#000000" opacity=".5"/>
+   </g>
+  </g>
+ </g>
+</svg>

src/other/firefox/common/titlebuttons/titlebutton-unmaximize-hover-dark-alt.svg

@@ -0,0 +1,11 @@
+<svg width="16" height="16" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <g id="titlebutton-maximize-hover-alt-dark" transform="translate(-253 216.64)">
+  <rect x="253" y="-216.64" width="16" height="16" ry="1.6931e-5" opacity="0" stroke-width=".47432" style="paint-order:markers stroke fill"/>
+  <g transform="translate(254 -215.64)" enable-background="new">
+   <g transform="translate(-5 -1033.4)">
+    <path d="m12 1047.4c3.8659 0 6.9999-3.134 6.9999-7s-3.134-7-6.9999-7c-3.866 0-7.0001 3.134-7.0001 7s3.134 7 7.0001 7" fill="#59c837" fill-rule="evenodd"/>
+    <path transform="translate(-378 969.36)" d="m390 66.998c-0.554 0-1 0.446-1 1v2h-2c-0.554 0-1 0.446-1 1s0.446 1 1 1h2v2c0 0.554 0.446 1 1 1s1-0.446 1-1v-2h2c0.554 0 1-0.446 1-1s-0.446-1-1-1h-2v-2c0-0.554-0.446-1-1-1z" fill="#000000" opacity=".5"/>
+   </g>
+  </g>
+ </g>
+</svg>

tweaks.sh

@@ -19,6 +19,13 @@ source "${REPO_DIR}/shell/lib-install.sh"
 colors=("${COLOR_VARIANTS[@]}")
 opacities=("${OPACITY_VARIANTS[@]}")
 
+# Firefox values
+adaptive=''
+theme_name="$THEME_NAME"
+firefoxtheme="$THEME_NAME"
+left_button="3"
+right_button="3"
+
 usage() {
   # Please specify their default value manually, some of them are come from _variables.scss
   # You also have to check and update them regurally
@@ -37,10 +44,11 @@ usage() {
   helpify "--nord, --nordcolor" ""                                                  "  Install '${THEME_NAME}' Nord ColorScheme themes"                             ""
 
   helpify "" "" "[Others].." "options"
-  sec_title "-f, --firefox" "        [monterey|alt|adaptive]"                       "  Options:"
+  sec_title "-f, --firefox" "        [(monterey/flat)|alt|adaptive]"                "  Without options default WhiteSur theme will install..."                      "  Options:"
-  sec_helpify "1. monterey" "      [3+3,3+4,3+5,4+3,4+4,4+5,5+3,5+4,5+5]"           "  Topbar buttons number: 'a+b'"                                                "  a: left side buttons number, b: right side buttons number"
+  sec_helpify "1. monterey" "      [3+3|3+4|3+5|4+3|4+4|4+5|5+3|5+4|5+5]"           "  Topbar buttons number: 'a+b'"                                                "  a: left side buttons number, b: right side buttons number"
-  sec_helpify "2. alt" "           Monterey alt version"                            ""                                                                              ""
+  sec_helpify "2. flat" "          Monterey alt version"                            ""                                                                              "  Flat round tabs..."
-  sec_helpify "3. adaptive" "      Adaptive color version"                          "  You need install adaptive-tab-bar-colour plugin first"                       "  https://addons.mozilla.org/firefox/addon/adaptive-tab-bar-colour/"
+  sec_helpify "3. alt" "           Alt windows button version"                      ""                                                                              "  Alt window button style like gtk theme"
+  sec_helpify "4. adaptive" "      Adaptive color version"                          "  You need install adaptive-tab-bar-colour plugin first"                       "  https://addons.mozilla.org/firefox/addon/adaptive-tab-bar-colour/"
 
   helpify "-e, --edit-firefox"  "[default|monterey|alt|adaptive]"                   "  Edit '${THEME_NAME}' theme for Firefox settings and also connect the theme to the current Firefox profiles" ""
 
@@ -147,12 +155,16 @@ while [[ $# -gt 0 ]]; do
               esac
             done
             prompt -s "Left side topbar button number: $left_button, right side topbar button number: $right_button.\n" ;;
-          alt)
+          flat)
-            firefoxtheme="Alt"
+            firefoxtheme="Flat"
             theme_name="Monterey"
             shift ;;
+          alt)
+            window="alt"
+            prompt -i "Alt windnows button version...\n"
+            shift ;;
           adaptive)
-            adaptive="true"
+            adaptive="-adaptive"
             prompt -i "Firefox adaptive color version...\n"
             prompt -w "You need install adaptive-tab-bar-colour plugin first: https://addons.mozilla.org/firefox/addon/adaptive-tab-bar-colour/\n"
             shift ;;