diff --git a/src/_functions.scss b/src/_functions.scss
index 6c37de1..3ca9405 100644
--- a/src/_functions.scss
+++ b/src/_functions.scss
@@ -1,252 +1,252 @@
 //
 // Theme color functions
 //
 
 
 // Button Color
 @function b_color($c: normal) {
   @if $c == normal {
     @return $ButtonBackgroundNormal;
   }
   @if $c == hover {
     @return $ButtonDecorationHover;
   }
   @if $c == active {
     @return $ButtonDecorationFocus;
   }
   @if $c == text {
     @return $ButtonForegroundNormal;
   }
   @if $c == active-text {
     @return $SelectionForegroundNormal;
   }
 }
 
 // Selection Color
 @function s_color($c: normal) {
   @if $c == normal {
     @return $SelectionBackgroundNormal;
   }
   @if $c == hover {
     @return $SelectionDecorationHover;
   }
   @if $c == text {
     @return $SelectionForegroundNormal;
   }
   @if $c == backdrop {
     @return transparentize($SelectionBackgroundNormal,0.5);
   }
 }
 
 // View Color
 @function v_color($c: normal) {
   @if $c == normal {
     @return $ViewBackgroundNormal;
   }
   @if $c == hover {
     @return $ViewDecorationHover;
   }
   @if $c == active {
     @return $ViewDecorationFocus;
   }
   @if $c == text {
     @return $ViewForegroundNormal;
   }
 }
 
 // Window Color
 @function w_color($c: normal) {
   @if $c == normal {
     @return $WindowBackgroundNormal;
   }
   @if $c == text {
     @return $WindowForegroundNormal;
   }
 }
 
 // Titlebar color
 @function t_color($c: text) {
   @if $c == text {
     @return $WMactiveForeground;
   }
   @if $c == background {
     @return $WMactiveBackground;
   }
   @if $c == backdrop-text {
     @return $WMinactiveForeground;
   }
   @if $c == backdrop-background {
     @return $WMinactiveBackground;
   }
 }
 
 @function tooltip($c: text) {
   @if $c == text {
     @return $TooltipForegroundNormal;
   }
   @if $c == background {
     @return $TooltipBackgroundNormal;
   }
 }
 
 @function button_gradient($c, $state: normal) {
   @if $state == normal {
-    @return linear-gradient(to bottom, change-color($c, $lightness: lightness($c)*1.01), change-color($c, $lightness:lightness($c)/1.03));
+    @return linear-gradient(to bottom, change-color($c, $lightness: min(lightness($c)*1.01,100%)), change-color($c, $lightness:min(lightness($c)/1.03,100%)));
   }
   @else {
-    @return linear-gradient(to bottom, change-color($c, $lightness: lightness($c)*1.03), change-color($c, $lightness:lightness($c)/1.10));
+    @return linear-gradient(to bottom, change-color($c, $lightness: min(lightness($c)*1.03,100%)), change-color($c, $lightness:min(lightness($c)/1.10,100%)));
   }
 }
 
 $border_color: mix($WindowBackgroundNormal,$WindowForegroundNormal, 75%);
 $menu_color: w_color(normal);
 $link_color: $ViewForegroundLink;
 $link_visited_color: $ViewForegroundVisited;
 
 $warning_color: $ViewForegroundNeutral;
 $error_color: $ViewForegroundNegative;
 $success_color: $ViewForegroundPositive;
 $destructive_color: $error_color;
 
 $trough_color: mix(w_color(normal),w_color(text),70%);
 $scrollbar_color: mix($trough_color,v_color(text),50%);
 //
 // Color effects
 //
 //
 // Color maps for color effect functions
 //
 $Color: (
   Disabled: $DisabledColor,
   Inactive: $InactiveColor
   );
 $ColorAmount: (
   Disabled: $DisabledColorAmount,
   Inactive: $InactiveColorAmount
   );
 $ColorEffect: (
   Disabled: $DisabledColorEffect,
   Inactive: $InactiveColorEffect
   );
 $ContrastAmount: (
   Disabled: $DisabledContrastAmount,
   Inactive: $InactiveContrastAmount
   );
 $ContrastEffect: (
   Disabled: $DisabledContrastEffect,
   Inactive: $InactiveContrastEffect
   );
 $IntensityAmount: (
   Disabled: $DisabledIntensityAmount,
   Inactive: $InactiveIntensityAmount
   );
 $IntensityEffect: (
   Disabled: $DisabledIntensityEffect,
   Inactive: $InactiveIntensityEffect
   );
 
 $r: 3px; // standard radius
 
 @function insensitive($c) {
   @return Color(Intensity(Contrast($c, Disabled), Disabled), Disabled);
 }
 
 @function backdrop($c) {
   @if $InactiveEnable == true {
     @return Color(Intensity(Contrast($c, Inactive), Inactive), Inactive);
   }
   @else {
     @return $c;
   }
 }
 
 @function Contrast($c, $state) {
 
   @if map-get($ContrastEffect, $state) == 0 {
     @return $c;
   }
 
   @if map-get($ContrastEffect, $state) == 1 {
     @if lightness(w_color()) > lightness(w_color(text)) {
       @if lightness($c) < lightness(w_color()) or ($c == t_color(text) and lightness(t_color(background)) <= lightness(t_color(text))) {
         @return transparentize($c, map-get($ContrastAmount, $state));
       }
       @else { @return $c; }
     }
     @if lightness(w_color()) <= lightness(w_color(text)) {
       @if lightness($c) > lightness(w_color()) or ($c == t_color(text) and lightness(t_color(background)) > lightness(t_color(text))) {
         @return transparentize($c, map-get($ContrastAmount, $state));
       }
       @else { @return $c; }
     }
   }
 
   @if map-get($ContrastEffect, $state) == 2 {
     @if lightness(w_color()) > lightness(w_color(text)) {  // don't know what a reasonable lightness treshhold is for Contrast
       @if lightness($c) < lightness(w_color()) or ($c == t_color(text) and lightness(t_color(background)) <= lightness(t_color(text))) {
         @return transparentize($c, map-get($ContrastAmount, $state));
       }
       @else { @return $c; }
     }
     @if lightness(w_color()) <= lightness(w_color(text)) {
       @if lightness($c) > lightness(w_color()) or ($c == t_color(text) and lightness(t_color(background)) > lightness(t_color(text))){
         @return transparentize($c, map-get($ContrastAmount, $state));
       }
       @else { @return $c; }
     }
   }
 }
 
 @function Color($c, $state) {
 
   @if map-get($ColorEffect, $state) ==0 {
     @return $c;
   }
 
   @if map-get($ColorEffect, $state) ==1 {
     @if map-get($ColorAmount, $state) >=0 {
       @return desaturate($c, percentage(map-get($ColorAmount, $state)));
     }
     @else {
       @return saturate($c, percentage(abs(map-get($ColorAmount, $state))));
     }
   }
 
   @if map-get($ColorEffect, $state)==2 or map-get($ColorEffect, $state)==3 { // 2 and 3 seem to do the same
     @return mix(map-get($Color, $state),$c, percentage(map-get($ColorAmount, $state)));
   }
 }
 
 @function Intensity($c, $state) {
 
   @if map-get($IntensityEffect, $state) == 0 {
     @return $c;
   }
   @if map-get($IntensityEffect, $state) == 1 {
     @if map-get($IntensityAmount, $state) >= 0 {
       @return mix(white, $c, percentage(map-get($IntensityAmount, $state)));
     }
     @else {
       @return mix(black, $c, percentage(abs(map-get($IntensityAmount, $state))));
     }
   }
 
   @if map-get($IntensityEffect, $state) == 2 {
     @if map-get($IntensityAmount, $state) == -1 {
       @return change-color($c, $lightness: 100%);
     }
     @else {
       @return change-color($c, $lightness: min(lightness($c)/(1+map-get($IntensityAmount, $state)),100%));
     }
   }
 
   @if map-get($IntensityEffect, $state) == 3 {
     @return change-color($c, $lightness: min(lightness($c)*(1+map-get($IntensityAmount, $state)),100%));
   }
 }
 
 @function alpha2solid($c,$background) {
   $amount:alpha($c);
   $c:rgb(red($c),green($c),blue($c));
   @return mix($c,$background,$amount);
 }
diff --git a/src/_global.scss b/src/_global.scss
index 13d44a4..95fb251 100644
--- a/src/_global.scss
+++ b/src/_global.scss
@@ -1,82 +1,82 @@
-$ViewForegroundInactive:189,195,199;
-$ViewForegroundNormal:rgb(239,240,241);
-$WindowBackgroundAlternate:rgb(77,77,77);
-$TooltipForegroundNeutral:rgb(246,116,0);
-$WMinactiveForeground:rgb(127,140,141);
-$ButtonDecorationHover:rgb(61,174,233);
-$ButtonBackgroundAlternate:rgb(77,77,77);
-$TooltipForegroundNormal:rgb(239,240,241);
-$TooltipForegroundNegative:rgb(218,68,83);
-$InactiveContrastAmount:0.1;
-$DisabledIntensityAmount:0.1;
+$ViewForegroundInactive:135,143,154;
+$ViewForegroundNormal:rgb(210,222,240);
+$WindowBackgroundAlternate:rgb(78,83,94);
+$TooltipForegroundNeutral:rgb(86,78,45);
+$WMinactiveForeground:rgb(140,152,168);
+$ButtonDecorationHover:rgb(119,149,179);
+$ButtonBackgroundAlternate:rgb(90,98,109);
+$TooltipForegroundNormal:rgb(42,44,48);
+$TooltipForegroundNegative:rgb(99,66,92);
+$InactiveContrastAmount:0.25;
+$DisabledIntensityAmount:0.25;
 $DisabledContrastAmount:0.65;
-$ViewBackgroundNormal:rgb(35,38,41);
-$ButtonForegroundLink:rgb(41,128,185);
-$WindowForegroundInactive:189,195,199;
-$TooltipDecorationHover:rgb(61,174,233);
-$TooltipBackgroundAlternate:rgb(77,77,77);
-$InactiveColorEffect:2;
-$SelectionDecorationHover:rgb(61,174,233);
-$SelectionForegroundPositive:rgb(39,174,96);
-$WindowForegroundVisited:rgb(127,140,141);
-$TooltipBackgroundNormal:rgb(49,54,59);
-$ButtonForegroundNegative:rgb(218,68,83);
-$SelectionForegroundVisited:rgb(189,195,199);
-$DisabledColor:56,56,56;
-$TooltipForegroundLink:rgb(41,128,185);
-$WindowForegroundNormal:rgb(239,240,241);
-$SelectionForegroundActive:rgb(252,252,252);
-$TooltipForegroundVisited:rgb(127,140,141);
-$WindowDecorationFocus:rgb(61,174,233);
-$ViewForegroundActive:rgb(61,174,233);
+$ViewBackgroundNormal:rgb(60,64,72);
+$ButtonForegroundLink:rgb(156,212,255);
+$WindowForegroundInactive:135,143,154;
+$TooltipDecorationHover:rgb(119,149,179);
+$TooltipBackgroundAlternate:rgb(171,181,195);
+$InactiveColorEffect:0;
+$SelectionDecorationHover:rgb(119,149,179);
+$SelectionForegroundPositive:rgb(145,221,100);
+$WindowForegroundVisited:rgb(64,128,255);
+$TooltipBackgroundNormal:rgb(182,193,208);
+$ButtonForegroundNegative:rgb(225,150,209);
+$SelectionForegroundVisited:rgb(64,128,255);
+$DisabledColor:rgb(56,56,56);
+$TooltipForegroundLink:rgb(87,161,218);
+$WindowForegroundNormal:rgb(182,193,208);
+$SelectionForegroundActive:rgb(255,255,255);
+$TooltipForegroundVisited:rgb(46,95,185);
+$WindowDecorationFocus:rgb(125,141,153);
+$ViewForegroundActive:rgb(255,255,255);
 $DisabledIntensityEffect:2;
-$ViewDecorationFocus:rgb(61,174,233);
+$ViewDecorationFocus:rgb(125,141,153);
 $WMactiveBlend:rgb(255,255,255);
 $DisabledColorAmount:0;
 $DisabledContrastEffect:1;
-$SelectionForegroundInactive:239,240,241;
-$WindowForegroundNeutral:rgb(246,116,0);
-$ViewForegroundVisited:rgb(127,140,141);
+$SelectionForegroundInactive:174,192,218;
+$WindowForegroundNeutral:rgb(218,198,115);
+$ViewForegroundVisited:rgb(64,128,255);
 $InactiveEnable:false;
-$WindowDecorationHover:rgb(61,174,233);
-$WindowForegroundActive:rgb(61,174,233);
-$WMactiveBackground:rgb(49,54,59);
-$ButtonBackgroundNormal:rgb(49,54,59);
+$WindowDecorationHover:rgb(119,149,179);
+$WindowForegroundActive:rgb(255,255,255);
+$WMactiveBackground:rgb(138,151,166);
+$ButtonBackgroundNormal:rgb(82,88,99);
 $InactiveChangeSelectionColor:true;
-$SelectionForegroundNegative:rgb(218,68,83);
-$WindowForegroundNegative:rgb(218,68,83);
-$WindowForegroundLink:rgb(41,128,185);
-$ButtonForegroundNormal:rgb(239,240,241);
-$InactiveColor:112,111,110;
-$ViewForegroundPositive:rgb(39,174,96);
-$WMactiveForeground:rgb(239,240,241);
-$WindowForegroundPositive:rgb(39,174,96);
+$SelectionForegroundNegative:rgb(225,150,209);
+$WindowForegroundNegative:rgb(225,150,209);
+$WindowForegroundLink:rgb(156,212,255);
+$ButtonForegroundNormal:rgb(210,222,240);
+$InactiveColor:rgb(112,111,110);
+$ViewForegroundPositive:rgb(145,221,100);
+$WMactiveForeground:rgb(224,237,255);
+$WindowForegroundPositive:rgb(145,221,100);
 $InactiveContrastEffect:2;
-$WMinactiveBackground:rgb(49,54,59);
-$InactiveColorAmount:0.025;
-$ViewBackgroundAlternate:rgb(49,54,59);
-$SelectionBackgroundNormal:rgb(61,174,233);
-$ViewForegroundNegative:rgb(218,68,83);
-$ButtonForegroundInactive:189,195,199;
-$SelectionDecorationFocus:rgb(61,174,233);
-$SelectionForegroundLink:rgb(253,188,75);
-$ButtonForegroundActive:rgb(61,174,233);
-$TooltipForegroundInactive:189,195,199;
-$ButtonForegroundPositive:rgb(39,174,96);
-$ViewDecorationHover:rgb(61,174,233);
-$TooltipDecorationFocus:rgb(61,174,233);
+$WMinactiveBackground:rgb(82,89,99);
+$InactiveColorAmount:0;
+$ViewBackgroundAlternate:rgb(67,71,80);
+$SelectionBackgroundNormal:rgb(120,136,156);
+$ViewForegroundNegative:rgb(225,150,209);
+$ButtonForegroundInactive:135,143,154;
+$SelectionDecorationFocus:rgb(125,141,153);
+$SelectionForegroundLink:rgb(156,212,255);
+$ButtonForegroundActive:rgb(255,255,255);
+$TooltipForegroundInactive:112,118,128;
+$ButtonForegroundPositive:rgb(145,221,100);
+$ViewDecorationHover:rgb(119,149,179);
+$TooltipDecorationFocus:rgb(125,141,153);
 $WMinactiveBlend:rgb(75,71,67);
-$InactiveIntensityAmount:0;
-$TooltipForegroundPositive:rgb(39,174,96);
-$TooltipForegroundActive:rgb(61,174,233);
-$ViewForegroundNeutral:rgb(246,116,0);
+$InactiveIntensityAmount:0.05;
+$TooltipForegroundPositive:rgb(57,86,38);
+$TooltipForegroundActive:rgb(255,255,255);
+$ViewForegroundNeutral:rgb(218,198,115);
 $DisabledColorEffect:0;
