diff --git a/gtk-2.0/gtkrc b/gtk-2.0/gtkrc
index 4bba054..953e17b 100755
--- a/gtk-2.0/gtkrc
+++ b/gtk-2.0/gtkrc
@@ -93,7 +93,7 @@ menubarstyle = 2
 toolbarstyle = 1
 animation = FALSE
 radius = 3.0
-style = GUMMY
+style = GLOSSY
 
 # Set a hint to disable backward compatibility fallbacks.
 hint = "use-hints"
@@ -186,11 +186,7 @@ ythickness = 3
 
 bg[NORMAL]        = @button_bg_color
 fg[NORMAL]        = @button_fg_color
-<<<<<<< HEAD
-bg[PRELIGHT]      = shade (1.06, @button_bg_color)
-=======
 bg[PRELIGHT]      = shade (1.06, @button_checked_bg_color)
->>>>>>> 2c3647c (Finished templating. Now it's only a matter of adding more themes!)
 bg[ACTIVE]        = @button_checked_bg_color
 fg[ACTIVE]        = @button_checked_fg_color
 }
diff --git a/gtk-3.0/gtk.css b/gtk-3.0/gtk.css
index 8302b40..892e490 100644
--- a/gtk-3.0/gtk.css
+++ b/gtk-3.0/gtk.css
@@ -296,7 +296,7 @@ notebook > header > tabs > arrow.osd:backdrop, button.osd:backdrop { border: non
 
 .app-notification button.flat:active, popover.background.touch-selection button.flat:active, popover.background.magnifier button.flat:active, .app-notification button.flat:checked, popover.background.touch-selection button.flat:checked, popover.background.magnifier button.flat:checked, .osd notebook > header > tabs > arrow.flat:active, .osd notebook > header > tabs > arrow.flat:checked, .osd button.flat:active, .osd button.flat:checked { box-shadow: 0 1px rgba(255, 255, 255, 0.65), inset 0 1px 2px rgba(0, 0, 0, 0.4); }
 
-notebook > header > tabs > arrow.suggested-action, button.suggested-action { color: white; background-color: #73d216; border-color: #b9e98b; outline-color: rgba(157, 204, 255, 0.5); background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0.9), rgba(255, 255, 255, 0.5) 50%, rgba(255, 255, 255, 0) 50%, rgba(255, 255, 255, 0.3)); text-shadow: 0 -1px rgba(0, 0, 0, 0.636078); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.636078); box-shadow: inset 0 1px rgba(255, 255, 255, 0.35), 0 1px 2px rgba(0, 0, 0, 0.4); }
+notebook > header > tabs > arrow.suggested-action, button.suggested-action { color: black; background-color: #73d216; border-color: #3a690b; outline-color: rgba(157, 204, 255, 0.5); background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0.9), rgba(255, 255, 255, 0.5) 50%, rgba(255, 255, 255, 0) 50%, rgba(255, 255, 255, 0.3)); text-shadow: 0 1px rgba(255, 255, 255, 0.3); -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.3); box-shadow: inset 0 1px rgba(255, 255, 255, 0.35), 0 1px 2px rgba(0, 0, 0, 0.4); }
 
 notebook > header > tabs > arrow.suggested-action.flat, button.suggested-action.flat { border-color: transparent; background-color: transparent; background-image: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; color: #73d216; }
 
@@ -340,8 +340,6 @@ notebook > header > tabs.stack-switcher > arrow.image-button, .stack-switcher >
 
 notebook > header > tabs.stack-switcher > arrow.needs-attention:active > label, notebook > header > tabs.stack-switcher > arrow.needs-attention:active > image, notebook > header > tabs.stack-switcher > arrow.needs-attention:checked > label, notebook > header > tabs.stack-switcher > arrow.needs-attention:checked > image, .stack-switcher > button.needs-attention:active > label, .stack-switcher > button.needs-attention:active > image, .stack-switcher > button.needs-attention:checked > label, .stack-switcher > button.needs-attention:checked > image { animation: none; background-image: none; }
 
-notebook > header > tabs > arrow.font separator, notebook > header > tabs > arrow.file separator, button.font separator, button.file separator { background-color: transparent; }
-
 notebook > header > tabs > arrow.font > box > box > label, button.font > box > box > label { font-weight: bold; }
 
 .primary-toolbar notebook > header > tabs > arrow, .primary-toolbar button { -gtk-icon-shadow: none; }
@@ -524,7 +522,7 @@ searchbar > revealer > box { margin: -6px; padding: 6px; }
 .inline-toolbar:backdrop, searchbar > revealer > box:backdrop, .location-bar:backdrop { border-color: #a4a4a4; background-color: #bcbcbc; box-shadow: none; transition: 200ms ease-out; }
 
 /*************** Header bars * */
-.titlebar:not(headerbar), headerbar { padding: 0 6px; min-height: 40px; border-width: 0 0 1px; border-style: solid; border-color: #8c8c8c; border-radius: 0; color: #000000; background: #9dccff linear-gradient(to top, #93c7ff, #a2cfff); box-shadow: inset 0 1px rgba(255, 255, 255, 0.8); /* Darken switchbuttons for headerbars. issue #1588 */ /* hide the close button separator */ }
+.titlebar:not(headerbar), headerbar { padding: 0 6px; min-height: 40px; border-width: 0 0 1px; border-style: solid; border-color: #8c8c8c; border-radius: 0; color: #000000; background: #9dccff linear-gradient(to top, #93c7ff, #a2cfff); box-shadow: inset 0 1px rgba(255, 255, 255, 0.8); /* Darken switchbuttons for headerbars. issue #1588 */ }
 
 .titlebar:backdrop:not(headerbar), headerbar:backdrop { border-color: #a4a4a4; background: #c9c9c9 linear-gradient(to top, #c4c4c4, #cccccc); box-shadow: inset 0 1px rgba(255, 255, 255, 0.8); color: #1d1d1d; transition: 200ms ease-out; }
 
@@ -584,8 +582,6 @@ searchbar > revealer > box { margin: -6px; padding: 6px; }
 
 .default-decoration.titlebar:not(headerbar) button.titlebutton, headerbar.default-decoration button.titlebutton { min-height: 26px; min-width: 26px; margin: 0; padding: 0; }
 
-.titlebar:not(headerbar) separator.titlebutton, headerbar separator.titlebutton { opacity: 0; }
-
 .solid-csd .titlebar:dir(rtl):not(headerbar), .solid-csd .titlebar:dir(ltr):not(headerbar), .solid-csd headerbar:backdrop:dir(rtl), .solid-csd headerbar:backdrop:dir(ltr), .solid-csd headerbar:dir(rtl), .solid-csd headerbar:dir(ltr) { margin-left: -1px; margin-right: -1px; margin-top: -1px; border-radius: 0; box-shadow: none; }
 
 headerbar entry, headerbar spinbutton, headerbar separator:not(.sidebar), headerbar button { margin-top: 5px; margin-bottom: 5px; }
@@ -920,7 +916,7 @@ notebook > stack:not(:only-child):backdrop { background-color: #e2e2e2; }
 /************** Scrollbars * */
 scrollbar { background-color: #a7a7a7; transition: all 300ms cubic-bezier(0.25, 0.46, 0.45, 0.94); }
 
-* { -GtkScrollbar-has-backward-stepper: false; -GtkScrollbar-has-forward-stepper: false; }
+* { -GtkScrollbar-has-backward-stepper: true; -GtkScrollbar-has-forward-stepper: true; }
 
 scrollbar.top { border-bottom: 1px solid #9b9b9b; }
 
@@ -932,9 +928,9 @@ scrollbar.right { border-left: 1px solid #9b9b9b; }
 
 scrollbar:backdrop { background-color: #c1c1c1; border-color: #a4a4a4; transition: 200ms ease-out; }
 
-scrollbar slider { padding: 0; background-image: none; min-width: 8px; min-height: 8px; margin: 3px; border-radius: 10px; background-clip: padding-box; background-color: #626262; transition: all 300ms cubic-bezier(0.25, 0.46, 0.45, 0.94); }
+scrollbar slider { padding: 0; min-width: 13px; min-height: 13px; margin: 0px; border-radius: 0px; background-clip: padding-box; background-color: #d3d3d3; transition: all 300ms cubic-bezier(0.25, 0.46, 0.45, 0.94); }
 
-scrollbar slider:hover { background-color: #3f3f3f; }
+scrollbar slider:hover { background-color: #c8d2dc; }
 
 scrollbar slider:hover:active { background-color: #6ab1ff; }
 
@@ -944,21 +940,11 @@ scrollbar slider:disabled { background-color: transparent; }
 
 scrollbar.fine-tune slider, scrollbar.fine-tune slider:hover, scrollbar.fine-tune slider:active { background-color: #ffffa4; }
 
-scrollbar.horizontal slider { min-width: 40px; }
+scrollbar.horizontal slider { min-width: 40px; background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0.9), rgba(255, 255, 255, 0.5) 50%, rgba(255, 255, 255, 0) 50%, rgba(255, 255, 255, 0.3)); }
 
-scrollbar.vertical slider { min-height: 40px; }
+scrollbar.vertical slider { min-height: 40px; background-image: linear-gradient(to right, rgba(255, 255, 255, 0.9), rgba(255, 255, 255, 0.5) 50%, rgba(255, 255, 255, 0) 50%, rgba(255, 255, 255, 0.3)); }
 
-scrollbar button { padding: 0; min-width: 12px; min-height: 12px; border-style: none; border-radius: 0; transition-property: min-height, min-width, color; border-color: transparent; background-color: transparent; background-image: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; color: #626262; }
-
-scrollbar button:hover { border-color: transparent; background-color: transparent; background-image: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; color: #3f3f3f; }
-
-scrollbar button:active, scrollbar button:checked { border-color: transparent; background-color: transparent; background-image: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; color: #6ab1ff; }
-
-scrollbar button:disabled { border-color: transparent; background-color: transparent; background-image: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; color: rgba(98, 98, 98, 0.2); }
-
-scrollbar button:backdrop { border-color: transparent; background-color: transparent; background-image: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; color: #a7a7a7; }
-
-scrollbar button:backdrop:disabled { border-color: transparent; background-color: transparent; background-image: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; color: rgba(167, 167, 167, 0.2); }
+scrollbar button { padding: 0; min-width: 12px; min-height: 12px; border-radius: 0; transition-property: min-height, min-width, color; }
 
 scrollbar.vertical button.down { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); }
 
@@ -1498,16 +1484,12 @@ placesview row.activatable:hover { background-color: transparent; }
 placesview > actionbar > revealer > box > label { padding-left: 8px; padding-right: 8px; }
 
 /********* Paned * */
-paned > separator { min-width: 1px; min-height: 1px; -gtk-icon-source: none; border-style: none; background-color: transparent; background-image: image(#9b9b9b); background-size: 1px 1px; }
+paned > separator { min-width: 2px; min-height: 2px; border-style: none; }
 
 paned > separator:selected { background-image: image(#9dccff); }
 
-paned > separator:backdrop { background-image: image(#a4a4a4); }
-
 paned > separator.wide { min-width: 5px; min-height: 5px; background-color: #c9c9c9; background-image: image(#9b9b9b), image(#9b9b9b); background-size: 1px 1px, 1px 1px; }
 
-paned > separator.wide:backdrop { background-color: #c9c9c9; background-image: image(#a4a4a4), image(#a4a4a4); }
-
 paned.horizontal > separator { background-repeat: repeat-y; }
 
 paned.horizontal > separator:dir(ltr) { margin: 0 -8px 0 0; padding: 0 8px 0 0; background-position: left; }
diff --git a/gtk-4.0/gtk.css b/gtk-4.0/gtk.css
index cd90576..a83cd06 100644
--- a/gtk-4.0/gtk.css
+++ b/gtk-4.0/gtk.css
@@ -296,19 +296,19 @@ notebook > header > tabs > arrow.osd:active, notebook > header > tabs > arrow.os
 
 .app-notification button.flat:active, popover.background.touch-selection button.flat:active, popover.background.magnifier button.flat:active, .app-notification button.flat:checked, popover.background.touch-selection button.flat:checked, popover.background.magnifier button.flat:checked, .osd notebook > header > tabs > arrow.flat:active, .osd notebook > header > tabs > arrow.flat:checked, .osd button.flat:active, .osd button.flat:checked { box-shadow: 0 1px rgba(255, 255, 255, 0.65), inset 0 1px 2px rgba(0, 0, 0, 0.4); }
 
-notebook > header > tabs > arrow.suggested-action, button.suggested-action { color: black; background-color: #9dccff; border-color: #4f6680; outline-color: rgba(157, 204, 255, 0.5); background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0.9), rgba(255, 255, 255, 0.5) 50%, rgba(255, 255, 255, 0) 50%, rgba(255, 255, 255, 0.3)); text-shadow: 0 1px rgba(255, 255, 255, 0.3); -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.3); box-shadow: inset 0 1px rgba(255, 255, 255, 0.65), 0 1px 2px rgba(0, 0, 0, 0.4); transition-property: outline, outline-width, outline-offset, outline-color; transition-duration: 300ms; animation-timing-function: ease-in-out; }
+notebook > header > tabs > arrow.suggested-action, button.suggested-action { color: black; background-color: #73d216; border-color: #3a690b; outline-color: rgba(157, 204, 255, 0.5); background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0.9), rgba(255, 255, 255, 0.5) 50%, rgba(255, 255, 255, 0) 50%, rgba(255, 255, 255, 0.3)); text-shadow: 0 1px rgba(255, 255, 255, 0.3); -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.3); box-shadow: inset 0 1px rgba(255, 255, 255, 0.35), 0 1px 2px rgba(0, 0, 0, 0.4); transition-property: outline, outline-width, outline-offset, outline-color; transition-duration: 300ms; animation-timing-function: ease-in-out; }
 
 notebook > header > tabs > arrow.suggested-action, button.suggested-action { outline: 0 solid transparent; outline-offset: 4px; }
 
 notebook > header > tabs > arrow.suggested-action:focus:focus-visible, button.suggested-action:focus:focus-visible { outline-color: rgba(255, 255, 255, 0.8); outline-width: 2px; outline-offset: -2px; }
 
-notebook > header > tabs > arrow.suggested-action.flat, button.suggested-action.flat { border-color: transparent; background-color: transparent; background-image: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; color: #9dccff; }
+notebook > header > tabs > arrow.suggested-action.flat, button.suggested-action.flat { border-color: transparent; background-color: transparent; background-image: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; color: #73d216; }
 
-notebook > header > tabs > arrow.suggested-action:hover, button.suggested-action:hover { background-color: shade(#9dccff, 1.1); }
+notebook > header > tabs > arrow.suggested-action:hover, button.suggested-action:hover { background-color: shade(#73d216, 1.1); }
 
-notebook > header > tabs > arrow.suggested-action:active, notebook > header > tabs > arrow.suggested-action:checked, button.suggested-action:active, button.suggested-action:checked { box-shadow: 0 1px rgba(255, 255, 255, 0.65), inset 0 1px 2px rgba(0, 0, 0, 0.4); }
+notebook > header > tabs > arrow.suggested-action:active, notebook > header > tabs > arrow.suggested-action:checked, button.suggested-action:active, button.suggested-action:checked { box-shadow: 0 1px rgba(255, 255, 255, 0.35), inset 0 1px 2px rgba(0, 0, 0, 0.4); }
 
-notebook > header > tabs > arrow.suggested-action.flat:disabled, button.suggested-action.flat:disabled { border-color: transparent; background-color: transparent; background-image: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; color: rgba(157, 204, 255, 0.8); }
+notebook > header > tabs > arrow.suggested-action.flat:disabled, button.suggested-action.flat:disabled { border-color: transparent; background-color: transparent; background-image: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; color: rgba(115, 210, 22, 0.8); }
 
 notebook > header > tabs > arrow.suggested-action:disabled, button.suggested-action:disabled { color: #552222; border-color: #8e7070; background-color: #c7bebe; background-image: none; text-shadow: none; -gtk-icon-shadow: none; }
 
@@ -336,8 +336,6 @@ stackswitcher > button > label { padding: 0 6px; margin: 0 -6px; }
 
 stackswitcher > button > image { padding: 3px 6px; margin: -3px -6px; }
 
-notebook > header > tabs > arrow.font separator, button.font separator { background-color: transparent; }
-
 notebook > header > tabs > arrow.font > box, button.font > box { border-spacing: 6px; }
 
 notebook > header > tabs > arrow.font > box > box > label, button.font > box > box > label { font-weight: bold; }
@@ -360,7 +358,7 @@ stacksidebar row.needs-attention > label:dir(rtl), stackswitcher > button.needs-
 
 .linked.vertical > filechooserbutton > combobox:not(:last-child) > box > button.combo, .linked.vertical > appchooserbutton > combobox:not(:last-child) > box > button.combo, .linked.vertical > combobox:not(:last-child) > box > button.combo, .linked.vertical > menubutton:not(:last-child) > button, .linked.vertical > dropdown:not(:last-child) > button, .linked.vertical > colorbutton:not(:last-child) > button, .linked.vertical > fontbutton:not(:last-child) > button, .linked.vertical > filechooserbutton:not(:last-child) > button, spinbutton.vertical.linked > text:not(:last-child), .linked.vertical > spinbutton:not(:last-child):not(.vertical), .linked.vertical > entry:not(:last-child), notebook > header > tabs.linked.vertical > arrow:not(:last-child), .linked.vertical > button:not(:last-child) { border-bottom-style: none; border-bottom-left-radius: 0; border-bottom-right-radius: 0; }
 
-button.link, button.link:hover, button.link:active, button.link:checked, popover.menu box.circular-buttons button.circular.image-button.model, list > row button.image-button:not(.flat), modelbutton.flat:not(:hover):not(:active):not(:checked):not(:disabled) { background-color: transparent; background-image: none; border-color: transparent; box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; }
+button.link, button.link:hover, button.link:active, button.link:checked, modelbutton.flat:not(:hover):not(:active):not(:checked):not(:disabled) { background-color: transparent; background-image: none; border-color: transparent; box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; }
 
 /* menu buttons */
 modelbutton.flat { min-height: 26px; padding-left: 5px; padding-right: 5px; border-radius: 5px; }
@@ -392,24 +390,6 @@ button.color > colorswatch:only-child, button.color > colorswatch:only-child > o
 
 /* list buttons */
 /* tone down as per new designs, see issue #1473 */
-popover.menu box.circular-buttons button.circular.image-button.model, list > row button.image-button:not(.flat) { border: 1px solid rgba(155, 155, 155, 0.5); }
-
-popover.menu box.circular-buttons button.circular.image-button.model:hover, list > row button.image-button:not(.flat):hover { background-color: shade(#d3d3d3, 1.1); }
-
-popover.menu box.circular-buttons button.circular.image-button.model:active, popover.menu box.circular-buttons button.circular.image-button.model:checked, list > row button.image-button:not(.flat):active, list > row button.image-button:not(.flat):checked { box-shadow: 0 1px rgba(255, 255, 255, 0.65), inset 0 1px 2px rgba(0, 0, 0, 0.4); }
-
-popover.menu box.circular-buttons button.suggested-action.circular.image-button.model, list > row button.image-button:not(.flat).suggested-action { color: white; background-color: #9dccff; border-color: #cee6ff; outline-color: rgba(157, 204, 255, 0.5); background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0.9), rgba(255, 255, 255, 0.5) 50%, rgba(255, 255, 255, 0) 50%, rgba(255, 255, 255, 0.3)); text-shadow: 0 -1px rgba(0, 0, 0, 0.353725); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.353725); box-shadow: inset 0 1px rgba(255, 255, 255, 0.65), 0 1px 2px rgba(0, 0, 0, 0.4); transition-property: outline, outline-width, outline-offset, outline-color; transition-duration: 300ms; animation-timing-function: ease-in-out; }
-
-popover.menu box.circular-buttons button.suggested-action.circular.image-button.model, list > row button.image-button:not(.flat).suggested-action { outline: 0 solid transparent; outline-offset: 4px; }
-
-popover.menu box.circular-buttons button.suggested-action.circular.image-button.model:focus:focus-visible, list > row button.image-button:not(.flat).suggested-action:focus:focus-visible { outline-color: rgba(255, 255, 255, 0.8); outline-width: 2px; outline-offset: -2px; }
-
-popover.menu box.circular-buttons button.destructive-action.circular.image-button.model, list > row button.image-button:not(.flat).destructive-action { color: white; background-color: #df0000; border-color: #ef8080; outline-color: rgba(157, 204, 255, 0.5); background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0.9), rgba(255, 255, 255, 0.5) 50%, rgba(255, 255, 255, 0) 50%, rgba(255, 255, 255, 0.3)); text-shadow: 0 -1px rgba(0, 0, 0, 0.650196); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.650196); box-shadow: inset 0 1px rgba(255, 255, 255, 0.35), 0 1px 2px rgba(0, 0, 0, 0.4); transition-property: outline, outline-width, outline-offset, outline-color; transition-duration: 300ms; animation-timing-function: ease-in-out; }
-
-popover.menu box.circular-buttons button.destructive-action.circular.image-button.model, list > row button.image-button:not(.flat).destructive-action { outline: 0 solid transparent; outline-offset: 4px; }
-
-popover.menu box.circular-buttons button.destructive-action.circular.image-button.model:focus:focus-visible, list > row button.image-button:not(.flat).destructive-action:focus:focus-visible { outline-color: rgba(255, 255, 255, 0.8); outline-width: 2px; outline-offset: -2px; }
-
 /********* Links * */
 button.link, link { color: #004B91; text-decoration: underline; }
 
@@ -591,8 +571,6 @@ headerbar switch { margin-top: 10px; margin-bottom: 10px; }
 
 window.csd > .titlebar:not(headerbar) { padding: 0; background-color: transparent; background-image: none; border-style: none; border-color: transparent; }
 
-.titlebar:not(headerbar) separator { background-color: #9b9b9b; }
-
 window.devel headerbar.titlebar { background: #c9c9c9 cross-fade(10% -gtk-icontheme("system-run-symbolic"), image(transparent)) 90% 0/256px 256px no-repeat, linear-gradient(to right, transparent 65%, rgba(157, 204, 255, 0.2)), linear-gradient(to top, #a8a8a8, #b0b0b0 3px, #bfbfbf); }
 
 window.devel headerbar.titlebar:backdrop { background: #c9c9c9 cross-fade(10% -gtk-icontheme("system-run-symbolic"), image(transparent)) 90% 0/256px 256px no-repeat, image(#c9c9c9); /* background-color would flash */ }
@@ -692,7 +670,7 @@ popover.background > contents { padding: 8px; border-radius: 9px; }
 
 popover.background > contents > list, popover.background > contents > .view, popover.background > contents > iconview, popover.background > contents > .toolbar { border-style: none; background-color: transparent; }
 
-popover.background > contents separator { background-color: darkgray; margin: 3px; }
+popover.background > contents separator { margin: 3px; }
 
 popover.background > contents list separator { margin: 0; }
 
@@ -905,9 +883,9 @@ scrollbar.left { border-right: 1px solid #9b9b9b; }
 
 scrollbar.right { border-left: 1px solid #9b9b9b; }
 
-scrollbar > range > trough > slider { padding: 0; background-image: none; min-width: 8px; min-height: 8px; margin: 3px; border-radius: 10px; background-clip: padding-box; background-color: #626262; transition: all 300ms cubic-bezier(0.25, 0.46, 0.45, 0.94); }
+scrollbar > range > trough > slider { padding: 0; min-width: 13px; min-height: 13px; margin: 0px; border-radius: 00px; background-clip: padding-box; background-color: #d3d3d3; transition: all 300ms cubic-bezier(0.25, 0.46, 0.45, 0.94); }
 
-scrollbar > range > trough > slider:hover { background-color: #3f3f3f; }
+scrollbar > range > trough > slider:hover { background-color: #c8d2dc; }
 
 scrollbar > range > trough > slider:hover:active { background-color: #6ab1ff; }
 
@@ -915,9 +893,9 @@ scrollbar > range > trough > slider:disabled { background-color: transparent; }
 
 scrollbar > range.fine-tune > trough > slider, scrollbar > range.fine-tune > trough > slider:hover, scrollbar > range.fine-tune > trough > slider:active { background-color: #ffffa4; }
 
-scrollbar.horizontal > range > trough > slider { min-width: 40px; }
+scrollbar.horizontal > range > trough > slider { min-width: 40px; background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0.9), rgba(255, 255, 255, 0.5) 50%, rgba(255, 255, 255, 0) 50%, rgba(255, 255, 255, 0.3)); }
 
-scrollbar.vertical > range > trough > slider { min-height: 40px; }
+scrollbar.vertical > range > trough > slider { min-height: 40px; background-image: linear-gradient(to right, rgba(255, 255, 255, 0.9), rgba(255, 255, 255, 0.5) 50%, rgba(255, 255, 255, 0) 50%, rgba(255, 255, 255, 0.3)); }
 
 treeview ~ scrollbar.vertical { border-top: 1px solid #9b9b9b; margin-top: -1px; }
 
@@ -1239,7 +1217,7 @@ scrolledwindow > junction { background: #9b9b9b, linear-gradient(to bottom, tran
 
 scrolledwindow > junction:dir(rtl) { background: #9b9b9b, linear-gradient(to bottom, transparent 1px, #a7a7a7 1px), linear-gradient(to left, transparent 1px, #a7a7a7 1px); }
 
-separator { background: #a8a8a8; min-width: 1px; min-height: 1px; }
+separator { background: rgba(0, 0, 0, 0.1); min-width: 1px; min-height: 1px; }
 
 /********* Lists * */
 listview, list { color: #1d1d1d; background-color: #e5e5e5; border-color: #9b9b9b; }
@@ -1455,23 +1433,21 @@ placesview .server-list-button:checked > image { transition: 200ms cubic-bezier(
 placesview > actionbar > revealer > box > box { border-spacing: 6px; }
 
 /********* Paned * */
-paned > separator { min-width: 1px; min-height: 1px; -gtk-icon-source: none; border-style: none; background-color: transparent; background-image: image(#9b9b9b); background-size: 1px 1px; }
+paned > separator { min-width: 2px; min-height: 2px; border-style: none; }
 
-paned > separator:selected { background-image: image(#9dccff); }
+paned > separator:selected { background-color: #9dccff; }
 
-paned > separator.wide { min-width: 5px; min-height: 5px; background-color: #c9c9c9; background-image: image(#9b9b9b), image(#9b9b9b); background-size: 1px 1px, 1px 1px; }
+paned > separator.wide { min-width: 5px; min-height: 5px; }
 
-paned.horizontal > separator { background-repeat: repeat-y; }
+paned.horizontal > separator:dir(ltr) { margin: 0 -8px 0 0; padding: 0 8px 0 0; }
 
-paned.horizontal > separator:dir(ltr) { margin: 0 -8px 0 0; padding: 0 8px 0 0; background-position: left; }
+paned.horizontal > separator:dir(rtl) { margin: 0 0 0 -8px; padding: 0 0 0 8px; }
 
-paned.horizontal > separator:dir(rtl) { margin: 0 0 0 -8px; padding: 0 0 0 8px; background-position: right; }
+paned.horizontal > separator.wide { margin: 0; padding: 0; }
 
-paned.horizontal > separator.wide { margin: 0; padding: 0; background-repeat: repeat-y, repeat-y; background-position: left, right; }
+paned.vertical > separator { margin: 0 0 -8px 0; padding: 0 0 8px 0; }
 
-paned.vertical > separator { margin: 0 0 -8px 0; padding: 0 0 8px 0; background-repeat: repeat-x; background-position: top; }
-
-paned.vertical > separator.wide { margin: 0; padding: 0; background-repeat: repeat-x, repeat-x; background-position: bottom, top; }
+paned.vertical > separator.wide { margin: 0; padding: 0; }
 
 /************** GtkVideo * */
 video { background: black; }
diff --git a/previews/gtk3-gtk4-gtk2-desktop.png b/previews/gtk3-gtk4-gtk2-desktop.png
index 476c217..125ef70 100644
Binary files a/previews/gtk3-gtk4-gtk2-desktop.png and b/previews/gtk3-gtk4-gtk2-desktop.png differ
diff --git a/previews/gtk3wf-1-Soil.png b/previews/gtk3wf-1-Soil.png
deleted file mode 100644
index ee613e2..0000000
Binary files a/previews/gtk3wf-1-Soil.png and /dev/null differ
diff --git a/previews/gtk3wf-2.png b/previews/gtk3wf-2.png
index cd0a603..3dca89b 100644
Binary files a/previews/gtk3wf-2.png and b/previews/gtk3wf-2.png differ
diff --git a/previews/gtk3wf-3.png b/previews/gtk3wf-3.png
index c0bbf0c..4960900 100644
Binary files a/previews/gtk3wf-3.png and b/previews/gtk3wf-3.png differ
diff --git a/previews/gtk4wf-1.png b/previews/gtk4wf-1.png
new file mode 100644
index 0000000..1ea44c7
Binary files /dev/null and b/previews/gtk4wf-1.png differ
diff --git a/previews/logo.png b/previews/logo.png
index e2fa8ce..0b337d3 100644
Binary files a/previews/logo.png and b/previews/logo.png differ