diff --git a/src/gtk316/widgets/_window_decorations.scss b/src/gtk316/widgets/_window_decorations.scss
index ea66bdf..e47cc14 100644
--- a/src/gtk316/widgets/_window_decorations.scss
+++ b/src/gtk316/widgets/_window_decorations.scss
@@ -1,174 +1,174 @@
 /**********************
  * Window Decorations *
  *********************/
 
 .window-frame {
 
   //border: 1px solid transparent;
   border-radius: $r;
   box-shadow: 0 2px 6px 1px rgba(0, 0, 0, 0.5);
 
   // FIXME rationalize window-frame shadows
 
   /* this is used for the resize cursor area */
   margin: 10px;
 
   &:backdrop {
     box-shadow: 0 2px 6px 1px rgba(0, 0, 0, 0.5);
   }
   &.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: 0px;
     background-color: t_color(background-light);
     border: none;
     box-shadow: none;
   }
 }
 
 // Window Close button
 .header-bar .button.titlebutton,
 .titlebar .button.titlebutton {
   @extend %undecorated_button;
   padding: 0px;
   &:hover,
   &:active,
   &:checked,
   &:backdrop,
   &:active:hover { @extend %undecorated_button; transition: none;}
 
   &.close {
-    padding: 6px 1px;
+    padding: 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;
+    padding: 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;
+    padding: 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'));
   }
 }
 
 .header-bar,
 .titlebar {
   .maximized & {
     .button.titlebutton {
       &.maximize {
-        padding: 6px 1px;
+        padding: 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'));
     	}
     }
   }
 }
 
 .header-bar.selection-mode .button.titlebutton,
 .titlebar.selection-mode .button.titlebutton {
   text-shadow: none;
   &:backdrop { icon-shadow: none; }
 }
diff --git a/src/gtk320/widgets/_headerbar.scss b/src/gtk320/widgets/_headerbar.scss
index 4efb714..85b5b11 100644
--- a/src/gtk320/widgets/_headerbar.scss
+++ b/src/gtk320/widgets/_headerbar.scss
@@ -1,168 +1,168 @@
 /***************
  * 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: min(lightness(t_color(background))*1.2,100%)),t_color(background));
+  background-image: linear-gradient(to bottom,t_color(background-light),t_color(background));
   &:backdrop {
     border-color: transparent;
     background-image: none;
     background-color: t_color(backdrop-background);
     color: t_color(backdrop-text);
     box-shadow: none;
   }
   label {
     font-weight: normal;
     &:backdrop { color: t_color(backdrop-text); }
   }
   .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: 4px 6px;
 
       GtkArrow { -GtkArrow-arrow-scaling: 1; }
 
       .arrow {
         -gtk-icon-source: -gtk-icontheme('pan-down-symbolic');
         -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/_window_decorations.scss b/src/gtk320/widgets/_window_decorations.scss
index 65eb8c1..23b41c4 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;
+    background-color: t_color(background-light);
     box-shadow: none;
   }
 }
 
 headerbar,
 .titlebar {
   &.default-decoration button.titlebutton {
-    padding: 6px 1px;
+    padding: 1px;
     min-height: 18px;
     min-width: 18px;
     margin: 0;
   }
   button.titlebutton {
-    padding: 6px;
+    padding: 1px;
     &:hover,
     &:active,
     &:checked,
     &:backdrop,
     &:active:hover {
       transition: none;
     }
 
     &.close {
-      padding: 6px 1px;
+      padding: 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;
+      padding: 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;
+      padding: 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;
+        padding: 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; }
 }