-$InactiveIntensityEffect:0;
-$SelectionForegroundNormal:rgb(239,240,241);
-$ViewForegroundLink:rgb(41,128,185);
-$ButtonDecorationFocus:rgb(61,174,233);
-$ButtonForegroundVisited:rgb(127,140,141);
-$SelectionForegroundNeutral:rgb(246,116,0);
-$WindowBackgroundNormal:rgb(49,54,59);
-$SelectionBackgroundAlternate:rgb(29,153,243);
-$ButtonForegroundNeutral:rgb(246,116,0);
+$InactiveIntensityEffect:2;
+$SelectionForegroundNormal:rgb(209,225,244);
+$ViewForegroundLink:rgb(156,212,255);
+$ButtonDecorationFocus:rgb(125,141,153);
+$ButtonForegroundVisited:rgb(64,128,255);
+$SelectionForegroundNeutral:rgb(218,198,115);
+$WindowBackgroundNormal:rgb(73,78,88);
+$SelectionBackgroundAlternate:rgb(111,126,144);
+$ButtonForegroundNeutral:rgb(218,198,115);
diff --git a/src/assets/arrow-down-active.png b/src/assets/arrow-down-active.png
deleted file mode 100644
index 989ee67..0000000
Binary files a/src/assets/arrow-down-active.png and /dev/null differ
diff --git a/src/assets/arrow-down-hover.png b/src/assets/arrow-down-hover.png
deleted file mode 100644
index 989ee67..0000000
Binary files a/src/assets/arrow-down-hover.png and /dev/null differ
diff --git a/src/assets/arrow-down-insensitive.png b/src/assets/arrow-down-insensitive.png
deleted file mode 100644
index 7cf6480..0000000
Binary files a/src/assets/arrow-down-insensitive.png and /dev/null differ
diff --git a/src/assets/arrow-down.png b/src/assets/arrow-down.png
deleted file mode 100644
index d72ee1b..0000000
Binary files a/src/assets/arrow-down.png and /dev/null differ
diff --git a/src/assets/arrow-left-active.png b/src/assets/arrow-left-active.png
deleted file mode 100644
index d229b39..0000000
Binary files a/src/assets/arrow-left-active.png and /dev/null differ
diff --git a/src/assets/arrow-left-hover.png b/src/assets/arrow-left-hover.png
deleted file mode 100644
index d229b39..0000000
Binary files a/src/assets/arrow-left-hover.png and /dev/null differ
diff --git a/src/assets/arrow-left-insensitive.png b/src/assets/arrow-left-insensitive.png
deleted file mode 100644
index cc87896..0000000
Binary files a/src/assets/arrow-left-insensitive.png and /dev/null differ
diff --git a/src/assets/arrow-left.png b/src/assets/arrow-left.png
deleted file mode 100644
index e296294..0000000
Binary files a/src/assets/arrow-left.png and /dev/null differ
diff --git a/src/assets/arrow-right-active.png b/src/assets/arrow-right-active.png
deleted file mode 100644
index 283b898..0000000
Binary files a/src/assets/arrow-right-active.png and /dev/null differ
diff --git a/src/assets/arrow-right-hover.png b/src/assets/arrow-right-hover.png
deleted file mode 100644
index 283b898..0000000
Binary files a/src/assets/arrow-right-hover.png and /dev/null differ
diff --git a/src/assets/arrow-right-insensitive.png b/src/assets/arrow-right-insensitive.png
deleted file mode 100644
index 6cbd9a5..0000000
Binary files a/src/assets/arrow-right-insensitive.png and /dev/null differ
diff --git a/src/assets/arrow-right.png b/src/assets/arrow-right.png
deleted file mode 100644
index 43daf58..0000000
Binary files a/src/assets/arrow-right.png and /dev/null differ
diff --git a/src/assets/arrow-small-down-active.png b/src/assets/arrow-small-down-active.png
deleted file mode 100644
index fa450d1..0000000
Binary files a/src/assets/arrow-small-down-active.png and /dev/null differ
diff --git a/src/assets/arrow-small-down-hover.png b/src/assets/arrow-small-down-hover.png
deleted file mode 100644
index fa450d1..0000000
Binary files a/src/assets/arrow-small-down-hover.png and /dev/null differ
diff --git a/src/assets/arrow-small-down-insensitive.png b/src/assets/arrow-small-down-insensitive.png
deleted file mode 100644
index 74441d7..0000000
Binary files a/src/assets/arrow-small-down-insensitive.png and /dev/null differ
diff --git a/src/assets/arrow-small-down.png b/src/assets/arrow-small-down.png
deleted file mode 100644
index 1843ea0..0000000
Binary files a/src/assets/arrow-small-down.png and /dev/null differ
diff --git a/src/assets/arrow-small-left-active.png b/src/assets/arrow-small-left-active.png
deleted file mode 100644
index 0dc188f..0000000
Binary files a/src/assets/arrow-small-left-active.png and /dev/null differ
diff --git a/src/assets/arrow-small-left-hover.png b/src/assets/arrow-small-left-hover.png
deleted file mode 100644
index 0dc188f..0000000
Binary files a/src/assets/arrow-small-left-hover.png and /dev/null differ
diff --git a/src/assets/arrow-small-left-insensitive.png b/src/assets/arrow-small-left-insensitive.png
deleted file mode 100644
index 6a2e612..0000000
Binary files a/src/assets/arrow-small-left-insensitive.png and /dev/null differ
diff --git a/src/assets/arrow-small-left.png b/src/assets/arrow-small-left.png
deleted file mode 100644
index 5a0a303..0000000
Binary files a/src/assets/arrow-small-left.png and /dev/null differ
diff --git a/src/assets/arrow-small-right-active.png b/src/assets/arrow-small-right-active.png
deleted file mode 100644
index 8831a1f..0000000
Binary files a/src/assets/arrow-small-right-active.png and /dev/null differ
diff --git a/src/assets/arrow-small-right-hover.png b/src/assets/arrow-small-right-hover.png
deleted file mode 100644
index 8831a1f..0000000
Binary files a/src/assets/arrow-small-right-hover.png and /dev/null differ
diff --git a/src/assets/arrow-small-right-insensitive.png b/src/assets/arrow-small-right-insensitive.png
deleted file mode 100644
index 756ff70..0000000
Binary files a/src/assets/arrow-small-right-insensitive.png and /dev/null differ
diff --git a/src/assets/arrow-small-right.png b/src/assets/arrow-small-right.png
deleted file mode 100644
index dcdf5b9..0000000
Binary files a/src/assets/arrow-small-right.png and /dev/null differ
diff --git a/src/assets/arrow-small-up-active.png b/src/assets/arrow-small-up-active.png
deleted file mode 100644
index 9156f79..0000000
Binary files a/src/assets/arrow-small-up-active.png and /dev/null differ
diff --git a/src/assets/arrow-small-up-hover.png b/src/assets/arrow-small-up-hover.png
deleted file mode 100644
index 9156f79..0000000
Binary files a/src/assets/arrow-small-up-hover.png and /dev/null differ
diff --git a/src/assets/arrow-small-up-insensitive.png b/src/assets/arrow-small-up-insensitive.png
deleted file mode 100644
index 7082030..0000000
Binary files a/src/assets/arrow-small-up-insensitive.png and /dev/null differ
diff --git a/src/assets/arrow-small-up.png b/src/assets/arrow-small-up.png
deleted file mode 100644
index ff09fba..0000000
Binary files a/src/assets/arrow-small-up.png and /dev/null differ
diff --git a/src/assets/arrow-up-active.png b/src/assets/arrow-up-active.png
deleted file mode 100644
index 1f0efc0..0000000
Binary files a/src/assets/arrow-up-active.png and /dev/null differ
diff --git a/src/assets/arrow-up-hover.png b/src/assets/arrow-up-hover.png
deleted file mode 100644
index 1f0efc0..0000000
Binary files a/src/assets/arrow-up-hover.png and /dev/null differ
diff --git a/src/assets/arrow-up-insensitive.png b/src/assets/arrow-up-insensitive.png
deleted file mode 100644
index 89db435..0000000
Binary files a/src/assets/arrow-up-insensitive.png and /dev/null differ
diff --git a/src/assets/arrow-up.png b/src/assets/arrow-up.png
deleted file mode 100644
index ff47a3a..0000000
Binary files a/src/assets/arrow-up.png and /dev/null differ
diff --git a/src/assets/button-active.png b/src/assets/button-active.png
deleted file mode 100644
index e178916..0000000
Binary files a/src/assets/button-active.png and /dev/null differ
diff --git a/src/assets/button-hover.png b/src/assets/button-hover.png
deleted file mode 100644
index c39e9d6..0000000
Binary files a/src/assets/button-hover.png and /dev/null differ
diff --git a/src/assets/button-insensitive.png b/src/assets/button-insensitive.png
deleted file mode 100644
index 09645d3..0000000
Binary files a/src/assets/button-insensitive.png and /dev/null differ
diff --git a/src/assets/button.png b/src/assets/button.png
deleted file mode 100644
index a1b05f3..0000000
Binary files a/src/assets/button.png and /dev/null differ
diff --git a/src/assets/check-checked-active.png b/src/assets/check-checked-active.png
deleted file mode 100644
index c5bec8f..0000000
Binary files a/src/assets/check-checked-active.png and /dev/null differ
diff --git a/src/assets/check-checked-active@2.png b/src/assets/check-checked-active@2.png
deleted file mode 100644
index aaf94c2..0000000
Binary files a/src/assets/check-checked-active@2.png and /dev/null differ
diff --git a/src/assets/check-checked-backdrop-insensitive.png b/src/assets/check-checked-backdrop-insensitive.png
deleted file mode 100644
index 9dae72d..0000000
Binary files a/src/assets/check-checked-backdrop-insensitive.png and /dev/null differ
diff --git a/src/assets/check-checked-backdrop-insensitive@2.png b/src/assets/check-checked-backdrop-insensitive@2.png
deleted file mode 100644
index b9d40b8..0000000
Binary files a/src/assets/check-checked-backdrop-insensitive@2.png and /dev/null differ
diff --git a/src/assets/check-checked-backdrop.png b/src/assets/check-checked-backdrop.png
deleted file mode 100644
index 3159fb1..0000000
Binary files a/src/assets/check-checked-backdrop.png and /dev/null differ
diff --git a/src/assets/check-checked-backdrop@2.png b/src/assets/check-checked-backdrop@2.png
deleted file mode 100644
index d6db09e..0000000
Binary files a/src/assets/check-checked-backdrop@2.png and /dev/null differ
diff --git a/src/assets/check-checked-hover.png b/src/assets/check-checked-hover.png
deleted file mode 100644
index c5bec8f..0000000
Binary files a/src/assets/check-checked-hover.png and /dev/null differ
diff --git a/src/assets/check-checked-hover@2.png b/src/assets/check-checked-hover@2.png
deleted file mode 100644
index aaf94c2..0000000
Binary files a/src/assets/check-checked-hover@2.png and /dev/null differ
diff --git a/src/assets/check-checked-insensitive.png b/src/assets/check-checked-insensitive.png
deleted file mode 100644
index 9dae72d..0000000
Binary files a/src/assets/check-checked-insensitive.png and /dev/null differ
diff --git a/src/assets/check-checked-insensitive@2.png b/src/assets/check-checked-insensitive@2.png
deleted file mode 100644
index b9d40b8..0000000
Binary files a/src/assets/check-checked-insensitive@2.png and /dev/null differ
diff --git a/src/assets/check-mixed-active.png b/src/assets/check-mixed-active.png
deleted file mode 100644
index 0327347..0000000
Binary files a/src/assets/check-mixed-active.png and /dev/null differ
diff --git a/src/assets/check-mixed-active@2.png b/src/assets/check-mixed-active@2.png
deleted file mode 100644
index 1c0a60a..0000000
Binary files a/src/assets/check-mixed-active@2.png and /dev/null differ
diff --git a/src/assets/check-mixed-backdrop-insensitive.png b/src/assets/check-mixed-backdrop-insensitive.png
deleted file mode 100644
index 68b47ae..0000000
Binary files a/src/assets/check-mixed-backdrop-insensitive.png and /dev/null differ
diff --git a/src/assets/check-mixed-backdrop-insensitive@2.png b/src/assets/check-mixed-backdrop-insensitive@2.png
deleted file mode 100644
index ca26d4c..0000000
Binary files a/src/assets/check-mixed-backdrop-insensitive@2.png and /dev/null differ
diff --git a/src/assets/check-mixed-backdrop.png b/src/assets/check-mixed-backdrop.png
deleted file mode 100644
index 118a0d2..0000000
Binary files a/src/assets/check-mixed-backdrop.png and /dev/null differ
diff --git a/src/assets/check-mixed-backdrop@2.png b/src/assets/check-mixed-backdrop@2.png
deleted file mode 100644
index f79c0c2..0000000
Binary files a/src/assets/check-mixed-backdrop@2.png and /dev/null differ
diff --git a/src/assets/check-mixed-hover.png b/src/assets/check-mixed-hover.png
deleted file mode 100644
index 0327347..0000000
Binary files a/src/assets/check-mixed-hover.png and /dev/null differ
diff --git a/src/assets/check-mixed-hover@2.png b/src/assets/check-mixed-hover@2.png
deleted file mode 100644
index 1c0a60a..0000000
Binary files a/src/assets/check-mixed-hover@2.png and /dev/null differ
diff --git a/src/assets/check-mixed-insensitive.png b/src/assets/check-mixed-insensitive.png
deleted file mode 100644
index 68b47ae..0000000
Binary files a/src/assets/check-mixed-insensitive.png and /dev/null differ
diff --git a/src/assets/check-mixed-insensitive@2.png b/src/assets/check-mixed-insensitive@2.png
deleted file mode 100644
index ca26d4c..0000000
Binary files a/src/assets/check-mixed-insensitive@2.png and /dev/null differ
diff --git a/src/assets/check-selectionmode-checked-active.png b/src/assets/check-selectionmode-checked-active.png
deleted file mode 100644
index e25dc78..0000000
Binary files a/src/assets/check-selectionmode-checked-active.png and /dev/null differ
diff --git a/src/assets/check-selectionmode-checked-active@2.png b/src/assets/check-selectionmode-checked-active@2.png
deleted file mode 100644
index d99042f..0000000
Binary files a/src/assets/check-selectionmode-checked-active@2.png and /dev/null differ
diff --git a/src/assets/check-selectionmode-checked-backdrop-insensitive.png b/src/assets/check-selectionmode-checked-backdrop-insensitive.png
deleted file mode 100644
index 25ad88e..0000000
Binary files a/src/assets/check-selectionmode-checked-backdrop-insensitive.png and /dev/null differ
diff --git a/src/assets/check-selectionmode-checked-backdrop-insensitive@2.png b/src/assets/check-selectionmode-checked-backdrop-insensitive@2.png
deleted file mode 100644
index c31caa5..0000000
Binary files a/src/assets/check-selectionmode-checked-backdrop-insensitive@2.png and /dev/null differ
diff --git a/src/assets/check-selectionmode-checked-backdrop.png b/src/assets/check-selectionmode-checked-backdrop.png
deleted file mode 100644
index 3e0e3c4..0000000
Binary files a/src/assets/check-selectionmode-checked-backdrop.png and /dev/null differ
diff --git a/src/assets/check-selectionmode-checked-backdrop@2.png b/src/assets/check-selectionmode-checked-backdrop@2.png
deleted file mode 100644
index 92d0732..0000000
Binary files a/src/assets/check-selectionmode-checked-backdrop@2.png and /dev/null differ
diff --git a/src/assets/check-selectionmode-checked-hover.png b/src/assets/check-selectionmode-checked-hover.png
deleted file mode 100644
index e25dc78..0000000
Binary files a/src/assets/check-selectionmode-checked-hover.png and /dev/null differ
diff --git a/src/assets/check-selectionmode-checked-hover@2.png b/src/assets/check-selectionmode-checked-hover@2.png
deleted file mode 100644
index d99042f..0000000
Binary files a/src/assets/check-selectionmode-checked-hover@2.png and /dev/null differ
diff --git a/src/assets/check-selectionmode-checked-insensitive.png b/src/assets/check-selectionmode-checked-insensitive.png
deleted file mode 100644
index 25ad88e..0000000
Binary files a/src/assets/check-selectionmode-checked-insensitive.png and /dev/null differ
diff --git a/src/assets/check-selectionmode-checked-insensitive@2.png b/src/assets/check-selectionmode-checked-insensitive@2.png
deleted file mode 100644
index c31caa5..0000000
Binary files a/src/assets/check-selectionmode-checked-insensitive@2.png and /dev/null differ
diff --git a/src/assets/check-selectionmode-unchecked-active.png b/src/assets/check-selectionmode-unchecked-active.png
deleted file mode 100644
index 1f7f75f..0000000
Binary files a/src/assets/check-selectionmode-unchecked-active.png and /dev/null differ
diff --git a/src/assets/check-selectionmode-unchecked-active@2.png b/src/assets/check-selectionmode-unchecked-active@2.png
deleted file mode 100644
index 15bc6b6..0000000
Binary files a/src/assets/check-selectionmode-unchecked-active@2.png and /dev/null differ
diff --git a/src/assets/check-selectionmode-unchecked-backdrop-insensitive.png b/src/assets/check-selectionmode-unchecked-backdrop-insensitive.png
deleted file mode 100644
index 82edbdc..0000000
Binary files a/src/assets/check-selectionmode-unchecked-backdrop-insensitive.png and /dev/null differ
diff --git a/src/assets/check-selectionmode-unchecked-backdrop-insensitive@2.png b/src/assets/check-selectionmode-unchecked-backdrop-insensitive@2.png
deleted file mode 100644
index f89984d..0000000
Binary files a/src/assets/check-selectionmode-unchecked-backdrop-insensitive@2.png and /dev/null differ
diff --git a/src/assets/check-selectionmode-unchecked-backdrop.png b/src/assets/check-selectionmode-unchecked-backdrop.png
deleted file mode 100644
index 432c9d5..0000000
Binary files a/src/assets/check-selectionmode-unchecked-backdrop.png and /dev/null differ
diff --git a/src/assets/check-selectionmode-unchecked-backdrop@2.png b/src/assets/check-selectionmode-unchecked-backdrop@2.png
deleted file mode 100644
index 424b46a..0000000
Binary files a/src/assets/check-selectionmode-unchecked-backdrop@2.png and /dev/null differ
diff --git a/src/assets/check-selectionmode-unchecked-hover.png b/src/assets/check-selectionmode-unchecked-hover.png
deleted file mode 100644
index 1f7f75f..0000000
Binary files a/src/assets/check-selectionmode-unchecked-hover.png and /dev/null differ
diff --git a/src/assets/check-selectionmode-unchecked-hover@2.png b/src/assets/check-selectionmode-unchecked-hover@2.png
deleted file mode 100644
index 15bc6b6..0000000
Binary files a/src/assets/check-selectionmode-unchecked-hover@2.png and /dev/null differ
diff --git a/src/assets/check-selectionmode-unchecked-insensitive.png b/src/assets/check-selectionmode-unchecked-insensitive.png
deleted file mode 100644
index 82edbdc..0000000
Binary files a/src/assets/check-selectionmode-unchecked-insensitive.png and /dev/null differ
diff --git a/src/assets/check-selectionmode-unchecked-insensitive@2.png b/src/assets/check-selectionmode-unchecked-insensitive@2.png
deleted file mode 100644
index f89984d..0000000
Binary files a/src/assets/check-selectionmode-unchecked-insensitive@2.png and /dev/null differ
diff --git a/src/assets/check-selectionmode-unchecked.png b/src/assets/check-selectionmode-unchecked.png
deleted file mode 100644
index 432c9d5..0000000
Binary files a/src/assets/check-selectionmode-unchecked.png and /dev/null differ
diff --git a/src/assets/check-selectionmode-unchecked@2.png b/src/assets/check-selectionmode-unchecked@2.png
deleted file mode 100644
index 424b46a..0000000
Binary files a/src/assets/check-selectionmode-unchecked@2.png and /dev/null differ
diff --git a/src/assets/check-unchecked-active.png b/src/assets/check-unchecked-active.png
deleted file mode 100644
index 7713f72..0000000
Binary files a/src/assets/check-unchecked-active.png and /dev/null differ
diff --git a/src/assets/check-unchecked-active@2.png b/src/assets/check-unchecked-active@2.png
deleted file mode 100644
index 768caa1..0000000
Binary files a/src/assets/check-unchecked-active@2.png and /dev/null differ
diff --git a/src/assets/check-unchecked-backdrop-insensitive.png b/src/assets/check-unchecked-backdrop-insensitive.png
deleted file mode 100644
index 51a57b9..0000000
Binary files a/src/assets/check-unchecked-backdrop-insensitive.png and /dev/null differ
diff --git a/src/assets/check-unchecked-backdrop-insensitive@2.png b/src/assets/check-unchecked-backdrop-insensitive@2.png
deleted file mode 100644
index 6e99fc2..0000000
Binary files a/src/assets/check-unchecked-backdrop-insensitive@2.png and /dev/null differ
diff --git a/src/assets/check-unchecked-backdrop.png b/src/assets/check-unchecked-backdrop.png
deleted file mode 100644
index 2d6f750..0000000
Binary files a/src/assets/check-unchecked-backdrop.png and /dev/null differ
diff --git a/src/assets/check-unchecked-backdrop@2.png b/src/assets/check-unchecked-backdrop@2.png
deleted file mode 100644
index a03e9f6..0000000
Binary files a/src/assets/check-unchecked-backdrop@2.png and /dev/null differ
diff --git a/src/assets/check-unchecked-hover.png b/src/assets/check-unchecked-hover.png
deleted file mode 100644
index 7713f72..0000000
Binary files a/src/assets/check-unchecked-hover.png and /dev/null differ
diff --git a/src/assets/check-unchecked-hover@2.png b/src/assets/check-unchecked-hover@2.png
deleted file mode 100644
index 768caa1..0000000
Binary files a/src/assets/check-unchecked-hover@2.png and /dev/null differ
diff --git a/src/assets/check-unchecked-insensitive.png b/src/assets/check-unchecked-insensitive.png
deleted file mode 100644
index 51a57b9..0000000
Binary files a/src/assets/check-unchecked-insensitive.png and /dev/null differ
diff --git a/src/assets/check-unchecked-insensitive@2.png b/src/assets/check-unchecked-insensitive@2.png
deleted file mode 100644
index 6e99fc2..0000000
Binary files a/src/assets/check-unchecked-insensitive@2.png and /dev/null differ
diff --git a/src/assets/check-unchecked.png b/src/assets/check-unchecked.png
deleted file mode 100644
index 2d6f750..0000000
Binary files a/src/assets/check-unchecked.png and /dev/null differ
diff --git a/src/assets/check-unchecked@2.png b/src/assets/check-unchecked@2.png
deleted file mode 100644
index a03e9f6..0000000
Binary files a/src/assets/check-unchecked@2.png and /dev/null differ
diff --git a/src/assets/combo-entry-active.png b/src/assets/combo-entry-active.png
deleted file mode 100644
index 69676be..0000000
Binary files a/src/assets/combo-entry-active.png and /dev/null differ
diff --git a/src/assets/combo-entry-button-active.png b/src/assets/combo-entry-button-active.png
deleted file mode 100644
index e3d0da6..0000000
Binary files a/src/assets/combo-entry-button-active.png and /dev/null differ
diff --git a/src/assets/combo-entry-button-insensitive.png b/src/assets/combo-entry-button-insensitive.png
deleted file mode 100644
index e8c5cd4..0000000
Binary files a/src/assets/combo-entry-button-insensitive.png and /dev/null differ
diff --git a/src/assets/combo-entry-button.png b/src/assets/combo-entry-button.png
deleted file mode 100644
index 289cee2..0000000
Binary files a/src/assets/combo-entry-button.png and /dev/null differ
diff --git a/src/assets/combo-entry-insensitive.png b/src/assets/combo-entry-insensitive.png
deleted file mode 100644
index 615bed8..0000000
Binary files a/src/assets/combo-entry-insensitive.png and /dev/null differ
diff --git a/src/assets/combo-entry.png b/src/assets/combo-entry.png
deleted file mode 100644
index 32177f5..0000000
Binary files a/src/assets/combo-entry.png and /dev/null differ
diff --git a/src/assets/entry-active.png b/src/assets/entry-active.png
deleted file mode 100644
index 660ae78..0000000
Binary files a/src/assets/entry-active.png and /dev/null differ
diff --git a/src/assets/entry-insensitive.png b/src/assets/entry-insensitive.png
deleted file mode 100644
index 203b88c..0000000
Binary files a/src/assets/entry-insensitive.png and /dev/null differ
diff --git a/src/assets/entry.png b/src/assets/entry.png
deleted file mode 100644
index 56b48c8..0000000
Binary files a/src/assets/entry.png and /dev/null differ
diff --git a/src/assets/frame-gap-end.png b/src/assets/frame-gap-end.png
deleted file mode 100644
index 6b53697..0000000
Binary files a/src/assets/frame-gap-end.png and /dev/null differ
diff --git a/src/assets/frame-gap-start.png b/src/assets/frame-gap-start.png
deleted file mode 100644
index b1af7a9..0000000
Binary files a/src/assets/frame-gap-start.png and /dev/null differ
diff --git a/src/assets/frame.png b/src/assets/frame.png
deleted file mode 100644
index 91a97ed..0000000
Binary files a/src/assets/frame.png and /dev/null differ
diff --git a/src/assets/handle-h.png b/src/assets/handle-h.png
deleted file mode 100644
index fde1d01..0000000
Binary files a/src/assets/handle-h.png and /dev/null differ
diff --git a/src/assets/handle-v.png b/src/assets/handle-v.png
deleted file mode 100644
index cb01d68..0000000
Binary files a/src/assets/handle-v.png and /dev/null differ
diff --git a/src/assets/line-h.png b/src/assets/line-h.png
deleted file mode 100644
index d629cc1..0000000
Binary files a/src/assets/line-h.png and /dev/null differ
diff --git a/src/assets/line-v.png b/src/assets/line-v.png
deleted file mode 100644
index 590ebcd..0000000
Binary files a/src/assets/line-v.png and /dev/null differ
diff --git a/src/assets/menu-arrow-insensitive.png b/src/assets/menu-arrow-insensitive.png
deleted file mode 100644
index 6cbd9a5..0000000
Binary files a/src/assets/menu-arrow-insensitive.png and /dev/null differ
diff --git a/src/assets/menu-arrow-selected.png b/src/assets/menu-arrow-selected.png
deleted file mode 100644
index 43daf58..0000000
Binary files a/src/assets/menu-arrow-selected.png and /dev/null differ
diff --git a/src/assets/menu-arrow.png b/src/assets/menu-arrow.png
deleted file mode 100644
index 43daf58..0000000
Binary files a/src/assets/menu-arrow.png and /dev/null differ
diff --git a/src/assets/menubar-button.png b/src/assets/menubar-button.png
deleted file mode 100644
index 58e1666..0000000
Binary files a/src/assets/menubar-button.png and /dev/null differ
diff --git a/src/assets/notebook-frame-bottom.png b/src/assets/notebook-frame-bottom.png
deleted file mode 100644
index 2e252ab..0000000
Binary files a/src/assets/notebook-frame-bottom.png and /dev/null differ
diff --git a/src/assets/notebook-frame-right.png b/src/assets/notebook-frame-right.png
deleted file mode 100644
index 17990c5..0000000
Binary files a/src/assets/notebook-frame-right.png and /dev/null differ
diff --git a/src/assets/notebook-frame-top.png b/src/assets/notebook-frame-top.png
deleted file mode 100644
index cf40ed7..0000000
Binary files a/src/assets/notebook-frame-top.png and /dev/null differ
diff --git a/src/assets/notebook-gap-horizontal.png b/src/assets/notebook-gap-horizontal.png
deleted file mode 100644
index 483c277..0000000
Binary files a/src/assets/notebook-gap-horizontal.png and /dev/null differ
diff --git a/src/assets/notebook-gap-vertical.png b/src/assets/notebook-gap-vertical.png
deleted file mode 100644
index 4ef8397..0000000
Binary files a/src/assets/notebook-gap-vertical.png and /dev/null differ
diff --git a/src/assets/null.png b/src/assets/null.png
deleted file mode 100644
index bdf4c81..0000000
Binary files a/src/assets/null.png and /dev/null differ
diff --git a/src/assets/progressbar-bar.png b/src/assets/progressbar-bar.png
deleted file mode 100644
index 3bbce74..0000000
Binary files a/src/assets/progressbar-bar.png and /dev/null differ
diff --git a/src/assets/progressbar-trough.png b/src/assets/progressbar-trough.png
deleted file mode 100644
index f47d597..0000000
Binary files a/src/assets/progressbar-trough.png and /dev/null differ
diff --git a/src/assets/radio-checked-active.png b/src/assets/radio-checked-active.png
deleted file mode 100644
index 867ffa7..0000000
Binary files a/src/assets/radio-checked-active.png and /dev/null differ
diff --git a/src/assets/radio-checked-active@2.png b/src/assets/radio-checked-active@2.png
deleted file mode 100644
index 03f9fce..0000000
Binary files a/src/assets/radio-checked-active@2.png and /dev/null differ
diff --git a/src/assets/radio-checked-backdrop-insensitive.png b/src/assets/radio-checked-backdrop-insensitive.png
deleted file mode 100644
index 3df6367..0000000
Binary files a/src/assets/radio-checked-backdrop-insensitive.png and /dev/null differ
diff --git a/src/assets/radio-checked-backdrop-insensitive@2.png b/src/assets/radio-checked-backdrop-insensitive@2.png
deleted file mode 100644
index 2b0fc1c..0000000
Binary files a/src/assets/radio-checked-backdrop-insensitive@2.png and /dev/null differ
diff --git a/src/assets/radio-checked-backdrop.png b/src/assets/radio-checked-backdrop.png
deleted file mode 100644
index e5354d0..0000000
Binary files a/src/assets/radio-checked-backdrop.png and /dev/null differ
diff --git a/src/assets/radio-checked-backdrop@2.png b/src/assets/radio-checked-backdrop@2.png
deleted file mode 100644
index b305236..0000000
Binary files a/src/assets/radio-checked-backdrop@2.png and /dev/null differ
diff --git a/src/assets/radio-checked-hover.png b/src/assets/radio-checked-hover.png
deleted file mode 100644
index 867ffa7..0000000
Binary files a/src/assets/radio-checked-hover.png and /dev/null differ
diff --git a/src/assets/radio-checked-hover@2.png b/src/assets/radio-checked-hover@2.png
deleted file mode 100644
index 03f9fce..0000000
Binary files a/src/assets/radio-checked-hover@2.png and /dev/null differ
diff --git a/src/assets/radio-checked-insensitive.png b/src/assets/radio-checked-insensitive.png
deleted file mode 100644
index 3df6367..0000000
Binary files a/src/assets/radio-checked-insensitive.png and /dev/null differ
diff --git a/src/assets/radio-checked-insensitive@2.png b/src/assets/radio-checked-insensitive@2.png
deleted file mode 100644
index 2b0fc1c..0000000
Binary files a/src/assets/radio-checked-insensitive@2.png and /dev/null differ
diff --git a/src/assets/radio-mixed-active.png b/src/assets/radio-mixed-active.png
deleted file mode 100644
index 1afbd18..0000000
Binary files a/src/assets/radio-mixed-active.png and /dev/null differ
diff --git a/src/assets/radio-mixed-active@2.png b/src/assets/radio-mixed-active@2.png
deleted file mode 100644
index 73664aa..0000000
Binary files a/src/assets/radio-mixed-active@2.png and /dev/null differ
diff --git a/src/assets/radio-mixed-backdrop-insensitive.png b/src/assets/radio-mixed-backdrop-insensitive.png
deleted file mode 100644
index 98abed9..0000000
Binary files a/src/assets/radio-mixed-backdrop-insensitive.png and /dev/null differ
diff --git a/src/assets/radio-mixed-backdrop-insensitive@2.png b/src/assets/radio-mixed-backdrop-insensitive@2.png
deleted file mode 100644
index be50cbb..0000000
Binary files a/src/assets/radio-mixed-backdrop-insensitive@2.png and /dev/null differ
diff --git a/src/assets/radio-mixed-backdrop.png b/src/assets/radio-mixed-backdrop.png
deleted file mode 100644
index 8ce6d7d..0000000
Binary files a/src/assets/radio-mixed-backdrop.png and /dev/null differ
diff --git a/src/assets/radio-mixed-backdrop@2.png b/src/assets/radio-mixed-backdrop@2.png
deleted file mode 100644
index 210aa3f..0000000
Binary files a/src/assets/radio-mixed-backdrop@2.png and /dev/null differ
diff --git a/src/assets/radio-mixed-hover.png b/src/assets/radio-mixed-hover.png
deleted file mode 100644
index 1afbd18..0000000
Binary files a/src/assets/radio-mixed-hover.png and /dev/null differ
diff --git a/src/assets/radio-mixed-hover@2.png b/src/assets/radio-mixed-hover@2.png
deleted file mode 100644
index 73664aa..0000000
Binary files a/src/assets/radio-mixed-hover@2.png and /dev/null differ
diff --git a/src/assets/radio-mixed-insensitive.png b/src/assets/radio-mixed-insensitive.png
deleted file mode 100644
index 98abed9..0000000
Binary files a/src/assets/radio-mixed-insensitive.png and /dev/null differ
diff --git a/src/assets/radio-mixed-insensitive@2.png b/src/assets/radio-mixed-insensitive@2.png
deleted file mode 100644
index be50cbb..0000000
Binary files a/src/assets/radio-mixed-insensitive@2.png and /dev/null differ
diff --git a/src/assets/radio-unchecked-active.png b/src/assets/radio-unchecked-active.png
deleted file mode 100644
index 1a21720..0000000
Binary files a/src/assets/radio-unchecked-active.png and /dev/null differ
diff --git a/src/assets/radio-unchecked-active@2.png b/src/assets/radio-unchecked-active@2.png
deleted file mode 100644
index 4a4e27d..0000000
Binary files a/src/assets/radio-unchecked-active@2.png and /dev/null differ
diff --git a/src/assets/radio-unchecked-backdrop-insensitive.png b/src/assets/radio-unchecked-backdrop-insensitive.png
deleted file mode 100644
index 25bd1e0..0000000
Binary files a/src/assets/radio-unchecked-backdrop-insensitive.png and /dev/null differ
diff --git a/src/assets/radio-unchecked-backdrop-insensitive@2.png b/src/assets/radio-unchecked-backdrop-insensitive@2.png
deleted file mode 100644
index e08b8f2..0000000
Binary files a/src/assets/radio-unchecked-backdrop-insensitive@2.png and /dev/null differ
diff --git a/src/assets/radio-unchecked-backdrop.png b/src/assets/radio-unchecked-backdrop.png
deleted file mode 100644
index 0992943..0000000
Binary files a/src/assets/radio-unchecked-backdrop.png and /dev/null differ
diff --git a/src/assets/radio-unchecked-backdrop@2.png b/src/assets/radio-unchecked-backdrop@2.png
deleted file mode 100644
index d7cb53f..0000000
Binary files a/src/assets/radio-unchecked-backdrop@2.png and /dev/null differ
diff --git a/src/assets/radio-unchecked-hover.png b/src/assets/radio-unchecked-hover.png
deleted file mode 100644
index 1a21720..0000000
Binary files a/src/assets/radio-unchecked-hover.png and /dev/null differ
diff --git a/src/assets/radio-unchecked-hover@2.png b/src/assets/radio-unchecked-hover@2.png
deleted file mode 100644
index 4a4e27d..0000000
Binary files a/src/assets/radio-unchecked-hover@2.png and /dev/null differ
diff --git a/src/assets/radio-unchecked-insensitive.png b/src/assets/radio-unchecked-insensitive.png
deleted file mode 100644
index 25bd1e0..0000000
Binary files a/src/assets/radio-unchecked-insensitive.png and /dev/null differ
diff --git a/src/assets/radio-unchecked-insensitive@2.png b/src/assets/radio-unchecked-insensitive@2.png
deleted file mode 100644
index e08b8f2..0000000
Binary files a/src/assets/radio-unchecked-insensitive@2.png and /dev/null differ
diff --git a/src/assets/radio-unchecked.png b/src/assets/radio-unchecked.png
deleted file mode 100644
index 0992943..0000000
Binary files a/src/assets/radio-unchecked.png and /dev/null differ
diff --git a/src/assets/radio-unchecked@2.png b/src/assets/radio-unchecked@2.png
deleted file mode 100644
index d7cb53f..0000000
Binary files a/src/assets/radio-unchecked@2.png and /dev/null differ
diff --git a/src/assets/scale-slider-active.png b/src/assets/scale-slider-active.png
deleted file mode 100644
index 3daddd3..0000000
Binary files a/src/assets/scale-slider-active.png and /dev/null differ
diff --git a/src/assets/scale-slider-hover.png b/src/assets/scale-slider-hover.png
deleted file mode 100644
index 3daddd3..0000000
Binary files a/src/assets/scale-slider-hover.png and /dev/null differ
diff --git a/src/assets/scale-slider-insensitive.png b/src/assets/scale-slider-insensitive.png
deleted file mode 100644
index 17010f0..0000000
Binary files a/src/assets/scale-slider-insensitive.png and /dev/null differ
diff --git a/src/assets/scale-slider.png b/src/assets/scale-slider.png
deleted file mode 100644
index c8e9292..0000000
Binary files a/src/assets/scale-slider.png and /dev/null differ
diff --git a/src/assets/scale-trough-horizontal.png b/src/assets/scale-trough-horizontal.png
deleted file mode 100644
index f67788b..0000000
Binary files a/src/assets/scale-trough-horizontal.png and /dev/null differ
diff --git a/src/assets/scale-trough-vertical.png b/src/assets/scale-trough-vertical.png
deleted file mode 100644
index 379fd5e..0000000
Binary files a/src/assets/scale-trough-vertical.png and /dev/null differ
diff --git a/src/assets/scrollbar-slider-horizontal-active.png b/src/assets/scrollbar-slider-horizontal-active.png
deleted file mode 100644
index 7c4efa7..0000000
Binary files a/src/assets/scrollbar-slider-horizontal-active.png and /dev/null differ
diff --git a/src/assets/scrollbar-slider-horizontal-active@2.png b/src/assets/scrollbar-slider-horizontal-active@2.png
deleted file mode 100644
index 7a71e2c..0000000
Binary files a/src/assets/scrollbar-slider-horizontal-active@2.png and /dev/null differ
diff --git a/src/assets/scrollbar-slider-horizontal-hover.png b/src/assets/scrollbar-slider-horizontal-hover.png
deleted file mode 100644
index 7c4efa7..0000000
Binary files a/src/assets/scrollbar-slider-horizontal-hover.png and /dev/null differ
diff --git a/src/assets/scrollbar-slider-horizontal-hover@2.png b/src/assets/scrollbar-slider-horizontal-hover@2.png
deleted file mode 100644
index 7a71e2c..0000000
Binary files a/src/assets/scrollbar-slider-horizontal-hover@2.png and /dev/null differ
diff --git a/src/assets/scrollbar-slider-horizontal.png b/src/assets/scrollbar-slider-horizontal.png
deleted file mode 100644
index f6eba72..0000000
Binary files a/src/assets/scrollbar-slider-horizontal.png and /dev/null differ
diff --git a/src/assets/scrollbar-slider-horizontal@2.png b/src/assets/scrollbar-slider-horizontal@2.png
deleted file mode 100644
index 0f70e4d..0000000
Binary files a/src/assets/scrollbar-slider-horizontal@2.png and /dev/null differ
diff --git a/src/assets/scrollbar-slider-vertical-active.png b/src/assets/scrollbar-slider-vertical-active.png
deleted file mode 100644
index 644f19b..0000000
Binary files a/src/assets/scrollbar-slider-vertical-active.png and /dev/null differ
diff --git a/src/assets/scrollbar-slider-vertical-active@2.png b/src/assets/scrollbar-slider-vertical-active@2.png
deleted file mode 100644
index 68ee30f..0000000
Binary files a/src/assets/scrollbar-slider-vertical-active@2.png and /dev/null differ
diff --git a/src/assets/scrollbar-slider-vertical-hover.png b/src/assets/scrollbar-slider-vertical-hover.png
deleted file mode 100644
index 644f19b..0000000
Binary files a/src/assets/scrollbar-slider-vertical-hover.png and /dev/null differ
diff --git a/src/assets/scrollbar-slider-vertical-hover@2.png b/src/assets/scrollbar-slider-vertical-hover@2.png
deleted file mode 100644
index 68ee30f..0000000
Binary files a/src/assets/scrollbar-slider-vertical-hover@2.png and /dev/null differ
diff --git a/src/assets/scrollbar-slider-vertical.png b/src/assets/scrollbar-slider-vertical.png
deleted file mode 100644
index 9a0e607..0000000
Binary files a/src/assets/scrollbar-slider-vertical.png and /dev/null differ
diff --git a/src/assets/scrollbar-slider-vertical@2.png b/src/assets/scrollbar-slider-vertical@2.png
deleted file mode 100644
index 7a71675..0000000
Binary files a/src/assets/scrollbar-slider-vertical@2.png and /dev/null differ
diff --git a/src/assets/scrollbar-trough-horizontal.png b/src/assets/scrollbar-trough-horizontal.png
deleted file mode 100644
index 9660895..0000000
Binary files a/src/assets/scrollbar-trough-horizontal.png and /dev/null differ
diff --git a/src/assets/scrollbar-trough-horizontal@2.png b/src/assets/scrollbar-trough-horizontal@2.png
deleted file mode 100644
index d323b79..0000000
Binary files a/src/assets/scrollbar-trough-horizontal@2.png and /dev/null differ
diff --git a/src/assets/scrollbar-trough-vertical.png b/src/assets/scrollbar-trough-vertical.png
deleted file mode 100644
index 51c4384..0000000
Binary files a/src/assets/scrollbar-trough-vertical.png and /dev/null differ
diff --git a/src/assets/scrollbar-trough-vertical@2.png b/src/assets/scrollbar-trough-vertical@2.png
deleted file mode 100644
index 256a200..0000000
Binary files a/src/assets/scrollbar-trough-vertical@2.png and /dev/null differ
diff --git a/src/assets/spinbutton-down-insensitive.png b/src/assets/spinbutton-down-insensitive.png
deleted file mode 100644
index 4406c66..0000000
Binary files a/src/assets/spinbutton-down-insensitive.png and /dev/null differ
diff --git a/src/assets/spinbutton-down-rtl-insensitive.png b/src/assets/spinbutton-down-rtl-insensitive.png
deleted file mode 100644
index de3ce1e..0000000
Binary files a/src/assets/spinbutton-down-rtl-insensitive.png and /dev/null differ
diff --git a/src/assets/spinbutton-down-rtl.png b/src/assets/spinbutton-down-rtl.png
deleted file mode 100644
index 25f10b6..0000000
Binary files a/src/assets/spinbutton-down-rtl.png and /dev/null differ
diff --git a/src/assets/spinbutton-down.png b/src/assets/spinbutton-down.png
deleted file mode 100644
index fd1be85..0000000
Binary files a/src/assets/spinbutton-down.png and /dev/null differ
diff --git a/src/assets/spinbutton-up-insensitive.png b/src/assets/spinbutton-up-insensitive.png
deleted file mode 100644
index f5fbe6d..0000000
Binary files a/src/assets/spinbutton-up-insensitive.png and /dev/null differ
diff --git a/src/assets/spinbutton-up-rtl-insensitive.png b/src/assets/spinbutton-up-rtl-insensitive.png
deleted file mode 100644
index 70ff1ca..0000000
Binary files a/src/assets/spinbutton-up-rtl-insensitive.png and /dev/null differ
diff --git a/src/assets/spinbutton-up-rtl.png b/src/assets/spinbutton-up-rtl.png
deleted file mode 100644
index 7486bbc..0000000
Binary files a/src/assets/spinbutton-up-rtl.png and /dev/null differ
diff --git a/src/assets/spinbutton-up.png b/src/assets/spinbutton-up.png
deleted file mode 100644
index e924e8c..0000000
Binary files a/src/assets/spinbutton-up.png and /dev/null differ
diff --git a/src/assets/tab-bottom-active.png b/src/assets/tab-bottom-active.png
deleted file mode 100644
index f5fec4b..0000000
Binary files a/src/assets/tab-bottom-active.png and /dev/null differ
diff --git a/src/assets/tab-bottom-inactive.png b/src/assets/tab-bottom-inactive.png
deleted file mode 100644
index e967ae6..0000000
Binary files a/src/assets/tab-bottom-inactive.png and /dev/null differ
diff --git a/src/assets/tab-left-active.png b/src/assets/tab-left-active.png
deleted file mode 100644
index 0b9e98b..0000000
Binary files a/src/assets/tab-left-active.png and /dev/null differ
diff --git a/src/assets/tab-left-inactive.png b/src/assets/tab-left-inactive.png
deleted file mode 100644
index 25d37f3..0000000
Binary files a/src/assets/tab-left-inactive.png and /dev/null differ
diff --git a/src/assets/tab-right-active.png b/src/assets/tab-right-active.png
deleted file mode 100644
index 1e3ca55..0000000
Binary files a/src/assets/tab-right-active.png and /dev/null differ
diff --git a/src/assets/tab-right-inactive.png b/src/assets/tab-right-inactive.png
deleted file mode 100644
index 6c75ce0..0000000
Binary files a/src/assets/tab-right-inactive.png and /dev/null differ
diff --git a/src/assets/tab-top-active.png b/src/assets/tab-top-active.png
deleted file mode 100644
index 5fc6404..0000000
Binary files a/src/assets/tab-top-active.png and /dev/null differ
diff --git a/src/assets/tab-top-inactive.png b/src/assets/tab-top-inactive.png
deleted file mode 100644
index a88c300..0000000
Binary files a/src/assets/tab-top-inactive.png and /dev/null differ
diff --git a/src/assets/titlebutton-close-active-backdrop.png b/src/assets/titlebutton-close-active-backdrop.png
deleted file mode 100644
index 6d4a418..0000000
Binary files a/src/assets/titlebutton-close-active-backdrop.png and /dev/null differ
diff --git a/src/assets/titlebutton-close-active-backdrop@2.png b/src/assets/titlebutton-close-active-backdrop@2.png
deleted file mode 100644
index 9d675d9..0000000
Binary files a/src/assets/titlebutton-close-active-backdrop@2.png and /dev/null differ
diff --git a/src/assets/titlebutton-close-active.png b/src/assets/titlebutton-close-active.png
deleted file mode 100644
index 6d4a418..0000000
Binary files a/src/assets/titlebutton-close-active.png and /dev/null differ
diff --git a/src/assets/titlebutton-close-active@2.png b/src/assets/titlebutton-close-active@2.png
deleted file mode 100644
index 9d675d9..0000000
Binary files a/src/assets/titlebutton-close-active@2.png and /dev/null differ
diff --git a/src/assets/titlebutton-close-backdrop.png b/src/assets/titlebutton-close-backdrop.png
deleted file mode 100644
index 751e321..0000000
Binary files a/src/assets/titlebutton-close-backdrop.png and /dev/null differ
diff --git a/src/assets/titlebutton-close-backdrop@2.png b/src/assets/titlebutton-close-backdrop@2.png
deleted file mode 100644
index beb9aee..0000000
Binary files a/src/assets/titlebutton-close-backdrop@2.png and /dev/null differ
diff --git a/src/assets/titlebutton-close-hover-backdrop.png b/src/assets/titlebutton-close-hover-backdrop.png
deleted file mode 100644
index ddc21b3..0000000
Binary files a/src/assets/titlebutton-close-hover-backdrop.png and /dev/null differ
diff --git a/src/assets/titlebutton-close-hover-backdrop@2.png b/src/assets/titlebutton-close-hover-backdrop@2.png
deleted file mode 100644
index 79312d7..0000000
Binary files a/src/assets/titlebutton-close-hover-backdrop@2.png and /dev/null differ
diff --git a/src/assets/titlebutton-close-hover.png b/src/assets/titlebutton-close-hover.png
deleted file mode 100644
index ddc21b3..0000000
Binary files a/src/assets/titlebutton-close-hover.png and /dev/null differ
diff --git a/src/assets/titlebutton-close-hover@2.png b/src/assets/titlebutton-close-hover@2.png
deleted file mode 100644
index 79312d7..0000000
Binary files a/src/assets/titlebutton-close-hover@2.png and /dev/null differ
diff --git a/src/assets/titlebutton-close.png b/src/assets/titlebutton-close.png
deleted file mode 100644
index 08063d5..0000000
Binary files a/src/assets/titlebutton-close.png and /dev/null differ
diff --git a/src/assets/titlebutton-close@2.png b/src/assets/titlebutton-close@2.png
deleted file mode 100644
index 23c2afe..0000000
Binary files a/src/assets/titlebutton-close@2.png and /dev/null differ
diff --git a/src/assets/titlebutton-maximize-active-backdrop.png b/src/assets/titlebutton-maximize-active-backdrop.png
deleted file mode 100644
index 2851a85..0000000
Binary files a/src/assets/titlebutton-maximize-active-backdrop.png and /dev/null differ
diff --git a/src/assets/titlebutton-maximize-active-backdrop@2.png b/src/assets/titlebutton-maximize-active-backdrop@2.png
deleted file mode 100644
index b7c131f..0000000
Binary files a/src/assets/titlebutton-maximize-active-backdrop@2.png and /dev/null differ
diff --git a/src/assets/titlebutton-maximize-active.png b/src/assets/titlebutton-maximize-active.png
deleted file mode 100644
index 671e343..0000000
Binary files a/src/assets/titlebutton-maximize-active.png and /dev/null differ
diff --git a/src/assets/titlebutton-maximize-active@2.png b/src/assets/titlebutton-maximize-active@2.png
deleted file mode 100644
index 1c26c84..0000000
Binary files a/src/assets/titlebutton-maximize-active@2.png and /dev/null differ
diff --git a/src/assets/titlebutton-maximize-backdrop.png b/src/assets/titlebutton-maximize-backdrop.png
deleted file mode 100644
index 745481d..0000000
Binary files a/src/assets/titlebutton-maximize-backdrop.png and /dev/null differ
diff --git a/src/assets/titlebutton-maximize-backdrop@2.png b/src/assets/titlebutton-maximize-backdrop@2.png
deleted file mode 100644
index fd631db..0000000
Binary files a/src/assets/titlebutton-maximize-backdrop@2.png and /dev/null differ
diff --git a/src/assets/titlebutton-maximize-hover-backdrop.png b/src/assets/titlebutton-maximize-hover-backdrop.png
deleted file mode 100644
index d4b25e1..0000000
Binary files a/src/assets/titlebutton-maximize-hover-backdrop.png and /dev/null differ
diff --git a/src/assets/titlebutton-maximize-hover-backdrop@2.png b/src/assets/titlebutton-maximize-hover-backdrop@2.png
deleted file mode 100644
index db728d8..0000000
Binary files a/src/assets/titlebutton-maximize-hover-backdrop@2.png and /dev/null differ
diff --git a/src/assets/titlebutton-maximize-hover.png b/src/assets/titlebutton-maximize-hover.png
deleted file mode 100644
index 87b7e3c..0000000
Binary files a/src/assets/titlebutton-maximize-hover.png and /dev/null differ
diff --git a/src/assets/titlebutton-maximize-hover@2.png b/src/assets/titlebutton-maximize-hover@2.png
deleted file mode 100644
index 6016c90..0000000
Binary files a/src/assets/titlebutton-maximize-hover@2.png and /dev/null differ
diff --git a/src/assets/titlebutton-maximize-maximized-active-backdrop.png b/src/assets/titlebutton-maximize-maximized-active-backdrop.png
deleted file mode 100644
index 069b674..0000000
Binary files a/src/assets/titlebutton-maximize-maximized-active-backdrop.png and /dev/null differ
diff --git a/src/assets/titlebutton-maximize-maximized-active-backdrop@2.png b/src/assets/titlebutton-maximize-maximized-active-backdrop@2.png
deleted file mode 100644
index 511a870..0000000
Binary files a/src/assets/titlebutton-maximize-maximized-active-backdrop@2.png and /dev/null differ
diff --git a/src/assets/titlebutton-maximize-maximized-active.png b/src/assets/titlebutton-maximize-maximized-active.png
deleted file mode 100644
index f74700f..0000000
Binary files a/src/assets/titlebutton-maximize-maximized-active.png and /dev/null differ
diff --git a/src/assets/titlebutton-maximize-maximized-active@2.png b/src/assets/titlebutton-maximize-maximized-active@2.png
deleted file mode 100644
index 0b53456..0000000
Binary files a/src/assets/titlebutton-maximize-maximized-active@2.png and /dev/null differ
diff --git a/src/assets/titlebutton-maximize-maximized-backdrop.png b/src/assets/titlebutton-maximize-maximized-backdrop.png
deleted file mode 100644
index 26c9ef9..0000000
Binary files a/src/assets/titlebutton-maximize-maximized-backdrop.png and /dev/null differ
diff --git a/src/assets/titlebutton-maximize-maximized-backdrop@2.png b/src/assets/titlebutton-maximize-maximized-backdrop@2.png
deleted file mode 100644
index a145a60..0000000
Binary files a/src/assets/titlebutton-maximize-maximized-backdrop@2.png and /dev/null differ
diff --git a/src/assets/titlebutton-maximize-maximized-hover-backdrop.png b/src/assets/titlebutton-maximize-maximized-hover-backdrop.png
deleted file mode 100644
index a93ffec..0000000
Binary files a/src/assets/titlebutton-maximize-maximized-hover-backdrop.png and /dev/null differ
diff --git a/src/assets/titlebutton-maximize-maximized-hover-backdrop@2.png b/src/assets/titlebutton-maximize-maximized-hover-backdrop@2.png
deleted file mode 100644
index 1832792..0000000
Binary files a/src/assets/titlebutton-maximize-maximized-hover-backdrop@2.png and /dev/null differ
diff --git a/src/assets/titlebutton-maximize-maximized-hover.png b/src/assets/titlebutton-maximize-maximized-hover.png
deleted file mode 100644
index b1e84b7..0000000
Binary files a/src/assets/titlebutton-maximize-maximized-hover.png and /dev/null differ
diff --git a/src/assets/titlebutton-maximize-maximized-hover@2.png b/src/assets/titlebutton-maximize-maximized-hover@2.png
deleted file mode 100644
index 748757c..0000000
Binary files a/src/assets/titlebutton-maximize-maximized-hover@2.png and /dev/null differ
diff --git a/src/assets/titlebutton-maximize-maximized.png b/src/assets/titlebutton-maximize-maximized.png
deleted file mode 100644
index 9f81a51..0000000
Binary files a/src/assets/titlebutton-maximize-maximized.png and /dev/null differ
diff --git a/src/assets/titlebutton-maximize-maximized@2.png b/src/assets/titlebutton-maximize-maximized@2.png
deleted file mode 100644
index 7934b3e..0000000
Binary files a/src/assets/titlebutton-maximize-maximized@2.png and /dev/null differ
diff --git a/src/assets/titlebutton-maximize.png b/src/assets/titlebutton-maximize.png
deleted file mode 100644
index 6a5f84a..0000000
Binary files a/src/assets/titlebutton-maximize.png and /dev/null differ
diff --git a/src/assets/titlebutton-maximize@2.png b/src/assets/titlebutton-maximize@2.png
deleted file mode 100644
index c717e7c..0000000
Binary files a/src/assets/titlebutton-maximize@2.png and /dev/null differ
diff --git a/src/assets/titlebutton-minimize-active-backdrop.png b/src/assets/titlebutton-minimize-active-backdrop.png
deleted file mode 100644
index c217230..0000000
Binary files a/src/assets/titlebutton-minimize-active-backdrop.png and /dev/null differ
diff --git a/src/assets/titlebutton-minimize-active-backdrop@2.png b/src/assets/titlebutton-minimize-active-backdrop@2.png
deleted file mode 100644
index 770e206..0000000
Binary files a/src/assets/titlebutton-minimize-active-backdrop@2.png and /dev/null differ
diff --git a/src/assets/titlebutton-minimize-active.png b/src/assets/titlebutton-minimize-active.png
deleted file mode 100644
index d8e185e..0000000
Binary files a/src/assets/titlebutton-minimize-active.png and /dev/null differ
diff --git a/src/assets/titlebutton-minimize-active@2.png b/src/assets/titlebutton-minimize-active@2.png
deleted file mode 100644
index b9af054..0000000
Binary files a/src/assets/titlebutton-minimize-active@2.png and /dev/null differ
diff --git a/src/assets/titlebutton-minimize-backdrop.png b/src/assets/titlebutton-minimize-backdrop.png
deleted file mode 100644
index 0439c19..0000000
Binary files a/src/assets/titlebutton-minimize-backdrop.png and /dev/null differ
diff --git a/src/assets/titlebutton-minimize-backdrop@2.png b/src/assets/titlebutton-minimize-backdrop@2.png
deleted file mode 100644
index c352276..0000000
Binary files a/src/assets/titlebutton-minimize-backdrop@2.png and /dev/null differ
diff --git a/src/assets/titlebutton-minimize-hover-backdrop.png b/src/assets/titlebutton-minimize-hover-backdrop.png
deleted file mode 100644
index 634eda0..0000000
Binary files a/src/assets/titlebutton-minimize-hover-backdrop.png and /dev/null differ
diff --git a/src/assets/titlebutton-minimize-hover-backdrop@2.png b/src/assets/titlebutton-minimize-hover-backdrop@2.png
deleted file mode 100644
index 72e633b..0000000
Binary files a/src/assets/titlebutton-minimize-hover-backdrop@2.png and /dev/null differ
diff --git a/src/assets/titlebutton-minimize-hover.png b/src/assets/titlebutton-minimize-hover.png
deleted file mode 100644
index 733462a..0000000
Binary files a/src/assets/titlebutton-minimize-hover.png and /dev/null differ
diff --git a/src/assets/titlebutton-minimize-hover@2.png b/src/assets/titlebutton-minimize-hover@2.png
deleted file mode 100644
index 72c1055..0000000
Binary files a/src/assets/titlebutton-minimize-hover@2.png and /dev/null differ
diff --git a/src/assets/titlebutton-minimize.png b/src/assets/titlebutton-minimize.png
deleted file mode 100644
index cd3952a..0000000
Binary files a/src/assets/titlebutton-minimize.png and /dev/null differ
diff --git a/src/assets/titlebutton-minimize@2.png b/src/assets/titlebutton-minimize@2.png
deleted file mode 100644
index 923dcab..0000000
Binary files a/src/assets/titlebutton-minimize@2.png and /dev/null differ
diff --git a/src/assets/togglebutton-active.png b/src/assets/togglebutton-active.png
deleted file mode 100644
index 2176d46..0000000
Binary files a/src/assets/togglebutton-active.png and /dev/null differ
diff --git a/src/assets/togglebutton-hover.png b/src/assets/togglebutton-hover.png
deleted file mode 100644
index 5a2e041..0000000
Binary files a/src/assets/togglebutton-hover.png and /dev/null differ
diff --git a/src/assets/togglebutton-insensitive.png b/src/assets/togglebutton-insensitive.png
deleted file mode 100644
index 2bb40c4..0000000
Binary files a/src/assets/togglebutton-insensitive.png and /dev/null differ
diff --git a/src/assets/togglebutton.png b/src/assets/togglebutton.png
deleted file mode 100644
index bceb630..0000000
Binary files a/src/assets/togglebutton.png and /dev/null differ
diff --git a/src/assets/toolbar-background.png b/src/assets/toolbar-background.png
deleted file mode 100644
index cb8ae99..0000000
Binary files a/src/assets/toolbar-background.png and /dev/null differ
diff --git a/src/assets/toolbutton-active.png b/src/assets/toolbutton-active.png
deleted file mode 100644
index a1c403b..0000000
Binary files a/src/assets/toolbutton-active.png and /dev/null differ
diff --git a/src/assets/toolbutton-hover.png b/src/assets/toolbutton-hover.png
deleted file mode 100644
index e117c8b..0000000
Binary files a/src/assets/toolbutton-hover.png and /dev/null differ
diff --git a/src/assets/toolbutton-toggled.png b/src/assets/toolbutton-toggled.png
deleted file mode 100644
index 2bb962d..0000000
Binary files a/src/assets/toolbutton-toggled.png and /dev/null differ
diff --git a/src/assets/tree-header.png b/src/assets/tree-header.png
deleted file mode 100644
index 09a7948..0000000
Binary files a/src/assets/tree-header.png and /dev/null differ
diff --git a/src/build_theme.sh b/src/build_theme.sh
index 401d1df..e9ab1a9 100644
--- a/src/build_theme.sh
+++ b/src/build_theme.sh
@@ -1,39 +1,38 @@
 #! /bin/bash
 
 create_folders () {
   folders=(gtk-2.0 gtk-3.0 gtk-3.16 gtk-3.18 gtk-3.20)
   for j in "${folders[@]}"
     do
       if ! [ -d $1/$j ]
         then mkdir -p $1/$j;
       fi
   done 
 }
 
 render_theme () {
   python render_assets.py $1
   create_folders $2
   sass --cache-location /tmp/sass-cache gtk316/gtk.scss $2/gtk-3.16/gtk.css
   sass --cache-location /tmp/sass-cache gtk318/gtk.scss $2/gtk-3.18/gtk.css
   sass --cache-location /tmp/sass-cache gtk320/gtk.scss $2/gtk-3.20/gtk.css
   cp -R assets $2/
   cp -R gtk2/* $2/gtk-2.0/
   if [ -d $HOME/.themes/$2 ]
     then rm -rf $HOME/.themes/$2;
   fi
   mv -f $2 $HOME/.themes/
 }
 
 if [ -z "$1" ]
 then
   render_theme "$HOME/.config/kdeglobals" Breeze
 else
   if [ -f "schemes/$1.colors" ]
   then 
     render_theme schemes/$1.colors $1
   else
     echo "colorscheme $1 not found"
   fi
 fi
-
-
+        
diff --git a/src/gtk2/gtkrc b/src/gtk2/gtkrc
index 8726dbb..aa3ffca 100644
--- a/src/gtk2/gtkrc
+++ b/src/gtk2/gtkrc
@@ -1,29 +1,30 @@
 # Theme:       Breeze-gtk
 # Description: Breeze theme for GTK+2.0
 
-gtk-color-scheme = "text_color:#eff0f1"
-gtk-color-scheme = "base_color:#232629"
-gtk-color-scheme = "insensitive_base_color:#1f2225"
-gtk-color-scheme = "fg_color:#eff0f1"
-gtk-color-scheme = "bg_color:#31363b"
-gtk-color-scheme = "selected_fg_color:#eff0f1"
-gtk-color-scheme = "selected_bg_color:#3daee9"
-gtk-color-scheme = "button_fg_color:#eff0f1"
-gtk-color-scheme = "tooltip_fg_color:#eff0f1"
-gtk-color-scheme = "tooltip_bg_color:#31363b"
-gtk-color-scheme = "insensitive_fg_color:#6b6f73"
-gtk-color-scheme = "insensitive_text_color:#626567"
-gtk-color-scheme = "button_insensitive_fg_color:#6b6f73"
-gtk-color-scheme = "border_color:#606468"
+gtk-color-scheme = "text_color:#b6c1d0"
+gtk-color-scheme = "base_color:#3c4048"
+gtk-color-scheme = "insensitive_base_color:#303339"
+gtk-color-scheme = "fg_color:#b6c1d0"
+gtk-color-scheme = "bg_color:#494e58"
+gtk-color-scheme = "selected_fg_color:#d1e1f4"
+gtk-color-scheme = "selected_bg_color:#78889c"
+gtk-color-scheme = "button_fg_color:#d2def0"
+gtk-color-scheme = "tooltip_fg_color:#2a2c30"
+gtk-color-scheme = "tooltip_bg_color:#b6c1d0"
+gtk-color-scheme = "insensitive_fg_color:#626873"
+gtk-color-scheme = "insensitive_text_color:#616771"
+gtk-color-scheme = "button_insensitive_fg_color:#707783"
+gtk-color-scheme = "button_active:#7d8d99"
+gtk-color-scheme = "border_color:#646a76"
 
 include "widgets/default"
 include "widgets/buttons"
 include "widgets/menu"
 include "widgets/entry"
 include "widgets/notebook"
 include "widgets/range"
 include "widgets/scrollbar"
 include "widgets/toolbar"
 include "widgets/progressbar"
 include "widgets/misc"
 include "widgets/styles"
diff --git a/src/gtk2/widgets/menu b/src/gtk2/widgets/menu
index 070af76..aaff5b1 100644
--- a/src/gtk2/widgets/menu
+++ b/src/gtk2/widgets/menu
@@ -1,277 +1,277 @@
 style "menubar"
 {
     #bg[SELECTED] = @selected_fg_color
 
 	fg[NORMAL] = @fg_color
 	fg[SELECTED] = @selected_fg_color
 
     text[PRELIGHT] = @fg_color
 
     xthickness  = 0
     ythickness  = 0
 
     engine "pixmap"
     {
     image
         {
           function      = BOX
           recolorable   = TRUE
           state         = PRELIGHT
           file          = "../assets/menubar-button.png"
 
           border          = { 4, 4, 4, 4 }
           stretch         = TRUE
         }
     }
 }
 
 style "menu"
 {
     xthickness  = 0
     ythickness  = 0
 
     #GtkMenuItem::arrow-scaling  = 0.4
 
     engine "pixmap" { # For menus that use horizontal lines rather than gtkseparator
 
     image {
       function = HLINE
       file = "../assets/line-h.png"
       border = { 1, 1, 1, 1 }
       stretch = TRUE
     }
   }
 }
 
 style "menu_item"
 {
     xthickness  = 2
     ythickness  = 4
 
-    bg[PRELIGHT]      = @selected_bg_color
+    bg[PRELIGHT]      = @button_active
     fg[PRELIGHT]      = @selected_fg_color
     text[PRELIGHT]  = @selected_fg_color
 
     GtkMenuItem::toggle-spacing = 10
     GtkMenuItem::arrow-spacing = 10
 
     engine "pixmap"
     {
 
     # Check Buttons
 
     image
     {
             function                = CHECK
             recolorable             = TRUE
             state                   = NORMAL
             shadow                  = OUT
             overlay_file            = "../assets/check-unchecked.png"
             overlay_stretch         = TRUE  #needed for LibreOffice
         }
     image
     {
             function                = CHECK
             recolorable             = TRUE
             state                   = PRELIGHT
             shadow                  = OUT
             overlay_file            = "../assets/check-unchecked.png"
             overlay_stretch         = TRUE
         }
     image
     {
             function                = CHECK
             recolorable             = TRUE
             state                   = ACTIVE
             shadow                  = OUT
             overlay_file            = "../assets/check-checked-active.png"
             overlay_stretch         = TRUE
         }
     image
     {
             function                = CHECK
             recolorable             = TRUE
             state                   = INSENSITIVE
             shadow                  = OUT
             overlay_file            = "../assets/check-unchecked-insensitive.png"
             overlay_stretch         = TRUE
         }
     image
     {
             function                = CHECK
             recolorable             = TRUE
               state                   = NORMAL
             shadow                  = IN
             overlay_file            = "../assets/check-checked-active.png"
             overlay_stretch       = TRUE
         }
     image
     {
             function                = CHECK
             recolorable             = TRUE
                 state                 = PRELIGHT
             shadow                  = IN
             overlay_file            = "../assets/check-checked-active.png"
             overlay_stretch         = TRUE
         }
     image
     {
             function                = CHECK
             recolorable             = TRUE
                 state                 = ACTIVE
             shadow                  = IN
             overlay_file            = "../assets/check-checked-active.png"
             overlay_stretch         = TRUE
         }
     image
     {
               function              = CHECK
             recolorable             = TRUE
             state                     = INSENSITIVE
             shadow                  = IN
             overlay_file            = "../assets/check-checked-insensitive.png"
             overlay_stretch         = TRUE
     }
 
     # Radio Buttons
 
     image
     {
             function                = OPTION
             state                   = NORMAL
             shadow                  = OUT
             overlay_file            = "../assets/radio-unchecked.png"
             overlay_stretch         = TRUE
         }
     image
     {
             function                = OPTION
             state                   = PRELIGHT
             shadow                  = OUT
             overlay_file            = "../assets/radio-unchecked.png"
             overlay_stretch         = TRUE
         }
     image
     {
             function                = OPTION
             state                   = ACTIVE
             shadow                  = OUT
             overlay_file            = "../assets/radio-checked-active.png"
             overlay_stretch         = TRUE
         }
     image
     {
             function                = OPTION
             state                   = INSENSITIVE
             shadow                = OUT
             overlay_file            = "../assets/radio-unchecked-insensitive.png"
             overlay_stretch         = FALSE
         }
     image
     {
             function                = OPTION
               state                     = NORMAL
             shadow                  = IN
             overlay_file            = "../assets/radio-checked-active.png"
             overlay_stretch         = TRUE
         }
     image
     {
             function                = OPTION
               state                   = PRELIGHT
             shadow                  = IN
             overlay_file            = "../assets/radio-checked-active.png"
             overlay_stretch         = TRUE
         }
     image
     {
             function                = OPTION
               state                   = ACTIVE
             shadow                  = IN
             overlay_file            = "../assets/radio-checked-active.png"
             overlay_stretch       = TRUE
         }
     image
     {
             function                = OPTION
               state                     = INSENSITIVE
             shadow                  = IN
             overlay_file            = "../assets/radio-checked-insensitive.png"
             overlay_stretch         = TRUE
         }
     image
         {
             function        = SHADOW # This fixes boxy Qt menu items
               file        = "../assets/null.png"
               border      = { 10, 10, 10, 10 }
               stretch     = TRUE
         }
 
     # Arrow Buttons
 
     image
     {
       function              = ARROW
       state                   = NORMAL
       overlay_file          = "../assets/menu-arrow.png"
       overlay_border        = { 0, 0, 0, 0 }
       overlay_stretch       = FALSE
       arrow_direction       = RIGHT
     }
     image
     {
       function              = ARROW
       state                   = PRELIGHT
       overlay_file          = "../assets/menu-arrow-selected.png"
       overlay_border        = { 0, 0, 0, 0 }
       overlay_stretch       = FALSE
       arrow_direction       = RIGHT
     }
     image
     {
       function              = ARROW
       state                   = INSENSITIVE
       overlay_file          = "../assets/menu-arrow-insensitive.png"
       overlay_border        = { 0, 0, 0, 0 }
       overlay_stretch       = FALSE
       arrow_direction       = RIGHT
     }
  }
 }
 
 style "menubar_item"
 {
     xthickness  = 2
     ythickness  = 2
     bg[PRELIGHT]    = @selected_fg_color
     fg[PRELIGHT]    = @selected_fg_color
 }
 
 style "menu_framed_box" #this is not needed in Gnome
 {
     engine "pixmap"
     {
      image
      {
         function                = BOX
         detail                  = "menu"
         file                          = "../assets/frame.png"
         border                  = { 3, 3, 3, 3 }
         stretch                   = TRUE
      }
     }
 }
 
 style "separator_menu_item"
 {
     engine "pixmap"
     {
         image
         {
             function            = BOX
               file              = "../assets/line-h.png"
               border            = { 1, 1, 1, 1 }
               stretch         = TRUE
         }
     }
 }
diff --git a/src/gtk316/widgets/_headerbar.scss b/src/gtk316/widgets/_headerbar.scss
index bd4e7a9..eb996ec 100644
--- a/src/gtk316/widgets/_headerbar.scss
+++ b/src/gtk316/widgets/_headerbar.scss
@@ -1,157 +1,157 @@
 /***************
  * Header bars *
  ***************/
 
 .titlebar,
 .header-bar {
   transition: none;
   padding: 4px 6px;
   border-width: 0px 0px 1px 0px;
   border-radius: 3px 3px 0px 0px;
   border-style: solid;
   border-color: s_color(normal);
   color: t_color(text);
-  background-image: linear-gradient(to bottom,change-color(t_color(background),$lightness: lightness(t_color(background))*1.2),t_color(background));
+  background-image: linear-gradient(to bottom,change-color(t_color(background),$lightness: min(lightness(t_color(background))*1.2,100%)),t_color(background));
   &:backdrop {
     border-color: transparent;
     background-image: none;
     background-color: t_color(backdrop-background);
     color: t_color(backdrop-text);
     box-shadow: none;
   }
 .path-bar .button {
   color: t_color(text);
   }
 .button {
   transition: none;
   @include button(undecorated, $tc: t_color(text));
 
   &.flat {
     @include button(undecorated,$tc: t_color(text));
   }
   &:hover {
     @include button(hover, $tc: t_color(text));
     &:backdrop { border-color: t_color(backdrop-background); }
   }
   &:active, &:checked {
     @include button(active);
     &:hover {
 	  @include button(active-hover);
     }
     &:backdrop {
       background-image: none;
       background-color: t_color(backdrop-background);
       border-color: t_color(backdrop-background);
       color: t_color(backdrop-text);
     }
   }
 
   &.suggested-action {
     @extend %suggested-action;
   }
 
   &:backdrop {
     background-color: t_color(backdrop-background);
     color: t_color(backdrop-text);
     }
 
   &.flat:backdrop, &.flat:backdrop:insensitive, &:insensitive:backdrop {
     background-image: none;
     background-color: t_color(backdrop-background);
     color: t_color(backdrop-text);
     border-color: transparent;
     }
   &.flat:insensitive {
     @extend %undecorated_button;;
     color: insensitive(t_color(text));
     }
   &:insensitive {
     background-color: transparent;
     background-image: none;
     color: insensitive(t_color(text));
     &:active, &:checked {
       @include button(insensitive-active);
     }
   }
 }
 
   .title {
     font-weight: normal;
     padding: 0px 12px;
   }
 
   .subtitle {
     font-size: smaller;
     padding: 0 12px;
     @extend .dim-label;
   }
 
   .header-bar-separator,
   & > GtkBox > .separator.vertical {
     -GtkWidget-wide-separators: true;
     -GtkWidget-separator-width: 1px;
     border-width: 0px;
     background-color: t_color(background);
     border-color: t_color(background);
     &:backdrop {
       background-color: t_color(backdrop-background);
       border-color: t_color(backdrop-background);
     }
   }
   &.selection-mode {
 
     @extend .info;
 
     &.suggested-action {
       @extend %suggested-action;
     }
 
     .subtitle:link { @extend *:link:selected;  }
 
     .selection-menu {
       padding-left: 10px;
       padding-right: 10px;
 
       GtkArrow { -GtkArrow-arrow-scaling: 1; }
 
       .arrow {
         -gtk-icon-source: -gtk-icontheme('arrow-down');
         icon-shadow: none;
       }
     }
   }
 
   .tiled &, .maximized & {
     border-radius: 0; // squared corners when the window is max'd or tiled
   }
 
   &.default-decoration {
     padding: 4px;
     .button { padding: 5px; }
   }
 }
 
 %suggested-action {
   background-image: none;
   background-color: b_color(active);
   &:hover {
     background-color: b_color(hover);
     color: b_color(text)
     }
   &:insensitive {
     background-color: transparent;
     background-image: none;
     color: insensitive(t_color(text));
     &:active, &:checked {
       @include button(insensitive-active);
       }
     }
   &:backdrop {
     background-color: t_color(backdrop-background);
     border-color: transparent;
     color: t_color(backdrop-text);
     &:insensitive {
       color: insensitive(t_color(backdrop-text));
     }
   }
 }
diff --git a/src/gtk320/widgets/_dialogs.scss b/src/gtk320/widgets/_dialogs.scss
index 4e1d6c5..c3f8849 100644
--- a/src/gtk320/widgets/_dialogs.scss
+++ b/src/gtk320/widgets/_dialogs.scss
@@ -1,44 +1,44 @@
 /***********
  * Dialogs *
  ***********/
 
 // .message-dialog .dialog-action-area .button {
 //   //padding: 8px;
 // }
 
 messagedialog { // Message Dialog styling
 
     &.background { background-color: w_color(normal); }
     &:backdrop { background-color: backdrop(w_color(normal))}
   .titlebar {
     min-height: 32px;
     background-color: transparent;
-    background-image: linear-gradient(to bottom,change-color(t_color(background),$lightness: lightness(t_color(background))*1.2),t_color(background));
+    background-image: linear-gradient(to bottom,change-color(t_color(background),$lightness: min(lightness(t_color(background))*1.2,100%)),t_color(background));
     box-shadow: none;
   }
   .dialog-action-area {
     padding: 8px;
   }
   button { margin: 2px; }
 }
 
 filechooser {
   .search-bar {
     background-color: w_color(normal);
     border-color: w_color(normal);
     box-shadow: none;
     &:backdrop {
       background-color: backdrop(w_color(normal));
       border-color: backdrop(w_color(normal));
       color: backdrop(w_color(text));
     }
   }
   .dialog-action-box {
     border-top: 1px solid $border_color;
     &:backdrop { border-top-color: backdrop($border_color); }
   }
   #pathbarbox {
     background-color: w_color(normal);
     border-bottom: 1px solid $border_color;
   }
 }
