diff --git a/src/other/firefox/chrome/WhiteSur/parts/titlebutton-dark.css b/src/other/firefox/chrome/WhiteSur/parts/titlebutton-dark.css
index ede20f9..b944530 100644
--- a/src/other/firefox/chrome/WhiteSur/parts/titlebutton-dark.css
+++ b/src/other/firefox/chrome/WhiteSur/parts/titlebutton-dark.css
@@ -9,6 +9,11 @@
 	background: url("../titlebuttons/titlebutton-maximize-dark.svg") no-repeat;
 	background-size: contain;
 }
+:root[tabsintitlebar] #titlebar .titlebar-buttonbox .titlebar-min,
+:root[tabsintitlebar] #titlebar #titlebar-min {
+	background: url("../titlebuttons/titlebutton-minimize-dark.svg") no-repeat;
+	background-size: contain;
+}
 :root[tabsintitlebar] #titlebar .titlebar-buttonbox .titlebar-restore,
 :root[tabsintitlebar] #titlebar #titlebar-restore,
 :root[tabsintitlebar][sizemode="maximized"] #titlebar .titlebar-buttonbox .titlebar-max,
@@ -16,57 +21,62 @@
 	background: url("../titlebuttons/titlebutton-maximize-dark.svg") no-repeat;
 	background-size: contain;
 }
-:root[tabsintitlebar] #titlebar .titlebar-buttonbox .titlebar-min,
-:root[tabsintitlebar] #titlebar #titlebar-min {
-	background: url("../titlebuttons/titlebutton-minimize-dark.svg") no-repeat;
+:root[tabsintitlebar] #titlebar .titlebar-buttonbox:hover .titlebar-close,
+:root[tabsintitlebar] #titlebar #titlebar-close:hover {
+	background: url("../titlebuttons/titlebutton-close-hover-inactive-dark.svg") no-repeat;
 	background-size: contain;
 }
-
-
-
-:root[tabsintitlebar] #titlebar .titlebar-close:hover,
+:root[tabsintitlebar] #titlebar .titlebar-buttonbox:hover .titlebar-max,
+:root[tabsintitlebar] #titlebar #titlebar-max:hover {
+	background: url("../titlebuttons/titlebutton-maximize-hover-inactive-dark.svg") no-repeat;
+	background-size: contain;
+}
+:root[tabsintitlebar] #titlebar .titlebar-buttonbox:hover .titlebar-min,
+:root[tabsintitlebar] #titlebar #titlebar-min:hover {
+	background: url("../titlebuttons/titlebutton-minimize-hover-inactive-dark.svg") no-repeat;
+	background-size: contain;
+}
+:root[tabsintitlebar] #titlebar .titlebar-buttonbox:hover .titlebar-close:hover,
 :root[tabsintitlebar] #titlebar #titlebar-close:hover {
 	background: url("../titlebuttons/titlebutton-close-hover-dark.svg") no-repeat;
 	background-size: contain;
 	transition: background-size 300ms cubic-bezier(0.0, 0.0, 0.2, 1);
 }
-:root[tabsintitlebar] #titlebar .titlebar-max:hover,
+:root[tabsintitlebar] #titlebar .titlebar-buttonbox:hover .titlebar-max:hover,
 :root[tabsintitlebar] #titlebar #titlebar-max:hover {
 	background: url("../titlebuttons/titlebutton-maximize-hover-dark.svg") no-repeat;
 	background-size: contain;
 	transition: background-size 300ms cubic-bezier(0.0, 0.0, 0.2, 1);
 }
-:root[tabsintitlebar] #titlebar .titlebar-min:hover,
+:root[tabsintitlebar] #titlebar .titlebar-buttonbox:hover .titlebar-min:hover,
 :root[tabsintitlebar] #titlebar #titlebar-min:hover {
 	background: url("../titlebuttons/titlebutton-minimize-hover-dark.svg") no-repeat;
 	background-size: contain;
 	transition: background-size 300ms cubic-bezier(0.0, 0.0, 0.2, 1);
 }
