diff --git a/gtk-3.0/gtk.css b/gtk-3.0/gtk.css
index 4e992c2..4983107 100644
--- a/gtk-3.0/gtk.css
+++ b/gtk-3.0/gtk.css
@@ -242,7 +242,7 @@ button.titlebutton:backdrop:not(:hover):not(:active):not(:checked):not(:disabled
 
 button.titlebutton:disabled:not(:hover):not(:active):not(:checked):not(:disabled), button.sidebar-button:disabled, notebook > header > tabs > arrow:disabled, scrollbar slider.flat:disabled, button.flat:disabled, button.flat:backdrop:disabled { background-color: #938989; }
 
-scrollbar slider:disabled, notebook > header > tabs > arrow:disabled, button:disabled { color: #552222; background-color: #938989; background-image: none; }
+scrollbar slider:disabled, notebook > header > tabs > arrow:disabled, button:disabled { color: #552222; border-color: #552222; background-color: #938989; background-image: none; }
 
 scrollbar slider:disabled:active, notebook > header > tabs > arrow:disabled:active, scrollbar slider:disabled:checked, notebook > header > tabs > arrow:disabled:checked, button:disabled:active, button:disabled:checked { color: #552222; background-color: #979687; }
 
@@ -280,7 +280,7 @@ button.osd:backdrop { border: none; }
 
 .app-notification button:active, popover.background.touch-selection button:active, popover.background.magnifier button:active, .app-notification button:checked, popover.background.touch-selection button:checked, popover.background.magnifier button:checked, .osd button:active:backdrop, .osd button:active, .osd button:checked:backdrop, .osd button:checked { box-shadow: 0 1px rgba(255, 255, 255, 0.5), inset 0 1px 2px rgba(0, 0, 0, 0.4); }
 
-.app-notification button:disabled, popover.background.touch-selection button:disabled, popover.background.magnifier button:disabled, .osd button:disabled:backdrop, .osd button:disabled { color: #552222; background-color: #938989; background-image: none; }
+.app-notification button:disabled, popover.background.touch-selection button:disabled, popover.background.magnifier button:disabled, .osd button:disabled:backdrop, .osd button:disabled { color: #552222; border-color: #552222; background-color: #938989; background-image: none; }
 
 .app-notification button:backdrop, popover.background.touch-selection button:backdrop, popover.background.magnifier button:backdrop, .osd button:backdrop { background-image: none; }
 
@@ -290,7 +290,7 @@ button.osd:backdrop { border: none; }
 
 .app-notification button.flat:hover, popover.background.touch-selection button.flat:hover, popover.background.magnifier button.flat:hover, .osd button.flat:hover { background-color: shade(rgba(103, 137, 180, 0.7), 1.1); }
 
-.app-notification button.flat:disabled, popover.background.touch-selection button.flat:disabled, popover.background.magnifier button.flat:disabled, .osd button.flat:disabled { color: #552222; background-color: #938989; background-image: none; background-color: #938989; background-image: none; border-color: transparent; box-shadow: none; }
+.app-notification button.flat:disabled, popover.background.touch-selection button.flat:disabled, popover.background.magnifier button.flat:disabled, .osd button.flat:disabled { color: #552222; border-color: #552222; background-color: #938989; background-image: none; background-color: #938989; background-image: none; border-color: transparent; box-shadow: none; }
 
 .app-notification button.flat:backdrop, popover.background.touch-selection button.flat:backdrop, popover.background.magnifier button.flat:backdrop, .osd button.flat: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; }
 
@@ -308,7 +308,7 @@ button.suggested-action:backdrop, button.suggested-action.flat:backdrop { backgr
 
 button.suggested-action.flat:backdrop, button.suggested-action.flat:disabled, button.suggested-action.flat: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(176, 221, 126, 0.8); }
 
-button.suggested-action:disabled { color: #552222; background-color: #938989; background-image: none; }
+button.suggested-action:disabled { color: #552222; border-color: #552222; background-color: #938989; background-image: none; }
 
 button.suggested-action:disabled:active, button.suggested-action:disabled:checked { color: #552222; background-color: #979687; }
 
@@ -324,7 +324,7 @@ button.destructive-action:backdrop, button.destructive-action.flat:backdrop { ba
 
 button.destructive-action.flat:backdrop, button.destructive-action.flat:disabled, button.destructive-action.flat: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(153, 0, 0, 0.8); }
 
-button.destructive-action:disabled { color: #552222; background-color: #938989; background-image: none; }
+button.destructive-action:disabled { color: #552222; border-color: #552222; background-color: #938989; background-image: none; }
 
 button.destructive-action:disabled:active, button.destructive-action:disabled:checked { color: #552222; background-color: #979687; }
 
@@ -366,7 +366,7 @@ stacksidebar row.needs-attention > label:dir(rtl), .stack-switcher > button.need
 
 .inline-toolbar toolbutton > button:active, .inline-toolbar toolbutton > button:checked { box-shadow: 0 1px rgba(255, 255, 255, 0.5), inset 0 1px 2px rgba(0, 0, 0, 0.4); }
 
-.inline-toolbar toolbutton > button:disabled { color: #552222; background-color: #938989; background-image: none; }
+.inline-toolbar toolbutton > button:disabled { color: #552222; border-color: #552222; background-color: #938989; background-image: none; }
 
 .inline-toolbar toolbutton > button:disabled:active, .inline-toolbar toolbutton > button:disabled:checked { color: #552222; background-color: #979687; }
 
@@ -556,7 +556,7 @@ searchbar > revealer > box { margin: -6px; padding: 6px; }
 
 .selection-mode button.titlebutton:backdrop, .selection-mode button.titlebutton:disabled, .selection-mode .titlebar:not(headerbar) button.flat:backdrop, .selection-mode .titlebar:not(headerbar) button.flat:disabled, .selection-mode.titlebar:not(headerbar) button.flat:backdrop, .selection-mode.titlebar:not(headerbar) button.flat:disabled, .selection-mode headerbar button.flat:backdrop, .selection-mode headerbar button.flat:disabled, .selection-mode headerbar button.flat:backdrop:disabled, headerbar.selection-mode button.flat:backdrop, headerbar.selection-mode button.flat:disabled, headerbar.selection-mode button.flat: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; }
 
-.selection-mode .titlebar:not(headerbar) button:disabled, .selection-mode.titlebar:not(headerbar) button:disabled, .selection-mode headerbar button:disabled, headerbar.selection-mode button:disabled { color: #552222; background-color: #938989; background-image: none; }
+.selection-mode .titlebar:not(headerbar) button:disabled, .selection-mode.titlebar:not(headerbar) button:disabled, .selection-mode headerbar button:disabled, headerbar.selection-mode button:disabled { color: #552222; border-color: #552222; background-color: #938989; background-image: none; }
 
 .selection-mode .titlebar:not(headerbar) button:disabled:active, .selection-mode .titlebar:not(headerbar) button:disabled:checked, .selection-mode.titlebar:not(headerbar) button:disabled:active, .selection-mode.titlebar:not(headerbar) button:disabled:checked, .selection-mode headerbar button:disabled:active, .selection-mode headerbar button:disabled:checked, headerbar.selection-mode button:disabled:active, headerbar.selection-mode button:disabled:checked { color: #552222; background-color: #979687; }
 
@@ -566,7 +566,7 @@ searchbar > revealer > box { margin: -6px; padding: 6px; }
 
 .selection-mode .titlebar:not(headerbar) button.suggested-action:active, .selection-mode.titlebar:not(headerbar) button.suggested-action:active, .selection-mode headerbar button.suggested-action:active, headerbar.selection-mode button.suggested-action:active { box-shadow: 0 1px rgba(255, 255, 255, 0.5), inset 0 1px 2px rgba(0, 0, 0, 0.4); border-color: #8bcd41; }
 
-.selection-mode .titlebar:not(headerbar) button.suggested-action:disabled, .selection-mode.titlebar:not(headerbar) button.suggested-action:disabled, .selection-mode headerbar button.suggested-action:disabled, headerbar.selection-mode button.suggested-action:disabled { color: #552222; background-color: #938989; background-image: none; border-color: #8bcd41; }
+.selection-mode .titlebar:not(headerbar) button.suggested-action:disabled, .selection-mode.titlebar:not(headerbar) button.suggested-action:disabled, .selection-mode headerbar button.suggested-action:disabled, headerbar.selection-mode button.suggested-action:disabled { color: #552222; border-color: #552222; background-color: #938989; background-image: none; border-color: #8bcd41; }
 
 .selection-mode .titlebar:not(headerbar) button.suggested-action:backdrop, .selection-mode.titlebar:not(headerbar) button.suggested-action:backdrop, .selection-mode headerbar button.suggested-action:backdrop, headerbar.selection-mode button.suggested-action:backdrop { background-image: none; border-color: #8bcd41; }
 
@@ -991,7 +991,7 @@ switch:hover slider { background-color: shade(#bcbeb9, 1.1); }
 
 switch:checked > slider { border: 1px solid #000000; }
 
-switch:disabled slider { color: #552222; background-color: #938989; background-image: none; }
+switch:disabled slider { color: #552222; border-color: #552222; background-color: #938989; background-image: none; }
 
 switch:backdrop slider { transition: 200ms ease-out; background-image: none; }
 
@@ -1149,13 +1149,13 @@ scale fill:disabled:backdrop, scale fill:disabled { border-color: transparent; b
 
 .osd scale fill:disabled:backdrop, .osd scale fill:disabled { border-color: transparent; background-color: transparent; }
 
-scale slider { min-height: 18px; min-width: 18px; margin: -9px; color: #241f31; background-color: #bcbeb9; border-color: #241f31; outline-color: rgba(176, 221, 126, 0.5); background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0.3), rgba(255, 255, 255, 0) 50%, rgba(0, 0, 0, 0) 50%, rgba(0, 0, 0, 0.15)); 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.5), 0 1px rgba(0, 0, 0, 0.1), 0 1px 2px rgba(0, 0, 0, 0.4); border: 1px solid #626262; border-radius: 100%; transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); transition-property: background, border, box-shadow; }
+scale slider { min-height: 18px; min-width: 18px; margin: -9px; color: #241f31; background-color: #bcbeb9; border-color: #241f31; outline-color: rgba(176, 221, 126, 0.5); background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0.3), rgba(255, 255, 255, 0) 50%, rgba(0, 0, 0, 0) 50%, rgba(0, 0, 0, 0.15)); 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.5), 0 1px 2px rgba(0, 0, 0, 0.4); border-width: 1px; border-style: solid; border-radius: 100%; transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); transition-property: background, border, box-shadow; }
 
 scale slider:hover { background-color: shade(#bcbeb9, 1.1); }
 
-scale slider:active { border-color: #8bcd41; }
+scale slider:active { border-color: #b0dd7e; }
 
-scale slider:disabled { color: #552222; background-color: #938989; background-image: none; }
+scale slider:disabled { color: #552222; border-color: #552222; background-color: #938989; background-image: none; }
 
 scale slider:backdrop { transition: 200ms ease-out; background-image: none; }
 
@@ -1531,7 +1531,7 @@ infobar.info button:hover, infobar.question button:hover, infobar.warning button
 
 infobar.info button:active, infobar.info button:checked, infobar.question button:active, infobar.question button:checked, infobar.warning button:active, infobar.warning button:checked, infobar.error button:active, infobar.error button:checked { box-shadow: 0 1px rgba(255, 255, 255, 0.5), inset 0 1px 2px rgba(0, 0, 0, 0.4); }
 
-infobar.info button:disabled, infobar.question button:disabled, infobar.warning button:disabled, infobar.error button:disabled { color: #552222; background-color: #938989; background-image: none; }
+infobar.info button:disabled, infobar.question button:disabled, infobar.warning button:disabled, infobar.error button:disabled { color: #552222; border-color: #552222; background-color: #938989; background-image: none; }
 
 infobar.info button:backdrop, infobar.question button:backdrop, infobar.warning button:backdrop, infobar.error button:backdrop { background-image: none; border-color: #8e8e8e; }
 
@@ -1681,7 +1681,7 @@ cursor-handle:hover { background-color: shade(#bcbeb9, 1.1); }
 
 cursor-handle:active { border-color: #8bcd41; }
 
-cursor-handle:disabled { color: #552222; background-color: #938989; background-image: none; }
+cursor-handle:disabled { color: #552222; border-color: #552222; background-color: #938989; background-image: none; }
 
 cursor-handle.top:dir(ltr), cursor-handle.bottom:dir(rtl) { border-radius: 100% 5px 5px 5px; }
 
diff --git a/gtk-4.0/gtk.css b/gtk-4.0/gtk.css
index 628ff80..6d4494a 100644
--- a/gtk-4.0/gtk.css
+++ b/gtk-4.0/gtk.css
@@ -242,7 +242,7 @@ scrollbar > range > trough > slider:backdrop, notebook > header > tabs > arrow:b
 
 scrollbar > range > trough > slider:backdrop:not(:disabled), notebook > header > tabs > arrow:backdrop:not(:disabled), button:backdrop.flat:not(:disabled), button:backdrop:not(:disabled) { -gtk-icon-filter: none; }
 
-scrollbar > range > trough > slider:disabled, notebook > header > tabs > arrow:disabled, button:disabled { color: #552222; background-color: #938989; background-image: none; -gtk-icon-filter: opacity(0.5); }
+scrollbar > range > trough > slider:disabled, notebook > header > tabs > arrow:disabled, button:disabled { color: #552222; border-color: #552222; background-color: #938989; background-image: none; -gtk-icon-filter: opacity(0.5); }
 
 scrollbar > range > trough > slider:disabled:active, notebook > header > tabs > arrow:disabled:active, scrollbar > range > trough > slider:disabled:checked, notebook > header > tabs > arrow:disabled:checked, button:disabled:active, button:disabled:checked { color: #552222; background-color: #979687; }
 
@@ -284,7 +284,7 @@ button.osd:active, button.osd:checked { border: none; box-shadow: none; }
 
 .app-notification button:active, popover.background.touch-selection button:active, popover.background.magnifier button:active, .app-notification button:checked, popover.background.touch-selection button:checked, popover.background.magnifier button:checked, .osd button:active:backdrop, .osd button:active, .osd button:checked:backdrop, .osd button:checked { box-shadow: 0 1px rgba(255, 255, 255, 0.5), inset 0 1px 2px rgba(0, 0, 0, 0.4); }
 
-.app-notification button:disabled, popover.background.touch-selection button:disabled, popover.background.magnifier button:disabled, .osd button:disabled:backdrop, .osd button:disabled { color: #552222; background-color: #938989; background-image: none; }
+.app-notification button:disabled, popover.background.touch-selection button:disabled, popover.background.magnifier button:disabled, .osd button:disabled:backdrop, .osd button:disabled { color: #552222; border-color: #552222; background-color: #938989; background-image: none; }
 
 .app-notification button.flat, popover.background.touch-selection button.flat, popover.background.magnifier button.flat, .osd button.flat { -gtk-icon-shadow: 0 1px black; }
 
@@ -292,7 +292,7 @@ button.osd:active, button.osd:checked { border: none; box-shadow: none; }
 
 .app-notification button.flat:hover, popover.background.touch-selection button.flat:hover, popover.background.magnifier button.flat:hover, .osd button.flat:hover { background-color: shade(rgba(103, 137, 180, 0.7), 1.1); }
 
-.app-notification button.flat:disabled, popover.background.touch-selection button.flat:disabled, popover.background.magnifier button.flat:disabled, .osd button.flat:disabled { color: #552222; background-color: #938989; background-image: none; }
+.app-notification button.flat:disabled, popover.background.touch-selection button.flat:disabled, popover.background.magnifier button.flat:disabled, .osd button.flat:disabled { color: #552222; border-color: #552222; background-color: #938989; background-image: none; }
 
 .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 button.flat:active, .osd button.flat:checked { box-shadow: 0 1px rgba(255, 255, 255, 0.5), inset 0 1px 2px rgba(0, 0, 0, 0.4); }
 
@@ -310,7 +310,7 @@ button.suggested-action:active, button.suggested-action:checked { box-shadow: 0
 
 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(176, 221, 126, 0.8); }
 
-button.suggested-action:disabled { color: #552222; background-color: #938989; background-image: none; }
+button.suggested-action:disabled { color: #552222; border-color: #552222; background-color: #938989; background-image: none; }
 
 button.suggested-action:disabled:active, button.suggested-action:disabled:checked { color: #552222; background-color: #979687; }
 
@@ -328,7 +328,7 @@ button.destructive-action:active, button.destructive-action:checked { box-shadow
 
 button.destructive-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(153, 0, 0, 0.8); }
 
-button.destructive-action:disabled { color: #552222; background-color: #938989; background-image: none; }
+button.destructive-action:disabled { color: #552222; border-color: #552222; background-color: #938989; background-image: none; }
 
 button.destructive-action:disabled:active, button.destructive-action:disabled:checked { color: #552222; background-color: #979687; }
 
@@ -367,7 +367,7 @@ modelbutton.flat { min-height: 26px; padding-left: 5px; padding-right: 5px; bord
 
 modelbutton.flat:hover:not(.osd):not(:checked):not(:active):not(:disabled):not(:backdrop) { background-color: shade(#bcbeb9, 1.1); }
 
-modelbutton.flat:disabled { color: #552222; background-color: #938989; background-image: none; }
+modelbutton.flat:disabled { color: #552222; border-color: #552222; background-color: #938989; background-image: none; }
 
 modelbutton.flat arrow { background: none; min-width: 16px; min-height: 16px; opacity: 1; }
 
@@ -904,7 +904,7 @@ switch:focus:focus-visible { outline-color: rgba(176, 221, 126, 0.5); outline-wi
 
 headerbar switch { background-color: #7c7c7c; }
 
-switch:checked { color: #000000; border-color: #8bcd41; background-color: #b0dd7e; }
+switch:checked { color: #000000; border-color: #000000; background-color: #b0dd7e; }
 
 switch:disabled { color: #552222; border-color: #797979; background-color: #938989; text-shadow: none; }
 
@@ -916,7 +916,7 @@ switch:hover > slider { background-color: shade(#bcbeb9, 1.1); }
 
 switch:checked > slider { border: 1px solid #8bcd41; }
 
-switch:disabled > slider { color: #552222; background-color: #938989; background-image: none; }
+switch:disabled > slider { color: #552222; border-color: #552222; background-color: #938989; background-image: none; }
 
 row:selected switch { outline-color: rgba(255, 255, 255, 0.8); box-shadow: none; border-color: #8bcd41; }
 
@@ -1036,9 +1036,9 @@ scale > trough > slider { min-height: 18px; min-width: 18px; margin: -9px; color
 
 scale > trough > slider:hover { background-color: shade(#bcbeb9, 1.1); }
 
-scale > trough > slider:active { border-color: #8bcd41; }
+scale > trough > slider:active { border-color: #b0dd7e; }
 
-scale > trough > slider:disabled { color: #552222; background-color: #938989; background-image: none; }
+scale > trough > slider:disabled { color: #552222; border-color: #552222; background-color: #938989; background-image: none; }
 
 row:selected scale > trough > slider:disabled, row:selected scale > trough > slider { border-color: #8bcd41; }
 
@@ -1572,7 +1572,7 @@ cursor-handle:hover { background-color: shade(#bcbeb9, 1.1); }
 
 cursor-handle:active { border-color: #8bcd41; }
 
-cursor-handle:disabled { color: #552222; background-color: #938989; background-image: none; }
+cursor-handle:disabled { color: #552222; border-color: #552222; background-color: #938989; background-image: none; }
 
 cursor-handle.top:dir(ltr), cursor-handle.bottom:dir(rtl) { border-radius: 100% 5px 5px 5px; }
 
diff --git a/previews/gtk3wf-1-Soil.png b/previews/gtk3wf-1-Soil.png
new file mode 100644
index 0000000..ee613e2
Binary files /dev/null and b/previews/gtk3wf-1-Soil.png differ
diff --git a/source/common/buttons.scss b/source/common/buttons.scss
index bb5d7cd..4fcac02 100644
--- a/source/common/buttons.scss
+++ b/source/common/buttons.scss
@@ -98,6 +98,9 @@ $_default_button_c: $button_bg;
 						transparentize($shadow_hard_color, 1) 50%,
 						transparentize($shadow_hard_color, if($variant == 'light',0.85,0.7)) );
 	
+	//remove borders on all buttons...
+	//border-width: 0;
+	
 	@if $t==normal or $t==normal-alt  {
 	//
 	// normal button
@@ -158,6 +161,7 @@ $_default_button_c: $button_bg;
   // insensitive button
   //
   		color: $insensitive_fg_color;
+  		border-color: $insensitive_fg_color;
   		background-color: $insensitive_bg_color;
   		background-image: if($backimage==null, none, $backimage);
   	}
diff --git a/source/common/common_colors.scss b/source/common/common_colors.scss
index f5db7c8..19bd253 100644
--- a/source/common/common_colors.scss
+++ b/source/common/common_colors.scss
@@ -72,7 +72,7 @@ $suggested_bg_color: $selected_bg_color;
 $suggested_border_color: $selected_borders_color;
 $progress_bg_color: $selected_bg_color;
 $progress_border_color: $selected_borders_color;
-$checkradio_bg_color: if($variant == 'light', $selected_bg_color, lighten($selected_bg_color,10%));
+$checkradio_bg_color: $selected_bg_color; //if($variant == 'light', $selected_bg_color, lighten($selected_bg_color,10%));
 $checkradio_fg_color: $selected_fg_color;
 $checkradio_borders_color: $selected_fg_color;//if($variant == 'light', darken($checkradio_bg_color,20%), darken($checkradio_bg_color,40%));
 $focus_border_color: if($variant == 'light', transparentize($selected_bg_color, 0.5), transparentize($selected_bg_color, 0.3));
diff --git a/source/gtk3/_common.scss b/source/gtk3/_common.scss
index ae5ab75..e2791cb 100644
--- a/source/gtk3/_common.scss
+++ b/source/gtk3/_common.scss
@@ -3183,16 +3183,20 @@ scale {
     min-height: 18px;
     min-width: 18px;
     margin: -9px;
-    @include button(normal-alt, $edge: $shadow_color);
+    //@include button(normal-alt, $edge: $shadow_color);
+    @include button(normal);
 
-    border: 1px solid darken($alt_borders_color, 3%);
+    //border: 1px solid darken($alt_borders_color, 3%);
+    border-width: 1px;
+    border-style: solid;
     border-radius: 100%;
     transition: $button_transition;
     transition-property: background, border, box-shadow;
 
-    &:hover { @include button(hover-alt, $edge: $shadow_color); }
+    //&:hover { @include button(hover-alt, $edge: $shadow_color); }
+    &:hover { @include button(hover); }
 
-    &:active { border-color: $progress_border_color; }
+    &:active { border-color: $selected_bg_color; }
 
     &:disabled { @include button(insensitive); }
 
diff --git a/source/gtk3/_drawing.scss b/source/gtk3/_drawing.scss
index 7bf7123..63bd44e 100644
--- a/source/gtk3/_drawing.scss
+++ b/source/gtk3/_drawing.scss
@@ -3,7 +3,7 @@
 // generic drawing of more complex things
 
 //to allow some common mixins to know whether they've been called for a gtk3 or gtk4 widget, because there are some things that are different.
-$gtk: 4;
+$gtk: 3;
 
 
 @function _widget_edge($c:$borders_edge) {
@@ -27,8 +27,9 @@ $gtk: 4;
 
 // entries
 @function entry_focus_border($fc:$selected_bg_color) {
-  @if $variant == 'light' { @return $fc; }
-  @else { @return if($fc==$selected_bg_color, $selected_borders_color, darken($fc, 35%)); }
+  //@if $variant == 'light' { @return $fc; }
+  //@else { @return if($fc==$selected_bg_color, $selected_borders_color, darken($fc, 35%)); }
+  @return $fc;
 }
 
 @function entry_focus_shadow($fc:$selected_bg_color) { @return inset 0 0 0 1px $fc; }
diff --git a/source/gtk3/gtk-new.css b/source/gtk3/gtk-new.css
index 4e992c2..4983107 100644
--- a/source/gtk3/gtk-new.css
+++ b/source/gtk3/gtk-new.css
@@ -242,7 +242,7 @@ button.titlebutton:backdrop:not(:hover):not(:active):not(:checked):not(:disabled
 
 button.titlebutton:disabled:not(:hover):not(:active):not(:checked):not(:disabled), button.sidebar-button:disabled, notebook > header > tabs > arrow:disabled, scrollbar slider.flat:disabled, button.flat:disabled, button.flat:backdrop:disabled { background-color: #938989; }
 
-scrollbar slider:disabled, notebook > header > tabs > arrow:disabled, button:disabled { color: #552222; background-color: #938989; background-image: none; }
+scrollbar slider:disabled, notebook > header > tabs > arrow:disabled, button:disabled { color: #552222; border-color: #552222; background-color: #938989; background-image: none; }
 
 scrollbar slider:disabled:active, notebook > header > tabs > arrow:disabled:active, scrollbar slider:disabled:checked, notebook > header > tabs > arrow:disabled:checked, button:disabled:active, button:disabled:checked { color: #552222; background-color: #979687; }
 
@@ -280,7 +280,7 @@ button.osd:backdrop { border: none; }
 
 .app-notification button:active, popover.background.touch-selection button:active, popover.background.magnifier button:active, .app-notification button:checked, popover.background.touch-selection button:checked, popover.background.magnifier button:checked, .osd button:active:backdrop, .osd button:active, .osd button:checked:backdrop, .osd button:checked { box-shadow: 0 1px rgba(255, 255, 255, 0.5), inset 0 1px 2px rgba(0, 0, 0, 0.4); }
 
-.app-notification button:disabled, popover.background.touch-selection button:disabled, popover.background.magnifier button:disabled, .osd button:disabled:backdrop, .osd button:disabled { color: #552222; background-color: #938989; background-image: none; }
+.app-notification button:disabled, popover.background.touch-selection button:disabled, popover.background.magnifier button:disabled, .osd button:disabled:backdrop, .osd button:disabled { color: #552222; border-color: #552222; background-color: #938989; background-image: none; }
 
 .app-notification button:backdrop, popover.background.touch-selection button:backdrop, popover.background.magnifier button:backdrop, .osd button:backdrop { background-image: none; }
 
@@ -290,7 +290,7 @@ button.osd:backdrop { border: none; }
 
 .app-notification button.flat:hover, popover.background.touch-selection button.flat:hover, popover.background.magnifier button.flat:hover, .osd button.flat:hover { background-color: shade(rgba(103, 137, 180, 0.7), 1.1); }
 
-.app-notification button.flat:disabled, popover.background.touch-selection button.flat:disabled, popover.background.magnifier button.flat:disabled, .osd button.flat:disabled { color: #552222; background-color: #938989; background-image: none; background-color: #938989; background-image: none; border-color: transparent; box-shadow: none; }
+.app-notification button.flat:disabled, popover.background.touch-selection button.flat:disabled, popover.background.magnifier button.flat:disabled, .osd button.flat:disabled { color: #552222; border-color: #552222; background-color: #938989; background-image: none; background-color: #938989; background-image: none; border-color: transparent; box-shadow: none; }
 
 .app-notification button.flat:backdrop, popover.background.touch-selection button.flat:backdrop, popover.background.magnifier button.flat:backdrop, .osd button.flat: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; }
 
@@ -308,7 +308,7 @@ button.suggested-action:backdrop, button.suggested-action.flat:backdrop { backgr
 
 button.suggested-action.flat:backdrop, button.suggested-action.flat:disabled, button.suggested-action.flat: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(176, 221, 126, 0.8); }
 
-button.suggested-action:disabled { color: #552222; background-color: #938989; background-image: none; }
+button.suggested-action:disabled { color: #552222; border-color: #552222; background-color: #938989; background-image: none; }
 
 button.suggested-action:disabled:active, button.suggested-action:disabled:checked { color: #552222; background-color: #979687; }
 
@@ -324,7 +324,7 @@ button.destructive-action:backdrop, button.destructive-action.flat:backdrop { ba
 
 button.destructive-action.flat:backdrop, button.destructive-action.flat:disabled, button.destructive-action.flat: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(153, 0, 0, 0.8); }
 
-button.destructive-action:disabled { color: #552222; background-color: #938989; background-image: none; }
+button.destructive-action:disabled { color: #552222; border-color: #552222; background-color: #938989; background-image: none; }
 
 button.destructive-action:disabled:active, button.destructive-action:disabled:checked { color: #552222; background-color: #979687; }
 
@@ -366,7 +366,7 @@ stacksidebar row.needs-attention > label:dir(rtl), .stack-switcher > button.need
 
 .inline-toolbar toolbutton > button:active, .inline-toolbar toolbutton > button:checked { box-shadow: 0 1px rgba(255, 255, 255, 0.5), inset 0 1px 2px rgba(0, 0, 0, 0.4); }
 
-.inline-toolbar toolbutton > button:disabled { color: #552222; background-color: #938989; background-image: none; }
+.inline-toolbar toolbutton > button:disabled { color: #552222; border-color: #552222; background-color: #938989; background-image: none; }
 
 .inline-toolbar toolbutton > button:disabled:active, .inline-toolbar toolbutton > button:disabled:checked { color: #552222; background-color: #979687; }
 
@@ -556,7 +556,7 @@ searchbar > revealer > box { margin: -6px; padding: 6px; }
 
 .selection-mode button.titlebutton:backdrop, .selection-mode button.titlebutton:disabled, .selection-mode .titlebar:not(headerbar) button.flat:backdrop, .selection-mode .titlebar:not(headerbar) button.flat:disabled, .selection-mode.titlebar:not(headerbar) button.flat:backdrop, .selection-mode.titlebar:not(headerbar) button.flat:disabled, .selection-mode headerbar button.flat:backdrop, .selection-mode headerbar button.flat:disabled, .selection-mode headerbar button.flat:backdrop:disabled, headerbar.selection-mode button.flat:backdrop, headerbar.selection-mode button.flat:disabled, headerbar.selection-mode button.flat: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; }
 
-.selection-mode .titlebar:not(headerbar) button:disabled, .selection-mode.titlebar:not(headerbar) button:disabled, .selection-mode headerbar button:disabled, headerbar.selection-mode button:disabled { color: #552222; background-color: #938989; background-image: none; }
+.selection-mode .titlebar:not(headerbar) button:disabled, .selection-mode.titlebar:not(headerbar) button:disabled, .selection-mode headerbar button:disabled, headerbar.selection-mode button:disabled { color: #552222; border-color: #552222; background-color: #938989; background-image: none; }
 
 .selection-mode .titlebar:not(headerbar) button:disabled:active, .selection-mode .titlebar:not(headerbar) button:disabled:checked, .selection-mode.titlebar:not(headerbar) button:disabled:active, .selection-mode.titlebar:not(headerbar) button:disabled:checked, .selection-mode headerbar button:disabled:active, .selection-mode headerbar button:disabled:checked, headerbar.selection-mode button:disabled:active, headerbar.selection-mode button:disabled:checked { color: #552222; background-color: #979687; }
 
@@ -566,7 +566,7 @@ searchbar > revealer > box { margin: -6px; padding: 6px; }
 
 .selection-mode .titlebar:not(headerbar) button.suggested-action:active, .selection-mode.titlebar:not(headerbar) button.suggested-action:active, .selection-mode headerbar button.suggested-action:active, headerbar.selection-mode button.suggested-action:active { box-shadow: 0 1px rgba(255, 255, 255, 0.5), inset 0 1px 2px rgba(0, 0, 0, 0.4); border-color: #8bcd41; }
 
-.selection-mode .titlebar:not(headerbar) button.suggested-action:disabled, .selection-mode.titlebar:not(headerbar) button.suggested-action:disabled, .selection-mode headerbar button.suggested-action:disabled, headerbar.selection-mode button.suggested-action:disabled { color: #552222; background-color: #938989; background-image: none; border-color: #8bcd41; }
+.selection-mode .titlebar:not(headerbar) button.suggested-action:disabled, .selection-mode.titlebar:not(headerbar) button.suggested-action:disabled, .selection-mode headerbar button.suggested-action:disabled, headerbar.selection-mode button.suggested-action:disabled { color: #552222; border-color: #552222; background-color: #938989; background-image: none; border-color: #8bcd41; }
 
 .selection-mode .titlebar:not(headerbar) button.suggested-action:backdrop, .selection-mode.titlebar:not(headerbar) button.suggested-action:backdrop, .selection-mode headerbar button.suggested-action:backdrop, headerbar.selection-mode button.suggested-action:backdrop { background-image: none; border-color: #8bcd41; }
 
@@ -991,7 +991,7 @@ switch:hover slider { background-color: shade(#bcbeb9, 1.1); }
 
 switch:checked > slider { border: 1px solid #000000; }
 
-switch:disabled slider { color: #552222; background-color: #938989; background-image: none; }
+switch:disabled slider { color: #552222; border-color: #552222; background-color: #938989; background-image: none; }
 
 switch:backdrop slider { transition: 200ms ease-out; background-image: none; }
 
@@ -1149,13 +1149,13 @@ scale fill:disabled:backdrop, scale fill:disabled { border-color: transparent; b
 
 .osd scale fill:disabled:backdrop, .osd scale fill:disabled { border-color: transparent; background-color: transparent; }
 
-scale slider { min-height: 18px; min-width: 18px; margin: -9px; color: #241f31; background-color: #bcbeb9; border-color: #241f31; outline-color: rgba(176, 221, 126, 0.5); background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0.3), rgba(255, 255, 255, 0) 50%, rgba(0, 0, 0, 0) 50%, rgba(0, 0, 0, 0.15)); 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.5), 0 1px rgba(0, 0, 0, 0.1), 0 1px 2px rgba(0, 0, 0, 0.4); border: 1px solid #626262; border-radius: 100%; transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); transition-property: background, border, box-shadow; }
+scale slider { min-height: 18px; min-width: 18px; margin: -9px; color: #241f31; background-color: #bcbeb9; border-color: #241f31; outline-color: rgba(176, 221, 126, 0.5); background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0.3), rgba(255, 255, 255, 0) 50%, rgba(0, 0, 0, 0) 50%, rgba(0, 0, 0, 0.15)); 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.5), 0 1px 2px rgba(0, 0, 0, 0.4); border-width: 1px; border-style: solid; border-radius: 100%; transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); transition-property: background, border, box-shadow; }
 
 scale slider:hover { background-color: shade(#bcbeb9, 1.1); }
 
-scale slider:active { border-color: #8bcd41; }
+scale slider:active { border-color: #b0dd7e; }
 
-scale slider:disabled { color: #552222; background-color: #938989; background-image: none; }
+scale slider:disabled { color: #552222; border-color: #552222; background-color: #938989; background-image: none; }
 
 scale slider:backdrop { transition: 200ms ease-out; background-image: none; }
 
@@ -1531,7 +1531,7 @@ infobar.info button:hover, infobar.question button:hover, infobar.warning button
 
 infobar.info button:active, infobar.info button:checked, infobar.question button:active, infobar.question button:checked, infobar.warning button:active, infobar.warning button:checked, infobar.error button:active, infobar.error button:checked { box-shadow: 0 1px rgba(255, 255, 255, 0.5), inset 0 1px 2px rgba(0, 0, 0, 0.4); }
 
-infobar.info button:disabled, infobar.question button:disabled, infobar.warning button:disabled, infobar.error button:disabled { color: #552222; background-color: #938989; background-image: none; }
+infobar.info button:disabled, infobar.question button:disabled, infobar.warning button:disabled, infobar.error button:disabled { color: #552222; border-color: #552222; background-color: #938989; background-image: none; }
 
 infobar.info button:backdrop, infobar.question button:backdrop, infobar.warning button:backdrop, infobar.error button:backdrop { background-image: none; border-color: #8e8e8e; }
 
@@ -1681,7 +1681,7 @@ cursor-handle:hover { background-color: shade(#bcbeb9, 1.1); }
 
 cursor-handle:active { border-color: #8bcd41; }
 
-cursor-handle:disabled { color: #552222; background-color: #938989; background-image: none; }
+cursor-handle:disabled { color: #552222; border-color: #552222; background-color: #938989; background-image: none; }
 
 cursor-handle.top:dir(ltr), cursor-handle.bottom:dir(rtl) { border-radius: 100% 5px 5px 5px; }
 
diff --git a/source/gtk4/_common.scss b/source/gtk4/_common.scss
index 076a08d..2ad52ba 100644
--- a/source/gtk4/_common.scss
+++ b/source/gtk4/_common.scss
@@ -2362,8 +2362,8 @@ switch {
 
   &:checked {
     color: $selected_fg_color;
-    border-color: $switch_borders_color;
-    background-color: $switch_bg_color;
+    border-color: $checkradio_borders_color;
+    background-color: $checkradio_bg_color;
   }
 
   &:disabled {
@@ -2694,7 +2694,7 @@ scale {
 
     &:hover { @include button(hover); }
 
-    &:active { border-color: $selected_borders_color; }
+    &:active { border-color: $selected_bg_color; }
 
     &:disabled { @include button(insensitive); }
 
diff --git a/source/gtk4/gtk-new.css b/source/gtk4/gtk-new.css
index 628ff80..6d4494a 100644
--- a/source/gtk4/gtk-new.css
+++ b/source/gtk4/gtk-new.css
@@ -242,7 +242,7 @@ scrollbar > range > trough > slider:backdrop, notebook > header > tabs > arrow:b
 
 scrollbar > range > trough > slider:backdrop:not(:disabled), notebook > header > tabs > arrow:backdrop:not(:disabled), button:backdrop.flat:not(:disabled), button:backdrop:not(:disabled) { -gtk-icon-filter: none; }
 
-scrollbar > range > trough > slider:disabled, notebook > header > tabs > arrow:disabled, button:disabled { color: #552222; background-color: #938989; background-image: none; -gtk-icon-filter: opacity(0.5); }
+scrollbar > range > trough > slider:disabled, notebook > header > tabs > arrow:disabled, button:disabled { color: #552222; border-color: #552222; background-color: #938989; background-image: none; -gtk-icon-filter: opacity(0.5); }
 
 scrollbar > range > trough > slider:disabled:active, notebook > header > tabs > arrow:disabled:active, scrollbar > range > trough > slider:disabled:checked, notebook > header > tabs > arrow:disabled:checked, button:disabled:active, button:disabled:checked { color: #552222; background-color: #979687; }
 
@@ -284,7 +284,7 @@ button.osd:active, button.osd:checked { border: none; box-shadow: none; }
 
 .app-notification button:active, popover.background.touch-selection button:active, popover.background.magnifier button:active, .app-notification button:checked, popover.background.touch-selection button:checked, popover.background.magnifier button:checked, .osd button:active:backdrop, .osd button:active, .osd button:checked:backdrop, .osd button:checked { box-shadow: 0 1px rgba(255, 255, 255, 0.5), inset 0 1px 2px rgba(0, 0, 0, 0.4); }
 
-.app-notification button:disabled, popover.background.touch-selection button:disabled, popover.background.magnifier button:disabled, .osd button:disabled:backdrop, .osd button:disabled { color: #552222; background-color: #938989; background-image: none; }
+.app-notification button:disabled, popover.background.touch-selection button:disabled, popover.background.magnifier button:disabled, .osd button:disabled:backdrop, .osd button:disabled { color: #552222; border-color: #552222; background-color: #938989; background-image: none; }
 
 .app-notification button.flat, popover.background.touch-selection button.flat, popover.background.magnifier button.flat, .osd button.flat { -gtk-icon-shadow: 0 1px black; }
 
@@ -292,7 +292,7 @@ button.osd:active, button.osd:checked { border: none; box-shadow: none; }
 
 .app-notification button.flat:hover, popover.background.touch-selection button.flat:hover, popover.background.magnifier button.flat:hover, .osd button.flat:hover { background-color: shade(rgba(103, 137, 180, 0.7), 1.1); }
 
-.app-notification button.flat:disabled, popover.background.touch-selection button.flat:disabled, popover.background.magnifier button.flat:disabled, .osd button.flat:disabled { color: #552222; background-color: #938989; background-image: none; }
+.app-notification button.flat:disabled, popover.background.touch-selection button.flat:disabled, popover.background.magnifier button.flat:disabled, .osd button.flat:disabled { color: #552222; border-color: #552222; background-color: #938989; background-image: none; }
 
 .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 button.flat:active, .osd button.flat:checked { box-shadow: 0 1px rgba(255, 255, 255, 0.5), inset 0 1px 2px rgba(0, 0, 0, 0.4); }
 
@@ -310,7 +310,7 @@ button.suggested-action:active, button.suggested-action:checked { box-shadow: 0
 
 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(176, 221, 126, 0.8); }
 
-button.suggested-action:disabled { color: #552222; background-color: #938989; background-image: none; }
+button.suggested-action:disabled { color: #552222; border-color: #552222; background-color: #938989; background-image: none; }
 
 button.suggested-action:disabled:active, button.suggested-action:disabled:checked { color: #552222; background-color: #979687; }
 
@@ -328,7 +328,7 @@ button.destructive-action:active, button.destructive-action:checked { box-shadow
 
 button.destructive-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(153, 0, 0, 0.8); }
 
-button.destructive-action:disabled { color: #552222; background-color: #938989; background-image: none; }
+button.destructive-action:disabled { color: #552222; border-color: #552222; background-color: #938989; background-image: none; }
 
 button.destructive-action:disabled:active, button.destructive-action:disabled:checked { color: #552222; background-color: #979687; }
 
@@ -367,7 +367,7 @@ modelbutton.flat { min-height: 26px; padding-left: 5px; padding-right: 5px; bord
 
 modelbutton.flat:hover:not(.osd):not(:checked):not(:active):not(:disabled):not(:backdrop) { background-color: shade(#bcbeb9, 1.1); }
 
-modelbutton.flat:disabled { color: #552222; background-color: #938989; background-image: none; }
+modelbutton.flat:disabled { color: #552222; border-color: #552222; background-color: #938989; background-image: none; }
 
 modelbutton.flat arrow { background: none; min-width: 16px; min-height: 16px; opacity: 1; }
 
@@ -904,7 +904,7 @@ switch:focus:focus-visible { outline-color: rgba(176, 221, 126, 0.5); outline-wi
 
 headerbar switch { background-color: #7c7c7c; }
 
-switch:checked { color: #000000; border-color: #8bcd41; background-color: #b0dd7e; }
+switch:checked { color: #000000; border-color: #000000; background-color: #b0dd7e; }
 
 switch:disabled { color: #552222; border-color: #797979; background-color: #938989; text-shadow: none; }
 
@@ -916,7 +916,7 @@ switch:hover > slider { background-color: shade(#bcbeb9, 1.1); }
 
 switch:checked > slider { border: 1px solid #8bcd41; }
 
-switch:disabled > slider { color: #552222; background-color: #938989; background-image: none; }
+switch:disabled > slider { color: #552222; border-color: #552222; background-color: #938989; background-image: none; }
 
 row:selected switch { outline-color: rgba(255, 255, 255, 0.8); box-shadow: none; border-color: #8bcd41; }
 
@@ -1036,9 +1036,9 @@ scale > trough > slider { min-height: 18px; min-width: 18px; margin: -9px; color
 
 scale > trough > slider:hover { background-color: shade(#bcbeb9, 1.1); }
 
-scale > trough > slider:active { border-color: #8bcd41; }
+scale > trough > slider:active { border-color: #b0dd7e; }
 
-scale > trough > slider:disabled { color: #552222; background-color: #938989; background-image: none; }
+scale > trough > slider:disabled { color: #552222; border-color: #552222; background-color: #938989; background-image: none; }
 
 row:selected scale > trough > slider:disabled, row:selected scale > trough > slider { border-color: #8bcd41; }
 
@@ -1572,7 +1572,7 @@ cursor-handle:hover { background-color: shade(#bcbeb9, 1.1); }
 
 cursor-handle:active { border-color: #8bcd41; }
 
-cursor-handle:disabled { color: #552222; background-color: #938989; background-image: none; }
+cursor-handle:disabled { color: #552222; border-color: #552222; background-color: #938989; background-image: none; }
 
 cursor-handle.top:dir(ltr), cursor-handle.bottom:dir(rtl) { border-radius: 100% 5px 5px 5px; }
 
diff --git a/source/templates/variables.sh b/source/templates/colorscheme-Skewaita_original_light.sh
similarity index 75%
rename from source/templates/variables.sh
rename to source/templates/colorscheme-Skewaita_original_light.sh
index 1d8973b..6a5c7fe 100755
--- a/source/templates/variables.sh
+++ b/source/templates/colorscheme-Skewaita_original_light.sh
@@ -1,13 +1,13 @@
 #! /bin/bash
 
-# This file contains a color scheme for Skewaita
+# This file contains a color scheme for Skewaita GTK theme
 # To use it, follow these steps:
-#  1. execute process_variables <name of the color scheme file>
-#     (this processes templates to create somw files, which are then copyied to their respective source directory) 
-#  2. go up one directory, to source, and execute "./compile.sh light" or "./compile.sh dark" depending on whether the theme is light or dark
+#  1. execute ./use_scheme.sh <this_file_name>
+#     (this processes templates to create some files, which are then copyied to their respective source directory) 
+#  2. go up one directory, to "source", and execute "./compile.sh light" or "./compile.sh dark" depending on whether the theme is light or dark
 
 
-# Original Skweaita: light, with grayish tones and light green accents, VERY easy on the eyes
+# Original Skewaita: light, with grayish tones and light green accents, VERY easy on the eyes
 
 vwindow_fg="#241f31"
 vwindow_bg="#a7a7a7"
diff --git a/source/templates/colorscheme-Soil_dark.sh b/source/templates/colorscheme-Soil_dark.sh
new file mode 100755
index 0000000..e206f38
--- /dev/null
+++ b/source/templates/colorscheme-Soil_dark.sh
@@ -0,0 +1,53 @@
+#! /bin/bash
+
+# This file contains a color scheme for Skewaita GTK theme
+# To use it, follow these steps:
+#  1. execute ./use_scheme.sh <this_file_name>
+#     (this processes templates to create some files, which are then copyied to their respective source directory) 
+#  2. go up one directory, to "source", and execute "./compile.sh light" or "./compile.sh dark" depending on whether the theme is light or dark
+
+
+# Soil colors: dark gray, with green accents, readable and easy on the eyes
+
+vwindow_fg="#c0c0c0"
+vwindow_bg="#3f3e3e"
+vtext_widget_fg="#b0b0b0"
+vtext_widget_bg="#2d2c2c"
+
+vselected_fg="#b5f08f"
+vselected_bg="#669900"
+
+vbutton_fg=$vtext_widget_fg
+vbutton_bg="#343F37"
+vbutton_checked_bg=$vselected_bg
+vbutton_checked_fg=$vselected_fg
+
+
+vdisabled_fg="#a14242"
+vdisabled_bg="#482B2B"
+
+# Usually an automatic fg color on these backgrounds should check this value!
+
+vwarningc="#f57900"
+verrorc="#CC0000"
+vsuccessc="#33d17a"
+
+
+vtitlebar_active_fg=$vselected_fg
+vtitlebar_active_bg=$vselected_bg
+
+vtitlebar_backdrop_fg=$vwindow_fg
+vtitlebar_backdrop_bg=$vwindow_bg
+
+vhint_fg="#5696c1"
+vhint_bg="#25456e"
+
+vosd_fg=$vhint_fg
+vosd_bg=$vhint_bg
+
+vlink_fg="#99c1f1"
+vlink_visited_fg="#dc8add"
+
+
+# export	vwindow_fg	vwindow_bg	vtext_widget_fg	vtext_widget_bg		vselected_fg	vselected_bg		vbutton_fg	vbutton_bg	vbutton_checked_bg	vbutton_checked_fg			vdisabled_fg	vdisabled_bg				vwarningc	verrorc	vsuccessc			vtitlebar_active_fg	vtitlebar_active_bg		vtitlebar_backdrop_fg	vtitlebar_backdrop_bg		vhint_fg	vhint_bg		vosd_fg	vosd_bg		vlink_fg	vlink_visited_fg
+
diff --git a/source/templates/process_variables.sh b/source/templates/process_variables.sh
deleted file mode 100755
index dfa6a92..0000000
--- a/source/templates/process_variables.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#! /bin/bash
-
-source variables.sh
-
-# envsubst <_theme_colors.scss >theme_colors_.scss.processed # not working!
-
-echo "Variables read; parsing files..."
-
-for FILE in "_theme_colors.scss" "gtkrc" ; do
-	echo "   processing $FILE..."
-	while read -r line ; do
-    	while [[ "$line" =~ (\$\{[a-zA-Z_][a-zA-Z_0-9]*\}) ]] ; do
-        	LHS=${BASH_REMATCH[1]}
-        	RHS="$(eval echo "\"$LHS\"")"
-        	line=${line//$LHS/$RHS}
-    	done
-    	echo "$line" 
-	done < "$FILE" > "$FILE.processed"
-done
-
-echo "Done; copying processed files"
-
-cp _theme_colors.scss.processed ../common/_theme_colors.scss
-cp gtkrc.processed ../../gtk-2.0/gtkrc
diff --git a/source/templates/use_scheme.sh b/source/templates/use_scheme.sh
new file mode 100755
index 0000000..d2014da
--- /dev/null
+++ b/source/templates/use_scheme.sh
@@ -0,0 +1,56 @@
+#! /bin/bash
+
+# exit when any command fails
+set -e
+
+usage () {
+    echo -e "\nUsage:"
+    echo -e $(basename "$0") "name_of_color_scheme_file.sh\n"
+    echo -e "Changes current color scheme for Skewaita, using the specified color scheme bash file."
+    echo -e "After this step, you need to rebuild the theme:"
+    echo -e 'go up one directory, to "source", and execute "./compile.sh light" or "./compile.sh dark" depending on whether the theme is light or dark\n'
+}
+
+
+# Check for correct parameters and the existence of color scheme file
+
+if [[ $# -ne 1 ]]
+then
+	usage
+	exit 1
+fi
+
+filename=$1
+
+# if color scheme filename provided does not include .sh extension, add it
+[[ "$filename" == *.sh ]] || filename="$filename.sh"
+
+echo -e "\nReading color scheme from file '$filename'\n"
+
+
+source $filename
+
+# envsubst <_theme_colors.scss >theme_colors_.scss.processed # not working!
+
+echo "New color scheme read; processing template files..."
+
+for FILE in "_theme_colors.scss" "gtkrc" ; do
+	echo "   processing $FILE..."
+	while read -r line ; do
+    	while [[ "$line" =~ (\$\{[a-zA-Z_][a-zA-Z_0-9]*\}) ]] ; do
+        	LHS=${BASH_REMATCH[1]}
+        	RHS="$(eval echo "\"$LHS\"")"
+        	line=${line//$LHS/$RHS}
+    	done
+    	echo "$line" 
+	done < "$FILE" > "$FILE.processed"
+done
+
+echo "Done; copying processed files"
+
+cp _theme_colors.scss.processed ../common/_theme_colors.scss
+cp gtkrc.processed ../../gtk-2.0/gtkrc
+echo -e "\nSUCCESS\n"
+echo "Now you need to rebuild the theme:"
+echo -e 'go up one directory, to "source", and execute "./compile.sh light" or "./compile.sh dark" depending on whether the theme is light or dark\n'
+