diff --git a/src/gtk320/widgets/_headerbar.scss b/src/gtk320/widgets/_headerbar.scss
index 3871699..a5df175 100644
--- a/src/gtk320/widgets/_headerbar.scss
+++ b/src/gtk320/widgets/_headerbar.scss
@@ -1,165 +1,165 @@
 /***************
  * Header bars *
  ***************/
 
 %titlebar,
 headerbar {
   transition: none;
   padding: 0px 6px;
   border-width: 0px 0px 1px 0px;
   border-radius: 3px 3px 0px 0px;
   border-style: solid;
   border-color: s_color(normal);
   color: t_color(text);
-  background-image: linear-gradient(to bottom,change-color(t_color(background),$lightness: lightness(t_color(background))*1.2),t_color(background));
+  background-image: linear-gradient(to bottom,change-color(t_color(background),$lightness: min(lightness(t_color(background))*1.2,100%)),t_color(background));
   &:backdrop {
     border-color: transparent;
     background-image: none;
     background-color: t_color(backdrop-background);
     color: t_color(backdrop-text);
     box-shadow: none;
   }
   .path-bar button {
     color: t_color(text);
     font-weight: normal;
     &:backdrop { color: t_color(backdrop-text)}
     }
   button {
     transition: none;
     @include button(undecorated, $tc: t_color(text));
 
     &.flat {
       @include button(undecorated,$tc: t_color(text));
     }
     &:hover {
       @include button(hover, $tc: t_color(text));
       &:backdrop { border-color: t_color(backdrop-background); }
     }
     &:active, &:checked {
       @include button(active);
       &:hover {
   	  @include button(active-hover);
       }
       &:backdrop {
         background-image: none;
         background-color: t_color(backdrop-background);
         border-color: t_color(backdrop-background);
         color: t_color(backdrop-text);
       }
     }
 
     &.suggested-action {
       @extend %suggested-action;
     }
 
     &:backdrop {
       border-color: transparent;
       background-image: none;
       background-color: t_color(backdrop-background);
       color: t_color(backdrop-text);
       }
 
     &.flat:backdrop, &.flat:backdrop:disabled, &:disabled:backdrop {
       background-image: none;
       background-color: t_color(backdrop-background);
       color: t_color(backdrop-text);
       border-color: transparent;
       }
     &.flat:disabled {
       @extend %undecorated_button;;
       color: insensitive(t_color(text));
       }
     &:disabled {
       background-color: transparent;
       background-image: none;
       border-color: transparent;
       color: insensitive(t_color(text));
       &:active, &:checked {
         @include button(insensitive-active);
       }
     }
   }
 
   .title {
     font-weight: normal;
     padding: 0px 12px;
     &:backdrop { color: t_color(backdrop-text)}
   }
 
   .subtitle {
     font-size: smaller;
     padding: 0 12px;
     @extend .dim-label;
     &:backdrop { color: t_color(backdrop-text)}
   }
 
   separator {
     border-width: 0px;
     background-color: transparent;
     background-image: none;
     border-color: transparent;
   }
 
   &.selection-mode {
 
     @extend .info;
 
     &.suggested-action {
       @extend %suggested-action;
     }
 
     .subtitle:link { @extend *:link:selected;  }
 
     .selection-menu {
       padding-left: 10px;
       padding-right: 10px;
 
       GtkArrow { -GtkArrow-arrow-scaling: 1; }
 
       .arrow {
         -gtk-icon-source: -gtk-icontheme('arrow-down');
         -gtk-icon-shadow: none;
       }
     }
   }
 
   .tiled &, .maximized & {
     border-radius: 0; // squared corners when the window is max'd or tiled
   }
 }
 
 headerbar {
   // add vertical margins to headerbar entries, buttons and separators to avoid them spanning the whole height
   entry,
   spinbutton,
   separator,
   button {
     margin-top: 3px;
     margin-bottom: 3px;
   }
 }
 
 %suggested-action {
   background-image: none;
   background-color: b_color(active);
   &:hover {
     background-color: b_color(hover);
     color: b_color(text)
     }
   &:disabled {
     background-color: transparent;
     background-image: none;
     color: insensitive(t_color(text));
     &:active, &:checked {
       @include button(insensitive-active);
       }
     }
   &:backdrop {
     background-color: t_color(backdrop-background);
     border-color: transparent;
     color: t_color(backdrop-text);
     &:disabled {
       color: insensitive(t_color(backdrop-text));
     }
   }
 }