-:root[tabsintitlebar] #titlebar .titlebar-restore:hover,
+:root[tabsintitlebar] #titlebar .titlebar-buttonbox:hover .titlebar-restore,
 :root[tabsintitlebar] #titlebar #titlebar-restore:hover,
 :root[tabsintitlebar][sizemode="maximized"] #titlebar .titlebar-buttonbox:hover .titlebar-max,
 :root[tabsintitlebar][sizemode="maximized"] #titlebar #titlebar-max:hover {
 	background: url("../titlebuttons/titlebutton-unmaximize-hover-dark.svg") no-repeat;
 	background-size: contain;
 }
-
-
-:root[tabsintitlebar] #titlebar .titlebar-close:active,
+:root[tabsintitlebar] #titlebar .titlebar-buttonbox:hover .titlebar-close:active,
 :root[tabsintitlebar] #titlebar #titlebar-close:active {
 	background: url("../titlebuttons/titlebutton-close-active-dark.svg") no-repeat;
 	background-size: contain;
 }
-:root[tabsintitlebar] #titlebar .titlebar-max:active,
+:root[tabsintitlebar] #titlebar .titlebar-buttonbox:hover .titlebar-max:active,
 :root[tabsintitlebar] #titlebar #titlebar-max:active {
 	background: url("../titlebuttons/titlebutton-maximize-active-dark.svg") no-repeat;
 	background-size: contain;
 }
-:root[tabsintitlebar] #titlebar .titlebar-min:active,
+:root[tabsintitlebar] #titlebar .titlebar-buttonbox:hover .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,
+:root[tabsintitlebar] #titlebar .titlebar-buttonbox:active .titlebar-restore,
 :root[tabsintitlebar] #titlebar #titlebar-restore:active,
 :root[tabsintitlebar][sizemode="maximized"] #titlebar .titlebar-buttonbox:active .titlebar-max:active,
 :root[tabsintitlebar][sizemode="maximized"] #titlebar #titlebar-max:active {
@@ -95,22 +105,22 @@
 	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-buttonbox:hover .titlebar-close,
 :root[tabsintitlebar] #titlebar:-moz-window-inactive #titlebar-close:hover {
 	background: url("../titlebuttons/titlebutton-close-backdrop-dark.svg") no-repeat;
 	background-size: contain;
 }
-:root[tabsintitlebar] #titlebar:-moz-window-inactive .titlebar-max:hover,
+:root[tabsintitlebar] #titlebar:-moz-window-inactive .titlebar-buttonbox:hover .titlebar-max,
 :root[tabsintitlebar] #titlebar:-moz-window-inactive #titlebar-max:hover {
 	background: url("../titlebuttons/titlebutton-maximize-backdrop-dark.svg") no-repeat;
 	background-size: contain;
 }
-:root[tabsintitlebar] #titlebar:-moz-window-inactive .titlebar-min:hover,
+:root[tabsintitlebar] #titlebar:-moz-window-inactive .titlebar-buttonbox:hover .titlebar-min,
 :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-buttonbox:hover .titlebar-restore,
 :root[tabsintitlebar] #titlebar:-moz-window-inactive #titlebar-restore:hover,
 :root[tabsintitlebar][sizemode="maximized"] #titlebar:-moz-window-inactive .titlebar-buttonbox:hover .titlebar-max,
 :root[tabsintitlebar][sizemode="maximized"] #titlebar:-moz-window-inactive #titlebar-max:hover {
diff --git a/src/other/firefox/chrome/WhiteSur/parts/titlebutton-light.css b/src/other/firefox/chrome/WhiteSur/parts/titlebutton-light.css
index 2d6a3d5..7d7c277 100644
--- a/src/other/firefox/chrome/WhiteSur/parts/titlebutton-light.css
+++ b/src/other/firefox/chrome/WhiteSur/parts/titlebutton-light.css
@@ -8,6 +8,11 @@
 	background: url("../titlebuttons/titlebutton-maximize.svg") no-repeat;
 	background-size: contain;
 }