diff --git a/src/gtk320/widgets/_menus.scss b/src/gtk320/widgets/_menus.scss
index 5c93862..ca3fadb 100644
--- a/src/gtk320/widgets/_menus.scss
+++ b/src/gtk320/widgets/_menus.scss
@@ -1,257 +1,255 @@
 /*********
  * Menus *
  *********/
 
 
 menubar,
 .menubar {
   -GtkWidget-window-dragging: true;
   padding: 0px;
   box-shadow: none;
-  border-style: solid;
-  border-color: $border_color;
-  border-bottom-width: 1px;
+  border-style: none;
   background-color: w_color(normal);
   &:backdrop {
     background-color: backdrop(w_color(normal));
   }
   > menuitem {
     min-height: 16px;
     padding: 4px 6px;
     border-style: solid;
     border-width: 1px 0px;
     border-color: w_color(normal);
     &:hover { //Seems like it :hover even with keyboard focus
       background-color: b_color(active);
       color: b_color(active-text);
     }
     &:disabled {
       color: insensitive(w_color(text));
       box-shadow: none;
       &:backdrop {
         background-color: backdrop(w_color(normal));
         color: backdrop(insensitive(w_color(text)));
       }
     }
     &:backdrop {
       background-color: backdrop(w_color(normal));
       border-color: backdrop(w_color(normal));
       color: backdrop(w_color(text));
     }
   }
 }
 
 menu,
 .menu {
   padding: 0px;
   background-color: $menu_color;
   border: 0px solid transparent;
   // FIXME workaround for libreoffice gtk3, should be a border
   //border: 1px solid $border_color; // adds borders in a non composited env
   box-shadow: inset 0px 0px 0px 1px $border_color;
 
   border-radius: $r;
   .csd & {
     background-color: transparent;
     border: 0px solid;
     border-radius: $r;
   }  // axes borders in a composited env
   separator {
     color: $border_color;
     margin-left: 6px;
     margin-right: 6px;
   }
   menuitem {
 	  text-shadow: none;
     min-height: 16px;
     min-width: 40px;
     padding: 4px 4px;
     &:hover {
       color: b_color(active-text);
       background-color: b_color(active);
     }
     &:disabled {
       color: insensitive(w_color(text));
       &:backdrop { color: backdrop(insensitive(w_color(text))); }
     }
     &:backdrop, &:backdrop:hover {
       color: backdrop(w_color(text));
       background-color: backdrop(w_color(normal));
     }
     // submenu indicators
     arrow {
       min-height: 16px;
       min-width: 16px;
 
       &:dir(ltr) {
         -gtk-icon-source: -gtk-icontheme('pan-end-symbolic');
         margin-left: 10px;
       }
 
       &:dir(rtl) {
         -gtk-icon-source:-gtk-icontheme('pan-end-symbolic-rtl');
         margin-right: 10px;
       }
     }
   }
   // overflow arrows
   > arrow {
     @include button(undecorated);
 
     min-height: 16px;
     min-width: 16px;
     padding: 4px;
     background-color: $menu_color;
     border-radius: 0;
 
     &.top {
       margin-top: -6px;
       border: none;
       -gtk-icon-source: -gtk-icontheme('pan-up-symbolic');
     }
 
     &.bottom {
       margin-bottom: -6px;
       border: none;
       -gtk-icon-source: -gtk-icontheme('pan-down-symbolic');
     }
 
     &:hover { color: b_color(hover); }
     &:active { color: b_color(active)}
 
     &:backdrop { background-color: backdrop($menu_color); }
 
     &:disabled {
       color: transparent;
       background-color: transparent;
       border-color: transparent ;
     }
   }
 }
 
 menuitem {
   accelerator { color: gtkalpha(currentColor,0.55); }
   check,
   radio {
     min-height: 18px;
     min-width: 18px;
 
     &:dir(ltr) { margin-right: 6px; }
     &:dir(rtl) { margin-left: 6px; }
   }
 }
 /***************
  * Popovers   *
  ***************/
 /* menu buttons */
 modelbutton.flat,
 .menuitem.button.flat {
  min-height: 16px;
  padding: 4px 8px;
 
  @extend %undecorated_button;
  color: w_color(text);
  &:hover {
     background-color: s_color(normal);
     color: s_color(text)
   }
  &:selected {
     background-color: b_color(active);
     color: b_color(active-text)
   }
  &:backdrop, &:backdrop:hover {
     @extend %undecorated_button;
     color: backdrop(w_color(text));
   }
   check:hover {-gtk-icon-source: -gtk-scaled(url("../assets/check-unchecked.png"), url("../assets/check-unchecked@2.png"));}
   radio:hover {-gtk-icon-source: -gtk-scaled(url("../assets/radio-unchecked.png"), url("../assets/radio-unchecked@2.png"));}
 
   check:checked:hover {-gtk-icon-source: -gtk-scaled(url("../assets/check-checked-active.png"), url("../assets/check-checked-active@2.png"));}
   radio:checked:hover {-gtk-icon-source: -gtk-scaled(url("../assets/radio-checked-active.png"), url("../assets/radio-checked-active@2.png"));}
 
   check:indeterminate:hover {-gtk-icon-source: -gtk-scaled(url("../assets/check-mixed.png"), url("../assets/check-mixed@2.png"));}
   radio:indeterminate:hover {-gtk-icon-source: -gtk-scaled(url("../assets/radio-mixed.png"), url("../assets/radio-mixed@2.png"));}
 
   // FIXME: remove the following when the checks/radios rewrite lands
   check:last-child,
   radio:last-child { margin-right: 0px; }
 
   check:first-child,
   radio:first-child { margin-left: 0px; }
 }
 
 modelbutton.flat arrow {
   background: none;
 
   &:hover { background: none; }
 
   &.left { -gtk-icon-source: -gtk-icontheme("pan-start-symbolic"); }
 
   &.right { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); }
 }
 
 popover.background {
   //margin: 10px;
   padding: 0px;
   border: 1px solid $border_color;
   border-radius: 3px;
   background-color: $menu_color;
 
   box-shadow: 0 2px 3px transparentize(black, 0.1);
 
   &:backdrop {
     box-shadow: none;
   }
 
   > list,
   > .view,
   > toolbar {
     border-style: none;
     background-color: transparent;
   }
   .csd &, & {
     &.touch-selection,
     &.magnifier {
       @extend %osd;
 
       border: 1px solid $border_color;
 
       button { @extend %button };
     }
 
     &.osd { @extend %osd; }
   }
 
   separator { margin: 3px; }
 
   list separator { margin: 0px; }
 
   checkbutton,
   radiobutton { @extend modelbutton.flat; }
 }
 
 // .scale-popup .button,
 // .scale-popup .button.flat { // +/- buttons on GtkVolumeButton popup
 //   @extend %undecorated_button;
 //   background-color: transparent;
 //   padding: 5px;
 //   color: w_color(text);
 //   &:hover {
 //     @extend %undecorated_button;
 //     color: b_color(hover);
 //   }
 //   &:active {
 //     color: b_color(active);
 //   }
 //   &:insensitive {
 //     color: insensitive(w_color(text));
 //   }
 //   &:backdrop {
 //     color: backdrop(w_color(text));
 //     &:insensitive {
 //       color: backdrop(insensitive(w_color(text)));
 //     }
 //   }
 // }
 
 GtkVolumeButton.button { padding: 5px; }
diff --git a/src/gtk320/widgets/_window_decorations.scss b/src/gtk320/widgets/_window_decorations.scss
index 6e03870..65eb8c1 100644
--- a/src/gtk320/widgets/_window_decorations.scss
+++ b/src/gtk320/widgets/_window_decorations.scss
@@ -1,178 +1,178 @@
 /**********************
  * Window Decorations *
  *********************/
 
 decoration {
 
   //border: 1px solid transparent;
   border-radius: $r $r 0 0;
   border-width: 0px;
   box-shadow: 0 2px 6px 1px rgba(0, 0, 0, 0.5);
 
   /* this is used for the resize cursor area */
   margin: 10px;
 
   .maximized &,
   .fullscreen &,
   .tiled & {
     border-radius: 0;
   }
   .popup & {
     border-radius: $r;
     box-shadow: 2px 2px 2px 1px rgba(0, 0, 0, 0.1)
   }
   // server-side decorations as used by mutter
   .ssd &{
 	  box-shadow: 0 2px 6px 1px rgba(0, 0, 0, 0.1);
   }
   .csd & {
     border-radius: $r;
     &.popup {
       box-shadow: 2px 2px 2px 1px rgba(0, 0, 0, 0.1)
     }
     &.tooltip {
       box-shadow: none;
     }
     &.message-dialog {
       box-shadow: 0 2px 6px 1px rgba(0, 0, 0, 0.5)
     }
   }
   .solid-csd & {
     border-radius: 0;
     margin: 0;
     padding: 1px;
     border: none;
     background-color: $border_color;
     box-shadow: none;
   }
 }
 
 headerbar,
 .titlebar {
   &.default-decoration button.titlebutton {
-    padding: 6px;
+    padding: 6px 1px;
     min-height: 18px;
     min-width: 18px;
     margin: 0;
   }
   button.titlebutton {
     padding: 6px;
     &:hover,
     &:active,
     &:checked,
     &:backdrop,
     &:active:hover {
       transition: none;
     }
 
     &.close {
       padding: 6px 1px;
       color: transparent;
       border-image: none;
       box-shadow: none;
       background-position: center;
       background-repeat: no-repeat;
       background-image: -gtk-scaled(url('../assets/titlebutton-close.png'),url('../assets/titlebutton-close@2.png'));
     }
     &.close:hover {
       border-color: transparent;
       background-color: transparent;
       background-image: -gtk-scaled(url('../assets/titlebutton-close-hover.png'),url('../assets/titlebutton-close-hover@2.png'));
     }
     &.close:active {
       border-color: transparent;
       background-color: transparent;
       background-image: -gtk-scaled(url('../assets/titlebutton-close-active.png'),url('../assets/titlebutton-close-active@2.png'));
     }
     &.close:backdrop {
       border-color: transparent;
       background-color: transparent;
       background-image: -gtk-scaled(url('../assets/titlebutton-close-backdrop.png'),url('../assets/titlebutton-close-backdrop@2.png'));
     }
 
     &.maximize {
       padding: 6px 1px;
       color: transparent;
       border-image: none;
       box-shadow: none;
       background-position: center;
       background-repeat: no-repeat;
       background-image: -gtk-scaled(url('../assets/titlebutton-maximize.png'),url('../assets/titlebutton-maximize@2.png'));
     }
     &.maximize:hover {
     	border-color: transparent;
       background-color: transparent;
     	background-image: -gtk-scaled(url('../assets/titlebutton-maximize-hover.png'),url('../assets/titlebutton-maximize-hover@2.png'));
   	}
     &.maximize:active {
     	border-color: transparent;
       background-color: transparent;
     	background-image: -gtk-scaled(url('../assets/titlebutton-maximize-active.png'),url('../assets/titlebutton-maximize-active@2.png'));
   	}
     &.maximize:backdrop {
     	border-color: transparent;
       background-color: transparent;
     	background-image: -gtk-scaled(url('../assets/titlebutton-maximize-backdrop.png'),url('../assets/titlebutton-maximize-backdrop@2.png'));
   	}
 
     &.minimize {
       padding: 6px 1px;
       color: transparent;
       border-image: none;
       box-shadow: none;
       background-position: center;
       background-repeat: no-repeat;
       background-image: -gtk-scaled(url('../assets/titlebutton-minimize.png'),url('../assets/titlebutton-minimize@2.png'));
     }
     &.minimize:hover {
   	  border-color: transparent;
       background-color: transparent;
       background-image: -gtk-scaled(url('../assets/titlebutton-minimize-hover.png'),url('../assets/titlebutton-minimize-hover@2.png'));
     }
     &.minimize:active {
   	  border-color: transparent;
       background-color: transparent;
       background-image: -gtk-scaled(url('../assets/titlebutton-minimize-active.png'),url('../assets/titlebutton-minimize-active@2.png'));
     }
     &.minimize:backdrop {
   	  border-color: transparent;
       background-color: transparent;
       background-image: -gtk-scaled(url('../assets/titlebutton-minimize-backdrop.png'),url('../assets/titlebutton-minimize-backdrop@2.png'));
     }
   }
 
   .maximized & {
     button.titlebutton {
       &.maximize {
         padding: 6px 1px;
         color: transparent;
         border-image: none;
         box-shadow: none;
         background-position: center;
         background-repeat: no-repeat;
         background-image: -gtk-scaled(url('../assets/titlebutton-maximize-maximized.png'),url('../assets/titlebutton-maximize-maximized@2.png'));
       }
       &.maximize:hover {
       	border-color: transparent;
         background-color: transparent;
       	background-image: -gtk-scaled(url('../assets/titlebutton-maximize-maximized-hover.png'),url('../assets/titlebutton-maximize-maximized-hover@2.png'));
     	}
       &.maximize:active {
       	border-color: transparent;
         background-color: transparent;
       	background-image: -gtk-scaled(url('../assets/titlebutton-maximize-maximized-active.png'),url('../assets/titlebutton-maximize-maximized-active@2.png'));
     	}
       &.maximize:backdrop {
       	border-color: transparent;
         background-color: transparent;
       	background-image: -gtk-scaled(url('../assets/titlebutton-maximize-maximized-backdrop.png'),url('../assets/titlebutton-maximize-maximized-backdrop@2.png'));
     	}
     }
   }
 }
 
 headerbar.selection-mode button.titlebutton,
 .titlebar.selection-mode button.titlebutton {
   text-shadow: none;
   &:backdrop { -gtk-icon-shadow: none; }
 }