+:root[tabsintitlebar] #titlebar .titlebar-buttonbox .titlebar-min,
+:root[tabsintitlebar] #titlebar #titlebar-min {
+	background: url("../titlebuttons/titlebutton-minimize.svg") no-repeat;
+	background-size: contain;
+}
 :root[tabsintitlebar] #titlebar .titlebar-buttonbox .titlebar-restore,
 :root[tabsintitlebar] #titlebar #titlebar-restore,
 :root[tabsintitlebar][sizemode="maximized"] #titlebar .titlebar-buttonbox .titlebar-max,
@@ -15,64 +20,68 @@
 	background: url("../titlebuttons/titlebutton-maximize.svg") no-repeat;
 	background-size: contain;
 }
-:root[tabsintitlebar] #titlebar .titlebar-buttonbox .titlebar-min,
-:root[tabsintitlebar] #titlebar #titlebar-min {
-	background: url("../titlebuttons/titlebutton-minimize.svg") no-repeat;
+:root[tabsintitlebar] #titlebar .titlebar-buttonbox:hover .titlebar-close,
+:root[tabsintitlebar] #titlebar #titlebar-close:hover {
+	background: url("../titlebuttons/titlebutton-close-hover-inactive.svg") no-repeat;
 	background-size: contain;
 }
-
-
-
-:root[tabsintitlebar] #titlebar .titlebar-close:hover,
+:root[tabsintitlebar] #titlebar .titlebar-buttonbox:hover .titlebar-max,
+:root[tabsintitlebar] #titlebar #titlebar-max:hover {
+	background: url("../titlebuttons/titlebutton-maximize-hover-inactive.svg") no-repeat;
+	background-size: contain;
+}
+:root[tabsintitlebar] #titlebar .titlebar-buttonbox:hover .titlebar-min,
+:root[tabsintitlebar] #titlebar #titlebar-min:hover {
+	background: url("../titlebuttons/titlebutton-minimize-hover-inactive.svg") no-repeat;
+	background-size: contain;
+}
+:root[tabsintitlebar] #titlebar .titlebar-buttonbox:hover .titlebar-close:hover,
 :root[tabsintitlebar] #titlebar #titlebar-close:hover {
 	background: url("../titlebuttons/titlebutton-close-hover.svg") no-repeat;
 	background-size: contain;
-	transition: background-size 500ms cubic-bezier(0.0, 0.0, 0.2, 1);
+	transition: background-size 300ms cubic-bezier(0.0, 0.0, 0.2, 1);
 }
-:root[tabsintitlebar] #titlebar .titlebar-max:hover,
+:root[tabsintitlebar] #titlebar .titlebar-buttonbox:hover .titlebar-max:hover,
 :root[tabsintitlebar] #titlebar #titlebar-max:hover {
 	background: url("../titlebuttons/titlebutton-maximize-hover.svg") no-repeat;
 	background-size: contain;
-	transition: background-size 500ms cubic-bezier(0.0, 0.0, 0.2, 1);
+	transition: background-size 300ms cubic-bezier(0.0, 0.0, 0.2, 1);
 }
-:root[tabsintitlebar] #titlebar .titlebar-min:hover,
+:root[tabsintitlebar] #titlebar .titlebar-buttonbox:hover .titlebar-min:hover,
 :root[tabsintitlebar] #titlebar #titlebar-min:hover {
 	background: url("../titlebuttons/titlebutton-minimize-hover.svg") no-repeat;
 	background-size: contain;
-	transition: background-size 500ms cubic-bezier(0.0, 0.0, 0.2, 1);
+	transition: background-size 300ms cubic-bezier(0.0, 0.0, 0.2, 1);
 }
-:root[tabsintitlebar] #titlebar .titlebar-restore:hover,
+:root[tabsintitlebar] #titlebar .titlebar-buttonbox:hover .titlebar-restore,
 :root[tabsintitlebar] #titlebar #titlebar-restore:hover,
 :root[tabsintitlebar][sizemode="maximized"] #titlebar .titlebar-buttonbox:hover .titlebar-max,
 :root[tabsintitlebar][sizemode="maximized"] #titlebar #titlebar-max:hover {
 	background: url("../titlebuttons/titlebutton-unmaximize-hover.svg") no-repeat;
 	background-size: contain;