diff --git a/src/render_assets.py b/src/render_assets.py
index d0d88dd..45d716a 100644
--- a/src/render_assets.py
+++ b/src/render_assets.py
@@ -1,758 +1,765 @@
 import cairo
 import colorsys
 from math import pi
 import os
 import errno
 import sys
 
 def make_sure_path_exists(path):
     try:
         os.makedirs(path)
     except OSError as exception:
         if exception.errno != errno.EEXIST:
             raise
 
 class ReadKdeGlobals():
     def __init__(self):
         self._colors = {}
         self._colors = self.read_globals('schemes/Breeze.colors')
 
     def read_globals(self,filename):
         with open(filename, 'r') as _kde:
             for widget in ['Disabled', 'Inactive','Button', 'Selection', 'Tooltip', 'View', 'Window', 'WM']:
                 for line in _kde:
                     if line.strip().split(':')[-1].strip('[]') == widget:
                         break
                 for line in _kde:
                     if line == '\n':
                         break
                     self._colors['{0}{1}'.format(widget,line.strip().split('=')[0])] = line.strip().split('=')[1]
         return self._colors
 
 class Color(object):
     def __init__(self, colordict,name,name2=None,amount=0):
         color = colordict[name]
         self.colordict = colordict
 
         r = float(color.split(',')[0])
         g = float(color.split(',')[1])
         b = float(color.split(',')[2])
         if not name2 == None:
             color2 = colordict[name2]
             r = r * amount + float(color2.split(',')[0]) * (1 - amount)
             g = g * amount + float(color2.split(',')[1]) * (1 - amount)
             b = b * amount + float(color2.split(',')[2]) * (1 - amount)
 
+        self.rgb255 = (r,g,b)
         self.rgb = (r/255,g/255,b/255)
+        self.html = '#%02x%02x%02x' % self.rgb255
         self.insensitive = self._color_effect(self._intensity_effect(self.rgb,'Disabled'),'Disabled')
         self.insensitive_alpha = self._contrast_effect(self.rgb,'Disabled')
 
         if self.colordict['InactiveEnable'] == 'false':
             self.inactive = self.rgb
             self.inactive_alpha = 1.0
         else:
             self.inactive = self._color_effect(self._intensity_effect(self.rgb,'Inactive'),'Inactive')
             self.inactive_alpha = self._contrast_effect(self.rgb,'Inactive')
         self.inactive_insensitive = self._color_effect(self._intensity_effect(self.inactive,'Disabled'),'Disabled')
         self.inactive_insensitive_alpha = max(self.inactive_alpha - (1 - self.insensitive_alpha),0)
 
     def _mix(self,color, mix_color, amount):
         r = color[0] * amount + mix_color[0] * (1 - amount)
         g = color[1] * amount + mix_color[1] * (1 - amount)
         b = color[2] * amount + mix_color[2] * (1 - amount)
         return (r,g,b)
 
     def _lighter(self,color,amount):
         h,s,v = colorsys.rgb_to_hsv(color[0],color[1],color[2])
         v = min((1+amount)*v,1)
         r,g,b = colorsys.hsv_to_rgb(h,s,v)
         return (r,g,b)
 
     def _darker(self,color,amount):
         h,s,v = colorsys.rgb_to_hsv(color[0],color[1],color[2])
         if amount == -1:
             v = 1
         else:
             v = min(v/(1+amount),1)
         r,g,b = colorsys.hsv_to_rgb(h,s,v)
         return (r,g,b)
 
     def _desaturate(self,color,amount):
         h,s,v = colorsys.rgb_to_hsv(color[0],color[1],color[2])
         s = min(s * (1 - amount),1)
         r,g,b = colorsys.hsv_to_rgb(h,s,v)
         return (r,g,b)
 
     def _intensity_effect(self,color,state):
         effect = int(self.colordict[state + 'IntensityEffect'])
         amount = float(self.colordict[state + 'IntensityAmount'])
         if effect == 0:
             (r,g,b) = color
         elif effect == 1:
             if amount >= 0:
                 (r,g,b) = self._mix((1.0,1.0,1.0),color,amount)
             else:
                 (r,g,b) = self._mix((0.0,0.0,0.0),color,amount)
         elif effect == 2:
             (r,g,b) = self._darker(color,amount)
         elif effect == 3:
             (r,g,b) = self._lighter(color,amount)
         return (r,g,b)
 
     def _color_effect(self,color,state):
         effect = int(self.colordict[state + 'ColorEffect'])
         amount = float(self.colordict[state + 'ColorAmount'])
         effect_color = self.colordict[state + 'Color']
         effect_color = (float(effect_color.split(',')[0])/255,float(effect_color.split(',')[1])/255,float(effect_color.split(',')[2])/255)
         if effect == 0:
             (r,g,b) = color
         elif effect == 1:
             (r,g,b) = self._desaturate(color,amount)
         else:
             (r,g,b) = self._mix(effect_color,color,amount)
         return (r,g,b)
 
     def _contrast_effect(self,color,state):
         effect = int(self.colordict[state + 'ContrastEffect'])
         amount = float(self.colordict[state + 'ContrastAmount'])
         if effect == 0:
             return 1.0
         else:
             return 1.0 - amount
 
     def lighten_color(self,amount):
         h,s,v = colorsys.rgb_to_hsv(self.rgb[0], self.rgb[1], self.rgb[2])
         v = (1+amount)*v
         r,g,b = colorsys.hsv_to_rgb(h,s,v)
         self.rgb = (r,g,b)
+        self.rgb255 = (r*255,g*255,b*255)
+
 
     def gradient(self,state='',alpha=1.0):
         if state == 'active':
             stop1 = self._lighter(self.rgb,0.03)
             stop2 = self._darker(self.rgb,0.10)
             linear = cairo.LinearGradient(1, 1, 1, 19)
             linear.add_color_stop_rgba(0.0,stop1[0],stop1[1],stop1[2],alpha)
             linear.add_color_stop_rgba(1.0,stop2[0],stop2[1],stop2[2],alpha)
         else:
             stop1 = self._lighter(self.rgb,0.01)
             stop2 = self._darker(self.rgb,0.03)
             linear = cairo.LinearGradient(1, 1, 1, 19)
             linear.add_color_stop_rgba(0.0,stop1[0],stop1[1],stop1[2],alpha)
             linear.add_color_stop_rgba(1.0,stop2[0],stop2[1],stop2[2],alpha)
         return linear
 
 class Assets(object):
     def __init__(self,width,height,scl=1, rotation=0):
         self.w = width; self.h = height
         self.surface = cairo.ImageSurface(cairo.FORMAT_ARGB32, scl*width, scl*height)
         cr = self.cr = cairo.Context(self.surface)
         if rotation != 0:
             cr.translate(scl*width/2,scl*height/2)
             cr.rotate(rotation*pi/2)
             cr.translate(-scl*width/2,-scl*height/2)
         cr.scale(scl,scl)
 
     def background(self,color):
         self.cr.rectangle(0,0,self.w,self.h)
         self.cr.set_source_rgb(color[0],color[1],color[2])
         self.cr.fill()
 
     def line(self,color,x,y,width,height):
         self.cr.rectangle(x,y,width,height)
         self.cr.set_source_rgb(color[0],color[1],color[2])
         self.cr.fill()
 
     def rounded_rectancle(self, color, width, height, x, y, radius, alpha=1.0, gradient=False):
         self.cr.new_sub_path()
         self.cr.arc(x + width - radius, y + radius, radius, -pi/2, 0)
         self.cr.arc(x + width - radius, y + height - radius, radius, 0, pi/2)
         self.cr.arc(x + radius, y + height - radius, radius, pi/2, pi)
         self.cr.arc(x + radius, y + radius, radius, pi, 3*pi/2)
         self.cr.close_path()
         if gradient:
             self.cr.set_source(color)
         elif color == None:
             self.cr.set_operator(cairo.OPERATOR_CLEAR)
         elif color == 'shadow':
             self.cr.set_source_rgba(0.0,0.0,0.0, 0.15)
         else:
             self.cr.set_source_rgba(color[0],color[1],color[2], alpha)
         self.cr.fill()
 
     def rounded_triangle(self, color, width, height, x, y, radius, alpha=1.0):
         self.cr.new_sub_path()
         self.cr.move_to(x + width, y)
         self.cr.line_to(x + width, y + height - radius)
         self.cr.arc(x + width - radius, y + height - radius,radius, 0, pi/2)
         self.cr.line_to(x, y + height)
         self.cr.close_path()
         self.cr.set_source_rgba(color[0],color[1],color[2], alpha)
         self.cr.fill()
 
     def circle(self, color, x, y, radius, alpha=1.0, gradient=False):
         self.cr.new_sub_path()
         self.cr.arc(x, y, radius, 0, 2*pi)
         self.cr.close_path()
         if gradient:
             self.cr.set_source(color)
         elif color == None:
             self.cr.set_operator(cairo.OPERATOR_CLEAR)
         elif color == 'shadow':
             self.cr.set_source_rgba(0.0,0.0,0.0, 0.15)
         else:
             self.cr.set_source_rgba(color[0],color[1],color[2], alpha)
         self.cr.fill()
 
     def half_circle(self, color, x, y, radius, alpha=1.0):
         self.cr.new_sub_path()
         self.cr.arc(x, y, radius, -pi/4, 3*pi/4)
         self.cr.close_path()
         self.cr.set_source_rgba(color[0],color[1],color[2],alpha)
         self.cr.fill()
 
     def arrow(self, color, alpha=1.0):
         self.cr.new_sub_path()
         self.cr.move_to(1,8)
         self.cr.line_to(6,3)
         self.cr.line_to(11,8)
         self.cr.set_source_rgba(color[0],color[1],color[2],alpha)
         self.cr.set_line_width(1.0)
         self.cr.stroke()
 
     def arrow_small(self, color,alpha=1.0):
         self.cr.new_sub_path()
         self.cr.move_to(1,6)
         self.cr.line_to(4,3)
         self.cr.line_to(7,6)
         self.cr.set_source_rgba(color[0],color[1],color[2], alpha)
         self.cr.set_line_width(1.0)
         self.cr.stroke()
 
     def tab(self, color, width, height, x, y, radius, alpha=1.0):
         self.cr.move_to(width + x, y)
         self.cr.line_to(width + x, height - radius + y)
         self.cr.arc(width - radius + x, height - radius + y, radius, 0, pi/2)
         self.cr.line_to(radius + x, height + y)
         self.cr.arc(radius + x,height - radius + y,radius,pi/2,pi)
         self.cr.line_to(x,y)
         self.cr.close_path
         if color == None:
             self.cr.set_operator(cairo.OPERATOR_CLEAR)
         else:
             self.cr.set_source_rgba(color[0],color[1],color[2], alpha)
         self.cr.fill()
 
     def spinbutton(self, color, width, height, x, y, radius,alpha=1.0):
         self.cr.move_to(width + x, y)
         self.cr.line_to(width + x, height - radius + y)
         self.cr.arc(width - radius + x, height - radius + y, radius, 0, pi/2)
         self.cr.line_to(x, height + y)
         self.cr.line_to(x,y)
         self.cr.close_path()
         if color == None:
             self.cr.set_operator(cairo.OPERATOR_CLEAR)
         else:
             self.cr.set_source_rgba(color[0],color[1],color[2],alpha)
         self.cr.fill()
 
     def notebook(self, color, width, height, x, y, radius):
         self.cr.move_to(x, y)
         self.cr.line_to(x + width - radius, y)
         self.cr.arc(x + width - radius, y + radius, radius, -pi/2, 0)
         self.cr.line_to(x + width, y + height-radius)
         self.cr.arc(x + width - radius, y + height - radius, radius, 0, pi/2)
         self.cr.line_to(x + radius,y + height)
         self.cr.arc(x + radius, y + height -radius, radius, pi/2, pi)
         self.cr.close_path()
         self.cr.set_source_rgb(color[0],color[1],color[2])
         self.cr.fill()
 
     def minimize(self,color=None):
         self.cr.move_to(4,7)
         self.cr.line_to(9,12)
         self.cr.line_to(14,7)
         if color == None:
             self.cr.set_operator(cairo.OPERATOR_CLEAR)
         else:
             self.cr.set_source_rgb(color[0],color[1],color[2])
         self.cr.set_line_width(1.0)
         self.cr.stroke()
 
     def maximize(self,color=None):
         self.cr.move_to(4,11)
         self.cr.line_to(9,6)
         self.cr.line_to(14,11)
         if color == None:
             self.cr.set_operator(cairo.OPERATOR_CLEAR)
         else:
             self.cr.set_source_rgb(color[0],color[1],color[2])
         self.cr.set_line_width(1.0)
         self.cr.stroke()
 
     def maximize_maximized(self,color=None):
         self.cr.move_to(4.5,9)
         self.cr.line_to(9,4.5)
         self.cr.line_to(13.5,9)
         self.cr.line_to(9,13.5)
         self.cr.close_path()
         if color == None:
             self.cr.set_operator(cairo.OPERATOR_CLEAR)
         else:
             self.cr.set_source_rgb(color[0],color[1],color[2])
         self.cr.set_line_width(1.0)
         self.cr.stroke()
 
     def close(self,color=None):
         self.cr.move_to(5,5)
         self.cr.line_to(13,13)
         self.cr.move_to(13,5)
         self.cr.line_to(5,13)
         if color == None:
             self.cr.set_operator(cairo.OPERATOR_CLEAR)
         else:
             self.cr.set_source_rgb(color[0],color[1],color[2])
         self.cr.set_line_width(1.0)
         self.cr.stroke()
 
     def save(self, filename):
         self.surface.write_to_png('assets/' + filename)
 
 
 def check_items(color1,color2,state,alpha=1.0):
     for scl in  [1,2]:
         if scl == 2:
             ending = '@2.png'
         else:
             ending = '.png'
         # checkboxes
         box = Assets(20,20,scl)
         box.rounded_rectancle('shadow',18,18,2,2,3)
         box.rounded_rectancle(color2,18,18,1,1,3)
         box.rounded_rectancle(color1,18,18,1,1,3,alpha=alpha)
         box.rounded_rectancle(color2,16,16,2,2,2)
         box.save('check-unchecked' + state + ending)
         if state != '':
             box.rounded_rectancle(color1,12,12,4,4,1,alpha=alpha)
             box.save('check-checked' + state + ending)
             box.rounded_triangle(color2,8,8,6,6,1,alpha=alpha)
             box.save('check-mixed' + state + ending)
 
         # radio
         radio = Assets(20,20,scl)
         radio.circle('shadow',11,11,9)
         radio.circle(color2,10,10,9)
         radio.circle(color1,10,10,9,alpha=alpha)
         radio.circle(color2,10,10,8)
         radio.save('radio-unchecked' + state + ending)
         if state != '':
             radio.circle(color1,10,10,6,alpha=alpha)
             radio.save('radio-checked' + state + ending)
             radio.half_circle(color2,10,10,4,alpha=alpha)
             radio.save('radio-mixed' + state + ending)
 
         # selectionmode
         selectionmode = Assets(40,40,scl)
         selectionmode.rounded_rectancle('shadow',18,18,12,12,3)
         selectionmode.rounded_rectancle(color2,18,18,11,11,3)
         selectionmode.rounded_rectancle(color1,18,18,11,11,3,alpha=alpha)
         selectionmode.rounded_rectancle(color2,16,16,12,12,2)
         selectionmode.save('check-selectionmode-unchecked' + state + ending)
         if state != '':
             selectionmode.rounded_rectancle(color1,12,12,14,14,1,alpha=alpha)
             selectionmode.save('check-selectionmode-checked' + state + ending)
 
 def buttons(color1,color2,color3,state,alpha=1.0):
     button = Assets(20,20)
     button.rounded_rectancle('shadow',18,18,2,2,3)
     button.rounded_rectancle(color1,18,18,1,1,3)
     button.rounded_rectancle(color2,18,18,1,1,3,alpha=alpha)
     if state == '-active':
         button.rounded_rectancle(color3,18,18,1,1,3, gradient=True)
     else:
         button.rounded_rectancle(color1,16,16,2,2,2)
         button.rounded_rectancle(color3,16,16,2,2,2, gradient=True)
     button.save('button' + state + '.png')
 
 def togglebuttons(color1,color2,color3,state,alpha=1.0):
     button = Assets(20,20)
     button.rounded_rectancle(color1,18,18,1,1,3)
     button.rounded_rectancle(color2,18,18,1,1,3,alpha=alpha)
     if state == '-active':
         button.rounded_rectancle(color3,18,18,1,1,3, gradient=True)
     else:
         button.rounded_rectancle(color1,16,16,2,2,2)
         button.rounded_rectancle(color3,16,16,2,2,2, gradient=True)
     button.save('togglebutton' + state + '.png')
 
 def scale_slider(color1,color2,color3,state,alpha=1.0):
     scale = Assets(20,20)
     scale.circle(color1,10,10,10)
     scale.circle(color2,10,10,10,alpha=alpha)
     scale.circle(color1,10,10,9)
     scale.circle(color3,10,10,9,gradient=True)
     scale.save('scale-slider' + state + '.png')
 
 def scale_trough(color):
     trough_h = Assets(20,20)
     trough_h.rounded_rectancle(color,20,6,0,7,3)
     trough_h.save('scale-trough-horizontal.png')
 
     trough_h = Assets(20,20)
     trough_h.rounded_rectancle(color,6,20,7,0,3)
     trough_h.save('scale-trough-vertical.png')
 
 
 def tabs(color1,color2,state):
     if state == '-inactive':
         alpha = 0.2
     else:
         alpha = 1.0
     direction = ['-bottom','-left','-top','-right']
     for i in range(0,4):
         tab = Assets(20,20,rotation=i)
         tab.tab(color1,20,20,0,0,3,alpha)
         if state == '-active':
             tab.tab(color2,18,19,1,0,2)
         tab.save('tab' + direction[i] + state + '.png')
 
 def arrows(color,state,alpha=1.0):
     direction = ['-up','-right','-down','-left']
     for i in range(0,4):
         arw = Assets(12,12,rotation=i)
         arw.arrow(color,alpha)
         arw.save('arrow' + direction[i] + state + '.png')
 
         arw = Assets(8,8,rotation=i)
         arw.arrow_small(color,alpha)
         arw.save('arrow-small' + direction[i] + state + '.png')
 
 def menu_arrow(color,state,alpha=1.0):
     arrow = Assets(12,12,rotation=1)
     arrow.arrow(color,alpha)
     arrow.save('menu-arrow' + state + '.png')
 
 def scrollbar_slider(color,state,alpha=1):
     for scl in [1,2]:
         if scl == 2:
             ending = '@2.png'
         else:
             ending = '.png'
         slider = Assets(30,20,scl)
         slider.rounded_rectancle(color,30,10,0,5,5,alpha)
         slider.save('scrollbar-slider-horizontal' + state + ending)
 
         slider = Assets(20,30,scl)
         slider.rounded_rectancle(color,10,30,5,0,5,alpha)
         slider.save('scrollbar-slider-vertical' + state + ending)
 
 def scrollbar_trough(color):
     for scl in [1,2]:
         if scl == 2:
             ending = '@2.png'
         else:
             ending = '.png'
         trough = Assets(56,20,scl)
         trough.rounded_rectancle(color,26,10,15,5,5,0.3)
         trough.save('scrollbar-trough-horizontal' + ending)
 
         trough = Assets(20,56,scl)
         trough.rounded_rectancle(color,10,26,5,15,5,0.3)
         trough.save('scrollbar-trough-vertical' + ending)
 
 def titlebuttons(color1,color2,state):
     for scl in [1,2]:
         if scl == 2:
             ending = '@2.png'
         else:
             ending = '.png'
         title_minimize = Assets(18,18,scl)
         title_maximize = Assets(18,18,scl)
         title_maximized = Assets(18,18,scl)
         if state == '' or state == '-backdrop':
             title_minimize.minimize(color1)
             title_maximize.maximize(color1)
             title_maximized.maximize_maximized(color1)
         else:
             title_minimize.circle(color1,9,9,9)
             title_maximize.circle(color1,9,9,9)
             title_maximized.circle(color1,9,9,9)
             title_minimize.minimize()
             title_maximize.maximize()
             title_maximized.maximize_maximized()
         title_minimize.save('titlebutton-minimize' + state + ending)
         title_maximize.save('titlebutton-maximize' + state + ending)
         title_maximized.save('titlebutton-maximize-maximized' + state + ending)
 
         title_close = Assets(18,18,scl)
         title_close.circle(color2,9,9,9)
         title_close.close()
         title_close.save('titlebutton-close' + state + ending)
 
 def entry(color1,color2,color3,state,alpha=1.0):
     entry = Assets(20,20)
     entry.background(color1)
     entry.rounded_rectancle(color2,18,18,1,1,3,alpha=alpha)
     entry.rounded_rectancle(color3,16,16,2,2,2)
     entry.rounded_rectancle(color3,16,16,2,2,2)
     entry.save('entry' + state + '.png')
 
     entry = Assets(20,20,rotation=1)
     entry.background(color1)
     entry.tab(color2,18,19,1,0,3,alpha=alpha)
     entry.tab(color3,16,18,2,0,2)
     entry.save('combo-entry' + state + '.png')
 
     entry_button = Assets(20,20,rotation=3)
     entry_button.background(color1)
     entry_button.tab(color2,18,19,1,0,3,alpha=alpha)
     entry_button.tab(color3,16,18,2,0,2)
     entry_button.save('combo-entry-button' + state + '.png')
 
     if state != '-active':
         direction = ['-down','-down-rtl','-up-rtl','-up']
         for i in range(0,4):
             spin = Assets(20,20,rotation=i)
             spin.background(color1)
             spin.spinbutton(color2,19,19,0,0,3,alpha=alpha)
             spin.spinbutton(color3,18,18,0,0,2)
             spin.save('spinbutton' + direction[i] + state + '.png')
 
 def mixed(color1, color2,color3):
     nll = Assets(20,20)
     nll.save('null.png')
 
     # Frame
     frame = Assets(20,20)
     frame.rounded_rectancle(color1,20,20,0,0,3)
     frame.rounded_rectancle(color2,18,18,1,1,2)
     frame.save('frame.png')
 
     # Tree header
     header = Assets(20,20)
     header.background(color2)
     header.line(color1,0,19,20,1)
     header.line(color1,19,0,1,20)
     header.save('tree-header.png')
 
     # Notebook gap
     notebook_gap = Assets(4,2)
     notebook_gap.line(color2,1,0,2,2)
     notebook_gap.save('notebook-gap-horizontal.png')
 
     notebook_gap = Assets(2,4)
     notebook_gap.line(color2,0,1,2,2)
     notebook_gap.save('notebook-gap-vertical.png')
 
     # Notebook frame
     direction = ['-top','-right','-bottom','-bottom']
     for i in range(0,4):
         notebook_frame = Assets(20,20,rotation=i)
         notebook_frame.notebook(color1,20,20,0,0,3)
         notebook_frame.notebook(color2,18,18,1,1,2)
         notebook_frame.save('notebook-frame' + direction[i] + '.png')
 
 
     # Frame gap
     frame_gap = Assets(2,1)
     frame_gap.line(color1,1,0,1,1)
     frame_gap.save('frame-gap-start.png')
 
     frame_gap = Assets(2,1)
     frame_gap.line(color1,0,0,1,1)
     frame_gap.save('frame-gap-end.png')
 
     # Lines
     lines = Assets(20,1)
     lines.line(color1,0,0,20,1)
     lines.save('line-h.png')
 
     lines = Assets(1,20)
     lines.line(color1,0,0,1,20)
     lines.save('line-v.png')
 
     lines = Assets(20,1)
     lines.line(color2,0,0,20,1)
     lines.save('handle-h.png')
 
     lines = Assets(1,20)
     lines.line(color2,0,0,1,20)
     lines.save('handle-v.png')
 
     menubar = Assets(20,20)
     menubar.line(color3,1,1,18,18)
     menubar.save('menubar-button.png')
 
 def toolbar(color1, color2, color3):
     # Toolbar background
     bar = Assets(20,20)
     bar.background(color2)
     bar.save('toolbar-background.png')
 
     # Toolbutton toggled
     toolbutton = Assets(20,20)
     toolbutton.rounded_rectancle(color1,18,18,1,1,3)
     toolbutton.save('toolbutton-toggled.png')
 
     # Toolbutton hover
     toolbutton = Assets(20,20)
     toolbutton.rounded_rectancle(color3,18,18,1,1,3)
     toolbutton.rounded_rectancle(color2,16,16,2,2,2)
     toolbutton.save('toolbutton-hover.png')
 
     # Toolbutton active
     toolbutton = Assets(20,20)
     toolbutton.rounded_rectancle(color3,18,18,1,1,3)
     toolbutton.save('toolbutton-active.png')
 
 def progressbar(color1, color2, state=''):
     bar = Assets(10,10)
     bar.rounded_rectancle(color1,10,10,0,0,3)
     bar.save('progressbar-bar' + state + '.png')
 
     trough = Assets(10,10)
     trough.rounded_rectancle(color2,10,10,0,0,3)
     trough.save('progressbar-trough' + state + '.png')
 
 
 
 def html(color):