-	transition: background-size 500ms cubic-bezier(0.0, 0.0, 0.2, 1);
 }
-
-:root[tabsintitlebar] #titlebar .titlebar-close:active,
+:root[tabsintitlebar] #titlebar .titlebar-buttonbox:hover .titlebar-close:active,
 :root[tabsintitlebar] #titlebar #titlebar-close:active {
 	background: url("../titlebuttons/titlebutton-close-active.svg") no-repeat;
 	background-size: contain;
 }
-:root[tabsintitlebar] #titlebar .titlebar-max:active,
+:root[tabsintitlebar] #titlebar .titlebar-buttonbox:hover .titlebar-max:active,
 :root[tabsintitlebar] #titlebar #titlebar-max:active {
 	background: url("../titlebuttons/titlebutton-maximize-active.svg") no-repeat;
 	background-size: contain;
 }
-:root[tabsintitlebar] #titlebar .titlebar-restore:active,
+:root[tabsintitlebar] #titlebar .titlebar-buttonbox:hover .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-buttonbox:active .titlebar-restore,
 :root[tabsintitlebar] #titlebar #titlebar-restore:active,
 :root[tabsintitlebar][sizemode="maximized"] #titlebar .titlebar-buttonbox:active .titlebar-max:active,
 :root[tabsintitlebar][sizemode="maximized"] #titlebar #titlebar-max:active {
 	background: url("../titlebuttons/titlebutton-unmaximize-active.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:-moz-window-inactive .titlebar-buttonbox .titlebar-close,
 :root[tabsintitlebar] #titlebar:-moz-window-inactive #titlebar-close {
 	background: url("../titlebuttons/titlebutton-backdrop.svg") no-repeat;
@@ -83,6 +92,11 @@
 	background: url("../titlebuttons/titlebutton-backdrop.svg") no-repeat;
 	background-size: contain;
 }
+:root[tabsintitlebar] #titlebar:-moz-window-inactive .titlebar-buttonbox .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-buttonbox .titlebar-restore,
 :root[tabsintitlebar] #titlebar:-moz-window-inactive #titlebar-restore,
 :root[tabsintitlebar][sizemode="maximized"] #titlebar:-moz-window-inactive .titlebar-buttonbox .titlebar-max,
@@ -90,28 +104,22 @@
 	background: url("../titlebuttons/titlebutton-backdrop.svg") no-repeat;
 	background-size: contain;
 }
-:root[tabsintitlebar] #titlebar:-moz-window-inactive .titlebar-buttonbox .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-close:hover,
+:root[tabsintitlebar] #titlebar:-moz-window-inactive .titlebar-buttonbox:hover .titlebar-close,
 :root[tabsintitlebar] #titlebar:-moz-window-inactive #titlebar-close:hover {
 	background: url("../titlebuttons/titlebutton-close-backdrop.svg") no-repeat;
 	background-size: contain;
 }
-:root[tabsintitlebar] #titlebar:-moz-window-inactive .titlebar-max:hover,
+:root[tabsintitlebar] #titlebar:-moz-window-inactive .titlebar-buttonbox:hover .titlebar-max,
 :root[tabsintitlebar] #titlebar:-moz-window-inactive #titlebar-max:hover {
 	background: url("../titlebuttons/titlebutton-maximize-backdrop.svg") no-repeat;
 	background-size: contain;
 }
-:root[tabsintitlebar] #titlebar:-moz-window-inactive .titlebar-min:hover,
+:root[tabsintitlebar] #titlebar:-moz-window-inactive .titlebar-buttonbox:hover .titlebar-min,
 :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-buttonbox:hover .titlebar-restore,
 :root[tabsintitlebar] #titlebar:-moz-window-inactive #titlebar-restore:hover,
 :root[tabsintitlebar][sizemode="maximized"] #titlebar:-moz-window-inactive .titlebar-buttonbox:hover .titlebar-max,
 :root[tabsintitlebar][sizemode="maximized"] #titlebar:-moz-window-inactive #titlebar-max:hover {