-    return '#%02x%02x%02x' % (int(color[0]*255),int(color[1]*255),int(color[2]*255))
+    return '#%02x%02x%02x' % (color[0]*255,color[1]*255,color[2]*255)
 
 def mix(color, mix_color, amount):
     r = color[0] * amount + mix_color[0] * (1 - amount)
     g = color[1] * amount + mix_color[1] * (1 - amount)
     b = color[2] * amount + mix_color[2] * (1 - amount)
     return (r,g,b)
 #___________________________________________________________________________________
 
 if len(sys.argv) == 2:
     filename = sys.argv[1]
 else:
     filename = 'schemes/Breeze.colors'
 
 make_sure_path_exists('assets')
 
 _colors = ReadKdeGlobals().read_globals(filename)
 
 border_color    = Color(_colors,'WindowBackgroundNormal','WindowForegroundNormal', 0.75)
 window_bg       = Color(_colors,'WindowBackgroundNormal')
 window_fg       = Color(_colors,'WindowForegroundNormal')
 check_color     = Color(_colors,'WindowBackgroundNormal','WindowForegroundNormal',0.5)
 button_bg       = Color(_colors,'ButtonBackgroundNormal')
 button_fg       = Color(_colors,'ButtonForegroundNormal')
 button_hover    = Color(_colors,'ButtonDecorationHover')
 button_active   = Color(_colors,'ButtonDecorationFocus')
 selection_bg    = Color(_colors,'SelectionBackgroundNormal')
 selection_fg    = Color(_colors,'SelectionForegroundNormal')
 view_bg         = Color(_colors,'ViewBackgroundNormal')
 view_fg         = Color(_colors,'ViewForegroundNormal')
 view_hover      = Color(_colors,'ViewDecorationHover')
 view_active     = Color(_colors,'ViewDecorationFocus')
 titlebutton     = Color(_colors,'WMactiveForeground')
 titlebutton_active = Color(_colors,'WMactiveBackground','WMactiveForeground',0.3)
 closebutton_hover = Color(_colors,'ViewForegroundNegative');closebutton_hover.lighten_color(0.5)
 closebutton_active = Color(_colors,'ViewForegroundNegative')
 titlebutton_inactive = Color(_colors,'WMinactiveForeground')
 titlebutton_inactive_active = Color(_colors,'WMinactiveBackground','WMinactiveForeground',0.3)
 
 tooltip_fg = Color(_colors,'TooltipForegroundNormal')
 tooltip_bg = Color(_colors,'TooltipBackgroundNormal')
 
 check_items(check_color.rgb,window_bg.rgb,'')
 check_items(button_hover.rgb,window_bg.rgb,'-hover')
 check_items(button_active.rgb,window_bg.rgb,'-active')
 check_items(check_color.insensitive,window_bg.rgb,'-insensitive',border_color.insensitive_alpha)
 check_items(check_color.inactive,window_bg.rgb,'-backdrop',border_color.inactive_alpha)
 check_items(check_color.inactive_insensitive,window_bg.rgb,'-backdrop-insensitive',border_color.inactive_insensitive_alpha)
 
 buttons(window_bg.rgb,border_color.rgb,button_bg.gradient(),'')
 buttons(window_bg.rgb,button_hover.rgb,button_bg.gradient(),'-hover')
 buttons(window_bg.rgb,button_hover.rgb,button_hover.gradient('active'),'-active')
 buttons(window_bg.rgb,border_color.rgb,button_bg.gradient(alpha=button_bg.insensitive_alpha),'-insensitive',border_color.insensitive_alpha)
 
 togglebuttons(window_bg.rgb,border_color.rgb,button_bg.gradient(),'')
 togglebuttons(window_bg.rgb,button_hover.rgb,button_bg.gradient(),'-hover')
 togglebuttons(window_bg.rgb,button_hover.rgb,button_hover.gradient('active'),'-active')
 togglebuttons(window_bg.rgb,border_color.rgb,button_bg.gradient(alpha=button_bg.insensitive_alpha),'-insensitive',border_color.insensitive_alpha)
 
 scale_slider(window_bg.rgb,border_color.rgb,button_bg.gradient(),'')
 scale_slider(window_bg.rgb,button_hover.rgb,button_bg.gradient(),'-hover')
 scale_slider(window_bg.rgb,button_active.rgb,button_bg.gradient(),'-active')
 scale_slider(window_bg.rgb,border_color.rgb,button_bg.gradient(alpha=button_bg.insensitive_alpha),'-insensitive',border_color.insensitive_alpha)
 scale_trough(border_color.rgb)
 
 tabs(border_color.rgb,window_bg.rgb,'-active')
 tabs(window_fg.rgb,window_bg.rgb,'-inactive')
 
 arrows(button_fg.rgb,'')
 arrows(button_hover.rgb,'-hover')
 arrows(button_active.rgb,'-active')
 arrows(button_fg.insensitive,'-insensitive',button_fg.insensitive_alpha)
 menu_arrow(window_fg.rgb,'')
 menu_arrow(selection_fg.rgb,'-selected')
 menu_arrow(window_fg.insensitive,'-insensitive',window_fg.insensitive_alpha)
 
 scrollbar_slider(window_fg.rgb,'',alpha=0.5)
 scrollbar_slider(button_hover.rgb,'-hover')
 scrollbar_slider(button_active.rgb,'-active')
 
 scrollbar_trough(window_fg.rgb)
 
 titlebuttons(titlebutton.rgb,titlebutton.rgb,'')
 titlebuttons(titlebutton.rgb,closebutton_hover.rgb,'-hover')
 titlebuttons(titlebutton_active.rgb,closebutton_active.rgb,'-active')
 titlebuttons(titlebutton_inactive.rgb,titlebutton_inactive.rgb,'-backdrop')
 titlebuttons(titlebutton_inactive.rgb,closebutton_hover.rgb,'-hover-backdrop')
 titlebuttons(titlebutton_inactive_active.rgb,closebutton_active.rgb,'-active-backdrop')
 
 entry(window_bg.rgb,border_color.rgb,view_bg.rgb,'')
 entry(window_bg.rgb,view_active.rgb,view_bg.rgb,'-active')
 entry(window_bg.rgb,border_color.insensitive,None,'-insensitive',border_color.insensitive_alpha)
 
 progressbar(selection_bg.rgb,mix(window_fg.rgb,window_bg.rgb,0.3))
 
 mixed(border_color.rgb,window_bg.rgb,button_active.rgb)
 
 toolbar(border_color.rgb,window_bg.rgb,button_hover.rgb)
 
 gtk2 = open('gtk2/gtkrc', 'w')
 gtk2.write(
 '# Theme:       Breeze-gtk\n'
 '# Description: Breeze theme for GTK+2.0\n'
 '\n'
 'gtk-color-scheme = "text_color:' + html(window_fg.rgb) + '"\n'
 'gtk-color-scheme = "base_color:'+ html(view_bg.rgb) + '"\n'
 'gtk-color-scheme = "insensitive_base_color:'+ html(view_bg.insensitive) + '"\n'
 'gtk-color-scheme = "fg_color:'+ html(window_fg.rgb) + '"\n'
 'gtk-color-scheme = "bg_color:' + html(window_bg.rgb) + '"\n'
 'gtk-color-scheme = "selected_fg_color:' + html(selection_fg.rgb) + '"\n'
 'gtk-color-scheme = "selected_bg_color:' + html(selection_bg.rgb) + '"\n'
 'gtk-color-scheme = "button_fg_color:' + html(button_fg.rgb) + '"\n'
 'gtk-color-scheme = "tooltip_fg_color:' + html(tooltip_fg.rgb) + '"\n'
 'gtk-color-scheme = "tooltip_bg_color:' + html(tooltip_bg.rgb) + '"\n'
 'gtk-color-scheme = "insensitive_fg_color:' + html(mix(window_fg.insensitive,window_bg.rgb,window_fg.insensitive_alpha)) + '"\n'
 'gtk-color-scheme = "insensitive_text_color:' + html(mix(view_fg.insensitive,view_bg.rgb,view_fg.insensitive_alpha)) + '"\n'
 'gtk-color-scheme = "button_insensitive_fg_color:' + html(mix(button_fg.insensitive,button_bg.rgb,button_fg.insensitive_alpha)) + '"\n'
+'gtk-color-scheme = "button_active:' + html(button_active.rgb) + '"\n'
 'gtk-color-scheme = "border_color:' + html(border_color.rgb) + '"\n'
 '\n'
 'include "widgets/default"\n'
 'include "widgets/buttons"\n'
 'include "widgets/menu"\n'
 'include "widgets/entry"\n'
 'include "widgets/notebook"\n'
 'include "widgets/range"\n'
 'include "widgets/scrollbar"\n'
 'include "widgets/toolbar"\n'
 'include "widgets/progressbar"\n'
 'include "widgets/misc"\n'
 'include "widgets/styles"\n'
 )
 gtk2.close()
 
 gtk3 = open('_global.scss', 'w')
 for key in _colors:
-    if 'Disabled' in key or 'Inactive' in key:
+    if key == 'DisabledColor' or key == 'InactiveColor':
+        gtk3.write('${0}:rgb({1});\n'.format(key,_colors[key]))
+    elif 'Disabled' in key or 'Inactive' in key:
         gtk3.write('${0}:{1};\n'.format(key,_colors[key]))
     else:
         gtk3.write('${0}:rgb({1});\n'.format(key,_colors[key]))
 gtk3.close()