use libsass and update build system

15 files changed, 4870 insertions, 0 deletions

diff --git a/common/gtk-3.0/3.16/sass/_applications.scss b/common/gtk-3.0/3.16/sass/_applications.scss
new file mode 100644
index 0000000..09680e1
--- /dev/null
+++ b/common/gtk-3.0/3.16/sass/_applications.scss
@@ -0,0 +1,728 @@
+//
+// Tab overrides
+//
+GeditNotebook.notebook,
+ScratchMainWindow .notebook,
+EphyNotebook.notebook,
+MidoriNotebook .notebook,
+TerminalWindow .notebook,
+PantheonTerminalPantheonTerminalWindow .notebook {
+
+  tab.reorderable-page.top, tab.top {
+    &:active, &.active-page, &.active-page:hover {
+      box-shadow: inset 0 1px $borders_color,
+                  inset 0 -1px $borders_color,
+                  inset 1px 0 $borders_color,
+                  inset -1px 0 $borders_color;
+    }
+  }
+}
+
+TerminalWindow .notebook,
+PantheonTerminalPantheonTerminalWindow .notebook {
+
+  tab.reorderable-page.top, tab.top {
+    padding-top: 7px;
+    border-top-width: 3px;
+  }
+
+  &.header.top {
+    box-shadow: inset 0  1px opacify($header_border, 1),
+                inset 0 -1px $borders_color;
+  }
+}
+
+//
+// Evolution
+//
+// needed for webkit/GtkStyle/Evolution compatibility
+GtkHTML {
+  background-color: $base_color;
+  color: $text_color;
+
+  &:active {
+    color: $selected_fg_color;
+    background-color: $selected_bg_color;
+  }
+}
+
+//
+// Sushi
+//
+// used by gnome-font-viewer and sushi
+SushiFontWidget {
+  padding: 6px 12px;
+}
+
+//
+// GNOME Terminal
+//
+$terminal_bg: #2A2F36;
+$terminal_fg: white;
+
+TerminalWindow {
+  .background {
+    background-color: transparent;
+  }
+
+  .scrollbar {
+    &.vertical .slider { margin-left: 3px; }
+    &.trough { border-width: 0; }
+  }
+}
+
+//
+// Nautilus
+//
+NautilusCanvasViewContainer.view .entry { border-radius: 3px; }
+
+.nautilus-canvas-item {
+  border-radius: 2px;
+}
+
+.nautilus-desktop.nautilus-canvas-item {
+  color: $selected_fg_color;
+  text-shadow: 1px 1px transparentize(black, 0.4);
+
+  &:active { color: $fg_color; }
+  &:selected { color: $selected_fg_color; }
+}
+
+.nautilus-canvas-item.dim-label,
+.nautilus-list-dim-label {
+  color: mix($fg_color, $bg_color, 50%);
+
+  &:selected, &:selected:focus { color: mix($selected_fg_color, $selected_bg_color, 80%); }
+}
+
+NautilusNotebook.notebook {
+  background-color: $base_color;
+
+  tab {
+    border-width: 0;
+    border-style: solid;
+    border-color: transparent;
+    background-color: transparent;
+  }
+}
+
+NautilusQueryEditor .search-bar.toolbar {
+  padding: 5px;
+  box-shadow: none;
+  background-color: $base_color;
+}
+
+.nautilus-circular-button {
+  border-radius: 50%;
+  outline-radius: 50%;
+}
+
+$disk_space_unknown: transparentize($fg_color, 0.5);
+$disk_space_used: transparentize($selected_bg_color, 0.2);
+$disk_space_free: darken($bg_color, 3%);
+
+.disk-space-display {
+  border-style: solid;
+  border-width: 1px;
+
+  &.unknown {
+    background-color: $disk_space_unknown;
+    border-color: darken($disk_space_unknown, 10%);
+  }
+  &.used {
+    background-color: $disk_space_used;
+    border-color: darken($disk_space_used, 10%);
+  }
+  &.free {
+    background-color: $disk_space_free;
+    border-color: darken($disk_space_free, 10%);
+  }
+}
+
+//
+// Nemo
+//
+NemoIconViewContainer { @extend NautilusCanvasViewContainer.view }
+
+NemoWindow .sidebar .frame {
+	border-width: 0;
+}
+
+NemoWindow GtkSeparator.separator.horizontal {
+	color: $borders_color;
+}
+
+.nemo-desktop.nemo-canvas-item {
+  @extend .nautilus-desktop.nautilus-canvas-item;
+}
+
+NemoWindow .primary-toolbar NemoPathBar.linked > .button {
+  @include button(header-hover);
+
+  &:hover { border-color: $selected_bg_color; }
+  &:active, &:checked { @include button(header-active); }
+
+  @extend %linked;
+}
+
+//
+// Gedit
+//
+.gedit-headerbar-paned { color: $header_border; }
+
+.open-document-selector-treeview.view {
+  padding: 3px 6px 3px 6px;
+  border-color: $base_color;  // disable borders, making them transparent doesn't work for some reason
+
+  &:prelight {
+    background-color: transparentize(black, 0.95);
+
+    &:selected {
+      color: $selected_fg_color;
+      background-color: $selected_bg_color;
+    }
+  }
+}
+
+/* Only normal state is handle */
+.open-document-selector-name-label {
+  color: $fg_color;
+}
+
+/* Only normal state is handle */
+.open-document-selector-path-label {
+    color: mix($fg_color, $base_color, 50%);
+    font-size: smaller;
+
+    &:selected { color: transparentize($selected_fg_color, 0.1); }
+}
+
+.gedit-document-panel {
+
+  .list-row .button {
+    color: transparent;
+    background-image: none;
+    background-color: transparent;
+    border: none;
+    box-shadow: none;
+    padding: 4px;
+    & GtkImage { color: inherit; }
+  }
+  .prelight-row .button {
+    color: mix($bg_color, $fg_color, 35%);
+  }
+  .list-row .button:hover,
+  .prelight-row .button:hover {
+    color: lighten(red, 15%);
+  }
+  .prelight-row:selected .button:hover {
+    color: lighten(red, 20%);
+    background-image: none;
+    background-color: transparent;
+    border: none;
+    box-shadow: none;
+    &:active { color: $selected_fg_color; }
+  }
+  .prelight-row .button:active {
+    color: $fg_color;
+  }
+}
+
+.gedit-document-panel-dragged-row {
+  border: 1px solid $borders_color;
+  background-color: darken($bg_color, 10%);
+  color: $fg_color;
+}
+
+//.gedit-document-panel-placeholder-row {
+//}
+
+GeditStatusbar {
+  border-top: 1px solid $borders_color;
+  background-color: $bg_color;
+}
+
+GeditStatusMenuButton.button.flat,
+GeditStatusMenuButton:prelight.button.flat,
+GeditStatusMenuButton:checked.button.flat {
+  border-bottom-style: none;
+  border-radius: 0;
+}
+
+
+GeditViewFrame .gedit-search-slider { @extend %search_slider }
+
+GeditFileBrowserWidget .toolbar {
+  border-bottom: 1px solid $borders_color;
+}
+
+.gedit-search-entry-occurrences-tag {
+  color: transparentize($fg_color, 0.4);
+  margin: 2px;
+  padding: 2px;
+}
+
+%search_slider {
+  background-color: lighten($bg_color, 2%);
+  padding: 6px;
+  border-color: $borders_color;
+  border-radius: 0 0 2px 2px;
+  border-width: 0 1px 1px 1px;
+  border-style: solid;
+}
+
+//
+// Gnome Builder
+//
+
+GbSearchBox.linked {
+
+  > GtkMenuButton.button:last-child:dir(ltr),
+  > GtkMenuButton.button:first-child:dir(rtl) {
+    padding: 0 10px;
+
+    @include entry(header-normal);
+
+    &:hover { @include entry(header-normal); border-color: $selected_bg_color; }
+    &:active, &:checked { @include entry(header-focus); }
+    &:insensitive { @include entry(header-insensitive); }
+  }
+
+  > GtkMenuButton.button:last-child:dir(ltr) {
+
+    border-left-style: none;
+    border-radius: 0 14.5px 14.5px 0;
+    outline-radius: 0 12.5px 12.5px 0;
+
+    &:hover { box-shadow: -1px 0 $selected_bg_color; }
+  }
+  > GtkMenuButton.button:first-child:dir(rtl) {
+    border-right-style: none;
+    border-radius: 14.5px 0 0 14.5px;
+    outline-radius: 12.5px 0 0 12.5px;
+
+    &:hover { box-shadow: 1px 0 $selected_bg_color; }
+  }
+}
+
+//Search entry that slides down from top of editor
+GbEditorFrame .gb-search-slider { @extend %search_slider; padding: 2px; }
+
+.gb-search-entry-occurrences-tag { @extend .gedit-search-entry-occurrences-tag }
+
+GdTaggedEntry { color: $fg_color; }
+
+// Preferences sidebar style
+.preferences.sidebar {
+
+  GtkViewport { border: none; }
+  GtkListBox { background-color: $bg_color; }
+  GtkListBoxRow { padding: 10px; }
+}
+
+// Preference page language style
+GbPreferencesPageLanguage  {
+
+  GtkSearchEntry {
+    border-bottom-left-radius: 0;
+    border-bottom-right-radius: 0;
+  }
+  GtkScrolledWindow { border-top-width: 0; }
+}
+
+// Command Bar styling
+GtkBox.gb-command-bar-box {
+  border: none;
+  background-color: opacify($osd_bg_color, 1);
+
+  GtkLabel { color: $osd_fg_color; }
+}
+
+GtkEntry.gb-command-bar-entry.entry.flat,
+GtkEntry.gb-command-bar-entry.entry.flat:focus {
+  font-family: Monospace;
+  color: $osd_fg_color;
+  background-image: none;
+  background-color: opacify($osd_bg_color, 1);
+  padding: 6px 6px 6px 6px;
+  border: none;
+
+  &:selected,
+  &:selected:focus {
+    @extend %selected_items;
+  }
+}
+
+GbSourceStyleSchemeWidget GtkSourceView {
+    font-family: Monospace;
+}
+
+GtkScrolledWindow.gb-linked-scroller {
+    border-top: none;
+}
+
+// Disable various animatinos that are enabled by default and really annoying
+// to the overall flow of Builder.
+GbSearchDisplayGroup GtkListBox .list-row, GbDocumentStack .button {
+    transition: none;
+}
+
+GbViewStack GtkBox.header.notebook,
+GbEditorWorkspace > GtkPaned > GtkBox > GtkBox.header.notebook {
+    border-bottom: 1px solid $borders_color;
+}
+
+GbViewStack.focused GtkBox.header.notebook {
+  background-color: $bg_color;
+
+ .button.dim-label { opacity: 1; }
+}
+
+//
+// Epiphany
+//
+EphyWindow .floating-bar { // Epiphany overrides the floating-bar style, so reset it
+  color: $fg_color;
+}
+
+//
+// Gnome Documents
+//
+.documents-load-more.button {
+  border-width: 1px 0 0;
+  border-radius: 0;
+}
+
+.documents-icon-bg {
+  background-color: $selected_bg_color;
+  color: $selected_fg_color;
+  border-radius: 2px;
+}
+
+.documents-collection-icon {
+  background-color: transparentize($fg_color, 0.7);
+  border-radius: 2px;
+}
+
+.documents-favorite.button:active,
+.documents-favorite.button:active:hover {
+  color: lighten($selected_bg_color, 20%);
+}
+
+.documents-entry-tag {
+  background-color: $selected_bg_color;
+  color: $selected_fg_color;
+  border-radius: 2px;
+  border-width: 0;
+  margin: 2px;
+  padding: 4px;
+
+  &:hover { background-color: lighten($selected_bg_color, 4%) }
+  &:active { background-color: darken($selected_bg_color, 4%) }
+
+  .toolbar .linked &.button {
+    background: none;
+    border: none;
+    box-shadow: none;
+    icon-shadow: none;
+
+    &:hover { color: transparentize($selected_fg_color, 0.3) }
+  }
+}
+
+.content-view.document-page {
+  border-style: solid;
+  border-width: 3px 3px 6px 4px;
+  border-image: url("assets/thumbnail-frame.png") 3 3 6 4;
+}
+
+//
+// Totem
+//
+TotemGrilo.vertical GdMainView.frame {
+  border-width: 0;
+}
+
+//
+// Synapse
+//
+SynapseGuiViewDefault *:selected { background-color: $selected_bg_color; }
+
+//
+// Fallback Mode/Budgie Panel
+//
+.gnome-panel-menu-bar,
+PanelApplet > GtkMenuBar.menubar,
+PanelToplevel,
+PanelWidget,
+PanelAppletFrame,
+PanelApplet {
+  color: $panel_fg;
+  background-image: linear-gradient(to bottom, $panel_bg);
+}
+
+PanelApplet .button, PanelApplet .button:backdrop {
+  padding: 4px;
+  border: 2px solid transparent;
+  border-radius: 0;
+  background-image: none;
+  background-color: transparent;
+  color: $panel_fg;
+}
+
+PanelApplet .button:hover {
+  color: lighten($panel_fg, 10%);
+  background-color: transparentize(black, 0.83);
+  border-color: transparentize(black, 0.83);
+}
+
+PanelApplet .button:active, PanelApplet .button:active:backdrop,
+PanelApplet .button:checked, PanelApplet .button:checked:backdrop {
+  background-clip: padding-box;
+  color: $selected_fg_color;
+  background-color: transparentize(black, 0.75);
+  border-radius: 0;
+  border-color: transparentize(black, 0.75);
+  box-shadow: inset 0 -2px $selected_bg_color;
+}
+
+PanelApplet:hover {
+  color: $selected_fg_color;
+}
+
+PanelApplet:active,
+PanelApplet:hover:active {
+  color: $selected_bg_color;
+}
+
+WnckPager {
+  color: mix($panel_fg, black, 50%);
+  &:selected { color: $selected_bg_color }
+}
+
+NaTrayApplet {
+  -NaTrayApplet-icon-padding: 12;
+  -NaTrayApplet-icon-size: 16;
+}
+
+ClockBox {
+  color: $panel_fg;
+}
+
+// Xfce Panel
+.xfce4-panel.panel {
+  background-color: $panel_bg;
+
+  .button.flat {
+    color: $panel_fg;
+    background-color: transparentize($panel_bg, 1);
+    border-radius: 0;
+
+    &:hover {
+      border: none;
+      background-color: lighten($panel_bg, 10%);
+    }
+    &:active, &:checked {
+      color: $selected_bg_color;
+      border: none;
+      background-color: darken($panel_bg, 7%);
+    }
+  }
+}
+
+//
+// Floating Bar
+//
+.floating-bar {
+  background-color: $selected_bg_color;
+  color: $selected_fg_color;
+
+  &.top { border-radius: 0 0 2px 2px; }
+  &.right { border-radius: 2px 0 0 2px; }
+  &.bottom { border-radius: 2px 2px 0 0; }
+  &.left { border-radius: 0 2px 2px 0; }
+
+  .button {
+    -GtkButton-image-spacing: 0;
+    -GtkButton-inner-border: 0;
+
+    background-color: transparent;
+    box-shadow: none;
+    border: none;
+  }
+}
+
+// Elementary Apps
+
+//
+// Birdie
+//
+BirdieWidgetsTweetList * {
+  background-image: none;
+  background-color: transparent;
+}
+
+//
+// Marlin / Pantheon Files
+//
+MarlinViewWindow GtkIconView.view:selected,
+MarlinViewWindow GtkIconView.view:selected:focus,
+MarlinViewWindow GtkIconView.view:selected:hover,
+MarlinViewWindow GtkIconView.view:selected:focus:hover {
+  background-color: transparent;
+}
+
+MarlinViewWindow FMListView,
+MarlinViewWindow FMColumnView {
+  outline-color: transparent;
+}
+
+MarlinViewWindow *:selected,
+MarlinViewWindow *:selected:focus {
+	color: $selected_fg_color;
+	background-color: $selected_bg_color;
+  outline-color: transparent;
+}
+
+.marlin-pathbar.pathbar {
+  border-radius: 14.5px;
+  @include entry(header-normal);
+
+  &:focus { @include entry(header-focus) }
+
+  &:insensitive { @include entry(header-insensitive) }
+
+  &:active, &:checked {
+    color: $selected_bg_color;
+  }
+}
+
+//
+// Gala
+//
+.gala-notification {
+    border: 1px solid if($variant=='light', rgba(0, 0, 0, 0.35), $borders_color);
+    border-radius: 3px;
+    box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2);
+    background-image: linear-gradient(to bottom, $base_color);
+    background-color: transparent;
+
+  .title, .label {
+    color: $fg_color;
+  }
+}
+
+//
+// Wingpanel
+//
+.panel {
+  background-color: transparent;
+  color: white;
+  font-weight: bold;
+  text-shadow: 0 1px 2px transparentize(black, 0.4);
+  icon-shadow: 0 1px 2px transparentize(black, 0.4);
+}
+
+.panel-shadow {
+  background-image: none;
+  background-color: transparent;
+}
+
+.panel .menu {
+  box-shadow: none;
+}
+
+.panel .menu .menuitem {
+  font-weight: normal;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.panel .menubar > .menuitem { padding: 3px 6px; }
+
+.panel .menubar > .menuitem:hover { background-color: transparent; }
+
+.panel .window-frame.menu.csd,
+.panel .window-frame.popup.csd {
+  box-shadow: none;
+}
+
+.panel .menu .window-frame.menu.csd,
+.panel .menu .window-frame.popup.csd {
+  box-shadow: 0 0 0 1px transparentize(black, 0.8),
+              0 10px 20px transparentize(black, 0.81),
+              0 6px 6px transparentize(black, 0.77);
+}
+
+.composited-indicator {
+  background-color: transparent;
+  color: white;
+  text-shadow: 0 1px 2px transparentize(black, 0.4);
+  icon-shadow: 0 1px 2px transparentize(black, 0.4);
+}
+
+.composited-indicator > GtkWidget > GtkWidget:first-child {
+  padding: 0 2px;
+}
+
+.panel-app-button > GtkWidget > GtkWidget:first-child {
+  padding: 0 2px 0 4px;
+}
+
+.composited-indicator.menuitem:active,
+.composited-indicator.menuitem:prelight {
+  border-style: none;
+  background-image: none;
+  box-shadow: none;
+}
+
+.composited-indicator > .popup > .menu {
+  padding-top: 8px;
+  padding-bottom: 8px;
+}
+
+.panel .menu .spinner,
+.menu .spinner { opacity: 1 } // Fixes sound indicator buttons
+
+//
+// Wingpanel Popover
+//
+WingpanelWidgetsIndicatorPopover.popover {
+  padding: 0;
+
+  text-shadow: none;
+  icon-shadow: none;
+
+  .menuitem {
+    padding: 5px;
+    outline-color: transparent;
+    text-shadow: none;
+    icon-shadow: none;
+    border: solid transparent;
+    border-width: 1px 0;
+
+    GtkLabel, GtkImage { padding: 0 3px; }
+
+    &:hover, &:active {
+      background-color: if($variant == 'light', transparentize(black, 0.96), transparentize(white, 0.95));
+      border: solid if($variant == 'light', transparentize(black, 0.92), transparentize(white, 0.93));
+      border-width: 1px 0;
+    }
+    *:insensitive { color: $insensitive_fg_color; }
+  }
+}
+
+//
+// Pantheon Terminal
+//
+PantheonTerminalPantheonTerminalWindow.background {
+   background-color: transparent;
+}
+
+//
+// Switchboard
+//
+SwitchboardCategoryView .view:selected,
+SwitchboardCategoryView .view:selected:focus {
+  color: $fg_color;
+}
diff --git a/common/gtk-3.0/3.16/sass/_colors-public.scss b/common/gtk-3.0/3.16/sass/_colors-public.scss
new file mode 100644
index 0000000..60d3cbf
--- /dev/null
+++ b/common/gtk-3.0/3.16/sass/_colors-public.scss
@@ -0,0 +1,77 @@
+//apps rely on some named colors to be exported
+/* GTK NAMED COLORS */
+
+// Sass thinks we're using the colors in the variables as strings and may shoot
+// warning, it's innocuous and can be defeated by using "" + $var
+@define-color theme_fg_color #{"" + $fg_color};
+@define-color theme_text_color #{"" + $text_color};
+@define-color theme_bg_color #{"" + $bg_color};
+@define-color theme_base_color #{"" + $base_color};
+@define-color theme_selected_bg_color #{"" + $selected_bg_color};
+@define-color theme_selected_fg_color #{"" + $selected_fg_color};
+@define-color fg_color #{"" + $fg_color};
+@define-color text_color #{"" + $text_color};
+@define-color bg_color #{"" + $bg_color};
+@define-color base_color #{"" + $base_color};
+@define-color selected_bg_color #{"" + $selected_bg_color};
+@define-color selected_fg_color #{"" + $selected_fg_color};
+@define-color insensitive_bg_color #{"" + $insensitive_bg_color};
+@define-color insensitive_fg_color alpha(#{"" + opacify($insensitive_fg_color, 1)}, 0.5);
+@define-color insensitive_base_color #{"" + $base_color};
+@define-color theme_unfocused_fg_color #{"" + $fg_color};
+@define-color theme_unfocused_text_color #{"" + $text_color};
+@define-color theme_unfocused_bg_color #{"" + $bg_color};
+@define-color theme_unfocused_base_color #{"" + $base_color};
+@define-color borders #{"" + $borders_color};
+@define-color unfocused_borders #{"" + $borders_color};
+
+@define-color warning_color #{"" + $warning_color};
+@define-color error_color #{"" + $error_color};
+@define-color success_color #{"" + $success_color};
+@define-color placeholder_text_color #A8A8A8;
+
+//WM
+$wm_highlight: lighten(opacify($header_bg, 1), 3%);
+$wm_bg_unfocused: opacify($header_bg_backdrop, 1);
+
+@define-color wm_title alpha(#{"" + opacify($header_fg, 1)}, 0.8);
+@define-color wm_unfocused_title alpha(#{"" + opacify($header_fg, 1)}, 0.5);
+
+@define-color wm_bg #{"" + opacify($header_bg, 1)};
+@define-color wm_bg_unfocused #{"" + $wm_bg_unfocused};
+
+@define-color wm_highlight #{"" + $wm_highlight};
+@define-color wm_shadow alpha(black, 0.35);
+
+//WM Buttons
+
+// Close
+@define-color wm_button_close_bg #{"" + $wm_button_close_bg};
+@define-color wm_button_close_hover_bg #{"" + $wm_button_close_hover_bg};
+@define-color wm_button_close_active_bg #{"" + $wm_button_close_active_bg};
+
+@define-color wm_icon_close_bg #{"" + $wm_icon_close_bg};
+@define-color wm_icon_close_hover_bg #{"" + $wm_icon_close_hover_bg};
+@define-color wm_icon_close_active_bg #{"" + $wm_icon_close_active_bg};
+
+// Minimize, Maximize
+@define-color wm_button_bg #{"" + $wm_button_bg};
+@define-color wm_button_unfocused_bg #{"" + $wm_button_unfocused_bg};
+@define-color wm_button_hover_bg #{"" + $wm_button_hover_bg};
+@define-color wm_button_active_bg #{"" + $wm_button_active_bg};
+
+@define-color wm_button_border #{"" + $wm_button_border};
+@define-color wm_button_unfocused_border #{"" + $wm_button_unfocused_border};
+@define-color wm_button_hover_border #{"" + $wm_button_hover_border};
+@define-color wm_button_active_border #{"" + $wm_button_active_border};
+
+@define-color wm_icon_bg #{"" + $wm_icon_bg};
+@define-color wm_icon_unfocused_bg #{"" + $wm_icon_unfocused_bg};
+@define-color wm_icon_hover_bg #{"" + $wm_icon_hover_bg};
+@define-color wm_icon_active_bg #{"" + $wm_icon_active_bg};
+
+
+//FIXME this is really an API
+
+@define-color content_view_bg #{"" + $base_color};
+
diff --git a/common/gtk-3.0/3.16/sass/_colors.scss b/common/gtk-3.0/3.16/sass/_colors.scss
new file mode 100644
index 0000000..c32b223
--- /dev/null
+++ b/common/gtk-3.0/3.16/sass/_colors.scss
@@ -0,0 +1,102 @@
+// When color definition differs for dark and light variant,
+// it gets @if ed depending on $variant
+
+
+$base_color: if($variant =='light', #ffffff, #383C45);
+$text_color: if($variant == 'light', #5c616c, #D3DAE3);
+$bg_color: if($variant =='light', #F5F6F7, #444852);
+$fg_color: if($variant =='light', #5c616c, #D3DAE3);
+
+$selected_fg_color: #ffffff;
+$selected_bg_color: #5294E2;
+$selected_borders_color: darken($selected_bg_color, 20%);
+$borders_color: if($variant =='light', darken($bg_color,9%), darken($bg_color,10%));
+
+$link_color: if($variant == 'light', darken($selected_bg_color,10%),
+                                     lighten($selected_bg_color,20%));
+$link_visited_color: if($variant == 'light', darken($selected_bg_color,20%),
+                                     lighten($selected_bg_color,10%));
+
+$selection_mode_bg: if($transparency == 'true', transparentize($selected_bg_color, 0.05), $selected_bg_color);
+$warning_color: #F27835;
+$error_color: #FC4138;
+$success_color: #73d216;
+$destructive_color: #F04A50;
+$suggested_color: #4DADD4;
+
+$osd_fg_color: #A8ADB5;
+$osd_bg_color: transparentize(#3c4049, 0.05);
+$osd_button_bg: darken($osd_bg_color, 3%);
+
+$osd_insensitive_bg_color: darken($osd_bg_color, 3%);
+$osd_insensitive_fg_color: mix($osd_fg_color, opacify($osd_bg_color, 1), 30%);
+$osd_borders_color: transparentize(black, 0.3);
+
+
+$tooltip_bg: $osd_bg_color;
+$tooltip_fg: #edf5fb;
+$tooltip_borders_color: transparentize(white, 0.9);
+
+//insensitive state derived colors
+$insensitive_fg_color: if($variant == 'light', transparentize($fg_color, 0.45), transparentize($fg_color, 0.55));
+$insensitive_bg_color: if($variant == 'light', mix($bg_color, $base_color, 40%), lighten($bg_color, 2%));
+
+
+$entry_bg: if($variant=='light', $base_color, lighten($base_color, 0%));
+$entry_border: if($variant == 'light', #cfd6e6, darken($borders_color, 0%));
+$entry_focus_border: $selected_bg_color;
+
+$button_bg: if($variant == 'light', lighten($bg_color, 2%), lighten($base_color, 2%));
+$button_border: $entry_border;
+
+$header_bg: red;
+@if $transparency=='true' and $variant=='light' { $header_bg: transparentize(#e7e8eb, 0.05); }
+@if $transparency=='false' and $variant=='light' { $header_bg: #e7e8eb; }
+@if $transparency=='true' and ($variant=='dark' or $darker=='true') { $header_bg: transparentize(#2f343b, 0.03); }
+@if $transparency=='false' and ($variant=='dark' or $darker=='true') { $header_bg: #2f343b; }
+
+//$header_bg: if(($darker == 'true' or $variant == 'dark') and $transparency == 'true', transparentize(#2f343b, 0.03), #2f343b);
+
+$header_bg_backdrop: if($darker == 'true' or $variant == 'dark', lighten($header_bg, 1.5%), lighten($header_bg, 3%));
+
+$header_border: if($variant == 'light', darken($header_bg, 7%), darken($header_bg, 5%));
+
+$header_fg: if($variant == 'light', saturate(transparentize($fg_color, 0.2), 10%), saturate(transparentize($fg_color, 0.2), 10%));
+$header_fg: if($darker == 'true', saturate(transparentize(#D3DAE3, 0.2), 10%), $header_fg);
+
+$dark_sidebar_bg: if($transparency == 'true' and $variant == 'light', $osd_bg_color, opacify($osd_bg_color, 1));
+@if $variant==dark { $dark_sidebar_bg: if($transparency == 'true', lighten($osd_bg_color, 4%), lighten(opacify($osd_bg_color, 1), 4%)); }
+
+$dark_sidebar_fg: $osd_fg_color;
+$dark_sidebar_border: if($variant == 'light', $dark_sidebar_bg, darken($dark_sidebar_bg, 10%));
+
+$panel_bg: darken($osd_bg_color, 10%);
+$panel_fg: $dark_sidebar_fg;
+
+
+//WM Buttons
+
+// Close
+$wm_button_close_bg: if($variant == 'light' and $darker == 'false', #f37076, #e45e65);
+$wm_button_close_hover_bg: if($variant == 'light' and $darker == 'false', #f79da1, #f48085);
+$wm_button_close_active_bg: if($variant == 'light' and $darker == 'false', #ef4048, #e6262f);
+
+$wm_icon_close_bg: $selected_fg_color;
+$wm_icon_close_hover_bg: $selected_fg_color;
+$wm_icon_close_active_bg: $selected_fg_color;
+
+// Minimize, Maximize
+$wm_button_bg: if($variant == 'light' and $darker == 'false', #fdfdfd, #272c32);
+$wm_button_unfocused_bg: if($variant == 'light' and $darker == 'false', #f6f7f8, #2a3035);
+$wm_button_hover_bg: if($variant == 'light' and $darker == 'false', #fdfdfd, #272c32);
+$wm_button_active_bg: $selected_bg_color;
+
+$wm_button_border: if($variant == 'light' and $darker == 'false', #d8dae0, #191C21);
+$wm_button_unfocused_border: if($variant == 'light' and $darker == 'false', #dddee2, #1F2328);
+$wm_button_hover_border: $selected_bg_color;
+$wm_button_active_border: $selected_bg_color;
+
+$wm_icon_bg: if($variant == 'light' and $darker == 'false', #8d93a4, #939ca8);
+$wm_icon_unfocused_bg: if($variant == 'light' and $darker == 'false', #b8bcc7, #686f78);
+$wm_icon_hover_bg: if($variant == 'light' and $darker == 'false', #70788d, #afb8c5);
+$wm_icon_active_bg: $selected_fg_color;
diff --git a/common/gtk-3.0/3.16/sass/_common.scss b/common/gtk-3.0/3.16/sass/_common.scss
new file mode 100644
index 0000000..5469eb6
--- /dev/null
+++ b/common/gtk-3.0/3.16/sass/_common.scss
@@ -0,0 +1,2836 @@
+@function gtkalpha($c,$a) {
+  @return unquote("alpha(#{$c},#{$a})");
+}
+
+$ease-out-quad: cubic-bezier(0.25, 0.46, 0.45, 0.94);
+$asset_suffix: if($variant=='dark', '-dark', ''); // use dark assets in dark variant
+$darker_asset_suffix: if($darker=='true', '-dark', $asset_suffix);
+
+* {
+  background-clip: padding-box;
+  -GtkToolButton-icon-spacing: 4;
+  -GtkTextView-error-underline-color: $error_color;
+  -GtkPaned-handle-size: 1;
+
+  -GtkCheckButton-indicator-size: 16;
+  -GtkCheckMenuItem-indicator-size: 16;
+
+  // The size for scrollbars. The slider is 2px smaller, but we keep it
+  // up so that the whole area is sensitive to button presses for the
+  // slider. The stepper button is larger in both directions, the slider
+  // only in the width
+
+  -GtkScrolledWindow-scrollbar-spacing: 0;
+  -GtkScrolledWindow-scrollbars-within-bevel: 1;
+
+  -GtkToolItemGroup-expander-size: 11;
+  -GtkExpander-expander-size: 16;
+  -GtkTreeView-expander-size: 11;
+
+  -GtkTreeView-horizontal-separator: 4;
+
+  -GtkMenu-horizontal-padding: 0;
+  -GtkMenu-vertical-padding: 0;
+
+  -GtkWidget-link-color: $link_color;
+  -GtkWidget-visited-link-color: $link_visited_color;
+
+  -GtkWidget-focus-padding: 2;    // FIXME: do we still need these?
+  -GtkWidget-focus-line-width: 1; //
+
+  -GtkWidget-text-handle-width: 20;
+  -GtkWidget-text-handle-height: 20;
+
+  -GtkDialog-button-spacing: 4;
+  -GtkDialog-action-area-border: 0;
+
+  -GtkStatusbar-shadow-type: none;
+
+  // We use the outline properties to signal the focus properties
+  // to the adwaita engine: using real CSS properties is faster,
+  // and we don't use any outlines for now.
+
+  outline-color: transparentize($fg_color, 0.7);
+  outline-style: dashed;
+  outline-offset: -3px;
+  outline-width: 1px;
+  outline-radius: 2px;
+}
+
+
+/***************
+ * Base States *
+ ***************/
+
+.background {
+  color: $fg_color;
+  background-color: transparentize($bg_color, 0.001); // without this headerbar transparency doesn't seem to work
+}
+
+/*
+   These wildcard seems unavoidable, need to investigate.
+   Wildcards are bad and troublesome, use them with care,
+   or better, just don't.
+   Everytime a wildcard is used a kitten dies, painfully.
+*/
+
+*:insensitive {
+  -gtk-image-effect: dim;
+}
+
+.gtkstyle-fallback {
+  background-color: $bg_color;
+  color: $fg_color;
+  &:prelight {
+    background-color: lighten($bg_color, 10%);
+    color: $fg_color;
+  }
+  &:active {
+    background-color: darken($bg_color, 10%);
+    color: $fg_color;
+  }
+  &:insensitive {
+    background-color: $insensitive_bg_color;
+    color: $insensitive_fg_color;
+  }
+  &:selected {
+    background-color: $selected_bg_color;
+    color: $selected_fg_color;
+  }
+}
+
+.view {
+  color: $text_color;
+  background-color: $base_color;
+
+  &:selected,
+  &:selected:focus,
+  &:selected:hover {
+    @extend %selected_items;
+  }
+  &.dim-label { 
+    color: transparentize($text_color, 0.45);
+
+    &:selected, &:selected:focus {
+      color: transparentize($selected_fg_color, 0.35);
+      text-shadow: none;
+    }
+  }
+}
+
+.rubberband {
+  border: 1px solid $selected_bg_color;
+  background-color: transparentize($selected_bg_color,0.8);
+}
+
+.label {
+  &.separator {
+    color: $fg_color;
+    @extend .dim-label;
+  }
+  &:selected,
+  &:selected:focus,
+  &:selected:hover {
+    @extend %selected_items;
+  }
+  &:insensitive {
+    color: $insensitive_fg_color;
+  }
+}
+
+.dim-label {
+  opacity: 0.55;
+}
+
+GtkAssistant {
+  .sidebar {
+    background-color: $base_color;
+    border-top: 1px solid $borders_color;
+    &:dir(ltr) { border-right: 1px solid $borders_color; }
+    &:dir(rtl) { border-left: 1px solid $borders_color; }
+  }
+  &.csd .sidebar { border-top-style: none; }
+  .sidebar .label {
+    padding: 6px 12px;
+  }
+  .sidebar .label.highlight {
+    background-color: $selected_bg_color;
+    color: $selected_fg_color;
+  }
+}
+
+GtkTextView { // This will get overridden by .view, needed by gedit line numbers
+  background-color: mix($bg_color, $base_color, 50%);
+}
+
+.grid-child {
+  padding: 3px;
+  border-radius: 3px;
+  &:selected {
+    @extend %selected_items;
+    outline-offset: -2px;
+  }
+}
+
+%osd, .osd {
+  color: $osd_fg_color;
+  border: none;
+  background-color: $osd_bg_color;
+  background-clip: padding-box;
+  outline-color: transparentize($osd_fg_color, 0.7);
+  box-shadow: none;
+}
+
+/**********************
+ * Spinner Animations *
+ **********************/
+
+@keyframes spin {
+  to { -gtk-icon-transform: rotate(1turn); }
+}
+
+.spinner {
+  background-image: none;
+  background-color: blue;
+  opacity: 0; // non spinning spinner makes no sense
+  -gtk-icon-source: -gtk-icontheme('process-working-symbolic');
+
+  &:active {
+    opacity: 1;
+    animation: spin 1s linear infinite;
+
+    &:insensitive {
+      opacity: 0.5;
+    }
+  }
+}
+
+/****************
+ * Text Entries *
+ ****************/
+
+.entry {
+  border: 1px solid;
+  padding: 5px 8px 6px;
+
+  border-radius: 15px;
+  transition: all 200ms $ease-out-quad;
+  @include entry(normal);
+
+  .header-bar & { padding: 6px 11px; }
+
+  //&.image { // icons inside the entry
+  //  &.left { padding-left: 0; }
+  //  &.right { padding-right: 0; }
+  //}
+  &.image { padding-left: 3px; padding-right: 3px; }
+
+  &.flat, &.flat:focus {
+    padding: 2px;
+    @include entry(normal);
+    border: none;
+    border-radius: 0;
+  }
+
+  &:focus {
+    background-clip: border-box;
+    @include entry(focus);
+  }
+
+  &:insensitive { @include entry(insensitive); }
+
+  &:selected,
+  &:selected:focus {
+    background-color: $selected_bg_color;
+    color: $selected_fg_color;
+  }
+
+  &.progressbar {
+    margin: 2px 12px;
+    border-radius: 0;
+    border-width: 0 0 2px;
+    border-color: $selected_bg_color;
+    border-style: solid;
+    background-image: none;
+    background-color: transparent;
+    box-shadow: none;
+  }
+
+  .linked > & { //FIXME: use same buttons linking logic and template
+    &:first-child {
+      border-top-right-radius: 0;
+      border-bottom-right-radius: 0;
+      &:dir(rtl) { border-right-style: none;}
+    }
+    &:last-child {
+      border-top-left-radius: 0;
+      border-bottom-left-radius: 0;
+      border-left-style: none;
+      &:dir(rtl) { border-left-style: solid; }
+    }
+  }
+
+  &.error {
+    color: white;
+    border-color: $error_color;
+    background-image: linear-gradient(to bottom, mix($error_color, $base_color, 80%));
+    &:focus {
+      background-image: linear-gradient(to bottom, $error_color);
+      color: white;
+    }
+    &:selected, &:selected:focus {
+      background-color: white;
+      color: $error_color;
+    }
+  }
+
+  &.warning {
+    color: white;
+    border-color: $warning_color;
+    background-image: linear-gradient(to bottom, mix($warning_color, $base_color, 80%));
+    &:focus {
+      background-image: linear-gradient(to bottom, $warning_color);
+      color: white;
+    }
+    &:selected, &:selected:focus {
+      background-color: white;
+      color: $warning_color;
+    }
+  }
+
+  &.image { // entry icons colors
+    color: mix($fg_color,$base_color,80%);
+    &:hover { color: $fg_color; }
+    &:active { color: $selected_bg_color; }
+  }
+
+  .linked.vertical > & { //FIXME comment stuff and make the whole thing smarter.
+    border-bottom-color: mix($borders_color, $base_color, 30%);
+    box-shadow: none;
+    @extend %linked_vertical;
+
+    &:focus {
+      border-color: $selected_bg_color;
+      box-shadow: 0 -1px 0 0 $selected_bg_color;
+      @extend %linked_vertical;
+    }
+
+    &:insensitive {
+      border-bottom-color: mix($borders_color, $base_color, 30%);
+      @extend %linked_vertical;
+    }
+
+    &:first-child {
+      border-bottom-color: mix($borders_color, $base_color, 30%);
+
+      &:focus {
+        border-bottom-color: $selected_bg_color;
+        box-shadow: none;
+      }
+
+      &:insensitive {
+        border-bottom-color: mix($borders_color, $base_color, 30%);
+        @extend %linked_vertical:first-child;
+      }
+    }
+
+    &:last-child {
+      border-bottom-color: rgba(0,0,0,0.14);
+      &:focus {
+        border-bottom-color: $selected_bg_color;
+        box-shadow: 0 -1px 0 0 $selected_bg_color;
+        @extend %linked_vertical:last-child;
+      }
+
+      &:insensitive {
+        border-bottom-color: rgba(0,0,0,0.14);
+        @extend %linked_vertical:last-child;
+
+      }
+    }
+  }
+
+  .osd & {
+    @include entry(osd);
+    &:focus { @include entry(osd-focus); }
+    &:insensitive { @include entry(osd-insensitive); }
+  }
+}
+
+/***********
+ * Buttons *
+ ***********/
+
+// stuff for .needs-attention
+$_dot_color: $selected_bg_color;
+
+@keyframes needs_attention {
+  from {
+    background-image: -gtk-gradient(radial,
+                                    center center, 0,
+                                    center center, 0.01,
+                                    to($_dot_color),
+                                    to(transparent));
+  }
+  to {
+    background-image: -gtk-gradient(radial,
+                                    center center, 0,
+                                    center center, 0.5,
+                                    to($selected_bg_color),
+                                    to(transparent));
+  }
+}
+
+
+.button {
+  $_button_transition: all 200ms $ease-out-quad;
+
+  transition: $_button_transition;
+  border: 1px solid;
+  border-radius: 3px;
+  padding: 5px 8px;
+
+  .header-bar & { padding: 6px 11px; }
+
+  @include button(normal);
+
+  &.flat { 
+    @include button(undecorated);
+    background-color: transparentize($bg_color, 1);
+    // to avoid adiacent buttons borders clashing when transitioning, the transition on the normal state is set
+    // to none, while it's added back in the hover state, so the button decoration will fade in on hover, but
+    // it won't fade out when the pointer leave the button allocation area. To make the transition more evident
+    // in this case the duration is increased.
+    transition: none;
+    &:hover {
+      transition: $_button_transition;
+      transition-duration: 350ms;
+      &:active { transition: $_button_transition; }
+    }
+  }
+  &:hover {
+    @include button(hover);
+    -gtk-image-effect: highlight;
+  }
+  &:active, &:checked {
+    background-clip: border-box;
+    @include button(active);
+    transition-duration: 50ms;
+  }
+
+  //Webkitgtk workaround start
+  &:active { color: $fg_color; }
+  &:active:hover, &:checked { color: $selected_fg_color; }
+  //Webkitgtk workaround end
+
+  &.flat:insensitive {
+    @include button(undecorated);
+  }
+  &:insensitive {
+    @include button(insensitive);
+    &:active, &:checked {
+      @include button(insensitive-active);
+    }
+  }
+  // big standalone buttons like in Documents pager
+  &.osd {
+    outline-color: transparentize($osd_fg_color, 0.7);
+
+    @include button(osd);
+    background-color: $osd_bg_color;
+
+    &.image-button { padding: 10px; }
+
+    &:hover { @include button(osd-hover); border-color: transparentize($osd_fg_color, 0.7)}
+    &:active, &:checked { @include button(osd-active); }
+    &:insensitive { @include button(osd-insensitive); }
+  }
+
+  //overlay / OSD style
+  .osd & {
+    @include button(osd);
+    // there's a problem with sass which prevents it to extend the linked
+    // placeholder as expected, it should just be "@extend %linked;", the
+    // placeholder is basically replicated here
+    //
+    // Workaround START
+    border-radius: 0;
+    border-left-style: none;
+    border-right-style: none;
+
+    &:dir(rtl) {
+      border-radius: 0;
+      border-right-style: none;
+      border-left-style: none
+    }
+    &:first-child {
+      border-radius: 3px 0 0 3px;
+      border-left-style: solid;
+    }
+    &:last-child {
+      border-radius: 0 3px 3px 0;
+      border-right-style: solid;
+
+      &:dir(rtl) { border-left-style: solid; }
+    }
+    &:only-child {
+      border-radius: 3px;
+      border-style: solid;
+    }
+    // Workaround END
+    &:hover {
+      @include button(osd-hover);
+      @extend %linked;
+    }
+    &:active, &:checked {
+      @include button(osd-active);
+      @extend %linked;
+    }
+    &:insensitive {
+      @include button(osd-insensitive);
+      @extend %linked;
+    }
+
+    &.flat {
+      @include button(undecorated);
+      box-shadow: none;
+      &:hover {
+        @include button(osd-hover);
+      }
+      &:insensitive {
+        @include button(osd-insensitive);
+        background-image: none;
+      }
+      &:active, &:checked {
+        @include button(osd-active);
+      }
+    }
+  }
+  // Suggested and Destructive Action buttons
+  @each $b_type, $b_color in (suggested-action, $suggested_color),
+                             (destructive-action, $destructive_color) {
+    &.#{$b_type} {
+      @include button(suggested_destructive, $b_color);
+
+      &.flat {
+        @include button(undecorated);
+        color: $b_color;
+        outline-color: transparentize($b_color, 0.7);
+      }
+      &:hover {
+        @include button(suggested_destructive, lighten($b_color, 10%));
+      }
+      &:active, &:checked {
+        @include button(suggested_destructive, darken($b_color, 10%));
+      }
+      &.flat:insensitive {
+        @include button(undecorated);
+        color: transparentize($b_color, 0.35);
+      }
+      &:insensitive { opacity: 0.75; }
+    }
+  }
+
+  &.image-button { padding: 8px; }
+
+  .header-bar &.image-button { padding: 6px 9px; }
+
+  &.text-button {
+    padding-left: 16px;
+    padding-right: 16px;
+  }
+
+  .header-bar &.text-button { padding: 6px 16px; }
+
+  &.text-button.image-button {
+    // those buttons needs uneven horizontal padding, we want the icon side
+    // to have the image-button padding, while the text side the text-button
+    // one, so we're adding the missing padding to the label depending on
+    // its position inside the button
+    padding: 4px 8px 5px; // same as .button
+    GtkLabel:first-child { padding-left: 8px; }
+    GtkLabel:last-child { padding-right: 8px; }
+  }
+
+  .header-bar &.text-button.image-button { padding: 6px 16px; }
+
+  .stack-switcher > & {
+    // to position the needs attention dot, padding is added to the button
+    // child, a label needs just lateral padding while an icon needs vertical
+    // padding added too.
+
+    outline-offset: -3px; // needs to be set or it gets overridden by GtkRadioButton outline-offset
+
+    > GtkLabel {
+      padding-left: 6px;  // label padding
+      padding-right: 6px; //
+    }
+    > GtkImage {
+      padding-left: 6px;
+      padding-right: 6px;
+      padding-top: 5px;
+      padding-bottom: 5px;
+    }
+
+    .header-bar > GtkLabel { padding: 6px 10px; }
+
+    &.text-button { padding: 5px 10px; }
+
+    .header-bar &.text-button { padding: 6px 10px; }
+
+    &.image-button { padding: 1px 3px; }
+
+    &.needs-attention > .label,
+    &.needs-attention > GtkImage { @extend %needs_attention; }
+    &.needs-attention:active > .label,
+    &.needs-attention:active > GtkImage,
+    &.needs-attention:checked > .label,
+    &.needs-attention:checked > GtkImage {
+      animation: none;
+      background-image: none;
+    }
+  }
+
+  %needs_attention {
+    animation: needs_attention 150ms ease-in;
+    background-image: -gtk-gradient(radial,
+                                    center center, 0,
+                                    center center, 0.5,
+                                    to($_dot_color),
+                                    to(transparent));
+    background-size: 6px 6px, 6px 6px;
+    background-repeat: no-repeat;
+    @if $variant == 'light' { background-position: right 3px, right 4px; }
+    @else { background-position: right 3px, right 2px; }
+    &:dir(rtl) {
+      @if $variant == 'light' { background-position: left 3px, left 4px; }
+      @else { background-position: left 3px, left 2px; }
+    }
+  }
+
+  //inline-toolbar buttons
+  .inline-toolbar &, .inline-toolbar &:backdrop {
+    border-radius: 2px;
+    border-width: 1px;
+    @extend %linked;
+  }
+
+  .linked > &,
+  .linked > &:hover,
+  .linked > &:active,
+  .linked > &:checked { @extend %linked; }
+
+  .linked.vertical > &,
+  .linked.vertical > &:hover,
+  .linked.vertical > &:active,
+  .linked.vertical > &:checked { @extend %linked_vertical; }
+}
+
+// all the following is for the +|- buttons on inline toolbars, that way
+// should really be deprecated...
+.inline-toolbar GtkToolButton > .button { // redefining the button look is
+                                          // needed since those are flat...
+  @include button(normal);
+  &:hover { @include button(hover); }
+  &:active,
+  &:checked{ @include button(active); }
+  &:insensitive { @include button(insensitive); }
+  &:insensitive:active,
+  &:insensitive:checked { @include button(insensitive-active); }
+}
+
+// More inline toolbar buttons
+.inline-toolbar.toolbar GtkToolButton {
+  & > .button.flat { @extend %linked_middle; }
+  &:dir(rtl) > .button.flat { @extend %linked_middle:dir(rtl); }
+  &:first-child > .button.flat { @extend %linked:first-child; }
+  &:last-child > .button.flat { @extend %linked:last-child; }
+  &:last-child:dir(rtl) > .button.flat { @extend %linked:last-child:dir(rtl); }
+  &:only-child > .button.flat { @extend %linked:only-child; }
+}
+
+%linked_middle {
+  border-radius: 0;
+  border-left-style: none;
+  border-right-style: none;
+
+  &:hover {
+    box-shadow: inset 1px 0 $selected_bg_color, inset -1px 0 $selected_bg_color;
+  }
+
+  &:dir(rtl) {
+    border-radius: 0; // needed when including %linked_middle:dir(rtl)
+  }
+}
+
+%linked {
+  @extend %linked_middle;
+
+  &:first-child {
+    border-radius: 3px 0 0 3px;
+    border-left-style: solid;
+
+    &:hover { box-shadow: inset -1px 0 $selected_bg_color; }
+  }
+  &:last-child {
+    border-radius: 0 3px 3px 0;
+    border-right-style: solid;
+
+    &:hover { box-shadow: inset 1px 0 $selected_bg_color; }
+
+    &:dir(rtl) { border-bottom-left-radius: 0; }
+
+  }
+  &:only-child {
+    border-radius: 3px;
+    border-style: solid;
+
+    &:hover { box-shadow: none; }
+  }
+}
+
+%linked_vertical_middle {
+  border-style: solid;
+  border-bottom-style: none;
+  border-top-style: none;
+  border-radius: 0;
+
+  &:hover { box-shadow: inset 0 1px $selected_bg_color, inset 0 -1px $selected_bg_color; }
+}
+
+%linked_vertical{
+  @extend %linked_vertical_middle;
+
+  &:first-child {
+    border-radius: 3px 3px 0 0;
+    border-top-style: solid;
+
+    &:hover { box-shadow: inset 0 -1px $selected_bg_color; }
+  }
+  &:last-child {
+    border-radius: 0 0 3px 3px;
+    border-bottom-style: solid;
+
+    &:hover { box-shadow: inset 0 1px $selected_bg_color; }
+  }
+  &:only-child {
+    border-radius: 3px;
+    border-style: solid;
+
+    &:hover { box-shadow: none; }
+  }
+}
+
+%undecorated_button {
+  border-color: transparent;
+  background-color: transparent;
+  background-image: none;
+  box-shadow: none;
+}
+
+/* menu buttons */
+.menuitem.button.flat {
+  transition: none;
+  @extend %undecorated_button;
+  outline-offset: -1px;
+  border-radius: 2px;
+
+  &:hover { background-color: mix($fg_color,$bg_color,5%); }
+  &:selected, &:checked, &:active {
+    @extend %selected_items;
+  }
+}
+
+/*********
+ * Links *
+ *********/
+
+*:link {
+  color: $link_color;
+  &:visited {
+    color: $link_visited_color;
+    *:selected & { color: mix($selected_fg_color, $selected_bg_color, 60%); }
+  }
+  &:hover {
+    color: lighten($link_color,10%);
+    *:selected & { color: mix($selected_fg_color, $selected_bg_color, 90%); }
+  }
+  &:active {
+    color: $link_color;
+    *:selected & { color: mix($selected_fg_color, $selected_bg_color, 80%); }
+  }
+  &:selected, *:selected & {
+    color: mix($selected_fg_color, $selected_bg_color, 80%);
+  }
+}
+
+.button:link, .button:visited {
+  @extend %undecorated_button;
+  @extend *:link;
+  &:hover, &:active, &:checked {
+    @extend %undecorated_button;
+  }
+}
+
+/*****************
+ * GtkSpinButton *
+ *****************/
+
+.spinbutton {
+  border-radius: 3px;
+
+  .button {
+    background-image: none;
+    border: 1px solid transparentize($borders_color,0.4);
+    border-style: none none none solid;
+    color: mix($fg_color,$base_color,95%);
+    border-radius: 0;
+    box-shadow: none;
+  //  padding-left: 6px;
+  //  padding-right: 6px;
+    &:dir(rtl) { border-style: none solid none none; }
+    &:first-child { color: red; }
+    &:hover {
+      color: $selected_bg_color;
+    }
+    &:insensitive {
+      color: $insensitive_fg_color;
+    }
+    &:active {
+      background-color: $selected_bg_color;
+      color: $selected_fg_color;
+    }
+  }
+
+//  .osd & {
+//    .button {
+//      @include button(undecorated);
+//      color: $osd_fg_color;
+//      border-style: none none none solid;
+//      border-color: transparentize($osd_borders_color, 0.3);
+//      border-radius: 0;
+//      box-shadow: none;
+//      &:dir(rtl) { border-style: none solid none none; }
+//      &:hover {
+//        @include button(undecorated);
+//        color: $osd_fg_color;
+//        border-color: transparentize(opacify($osd_borders_color, 1), 0.5);
+//        background-color: transparentize($osd_fg_color, 0.9);
+//        box-shadow: none;
+//      }
+//      &:insensitive {
+//        @include button(undecorated);
+//        color: $osd_insensitive_fg_color;
+//        border-color: transparentize(opacify($osd_borders_color, 1), 0.5);
+//        box-shadow: none;
+//      }
+//      &:last-child { border-radius: 0 2px 2px 0; }
+//      &:dir(rtl):first-child { border-radius: 2px 0 0 2px; }
+//    }
+//  }
+
+  &.vertical, &.vertical:dir(rtl) {
+    .button {
+      &:first-child {
+        @extend %top_button;
+        @include button(normal);
+        &:active {
+          @extend %top_button;
+          @include button(active);
+        }
+        &:hover {
+          @extend %top_button;
+          @include button(hover);
+        }
+        &:insensitive {
+          @extend %top_button;
+          @include button(insensitive);
+        }
+      }
+      &:last-child {
+        @extend %bottom_button;
+        @include button(normal);
+        &:active {
+          @extend %bottom_button;
+          @include button(active);
+        }
+        &:hover {
+          @extend %bottom_button;
+          @include button(hover);
+        }
+        &:insensitive {
+          @extend %bottom_button;
+          @include button(insensitive);
+        }
+      }
+    }
+    &.entry {
+      // we should remove the bottom edge hilight here, but seems
+      // like buttons are on top of it so it doesn't show up
+      border-radius: 0;
+      padding-left: 5px;
+      padding-right: 5px;
+    }
+    %top_button {
+      border-radius: 2px 2px 0 0;
+      border-style: solid solid none solid;
+    }
+    %bottom_button {
+      border-radius: 0 0 2px 2px;
+      border-style: none solid solid solid;
+    }
+  }
+  GtkTreeView & {
+    &.entry, &.entry:focus {
+      padding: 1px;
+      border-width: 1px 0;
+      border-color: $selected_bg_color;
+      border-radius: 0;
+      box-shadow: none;
+    }
+  }
+}
+
+/**************
+ * ComboBoxes *
+ **************/
+GtkComboBox {
+  > .button { padding-top: 3px; padding-bottom: 4px; } // Otherwise combos
+                                                       // are bigger then
+                                                       // buttons
+  -GtkComboBox-arrow-scaling: 0.5;
+  -GtkComboBox-shadow-type: none;
+
+  &:insensitive {
+    color: $insensitive_fg_color;
+  }
+
+  .separator.vertical {
+    // always disable separators
+    -GtkWidget-wide-separators: true;
+  }
+
+  &.combobox-entry .entry {
+    @extend %linked;
+
+    border-right-style: none;
+    &:dir(rtl) { border-left-style: none; }
+  }
+
+  &.combobox-entry .button {
+    @extend %linked;
+
+    color: transparentize($fg_color, 0.4);
+    background-color: $button_border;
+    border-color: $button_border;
+
+    &:hover {
+      background-color: lighten($button_border, 5%);
+      border-color: $selected_bg_color;
+      box-shadow: -1px 0 $selected_bg_color;
+    }
+
+    &:active, &:checked { @include button(active); }
+
+    &:insensitive { opacity: 0.5 }
+  }
+}
+
+.linked > GtkComboBox > .button {
+  // the combo is a composite widget so the way we do button linking doesn't
+  // work, special case needed. See
+  // https://bugzilla.gnome.org/show_bug.cgi?id=733979
+  &:dir(ltr) { @extend %linked_middle; } // specificity bump
+  &:dir(rtl) { @extend %linked_middle:dir(rtl); }
+}
+.linked > GtkComboBox:first-child > .button {
+  @extend %linked:first-child;
+}
+.linked > GtkComboBox:last-child > .button {
+  @extend %linked:last-child;
+}
+.linked > GtkComboBox:only-child > .button {
+  @extend %linked:only-child;
+}
+.linked.vertical > GtkComboBoxText > .button,
+.linked.vertical > GtkComboBox > .button { @extend %linked_vertical_middle; }
+.linked.vertical > GtkComboBoxText:first-child > .button,
+.linked.vertical > GtkComboBox:first-child > .button { @extend %linked_vertical:first-child; }
+.linked.vertical > GtkComboBoxText:last-child > .button,
+.linked.vertical > GtkComboBox:last-child > .button { @extend %linked_vertical:last-child; }
+.linked.vertical > GtkComboBoxText:only-child > .button,
+.linked.vertical > GtkComboBox:only-child > .button { @extend %linked_vertical:only-child; }
+
+/************
+ * Toolbars *
+ ************/
+.toolbar {
+  -GtkWidget-window-dragging: true;
+  padding: 4px;
+  background-color: $bg_color;
+  .osd &, &.osd {
+    padding: 7px;
+    border: none;
+    border-radius: 4px;
+    background-color: $osd_bg_color;
+  }
+}
+
+.primary-toolbar {
+  color: $header_fg;
+  background-color: opacify($header_bg, 1);
+  box-shadow: none;
+  border-width: 0 0 1px 0;
+  border-style: solid;
+  border-image: linear-gradient(to bottom, opacify($header_bg, 1),
+                                           darken($header_bg, 7%)) 1 0 1 0; //temporary hack for rhythmbox 3.1
+
+  &:backdrop { background-color: opacify($header_bg_backdrop, 1); }
+
+  .separator { @extend %header_separator; }
+
+  @extend %header_widgets;
+}
+
+.inline-toolbar {
+  @extend .toolbar;
+  background-color: darken($bg_color, 3%);
+  border-style: solid;
+  border-color: $borders_color;
+  border-width: 0 1px 1px;
+  padding: 3px;
+  border-radius: 0  0 3px 3px;
+}
+
+.search-bar {
+  background-color: $bg_color;
+  border-style: solid;
+  border-color: $borders_color;
+  border-width: 0 0 1px;
+  padding: 3px;
+  //box-shadow: inset 0 1px 2px rgba(0,0,0,0.25);
+}
+
+.action-bar { background-color: darken($bg_color, 3%) }
+
+/***************
+ * Header bars *
+ ***************/
+
+.header-bar {
+  padding: 7px 7px 6px 7px;
+
+  border-width: 0 0 1px;
+  border-style: solid;
+  border-radius: 0;
+  border-color: $header_border;
+
+  color: $header_fg;
+  background-color: opacify($header_bg, 1);
+
+  .csd & { background-color: $header_bg; }  // Transparent header-bars only in csd windows
+
+  &:backdrop {
+    color: transparentize($header_fg, 0.3);
+    background-color: opacify($header_bg_backdrop, 1);
+
+    .csd & { background-color: $header_bg_backdrop; }  // Transparent header-bars only in csd windows
+  }
+
+  .title {
+    padding: 0px 12px;
+  }
+
+  .subtitle {
+    font-size: smaller;
+    padding: 0 12px;
+    @extend .dim-label;
+  }
+
+  // Selectionmode
+  &.selection-mode,
+  &.titlebar.selection-mode {
+    color: $selected_fg_color;
+    background-color: $selection_mode_bg;
+    border-color: darken($selection_mode_bg, 4%);
+    box-shadow: none;
+
+    &:backdrop {
+      background-color: $selection_mode_bg;
+      color: transparentize($selected_fg_color, 0.4);
+    }
+
+    .subtitle:link { @extend *:link:selected;  }
+
+    .button {
+      color: $selected_fg_color;
+      outline-color: transparentize($selected_fg_color, 0.7);
+      background-color: transparentize($selected_fg_color, 1);
+      border-color: transparentize($selected_fg_color, 1);
+
+      &.flat {
+        @include button(undecorated);
+        color: $selected_fg_color;
+        background-color: transparentize($selected_fg_color, 1);
+      }
+      &:hover {
+        color: $selected_fg_color;
+        outline-color: transparentize($selected_fg_color, 0.7);
+        background-color: transparentize($selected_fg_color, 0.95);
+        border-color: transparentize($selected_fg_color, 0.5);
+      }
+      &:active, &:checked {
+        color: $selection_mode_bg;
+        outline-color: transparentize($selection_mode_bg, 0.7);
+        background-color: $selected_fg_color;
+        border-color: $selected_fg_color;
+      }
+      &:insensitive {
+        color: transparentize($selected_fg_color, 0.6);
+        background-color: transparentize($selected_fg_color, 1);
+        border-color: transparentize($selected_fg_color, 1);
+
+        &:active, &:checked {
+          color: transparentize($selection_mode_bg, 0.6);
+          background-color: transparentize($selected_fg_color, 0.85);
+          border-color: transparentize($selected_fg_color, 0.85);
+        }
+      }
+    }
+
+    .selection-menu {
+      box-shadow: none;
+      padding-left: 10px;
+      padding-right: 10px;
+      GtkArrow { -GtkArrow-arrow-scaling: 1; }
+      .arrow {
+        -gtk-icon-source: -gtk-icontheme('pan-down-symbolic');
+      }
+    }
+    .maximized & { background-color: opacify($selection_mode_bg, 1); }
+  }
+
+  .tiled &, .tiled &:backdrop,
+  .maximized &, .maximized &:backdrop {
+    border-radius: 0; // squared corners when the window is max'd or tiled
+  }
+
+  .maximized & {
+    background-color: opacify($header_bg, 1);
+
+    &:backdrop { background-color: opacify($header_bg_backdrop, 1); }
+  }
+
+  &.default-decoration {
+    padding-top: 5px;	    // less padding for ssd
+    padding-bottom: 5px;  //
+    background-color: opacify($header_bg, 1);
+    border-bottom-width: 0;
+
+    &:backdrop { background-color: opacify($header_bg_backdrop, 1); }
+  }
+}
+
+.titlebar {
+  padding-left: 7px;
+  padding-right: 7px;
+  border-radius: if($darker=='false' and $variant=='light', 4px 4px 0 0, 3px 3px 0 0);
+  color: $header_fg;
+  background-color: opacify($header_bg, 1);
+  box-shadow: inset 0  1px lighten($header_bg, 3%);
+
+  .csd & { background-color: $header_bg; }
+
+  &:backdrop {
+    color: transparentize($header_fg, 0.3);
+    background-color: opacify($header_bg_backdrop, 1);
+
+    .csd & { background-color: $header_bg_backdrop; }
+  }
+
+  .maximized & {
+    background-color: opacify($header_bg, 1);
+
+    &:backdrop { background-color: opacify($header_bg_backdrop, 1); }
+  }
+}
+
+.titlebar .titlebar,
+.titlebar .titlebar:backdrop { background-color: transparent; }
+
+// Only extending .header-bar avoids some problems (Gnome Documents searchbar)
+.header-bar {
+  .header-bar-separator,
+  & > GtkBox > .separator.vertical { @extend %header_separator; }
+
+  @extend %header_widgets;
+}
+
+%header_separator {
+  -GtkWidget-wide-separators: true;
+  -GtkWidget-separator-width: 1px;
+  border-width: 0 1px;
+  border-image: linear-gradient(to bottom,
+                                transparentize($header_fg, 1) 25%,
+                                transparentize($header_fg, 0.65) 25%,
+                                transparentize($header_fg, 0.65) 75%,
+                                transparentize($header_fg, 1) 75%) 0 1/0 1px stretch;
+
+  &:backdrop { opacity: 0.6; }
+}
+
+%header_widgets {
+  // Header-bar Entries
+  .entry {
+    @include entry(header-normal);
+
+    &:backdrop { opacity: 0.85; }
+
+    &:focus {
+      @include entry(header-focus);
+
+      &.image { color: $selected_fg_color; }
+    }
+    &:insensitive { @include entry(header-insensitive); }
+
+    &:selected:focus {
+      background-color: $selected_fg_color;
+      color: $selected_bg_color;
+    }
+
+    &.progressbar {
+      border-color: $selected_bg_color;
+      background-image: none;
+      background-color: transparent;
+    }
+  }
+
+  // Header-bar Buttons
+  .button {
+
+    @include button(header-normal);
+
+    &:backdrop { opacity: 0.7; }
+
+    &:hover { @include button(header-hover); }
+    &:active, &:checked { @include button(header-active); }
+    &:insensitive { @include button(header-insensitive); }
+    &:insensitive:active, &:insensitive:checked { @include button(header-insensitive-active); }
+  }
+
+    .linked > .button { border-radius: 3px; border-style: solid}
+
+    .linked > .button:hover { box-shadow: none; }
+
+    .linked.stack-switcher > .button,
+    .linked.path-bar > .button {
+      @include button(header-hover);
+
+      &:hover { border-color: $selected_bg_color; }
+      &:active, &:checked { @include button(header-active); }
+
+      @extend %linked;
+    }
+
+  // Header-bar Suggested and Destructive Action buttons
+  @each $b_type, $b_color in (suggested-action, $suggested_color),
+                             (destructive-action, $destructive_color) {
+    .button.#{$b_type} {
+      @include button(suggested_destructive, $b_color);
+
+      &.flat {
+        @include button(undecorated);
+        color: $b_color;
+        outline-color: transparentize($b_color, 0.7);
+      }
+      &:hover {
+        @include button(suggested_destructive, lighten($b_color, 10%));
+      }
+      &:active, &:checked {
+        @include button(suggested_destructive, darken($b_color, 10%));
+      }
+      &.flat:insensitive {
+        @include button(undecorated);
+        color: transparentize($b_color, 0.35);
+      }
+      &:insensitive { opacity: 0.75; }
+    }
+    .button.#{$b_type}:backdrop,
+    .button.#{$b_type}:backdrop {
+      opacity: 0.8;
+    }
+  }
+
+  // Header-bar Spinbuttons
+  & .spinbutton {
+
+      &:focus .button { color: $selected_fg_color; }
+
+      .button {
+        color: $header_fg;
+
+        &:hover { background-color: rgba(255,255,255,0.1); border-color: transparent; }
+        &:insensitive { color: transparentize($header_fg, 0.3); }
+        &:active { background-color: rgba(0,0,0,0.1); }
+    }
+  }
+
+  // Header-bar ComboBoxes
+  & GtkComboBox{
+    &:insensitive { color: transparentize($header_fg, 0.6); }
+
+    &.combobox-entry .button {
+      @include entry(header-normal);
+
+      &:hover { @include entry(header-focus); }
+      &:insensitive { @include entry(header-insensitive); }
+    }
+  }
+
+  // Header-bar Switches
+  GtkSwitch {
+    &:backdrop { opacity: 0.75; }
+  }
+
+  GtkProgressBar {
+
+    &.trough { background-color: transparentize($header_fg, 0.65); }
+
+    &:backdrop { opacity: 0.75; }
+  }
+
+  // Header-bar Scale
+  .scale {
+
+    &:backdrop { opacity: 0.75; }
+
+    &.trough {
+      background-image: linear-gradient(to bottom, transparentize($header_fg, 0.65));
+
+      &:insensitive { background-image: linear-gradient(to bottom, transparentize($header_fg, 0.7)); }
+    }
+    &.slider {
+      background-image: linear-gradient(to bottom, if($darker == 'false', mix($base_color, $header_bg, 90%), darken($header_bg, 4%)));
+
+      &:insensitive {
+        background-image: linear-gradient(to bottom, if($darker == 'false', mix($base_color, $header_bg, 40%), darken($header_bg, 1%)));
+
+        @if $darker=='true' { border-color: mix($header_bg, $selected_bg_color, 60%); }
+      }
+    }
+  }
+}
+
+/************
+ * Pathbars *
+ ************/
+
+.path-bar .button {
+  //padding: 5px 6px 6px;
+  &:first-child { padding-left: 8px; }
+  &:last-child { padding-right: 8px; }
+  &:only-child {
+    padding-left: 12px;
+    padding-right: 12px;
+  }
+
+  // the following is for spacing the icon and the label inside the home button
+  GtkLabel:last-child { padding-left: 2px; }
+  GtkLabel:first-child { padding-right: 2px; }
+  GtkLabel:only-child { padding-right: 0; padding-left: 0; }
+  //GtkImage { padding-top: 1px; }
+}
+
+/**************
+ * Tree Views *
+ **************/
+GtkTreeView.view {                                      // treeview grid lines and expanders, unfortunatelly
+                                                        // the tree lines color can't be set
+  -GtkTreeView-grid-line-width: 1;
+  -GtkTreeView-grid-line-pattern: '';
+  -GtkTreeView-tree-line-width: 1;
+  -GtkTreeView-tree-line-pattern: '';
+  -GtkTreeView-expander-size: 16;
+
+  border-left-color: transparentize($fg_color, 0.85);   // this is actually the tree lines color,
+  border-top-color: transparentize(black, 0.9);         // while this is the grid lines color, better then nothing
+
+  &:selected {
+    border-radius: 0;
+    border-left-color: mix($selected_fg_color, $selected_bg_color, 50%);
+    border-top-color: transparentize($fg_color, 0.9);   // doesn't work unfortunatelly
+  }
+
+  &:insensitive {
+    color: $insensitive_fg_color;
+    &:selected {
+      color: mix($selected_fg_color, $selected_bg_color, 40%);
+    }
+  }
+
+  &.dnd {
+    border-style: solid none;
+    border-width: 1px;
+    border-color: mix($fg_color, $selected_bg_color, 50%);
+  }
+
+  &.expander {
+    -gtk-icon-source: -gtk-icontheme('pan-end-symbolic');
+    &:dir(rtl) { -gtk-icon-source: -gtk-icontheme('pan-end-symbolic-rtl'); }
+
+    color: mix($fg_color, $base_color, 50%);
+
+    &:hover { color: $fg_color; }
+
+    &:selected {
+      color: mix($selected_fg_color, $selected_bg_color, 70%);
+      &:hover { color: $selected_fg_color; }
+    }
+
+    &:checked {
+      -gtk-icon-source: -gtk-icontheme('pan-down-symbolic');
+    }
+  }
+
+  &.progressbar { // progress bar in treeviews
+    color: $selected_fg_color;
+    border-radius: 3px;
+
+    &:selected {
+      color: $selected_bg_color;
+      box-shadow: none;
+      background-color: $selected_fg_color;
+    }
+  }
+  &.trough, &.trough:selected { // progress bar trough in treeviews
+    color: $fg_color;
+    background-color: $button_border;
+    border-radius: 3px;
+    border-width: 0;
+  }
+}
+
+column-header {
+  .button {
+    @extend %column_header_button;
+    $_column_header_color: mix($fg_color,$base_color,80%);
+    color: $_column_header_color;
+    background-color: $base_color;
+    &:hover {
+      @extend %column_header_button;
+      color: $selected_bg_color;
+      box-shadow: none;
+      transition: none; //I shouldn't need this
+    }
+    &:active {
+      @extend %column_header_button;
+      color: $fg_color;
+      transition: none; //I shouldn't need this
+    }
+    &.dnd {
+      @extend column-header.button.dnd;
+    }
+  }
+  &:last-child .button,
+  &:last-child.button { //treeview-like derived widgets in Banshee and Evolution
+    border-right-style: none;
+    border-image: none;
+  }
+}
+
+column-header.button.dnd { // for treeview-like derive widgets
+  transition: none;
+  color: $selected_bg_color;
+  box-shadow: inset 1px 1px 0 1px $selected_bg_color,
+              inset -1px 0 0 1px $selected_bg_color,
+              inset 1px 1px $base_color, inset -1px 0 $base_color;;
+  &:active { @extend column-header.button.dnd; }
+  &:selected { @extend column-header.button.dnd; }
+  &:hover { @extend column-header.button.dnd; }
+}
+
+%column_header_button {
+  padding: 3px 6px;
+  background-image: none;
+  border-style: none solid none none;
+  border-radius: 0;
+  border-image: linear-gradient(to bottom,
+                                transparentize(if($variant == 'light', black, white), 1) 20%,
+                                transparentize(if($variant == 'light', black, white), 0.89) 20%,
+                                transparentize(if($variant == 'light', black, white), 0.89) 80%,
+                                transparentize(if($variant == 'light', black, white), 1) 80%) 0 1 0 0 / 0 1px 0 0 stretch;
+
+  &:active { background-color: $base_color; }
+  &:insensitive {
+    border-color: $bg_color;
+    background-image: none;
+  }
+}
+
+/*********
+ * Menus *
+ *********/
+.menubar {
+  -GtkWidget-window-dragging: true;
+  padding: 0px;
+  background-color: opacify($header_bg, 1);
+  color: $header_fg;
+
+  &:backdrop { background-color: opacify($header_bg_backdrop, 1); }
+
+  & > .menuitem {
+    padding: 6px 8px;
+    border: solid transparent;
+    border-width: 0;
+
+    &:hover { //Seems like it :hover even with keyboard focus
+      background-color: $selected_bg_color;
+      color: $selected_fg_color;
+    }
+    &:insensitive {
+      color: transparentize($header_fg, 0.6);
+      border-color: transparent;
+    }
+  }
+}
+
+.menu, .popup {
+  margin: 4px;
+  padding: 0;
+  border-radius: 0;
+  background-color: $base_color;
+  border: 1px solid $borders_color;
+
+  .csd & {
+    padding: 4px 0px;
+    border-radius: 3px;
+    border: none;
+  }
+
+  .menuitem {
+    padding: 5px;
+    &:hover {
+      color: $fg_color;
+      background-color: if($variant == 'light', transparentize(black, 0.96), transparentize(white, 0.95));
+      border: solid if($variant == 'light', transparentize(black, 0.92), transparentize(white, 0.93));
+      border-width: 1px 0 1px 0;
+    }
+    &:insensitive {
+      color: $insensitive_fg_color;
+    }
+
+    &.separator { color: transparentize($base_color, 1); }
+
+    //submenu indicators
+    &.arrow { -gtk-icon-source: -gtk-icontheme('pan-end-symbolic'); }
+    &.arrow:dir(rtl) {-gtk-icon-source:-gtk-icontheme('pan-end-symbolic-rtl'); }
+  }
+  &.button { // overlow buttons
+    @extend %undecorated_button;
+    border-style: none;
+    border-radius: 0;
+    &.top { border-bottom: 1px solid mix($fg_color, $base_color, 10%); }
+    &.bottom { border-top: 1px solid mix($fg_color, $base_color, 10%); }
+    &:hover { background-color: mix($fg_color, $base_color, 10%); }
+    &:insensitive {
+      color: transparent;
+      background-color: transparent;
+      border-color: transparent ;
+    }
+  }
+}
+
+.menuitem .accelerator { color: gtkalpha(currentColor,0.55); }
+
+/************
+ * Popovers *
+ ************/
+
+.popover {
+  padding: 2px;
+  border: 1px solid darken($borders_color, 5%);
+  border-radius: 3px;
+  background-clip: border-box;
+  background-color: $base_color;
+
+  box-shadow: 0 2px 6px 1px if($variant=='light', transparentize(black, 0.93), transparentize(black, 0.65));
+
+  & .separator { color: transparentize($base_color, 1); }
+  .label.separator { @extend .label.separator; } // Noice
+
+  > .list,
+  > .view,
+  > .toolbar,
+  &.osd > .toolbar {
+    border-style: none;
+    background-color: transparent;
+  }
+  &.osd { @extend %osd; }
+}
+
+//touch selection handlebars for the Popover.osd above
+.entry.cursor-handle,
+.cursor-handle {
+  background-color: transparent;
+  background-image: none;
+  box-shadow: none;
+  border-style: none;
+  &.top { -gtk-icon-source: -gtk-icontheme('selection-start-symbolic'); }
+  &.bottom { -gtk-icon-source: -gtk-icontheme('selection-end-symbolic'); }
+}
+
+/*****************
+ * Notebooks and *
+ * Tabs          *
+ *****************/
+
+.notebook {
+  // Through me you go to the grief wracked city;
+  // Through me you go to everlasting pain;
+  // Through me you go a pass among lost souls.
+  // ...
+  // Abandon all hope — Ye Who Enter Here
+  padding: 0;
+  background-color: $base_color;
+  -GtkNotebook-initial-gap: 4;
+  -GtkNotebook-arrow-spacing: 5;
+  -GtkNotebook-tab-curvature: 0;
+  -GtkNotebook-tab-overlap: 1;
+  -GtkNotebook-has-tab-gap: false;
+  -GtkWidget-focus-padding: 0;
+  -GtkWidget-focus-line-width: 0;
+  transition: all 200ms $ease-out-quad;
+
+  &.frame {
+    border: 1px solid $borders_color;
+    // FIXME doesn't work
+    &.top { border-top-width: 0; }
+    &.bottom { border-bottom-width: 0; }
+    &.right { border-right-width: 0; }
+    &.left { border-left-width: 0; }
+  }
+  &.header {
+    // FIXME: double borders in some case, can't fix it w/o a class tho
+    // FIXME: doesn't work on dark var
+    background-color: $bg_color;
+
+    // this is the shading of the header behind the tabs
+    &.frame {
+      border: 0px solid $borders_color;
+      &.top { border-bottom-width: 0; }
+      &.bottom { border-top-width: 0; }
+      &.right { border-left-width: 0; }
+      &.left { border-right-width: 0; }
+    }
+
+    $_header_border: $borders_color;
+    &.top {
+      box-shadow: inset 0 -1px $_header_border; // border
+    }
+    &.bottom {
+      box-shadow: inset 0 1px $_header_border;
+    }
+    &.right {
+      box-shadow: inset 1px 0 $_header_border;
+    }
+    &.left {
+      box-shadow: inset -1px 0 $_header_border;
+    }
+  }
+  tab {
+    border-width: 0;
+    border-style: solid;
+    border-color: transparent;
+    background-color: transparent;
+    outline-color: transparent;
+
+    outline-offset: 0;
+
+    // tab sizing
+    $vpadding: 4px;
+    $hpadding: 15px;
+
+    //FIXME: we get double border in some cases, not considering the broken
+    //notebook content frame...
+    &.top, &.bottom { padding: $vpadding $hpadding; }
+    &.left, &.right { padding: $vpadding $hpadding; }
+
+    &.reorderable-page {
+      &.top, &.bottom {
+        padding-left: 12px;  // for a nicer close button
+        padding-right: 12px; // placement
+      }
+    }
+    @each $_tab in (top, bottom, right, left) {
+      &.reorderable-page.#{$_tab}, &.#{$_tab} {
+
+        @if $_tab==top or $_tab==bottom {
+          padding-#{$_tab}: $vpadding + 2;
+        }
+        @else if $_tab==left or $_tab==right {
+          padding-#{$_tab}: $hpadding + 2;
+        }
+
+        @if $_tab==top { border-radius: 3.5px 2px 0 0; }
+        @else if $_tab==bottom { border-radius: 0 0 2px 3.5px; }
+        @else if $_tab==left { border-radius: 3.5px 0 0 3.5px; }
+        @else if $_tab==right { border-radius: 0 3.5px 3.5px 0; }
+
+        border-width: 0;
+        border-#{$_tab}-width: 2px;
+        border-color: transparent;
+        background-color: transparentize($base_color, 1);
+
+        &:hover, &.prelight-page {
+          background-color: transparentize($base_color, 0.5);
+          box-shadow: inset 0 1px $borders_color,
+                      inset 0 -1px $borders_color,
+                      inset 1px 0 $borders_color,
+                      inset -1px 0 $borders_color;
+        }
+        &:active, &.active-page, &.active-page:hover {
+          background-color: $base_color;
+
+          @if $_tab==top {
+            box-shadow: inset 0 1px $borders_color,
+                        inset 0 -1px $base_color,
+                        inset 1px 0 $borders_color,
+                        inset -1px 0 $borders_color;
+          }
+          @else if $_tab==bottom {
+            box-shadow: inset 0 -1px $base_color,
+                        inset 0 -1px $borders_color,
+                        inset 1px 0 $borders_color,
+                        inset -1px 0 $borders_color;
+          }
+          @else if $_tab==left {
+            box-shadow: inset 0 1px $borders_color,
+                        inset 0 -1px $borders_color,
+                        inset 1px 0 $borders_color,
+                        inset -1px 0 $base_color;
+          }
+          @else if $_tab==right {
+            box-shadow: inset 0 1px $borders_color,
+                        inset 0 -1px $borders_color,
+                        inset 1px 0 $base_color,
+                        inset -1px 0 $borders_color;
+          }
+        }
+      }
+    }
+    GtkLabel { //tab text
+      padding: 0 2px; // needed for a nicer focus ring
+      color: $insensitive_fg_color;
+    }
+    .prelight-page GtkLabel, GtkLabel.prelight-page {
+      // prelight tab text
+      color: mix($fg_color, $insensitive_fg_color, 50%);
+    }
+    .active-page GtkLabel, GtkLabel.active-page {
+      // active tab text
+      color: $fg_color;
+    }
+    .button { //tab close button
+      padding: 0;
+      @extend %undecorated_button;
+      color: mix($bg_color, $fg_color, 35%);
+
+      &:hover {
+        color: lighten(red, 15%);
+      }
+      &:active {
+        color: $selected_bg_color;
+      }
+      & > GtkImage { // this is a hack which makes tabs grow
+        padding: 2px;
+      }
+    }
+  }
+  &.arrow {
+    color: $insensitive_fg_color;
+    &:hover { color: mix($fg_color, $insensitive_fg_color, 50%); }
+    &:active { color: $fg_color; }
+    &:insensitive {
+      color: transparentize($insensitive_fg_color,0.7);
+    }
+  }
+}
+
+/**************
+ * Scrollbars *
+ **************/
+
+$_scrollbar_bg_color: darken($base_color, 1%);
+
+.scrollbar {
+  -GtkRange-slider-width: 13;
+  -GtkRange-trough-border: 1;
+  -GtkScrollbar-has-backward-stepper: false;
+  -GtkScrollbar-has-forward-stepper: false;
+  -GtkScrollbar-min-slider-length: 42; // minimum size for the slider.
+                                       // sadly can't be in '.slider'
+                                       // where it belongs
+  -GtkRange-stepper-spacing: 0;
+  -GtkRange-trough-under-steppers: 1;
+
+  $_slider_margin: 3px;
+  $_slider_fine_tune_margin: 4px;
+
+  .button {
+    border: none;
+  }
+
+  &.overlay-indicator {
+    &:not(.dragging):not(.hovering) { // Overlay scrolling indicator
+      opacity: 0.4;
+
+      -GtkRange-slider-width: 6px;
+
+      .slider {
+        margin: 0;
+        background-color: mix($fg_color, $bg_color, 70%);
+        border: 1px solid if($variant == 'light', transparentize(white, 0.4), transparentize(black, 0.7));
+        background-clip: padding-box;
+      }
+
+      .trough {
+        border-style: none;
+        background-color: transparent;
+      }
+
+      // w/o the following margin tweaks the slider shrinks when hovering/dragging
+      &.vertical .slider {
+        margin-top: $_slider_margin - 1px;
+        margin-bottom: $_slider_margin - 1px;
+      }
+
+      &.horizontal .slider {
+        margin-left: $_slider_margin - 1px;
+        margin-right: $_slider_margin - 1px;
+      }
+
+    }
+
+    &.dragging,
+    &.hovering { opacity: 0.99; }
+  }
+
+  // trough coloring
+  .trough {
+    background-color: $_scrollbar_bg_color;
+    border: 1px none $borders_color;
+  }
+
+  // slider coloring
+  .slider {
+    background-color: mix($fg_color, $bg_color, 40%);
+
+    &:hover { background-color: mix($fg_color, $bg_color, 30%); }
+
+    &:prelight:active { background-color: $selected_bg_color;}
+
+    &:insensitive {
+      background-color: transparent;
+    }
+  }
+
+  // sizing
+  .slider {
+    border-radius: 100px;
+    margin: $_slider_margin;
+  }
+
+  &.fine-tune .slider { margin: $_slider_fine_tune_margin; }
+
+  &.vertical {
+
+    .slider {
+      margin-left: 1px + $_slider_margin;
+
+      &:dir(rtl) {
+        margin-left: $_slider_margin;
+        margin-right: 1px + $_slider_margin;
+      }
+    }
+
+    &.fine-tune .slider {
+      margin-left: 1px + $_slider_fine_tune_margin;
+
+      &:dir(rtl) {
+        margin-left: $_slider_fine_tune_margin;
+        margin-right: 1px + $_slider_fine_tune_margin;
+      }
+    }
+
+    .trough {
+      border-left-style: solid;
+
+      &:dir(rtl) {
+        border-left-style: none;
+        border-right-style: solid;
+      }
+    }
+  }
+
+  &.horizontal {
+
+    .slider { margin-top: 1px + $_slider_margin; }
+
+    &.fine-tune .slider { margin-top: 1px + $_slider_fine_tune_margin; }
+
+    .trough { border-top-style: solid; }
+  }
+}
+
+.scrollbars-junction,
+.scrollbars-junction.frame { // the small square between two scrollbars
+  border-color: transparent;
+  // the border image is used to add the missing dot between the borders, details, details, details...
+  border-image: linear-gradient(to bottom, $borders_color 1px, transparent 1px) 0 0 0 1 / 0 1px stretch;
+  background-color: $_scrollbar_bg_color;
+
+  &:dir(rtl) { border-image-slice: 0 1 0 0; }
+}
+
+
+/**********
+ * Switch *
+ **********/
+GtkSwitch {
+  font: 1;
+  -GtkSwitch-slider-width: 41;
+  outline-color: transparent;
+
+  &.trough, &.slider {
+    background-size: 52px 24px;
+    background-repeat: no-repeat;
+    background-position: right center;
+    color: transparent;
+    border-color: transparent;
+    border-image: none;
+    border-style: none;
+    box-shadow: none;
+
+    &:dir(rtl) { background-position: left center; }
+  }
+}
+
+@each $i,$j in ('',''), ('.list-row:selected ','-selected') {
+
+  @each $k,$l in ('',''),
+                 (':active','-active'),
+                 (':insensitive','-insensitive'),
+                 (':active:insensitive','-active-insensitive') {
+
+    // load switch troughs from .png files in assets directory
+
+    #{$i}GtkSwitch.trough#{$k} {
+      background-image: -gtk-scaled(url("assets/switch#{$l}#{$asset_suffix}.png"),url("assets/switch#{$l}#{$asset_suffix}@2.png"));
+    }
+
+    .list-row:selected GtkSwitch.trough#{$k} {
+      background-image: -gtk-scaled(url("assets/switch#{$l}-selected.png"),url("assets/switch#{$l}-selected@2.png"));
+    }
+
+    .header-bar GtkSwitch.trough#{$k},
+    .primary-toolbar GtkSwitch.trough#{$k} {
+      background-image: -gtk-scaled(url("assets/switch#{$l}-header#{$darker_asset_suffix}.png"),url("assets/switch#{$l}-header#{$darker_asset_suffix}@2.png"));
+    }
+
+    // load switch sliders from .png files in assets directory
+
+    //#{$i}GtkSwitch.slider#{$k} {
+    //  background-image: -gtk-scaled(url("assets/switch-slider#{$l}#{$j}#{$asset_suffix}.png"),url("assets/switch-slider#{$l}#{$j}#{$asset_suffix}@2.png"));
+    //}
+  }
+}
+
+/*************************
+ * Check and Radio items *
+ *************************/
+
+// draw regular check and radio items using our PNG assets
+// all assets are rendered from assets.svg. never add pngs directly
+
+@each $w,$a in ('check', 'checkbox'),
+               ('radio','radio') {
+
+  //standard checks and radios
+  @each $s,$as in ('','-unchecked'),
+                  (':insensitive','-unchecked-insensitive'),
+                  (':inconsistent', '-mixed'),
+                  (':inconsistent:insensitive', '-mixed-insensitive'),
+                  (':checked', '-checked'),
+                  (':checked:insensitive','-checked-insensitive') {
+    .#{$w}#{$s} {
+      -gtk-icon-source: -gtk-scaled(url("assets/#{$a}#{$as}#{$asset_suffix}.png"),
+                                    url("assets/#{$a}#{$as}#{$asset_suffix}@2.png"));
+    }
+    // the borders of checks and radios are
+    // too similar in luminosity to the selected background color, hence
+    // we need special casing.
+    GtkTreeView.view.#{$w}#{$s}:selected,
+    .list-row:selected .#{$w}#{$s} {
+      -gtk-icon-source: -gtk-scaled(url("assets/#{$a}#{$as}-selected.png"),
+                                    url("assets/#{$a}#{$as}-selected@2.png"));
+    }
+  }
+}
+
+//selection-mode
+@each $s,$as in ('','-selectionmode'),
+                  (':checked', '-checked-selectionmode') {
+  GtkIconView.view.check#{$s},
+  GtkFlowBox.view.check#{$s} {
+    -gtk-icon-source: -gtk-scaled(url("assets/checkbox#{$as}#{$asset_suffix}.png"),
+                                    url("assets/checkbox#{$as}#{$asset_suffix}@2.png"));
+    background-color: transparent;
+  }
+}
+
+GtkCheckButton.text-button, GtkRadioButton.text-button {
+  // this is for a nice focus on check and radios text
+  padding: 1px 2px 4px;
+  outline-offset: 0;
+  &:insensitive,
+  &:insensitive:active,
+  &:insensitive:inconsistent {
+    // set insensitive color, which is overriden otherwise
+    color: $insensitive_fg_color;
+  }
+}
+
+/************
+ * GtkScale *
+ ************/
+.scale {
+  -GtkScale-slider-length: 15;
+  -GtkRange-slider-width: 15;
+  -GtkRange-trough-border: 0;
+  outline-offset: -1px;
+  outline-radius: 2px;
+  //@include _shadows(_button_shadow(normal));
+
+  &.trough { margin: 5px; }
+  &.fine-tune {
+    &.trough { border-radius: 5px; margin: 3px; }
+  }
+  &.slider {
+    background-clip: border-box;
+    background-image: linear-gradient(to bottom, $entry_bg);
+    border: 1px solid $selected_bg_color;
+    border-radius: 50%;
+    box-shadow: none;
+
+    &:hover {
+    background-image: linear-gradient(to bottom, $selected_bg_color);
+    border-color: $selected_bg_color;
+    }
+    &:insensitive {
+      background-image: linear-gradient(to bottom, mix($entry_bg, $bg_color, 55%));
+      border-color: mix($selected_bg_color, $bg_color, 55%);
+    }
+    &:active {
+      background-image: linear-gradient(to bottom, darken($selected_bg_color, 10%));
+      border-color: darken($selected_bg_color, 10%);
+    }
+    //OSD sliders
+    .osd & {
+      background-image: linear-gradient(to bottom, $osd_bg_color);
+      border-color: $selected_bg_color;
+
+      &:hover { background-image: linear-gradient(to bottom, $selected_bg_color); }
+      &:active {
+        background-image: linear-gradient(to bottom, darken($selected_bg_color, 10%));
+        border-color: darken($selected_bg_color, 10%);
+      }
+    }
+    //selected list-row sliders
+    .list-row:selected & {
+      background-image: linear-gradient(to bottom, $selected_fg_color);
+      border-color: $selected_fg_color;
+
+      &:hover {
+        background-image: linear-gradient(to bottom, mix($selected_fg_color, $selected_bg_color, 85%));
+        border-color: mix($selected_fg_color, $selected_bg_color, 85%);
+      }
+      &:active {
+        background-image: linear-gradient(to bottom, mix($selected_fg_color, $selected_bg_color, 50%));
+        border-color: mix($selected_fg_color, $selected_bg_color, 50%);
+      }
+      &:insensitive{
+        background-image: linear-gradient(to bottom, mix($selected_fg_color, $selected_bg_color, 55%));
+        border-color: mix($selected_fg_color, $selected_bg_color, 55%);
+      }
+    }
+  }
+  &.trough {
+
+    $_scale_trough_bg: if($variant == 'light', $button_border, darken($base_color, 4%));
+
+    border: none;
+    border-radius: 2.5px;
+    background-image: linear-gradient(to bottom, $_scale_trough_bg);
+    &.highlight {
+      background-image: linear-gradient(to bottom, $selected_bg_color);
+
+      &:insensitive {
+        background-image: linear-gradient(to bottom, transparentize($selected_bg_color, 0.45));
+      }
+    }
+    &:insensitive {
+      background-image: linear-gradient(to bottom, transparentize($_scale_trough_bg, 0.45));
+    }
+
+    //OSD troughs
+    .osd & {
+      background-image: linear-gradient(to bottom, lighten($osd_bg_color, 7%));
+      outline-color: transparentize($osd_fg_color, 0.8);
+      &.highlight {
+        background-image: none;
+        background-image: linear-gradient(to bottom, $selected_bg_color);
+      }
+      &:insensitive {  }
+    }
+    // troughs in selected list-rows
+    .list-row:selected & {
+      background-image: linear-gradient(to bottom, transparentize(black, 0.8));
+
+      &.highlight {
+        background-image: linear-gradient(to bottom, $selected_fg_color);
+
+        &:insensitive { background-image: linear-gradient(to bottom, mix($selected_fg_color, $selected_bg_color, 55%)); }
+      }
+      &:insensitive { background-image: linear-gradient(to bottom, transparentize(black, 0.9)); }
+    }
+  }
+}
+
+/*****************
+ * Progress bars *
+ *****************/
+
+GtkProgressBar {
+  padding: 0;
+  font-size: smaller;
+  color: transparentize($fg_color, 0.3);
+  //@include _shadows(_button_shadow(normal));
+
+  &.osd {
+    -GtkProgressBar-xspacing: 0;
+    -GtkProgressBar-yspacing: 0;
+    -GtkProgressBar-min-horizontal-bar-height: 3;
+  }
+}
+
+// moving bit
+.progressbar {
+  background-color: $selected_bg_color;
+  border: none;
+  border-radius: 3px;
+  box-shadow: none; //needed for clipping
+  &.left.right {
+
+  }
+  &.osd {
+    background-color: $selected_bg_color;
+  }
+}
+
+.osd .scale.progressbar {
+  background-color: $selected_bg_color;
+}
+
+// background
+GtkProgressBar.trough {
+  border: none;
+  border-radius: 3px;
+  background-color: if($variant == 'light', $button_border, darken($base_color, 4%));
+
+  &.osd {
+    border-style: none;
+    background-color: transparent;
+    box-shadow: none;
+    //FIXME: there is a margin on top
+  }
+}
+
+/*************
+ * Level Bar *
+ *************/
+
+GtkLevelBar {
+  -GtkLevelBar-min-block-width: 34;
+  -GtkLevelBar-min-block-height: 3;
+}
+
+GtkLevelBar.vertical {
+  -GtkLevelBar-min-block-width: 3;
+  -GtkLevelBar-min-block-height: 34;
+}
+
+.level-bar {
+  &.trough {
+    @extend GtkProgressBar.trough;
+    padding: 3px;
+    border-radius: 4px;
+  }
+  &.fill-block {
+    // FIXME: it would be nice to set make fill blocks bigger, but we'd need
+    // :nth-child working on discrete indicators
+    border: 1px solid $selected_bg_color;
+    background-color: $selected_bg_color;
+    border-radius: 2px;
+
+    &.indicator-discrete {
+      &.horizontal { margin: 0 1px; }
+      &.vertical { margin: 1px 0; }
+    }
+    &.level-high {
+      border-color: $success_color;
+      background-color: $success_color;
+    }
+    &.level-low {
+      border-color: $warning_color;
+      background-color: $warning_color;
+    }
+    &.empty-fill-block {
+      background-color: transparentize($fg_color,0.8);
+      border-color: transparentize($fg_color,0.8);
+    }
+  }
+}
+
+
+/**********
+ * Frames *
+ **********/
+.frame {
+  border: 1px solid $borders_color;
+  &.flat { border-style: none; }
+  padding: 0;
+  &.action-bar {
+    padding: 6px;
+    border-width: 1px 0 0;
+  }
+}
+
+GtkScrolledWindow {
+  GtkViewport.frame { // avoid double borders when viewport inside
+                      // scrolled window
+    border-style: none;
+  }
+}
+
+//vbox and hbox separators
+.separator {
+  // always disable separators
+  // -GtkWidget-wide-separators: true;
+  color: transparentize(black, 0.9);
+
+  // Font and File button separators
+  GtkFileChooserButton &,
+  GtkFontButton &,
+  GtkFileChooserButton &.vertical,
+  GtkFontButton &.vertical {
+    // always disable separators
+    -GtkWidget-wide-separators: true;
+  }
+}
+
+/*********
+ * Lists *
+ *********/
+
+.list, .list-row {
+  background-color: $base_color;
+  border-color: $borders_color;
+}
+
+.list-row,
+.grid-child {
+  padding: 2px;
+}
+
+.list-row.button {
+  @extend %undecorated_button;
+  background-color: transparentize(black, 1); // for the transition
+  border-style: none; // I need no borders here
+  border-radius: 0;   // and no rounded corners
+  box-shadow: none;   // and no box-shadow
+  &:hover {
+    background-color: if($variant == 'light', transparentize(black, 0.95), transparentize(white, 0.97));
+  }
+  &:active {
+    color: $fg_color;
+  }
+  &:selected {
+    &:active { color: $selected_fg_color; }
+    &:hover { background-color: mix(black, $selected_bg_color, 10%); }
+    &:insensitive {
+      color: transparentize($selected_fg_color, 0.3);
+      background-color: transparentize($selected_bg_color, 0.3);
+      .label { color: inherit; }
+    }
+  }
+}
+
+.list-row:selected {
+  @extend %selected_items;
+  .button { @extend %selected-button }
+}
+
+// transition
+.list-row, list-row.button {
+  transition: all 300ms $ease-out-quad;
+  &:hover { transition: none; }
+}
+
+/*********************
+ * App Notifications *
+ *********************/
+
+.app-notification,
+.app-notification.frame {
+  @extend %osd;
+  padding: 10px;
+  background-color: $osd_bg_color;
+  background-clip: border-box;
+  border-radius: 0 0 2px 2px;
+  border-width: 0 1px 1px 1px;
+  border-style: solid;
+  border-color: darken($osd_bg_color, 10%);
+  
+  .button {
+    @include button(osd);
+    &.flat {
+      @extend %undecorated_button;
+      border-color: transparentize($selected_bg_color, 1);
+      &:insensitive { @extend %undecorated_button; }
+    }
+    &:hover { @include button(osd-hover); }
+    &:active, &:checked { @include button(osd-active); }
+    &:insensitive { @include button(osd-insensitive);
+    }
+  }
+}
+
+/*************
+ * Expanders *
+ *************/
+
+.expander {
+  -gtk-icon-source: -gtk-icontheme('pan-end-symbolic');
+  &:dir(rtl) { -gtk-icon-source: -gtk-icontheme('pan-end-symbolic-rtl'); }
+  &:hover { color: lighten($fg_color,30%); } //only lightens the arrow
+  &:checked { -gtk-icon-source: -gtk-icontheme('pan-down-symbolic'); }
+}
+
+/************
+ * Calendar *
+ ***********/
+GtkCalendar {
+  color: $fg_color;
+  border: 1px solid $borders_color;
+  border-radius: 3px;
+  padding: 2px;
+
+  &:selected {
+    background-color: $selected_bg_color;
+    color: $selected_fg_color;
+    border-radius: 1.5px;
+  }
+  &.header {
+    color: $fg_color;
+    border: none;
+    border-radius: 0;
+  }
+  &.button, &.button:focus {
+    color: transparentize($fg_color,0.55);
+    box-shadow: none;
+    border: none;
+    &:hover {
+      color: $fg_color;
+    }
+  }
+  &.highlight { color: gtkalpha(currentColor,0.55); }
+}
+
+/***********
+ * Dialogs *
+ ***********/
+.message-dialog .dialog-action-area .button {
+  padding: 8px;
+}
+
+.message-dialog { // Message Dialog styling
+  -GtkDialog-button-spacing: 0;
+
+  .titlebar { background-color: $header_bg; border-bottom: 1px solid darken($header_bg, 7%) }
+
+  &.csd { // rounded bottom border styling for csd version
+    &.background {
+      border-bottom-left-radius: 3px;
+      border-bottom-right-radius: 3px;
+      border: none;
+    }
+    .dialog-action-area .button {
+      padding: 8px;
+      border-radius: 0;
+
+      @extend %middle_button;
+
+      &:hover, &:active, &:insensitive {
+        @extend %middle_button;
+      }
+
+      &:focus {
+        color: $selected_bg_color;
+
+        &:active, &:checked { color: $selected_fg_color; }
+      }
+
+//      @each $b_type, $b_color in (suggested-action, $selected_bg_color),
+//                                 (destructive-action, $destructive_color) {
+//        &.#{$b_type} {
+//          @include button(normal, $b_color, white, $edge:none);
+//          @extend %middle_button;
+//          &:hover {
+//            @include button(hover, $b_color, white, $edge:none);
+//            @extend %middle_button;
+//          }
+//          &:active {
+//            @include button(active, $b_color, white, $edge:none);
+//            @extend %middle_button;
+//          }
+//          &:insensitive {
+//            @include button(insensitive, $edge:none);
+//           @extend %middle_button;
+//          }
+//        }
+//      }
+      &:first-child{ @extend %first_button; }
+      &:last-child { @extend %last_button; }
+    }
+    %middle_button {
+      border-right-style: none;
+      border-bottom-style: none;
+    }
+    %last_button {
+      border-bottom-right-radius: 3px;
+    }
+    %first_button {
+      border-left-style: none;
+      border-bottom-left-radius: 3px;
+    }
+  }
+}
+
+GtkFileChooserDialog {
+  .search-bar {
+    background-color: $bg_color;
+    border-color: $borders_color;
+    box-shadow: none;
+  }
+  .dialog-action-box {
+    border-top: 1px solid $borders_color;
+  }
+}
+
+/***********
+ * Sidebar *
+ ***********/
+.sidebar {
+  border: none;
+  background-color: $bg_color;
+
+  &:selected {
+    background-color: $selected_bg_color;
+  }
+}
+
+// Places sidebar is a special case, since the view here have to look like chrome not content, so we override text color
+GtkPlacesSidebar.sidebar .view {
+
+  color: $fg_color;
+  background-color: transparent;
+
+  &:selected {
+    color: $selected_fg_color;
+    background-color: $selected_bg_color;
+  }
+
+  &.separator { @extend .separator; }
+}
+
+.sidebar-item {
+  padding: 10px 4px;
+  > GtkLabel {
+    padding-left: 6px;
+    padding-right: 6px;
+  }
+  &.needs-attention > GtkLabel {
+    @extend %needs_attention;
+    background-size: 6px 6px, 0 0;
+  }
+}
+
+//
+// Paned
+//
+GtkPaned {                        // this is for the standard paned separator
+
+  -GtkPaned-handle-size: 1;       // sets separator width
+
+  -gtk-icon-source: none;         // removes handle decoration
+  margin: 0 8px 8px 0;            // drag area of the separator, not a real margin
+
+  &:dir(rtl) {
+    margin-right: 0;
+    margin-left: 8px;
+  }
+  .pane-separator {
+    background-color: $borders_color;
+  }
+}
+
+GtkPaned.wide {                     // this is for the paned with wide separator
+  -GtkPaned-handle-size: 5;         // wider separator here
+  margin: 0;                        // no need of the invisible drag area so, reset margin
+  .pane-separator {
+    background-color: transparent;
+    border-style: none solid;
+    border-color: $borders_color;
+    border-width: 1px;
+  }
+  &.vertical .pane-separator { border-style: solid none;}
+}
+
+/**************
+ * GtkInfoBar *
+ **************/
+GtkInfoBar {
+  border-style: none;
+
+  .button { @extend %selected-button }
+}
+
+.info,
+.question,
+.warning,
+.error,
+GtkInfoBar {
+  background-color: $selected_bg_color;
+  color: $selected_fg_color;
+}
+
+
+//
+// Buttons on selected backgrounds
+//
+%selected-button {
+  color: $selected_fg_color;
+  outline-color: transparentize($selected_fg_color, 0.7);
+  background-color: transparentize($selected_fg_color, 1);
+  border-color: transparentize($selected_fg_color, 0.5);
+
+  &.flat {
+    @include button(undecorated);
+    color: $selected_fg_color;
+    background-color: transparentize($selected_fg_color, 1);
+  }
+  &:hover {
+    color: $selected_fg_color;
+    outline-color: transparentize($selected_fg_color, 0.7);
+    background-color: transparentize($selected_fg_color, 0.8);
+    border-color: transparentize($selected_fg_color, 0.2);
+  }
+  &:active, &:active:hover, &:checked {
+    color: $selected_bg_color;
+    outline-color: transparentize($selected_bg_color, 0.7);
+    background-color: $selected_fg_color;
+    border-color: $selected_fg_color;
+  }
+  &:insensitive {
+    color: transparentize($selected_fg_color, 0.6);
+    background-color: transparentize($selected_fg_color, 1);
+    border-color: transparentize($selected_fg_color, 0.8);
+
+    &:active, &:checked {
+      color: transparentize($selected_bg_color, 0.6);
+      background-color: transparentize($selected_fg_color, 0.8);
+      border-color: transparentize($selected_fg_color, 0.8);
+    }
+  }
+}
+
+/************
+ * Tooltips *
+ ************/
+.tooltip {
+  &.background {
+    // background-color needs to be set this way otherwise it gets drawn twice
+    // see https://bugzilla.gnome.org/show_bug.cgi?id=736155 for details.
+    background-color: $tooltip_bg;
+    background-clip: padding-box;
+  }
+
+  color: $tooltip_fg;
+  border-radius: 2px;
+
+  &.window-frame.csd {
+    background-color: transparent;
+  }
+}
+
+.tooltip * { //Yeah this is ugly
+  padding: 4px;
+  background-color: transparent;
+  color: inherit; // just to be sure
+}
+
+/*****************
+ * Color Chooser *
+ *****************/
+
+GtkColorSwatch {
+  // This widget is made of two boxes one on top of the other, the lower box is GtkColorSwatch {} the other one
+  // is GtkColorSwatch .overlay {}, GtkColorSwatch has the programmatically set background, so most of the style
+  // is applied to the overlay box.
+
+  // take care of colorswatches on selected elements
+  :selected & {
+    box-shadow: none;
+    &.overlay, &.overlay:hover {
+      border-color: $selected_fg_color;
+    }
+  }
+
+  // border rounding
+  &.top {
+    border-top-left-radius: 3px;
+    border-top-right-radius: 3px;
+  }
+  &.bottom {
+    border-bottom-left-radius: 3px;
+    border-bottom-right-radius: 3px;
+  }
+  &.left, &:first-child, &:first-child .overlay {
+    border-top-left-radius: 3px;
+    border-bottom-left-radius: 3px;
+  }
+  &.right, &:last-child, &:last-child .overlay {
+    border-top-right-radius: 3px;
+    border-bottom-right-radius: 3px;
+  }
+  &:only-child, &:only-child .overlay {
+    border-radius: 3px;
+  }
+  // nth-child works just on the custom colors row
+
+  // hover effect
+  &:hover,
+  &:hover:selected {
+    background-image: linear-gradient(to bottom, transparentize(white, 0.8));
+  }
+
+  // no hover effect for the colorswatch in the color editor
+  GtkColorEditor & {
+    border-radius: 3px; // same radius as the entry
+    &:hover {
+      background-image: none;
+    }
+  }
+
+  // indicator and keynav outline colors, color-dark is a color with luminosity lower then 50%
+  &.color-dark {
+    color: white;
+    outline-color: transparentize(black, 0.7);
+  }
+  &.color-light {
+    color: black;
+    outline-color: transparentize(white, 0.5);
+  }
+
+  // border color
+  &.overlay,
+  &.overlay:selected {
+    border: 1px solid transparentize(black, 0.85);
+    &:hover { border-color: transparentize(black, 0.75); }
+  }
+
+  // make the add color button looks like, well, a button
+  &#add-color-button {
+    border-style: solid; // the borders are drawn by the overlay for standard colorswatches to have them semi
+    border-width: 1px;   // translucent on the colored background, here it's not necessary so they need to be set
+    @include button(normal);
+    &:hover { @include button(hover); }
+    .overlay { @include button(undecorated); } // reset the overlay to not cover the button style underneath
+  }
+}
+
+GtkColorButton.button {
+  padding: 4px; // Uniform padding on the GtkColorButton
+
+  GtkColorSwatch { border-radius: 0; }
+}
+
+/********
+ * Misc *
+ ********/
+.scale-popup .button { // +/- buttons on GtkVolumeButton popup
+  padding: 6px;
+  &:hover {
+    @include button(hover);
+  }
+}
+
+GtkVolumeButton.button { padding: 8px; }
+
+/**********************
+ * Window Decorations *
+ *********************/
+
+.window-frame {
+  border-radius: if($darker=='false' and $variant=='light', 4px 4px 0 0, 3px 3px 0 0);
+  // lamefun trick to get rounded borders regardless of CSD use
+  border-width: 0px;
+
+  // this needs to be transparent
+  // see bug #722563
+  $_wm_border: if($variant=='light', transparentize(black, 0.9), transparentize(black, 0.45));
+
+  box-shadow: 0 0 0 1px if($darker=='true' or $variant == 'dark', darken($header_bg, 7%), $_wm_border),
+              0 4px 8px 1px if($darker == 'false', opacify($_wm_border, 0.1), opacify($_wm_border, 0.15));
+
+  /* this is used for the resize cursor area */
+  margin: 10px;
+
+  &:backdrop {
+    box-shadow: 0 0 0 1px if($darker=='true' or $variant == 'dark', darken($header_bg, 7%), $_wm_border),
+                0 4px 5px 2px if($darker == 'false', $_wm_border, opacify($_wm_border, 0.15));
+  }
+  &.tiled {
+    border-radius: 0;
+  }
+  // server-side decorations as used by mutter
+  &.ssd {
+    border-radius: if($darker=='false' and $variant=='light', 4px 4px 0 0, 3px 3px 0 0);
+    box-shadow: 0 0 0 1px if($darker=='true' or $variant == 'dark', darken($header_bg, 7%), $_wm_border);
+
+    &.maximized { border-radius: 0; }
+  }
+  &.csd {
+    &.popup, &.menu {
+      border-radius: 3px;
+      box-shadow: 0 3px 6px if($variant == 'light', $_wm_border, transparentize($_wm_border, 0.1)),
+                  0 0 0 1px if($variant == 'light', $_wm_border, darken($base_color, 10%));
+    }
+    &.tooltip {
+      border-radius: 2px;
+      box-shadow: 0 1px 3px 1px $_wm_border;
+    }
+    &.message-dialog { border-radius: 3px; }
+  }
+  &.solid-csd {
+    border-radius: 0;
+    margin: 1px;
+    background-color: $header_bg;
+    box-shadow: none;
+  }
+}
+
+//
+// Titlebuttons
+//
+.header-bar,
+.titlebar {
+
+  &.default-decoration .button.titlebutton { // no vertical padding for ssd buttons
+    padding-top: 0px;                        // already handled by the titlebar-padding
+    padding-bottom: 0px;
+  }
+
+  .button.titlebutton {
+    padding: 7px 4px;
+
+    @include button(undecorated);
+    background-color: transparentize($header_bg, 1);
+    border-width: 0;
+
+    &:hover {
+      @include button(header-hover);
+    }
+    &:active, &:checked {
+      @include button(header-active);
+    }
+
+    &.close, &.maximize, &.minimize {
+
+      color: transparent;
+      background-color: transparent;
+      background-position: center;
+      background-repeat: no-repeat;
+
+      &:backdrop { opacity: 1; }
+    }
+
+    &.close { background-image: -gtk-scaled(url('assets/titlebutton-close#{$darker_asset_suffix}.png'),url('assets/titlebutton-close#{$darker_asset_suffix}@2.png')); }
+    &.close:backdrop { background-image: -gtk-scaled(url('assets/titlebutton-close-backdrop#{$darker_asset_suffix}.png'),url('assets/titlebutton-close-backdrop#{$darker_asset_suffix}@2.png')); }
+    &.close:hover { background-image: -gtk-scaled(url('assets/titlebutton-close-hover#{$darker_asset_suffix}.png'),url('assets/titlebutton-close-hover#{$darker_asset_suffix}@2.png')); }
+    &.close:active { background-image: -gtk-scaled(url('assets/titlebutton-close-active#{$darker_asset_suffix}.png'),url('assets/titlebutton-close-active#{$darker_asset_suffix}@2.png')); }
+
+    &.maximize { background-image: -gtk-scaled(url('assets/titlebutton-max#{$darker_asset_suffix}.png'),url('assets/titlebutton-max#{$darker_asset_suffix}@2.png')); }
+    &.maximize:backdrop { background-image: -gtk-scaled(url('assets/titlebutton-max-backdrop#{$darker_asset_suffix}.png'),url('assets/titlebutton-max-backdrop#{$darker_asset_suffix}@2.png')); }
+    &.maximize:hover { background-image: -gtk-scaled(url('assets/titlebutton-max-hover#{$darker_asset_suffix}.png'),url('assets/titlebutton-max-hover#{$darker_asset_suffix}@2.png')); }
+    &.maximize:active { background-image: -gtk-scaled(url('assets/titlebutton-max-active#{$darker_asset_suffix}.png'),url('assets/titlebutton-max-active#{$darker_asset_suffix}@2.png')); }
+
+    &.minimize { background-image: -gtk-scaled(url('assets/titlebutton-min#{$darker_asset_suffix}.png'),url('assets/titlebutton-min#{$darker_asset_suffix}@2.png')); }
+    &.minimize:backdrop { background-image: -gtk-scaled(url('assets/titlebutton-min-backdrop#{$darker_asset_suffix}.png'),url('assets/titlebutton-min-backdrop#{$darker_asset_suffix}@2.png')); }
+    &.minimize:hover { background-image: -gtk-scaled(url('assets/titlebutton-min-hover#{$darker_asset_suffix}.png'),url('assets/titlebutton-min-hover#{$darker_asset_suffix}@2.png')); }
+    &.minimize:active { background-image: -gtk-scaled(url('assets/titlebutton-min-active#{$darker_asset_suffix}.png'),url('assets/titlebutton-min-active#{$darker_asset_suffix}@2.png')); }
+  }
+}
+
+
+// catch all extend :)
+
+%selected_items {
+  background-image: none;
+  background-color: $selected_bg_color;
+  color: $selected_fg_color;
+  outline-color: transparentize($selected_fg_color, 0.7);
+}
+
+/* Decouple the font of context menus from their entry/textview */
+.touch-selection,
+.context-menu {
+  font: initial;
+}
+
+.monospace {
+  font: Monospace;
+}
+
+//
+// Overshoot
+//
+// This is used by GtkScrolledWindow, when content is touch-dragged past boundaries.
+// This draws a box on top of the content, the size changes programmatically.
+.overshoot {
+  &.top { @include overshoot(top); }
+  &.bottom { @include overshoot(bottom); }
+  &.left { @include overshoot(left); }
+  &.right { @include overshoot(right); }
+}
+
+//
+// Undershoot
+//
+// Overflow indication, works similarly to the overshoot, the size if fixed tho.
+.undershoot {
+  &.top { @include undershoot(top); }
+  &.bottom { @include undershoot(bottom); }
+  &.left { @include undershoot(left); }
+  &.right { @include undershoot(right); }
+}
diff --git a/common/gtk-3.0/3.16/sass/_drawing.scss b/common/gtk-3.0/3.16/sass/_drawing.scss
new file mode 100644
index 0000000..378e5d9
--- /dev/null
+++ b/common/gtk-3.0/3.16/sass/_drawing.scss
@@ -0,0 +1,377 @@
+// Drawing mixins
+
+// generic drawing of more complex things
+
+@mixin _shadows($shadow1, $shadow2:none, $shadow3:none, $shadow4:none) {
+//
+// Helper function to stack up to 4 box-shadows;
+//
+
+  @if $shadow4!=none { box-shadow: $shadow1, $shadow2, $shadow3, $shadow4; }
+  @else if $shadow3!=none { box-shadow: $shadow1, $shadow2, $shadow3; }
+  @else if $shadow2!=none { box-shadow: $shadow1, $shadow2; }
+  @else { box-shadow: $shadow1; }
+}
+
+// Entries
+
+@mixin entry($t) {
+//
+// Entries drawing function
+//
+// $t: entry type
+//
+
+  @if $t==normal {
+  //
+  // normal entry
+  //
+    color: $text_color;
+    border-color: $entry_border;
+    background-color: $entry_bg;
+    background-image: linear-gradient(to bottom, $entry_bg);
+  }
+
+  @if $t==focus {
+  //
+  // focused entry
+  //
+    color: $text_color;
+    border-color: $selected_bg_color;
+    background-color: $entry_bg;
+    background-image: linear-gradient(to bottom, $entry_bg);
+  }
+
+  @if $t==insensitive {
+  //
+  // insensitive entry
+  //
+    color: $insensitive_fg_color;
+    border-color: transparentize($entry_border, 0.45);
+    background-color: transparentize($entry_bg, 0.45);
+    background-image: linear-gradient(to bottom, transparentize($entry_bg, 0.45));
+  }
+
+  $_header_entry_bg: if($darker == 'true' or $variant == 'dark', transparentize(darken($header_bg, 4%), 0.1), transparentize($base_color, 0.1));
+  $_header_entry_border: if($darker == 'true' or $variant == 'dark', darken($header_bg, 10%), transparentize($header_fg, 0.7));
+
+  @if $t==header-normal {
+  //
+  // normal header-bar entry
+  //
+
+    color: $header_fg;
+    border-color: $_header_entry_border;
+    background-image: linear-gradient(to bottom, $_header_entry_bg);
+    background-color: transparent;
+
+    &.image, &.image:hover { color: inherit; }
+  }
+
+  @if $t==header-focus {
+  //
+  // focused header-bar entry
+  //
+    color: $selected_fg_color;
+    border-color: $selected_bg_color;
+    background-image: linear-gradient(to bottom, $selected_bg_color);
+  }
+
+  @if $t==header-insensitive {
+  //
+  // insensitive header-bar entry
+  //
+    color: transparentize($header_fg, 0.45);
+    background-image: linear-gradient(to bottom, transparentize($_header_entry_bg, 0.35));
+  }
+
+  @else if $t==osd {
+  //
+  // normal osd button
+  //
+    color: $osd_fg_color;
+    border-color: transparentize($osd_fg_color, 0.7);
+    background-color: transparent;
+    background-image: linear-gradient(to bottom, darken($osd_bg_color, 5%));
+  }
+
+  @else if $t==osd-focus {
+  //
+  // active osd button
+  //
+    color: $selected_bg_color;
+    border-color: $selected_bg_color;
+    background-image: linear-gradient(to bottom, darken($osd_bg_color, 5%));
+  }
+
+  @else if $t==osd-insensitive {
+  //
+  // insensitive osd button
+  //
+    color: $osd_insensitive_fg_color;
+    border-color: transparentize($osd_fg_color, 0.8);
+    background-image: linear-gradient(to bottom, $osd_insensitive_bg_color);
+  }
+}
+
+// Buttons
+
+@mixin button($t, $actionb_color:red) {
+//
+// Button drawing function
+//
+// $t:    button type,
+// $actionb_color: used for destructive and suggested action buttons
+
+  @if $t==normal {
+  //
+  // normal button
+  //
+    color: $fg_color;
+    outline-color: transparentize($fg_color, 0.7);
+    border-color: $button_border;
+    background-color: $button_bg;
+  }
+
+  @else if $t==hover {
+  //
+  // hovered button
+  //
+    color: $fg_color;
+    outline-color: transparentize($fg_color, 0.7);
+    border-color: $selected_bg_color;
+    background-color: $button_bg;
+  }
+
+  @else if $t==active {
+  //
+  // pushed button
+  //
+    color: $selected_fg_color;
+    outline-color: transparentize($selected_fg_color, 0.7);
+    border-color: $selected_bg_color;
+    background-color: $selected_bg_color;
+  }
+
+  @else if $t==insensitive {
+  //
+  // insensitive button
+  //
+    color: $insensitive_fg_color;
+    border-color: transparentize($button_border, 0.45);
+    background-color: transparentize($button_bg, 0.45);
+
+    > GtkLabel { color: inherit; }
+  }
+
+  @else if $t==insensitive-active {
+  //
+  // insensitive pushed button
+  //
+    color: transparentize($selected_fg_color, 0.45);
+    border-color: transparentize($selected_bg_color, 0.45);
+    background-color: transparentize($selected_bg_color, 0.45);
+
+    opacity: 0.6;
+
+    > GtkLabel { color: inherit; }
+  }
+
+  $_header_button_bg: if($darker == 'true' or $variant == 'dark', transparentize(darken($header_bg, 3%), 0.1), transparentize($button_bg, 0.1));
+  $_header_button_border: if($darker == 'true' or $variant == 'dark', darken($header_bg, 8%), transparentize($header_fg, 0.7));
+
+  @if $t==header-normal {
+  //
+  // normal header-bar button
+  //
+    color: $header_fg;
+    outline-color: transparentize($header_fg, 0.7);
+    outline-offset: -3px;
+    background-color: transparentize($header_bg, 1);
+    border-color: transparentize($header_bg, 1);
+  }
+
+  @else if $t==header-hover {
+  //
+  // hovered header-bar button
+  //
+    color: $header_fg;
+    outline-color: transparentize($header_fg, 0.7);
+    border-color: $_header_button_border;
+    background-color: $_header_button_bg;
+  }
+
+  @else if $t==header-active {
+  //
+  // pushed header-bar button
+  //
+    color: $selected_fg_color;
+    outline-color: transparentize($selected_fg_color, 0.7);
+    border-color: $selected_bg_color;
+    background-color: $selected_bg_color;
+  }
+
+  @else if $t==header-insensitive {
+  //
+  // insensitive header-bar button
+  //
+    color: transparentize($header_fg, 0.45);
+    background-color: transparentize($header_bg, 1);
+    border-color: transparentize($header_bg, 1);
+
+    > GtkLabel { color: inherit; }
+  }
+
+  @else if $t==header-insensitive-active {
+  //
+  // header-bar insensitive pushed button
+  //
+    color: transparentize($selected_fg_color, 0.25);
+    border-color: transparentize($selected_bg_color, 0.35);
+    background-color: transparentize($selected_bg_color, 0.35);
+  }
+
+  @else if $t==osd {
+  //
+  // normal osd button
+  //
+    color: $osd_fg_color;
+    outline-color: transparentize($osd_fg_color, 0.7);
+    border-color: transparentize($osd_fg_color, 0.7);
+    background-color: transparent;
+    background-image: linear-gradient(to bottom, darken($osd_bg_color, 5%));
+  }
+
+  @else if $t==osd-hover {
+  //
+  // active osd button
+  //
+    color: $selected_bg_color;
+    outline-color: transparentize($osd_fg_color, 0.7);
+    border-color: $selected_bg_color;
+    background-image: linear-gradient(to bottom, darken($osd_bg_color, 5%));
+  }
+
+  @else if $t==osd-active {
+  //
+  // active osd button
+  //
+    color: $selected_fg_color;
+    outline-color: transparentize($selected_fg_color, 0.7);
+    border-color: $selected_bg_color;
+    background-image: linear-gradient(to bottom, $selected_bg_color);
+  }
+
+  @else if $t==osd-insensitive {
+  //
+  // insensitive osd button
+  //
+    color: $osd_insensitive_fg_color;
+    border-color: transparentize($osd_fg_color, 0.8);
+    background-image: linear-gradient(to bottom, $osd_insensitive_bg_color);
+  }
+
+  @else if $t==suggested_destructive {
+  //
+  // suggested or destructive action buttons
+  //
+    background-clip: border-box;
+
+    color: $selected_fg_color;
+    outline-color: transparentize($selected_fg_color, 0.7);
+    background-color: $actionb_color;
+    border-color: $actionb_color;
+  }
+
+  @else if $t==undecorated {
+  //
+  // reset
+  //
+    border-color: transparent;
+    background-color: transparent;
+    background-image: none;
+  }
+}
+
+//
+// Overshoot
+//
+@mixin overshoot($p, $c:$selected_bg_color) {
+// $p: position
+// $c: base color
+//
+// possible $p values:
+// top, bottom, right, left
+//
+
+  $_big_gradient_length: 60%;
+
+  $_position: center top;
+  $_big_gradient_size: 100% $_big_gradient_length;
+
+  @if $p==bottom {
+    $_position: center bottom;
+  }
+
+  @else if $p==right {
+    $_position: right center;
+    $_big_gradient_size: $_big_gradient_length 100%;
+  }
+
+  @else if $p==left {
+    $_position: left center;
+    $_big_gradient_size: $_big_gradient_length 100%;
+  }
+
+  background-image: -gtk-gradient(radial,
+                                $_position, 0,
+                                $_position, 0.6,
+                                from(transparentize($c, 0.8)),
+                                to(transparentize($c, 1)));
+
+  background-size: $_big_gradient_size;
+  background-repeat: no-repeat;
+  background-position: $_position;
+
+  background-color: transparent; // reset some properties to be sure to not inherit them somehow
+  border: none;                  //
+  box-shadow: none;              //
+}
+
+//
+// Undershoot
+//
+@mixin undershoot($p) {
+// $p: position
+//
+// possible $p values:
+// top, bottom, right, left
+//
+
+  $_undershoot_color_dark: transparentize(black, 0.8);
+  $_undershoot_color_light: transparentize(white, 0.8);
+
+  $_gradient_dir: left;
+  $_dash_bg_size: 10px 1px;
+  $_gradient_repeat: repeat-x;
+  $_bg_pos: center $p;
+
+  background-color: transparent; // shouldn't be needed, but better to be sure;
+
+  @if ($p == left) or ($p == right) {
+    $_gradient_dir: top;
+    $_dash_bg_size: 1px 10px;
+    $_gradient_repeat: repeat-y;
+    $_bg_pos: $p center;
+  }
+
+  background-image: linear-gradient(to $_gradient_dir, // this is the dashed line
+                                    $_undershoot_color_light 50%,
+                                    $_undershoot_color_dark 50%);
+
+  padding-#{$p}: 1px;
+  background-size: $_dash_bg_size;
+  background-repeat: $_gradient_repeat;
+  background-origin: content-box;
+  background-position: $_bg_pos;
+}
diff --git a/common/gtk-3.0/3.16/sass/_granite.scss b/common/gtk-3.0/3.16/sass/_granite.scss
new file mode 100644
index 0000000..1e53c7f
--- /dev/null
+++ b/common/gtk-3.0/3.16/sass/_granite.scss
@@ -0,0 +1,214 @@
+// Granite Widgets
+
+//
+// Overlay Bar
+//
+.overlay-bar {
+  background-color: $selected_bg_color;
+  border-color: $selected_bg_color;
+  border-radius: 2px;
+  padding: 3px 6px;
+  margin: 3px;
+
+  GtkLabel { color: $selected_fg_color; }
+}
+
+//
+// Thin Pane Separator
+//
+GraniteWidgetsThinPaned {
+  background-color: transparent;
+  background-image: none;
+  margin: 0;
+  border-left: 1px solid $borders_color;
+  border-right: 1px solid $borders_color;
+
+}
+
+// avoid borders when a viewport is
+// packed into a Static Notebook, or Popover
+GraniteWidgetsPopOver .frame,
+GraniteWidgetsStaticNotebook .frame {
+  border: none;
+}
+
+//
+// Help Button
+//
+.help_button {
+    border-radius: 100px;
+    padding: 3px 9px;
+}
+
+//
+// Secondary Toolbars
+//
+.secondary-toolbar.toolbar {
+  padding: 3px;
+  border-bottom: 1px solid $borders_color;
+
+  .button { padding: 0 3px 0 3px; }
+}
+
+//
+// Bottom Toolbars
+//
+.bottom-toolbar.toolbar {
+  padding: 5px;
+  border-width: 1px 0 0 0;
+  border-style: solid;
+  border-color: $borders_color;
+  background-color: $bg_color;
+
+  .button { padding: 2px 3px 2px 3px; }
+}
+
+//
+// Sidebar & Source List
+//
+.source-list {
+  -GtkTreeView-horizontal-separator: 1px;
+  -GtkTreeView-vertical-separator: 6px;
+}
+
+.source-list,
+.source-list.view {
+  background-color: $bg_color;
+  color: $fg_color;
+  -gtk-icon-style: regular;
+}
+
+.source-list.category-expander {
+  color: transparent;
+}
+
+.source-list.view:prelight {
+  background-color: lighten($bg_color, 5%);
+}
+
+.source-list.view:selected,
+.source-list.view:prelight:selected,
+.source-list.view:selected:focus,
+.source-list.category-expander:hover {
+  color: $selected_fg_color;
+  background-color: $selected_bg_color;
+}
+
+.source-list .scrollbar.trough,
+.source-list .scrollbars-junction {
+  border-image: none;
+	border-color: transparent;
+	background-color: $bg_color;
+	background-image: none;
+}
+
+.source-list.badge,
+.source-list.badge:prelight,
+.source-list.badge:selected,
+.source-list.badge:selected:focus,
+.source-list.badge:prelight:selected {
+  background-image: none;
+  background-color: $selected_bg_color;
+  color: $selected_fg_color;
+  border-radius: 10px;
+  padding: 0 6px;
+  margin: 0 3px;
+  border-width: 0;
+}
+
+.source-list.badge:selected,
+.source-list.badge:selected:focus,
+.source-list.badge:prelight:selected {
+  background-color: $selected_fg_color;
+  color: $selected_bg_color;
+}
+
+//
+// Expander
+//
+.source-list.category-expander {
+    color: $fg_color;
+    -gtk-icon-source: -gtk-icontheme("pan-end-symbolic");
+    -GtkTreeView-expander-size: 16;
+}
+
+.source-list.category-expander,
+.source-list.category-expander:backdrop {
+    color: transparent;
+    border: none;
+}
+
+.source-list.category-expander:checked {
+    -gtk-icon-source: -gtk-icontheme("pan-down-symbolic");
+}
+
+//
+// Welcome
+//
+GraniteWidgetsWelcome {
+  background-color: $base_color;
+}
+
+GraniteWidgetsWelcome GtkLabel {
+  color: mix($fg_color, $bg_color, 50%);
+  font: open sans 11;
+  text-shadow: none;
+}
+
+GraniteWidgetsWelcome .h1,
+GraniteWidgetsWelcome .h3 {
+  color: transparentize($fg_color, 0.2);
+}
+
+//
+// Help Button
+//
+.help_button {
+  border-radius: 0;
+}
+
+//
+// Popover
+//
+GraniteWidgetsPopOver {
+  -GraniteWidgetsPopOver-arrow-width: 21;
+  -GraniteWidgetsPopOver-arrow-height: 10;
+  -GraniteWidgetsPopOver-border-radius: 2px;
+  -GraniteWidgetsPopOver-border-width: 1;
+  -GraniteWidgetsPopOver-shadow-size: 12;
+
+  border: 1px solid transparentize(black, 0.7);
+  margin: 0;
+}
+
+.popover_bg {
+  background-image: linear-gradient(to bottom, $base_color);
+  border: 1px solid transparentize(black, 0.7);
+}
+
+GraniteWidgetsPopOver .sidebar.view,
+GraniteWidgetsPopOver * {
+  background-color: transparent;
+}
+
+//
+// Text Styles
+//
+.h1 { font: open sans 24px; }
+.h2 { font: open sans light 18px; }
+.h3 { font: open sans 11px; }
+.h4,
+.category-label {
+    color: mix($bg_color, $text_color, 30%);
+    font-weight: 600;
+    text-shadow: 0 1px transparentize(white, 0.4);
+}
+
+.h4 {
+    padding-bottom: 6px;
+    padding-top: 6px;
+}
+
+GtkListBox .h4{
+	padding-left: 6px;
+}
diff --git a/common/gtk-3.0/3.16/sass/_lightdm.scss b/common/gtk-3.0/3.16/sass/_lightdm.scss
new file mode 100644
index 0000000..9b14d09
--- /dev/null
+++ b/common/gtk-3.0/3.16/sass/_lightdm.scss
@@ -0,0 +1,141 @@
+/* the panel widget at the top */
+#panel_window {
+  background-color: $panel_bg;
+  color: $panel_fg;
+  font: bold;
+  box-shadow: inset 0 -1px darken($panel_bg, 7%);
+
+  /* the menubars/menus of the panel, i.e. indicators */
+  .menubar,
+  .menubar > .menuitem {
+    background-color: transparent;
+    color: $panel_fg;
+    font: bold;
+  }
+
+  .menubar .menuitem:insensitive {
+    color: darken($panel_fg, 20%);
+
+    GtkLabel { color: inherit; }
+  }
+  .menubar .menu .menuitem { font: normal; }
+}
+
+/* the login window */
+#login_window,
+#shutdown_dialog,
+#restart_dialog {
+  font: normal;
+  border-style: none;
+  background-color: transparent;
+  color: $fg_color;
+}
+
+/* the top half of the login-window, in GtkDialog terms, the content */
+#content_frame {
+  padding-bottom: 14px;
+  background-color: transparentize($bg_color, 0.05);
+  border-top-left-radius: 2px;
+  border-top-right-radius: 2px;
+}
+
+#content_frame .button {
+  @include button(normal);
+
+  &:hover { @include button(hover); }
+  &:active, &:checked { @include button(active); }
+  &:insensitive { @include button(insensitive); }
+}
+
+/* the lower half of the login-window, in GtkDialog terms the buttonbox or action area */
+#buttonbox_frame {
+  padding-top: 20px;
+  padding-bottom: 0px;
+  border-style: none;
+  background-color: $osd_bg_color;
+  border-bottom-left-radius: 2px;
+  border-bottom-right-radius: 2px;
+}
+
+#buttonbox_frame .button{
+  @include button(osd);
+
+  &:hover { @include button(osd-hover); }
+  &:active, &:checked { @include button(osd-active); }
+  &:insensitive { @include button(osd-insensitive); }
+}
+
+#login_window #user_combobox {
+  color: $fg_color;
+  font: 13px;
+
+  .menu { font: normal; }
+  .arrow {}
+}
+
+/* the user's avatar box */
+#user_image {
+  padding: 3px;
+  border-radius: 3px;
+}
+
+/* the border around the user's avatar box */
+#user_image_border {}
+
+/* the shutdown button */
+#shutdown_button.button {
+  color: $selected_fg_color;
+  outline-color: transparentize($selected_fg_color, 0.7);
+  border-color: $destructive_color;
+  background-color: $destructive_color;
+  background-image: none;
+  background-clip: border-box;
+
+  &:hover {
+    color: $selected_fg_color;
+    outline-color: transparentize($selected_fg_color, 0.7);
+    border-color: lighten($destructive_color, 9%);
+    background-color: lighten($destructive_color, 9%);
+    background-image: none;
+  }
+  &:active, &:checked {
+    color: $selected_fg_color;
+    outline-color: transparentize($selected_fg_color, 0.7);
+    border-color: darken($destructive_color, 7%);
+    background-color: darken($destructive_color, 7%);
+    background-image: none;
+  }
+}
+
+/* the restart button */
+#restart_button.button {
+  $_restart_bg: #51CF74;
+
+  color: $selected_fg_color;
+  outline-color: transparentize($selected_fg_color, 0.7);
+  border-color: $_restart_bg;
+  background-color: $_restart_bg;
+  background-image: none;
+  background-clip: border-box;
+
+  &:hover {
+    color: $selected_fg_color;
+    outline-color: transparentize($selected_fg_color, 0.7);
+    border-color: lighten($_restart_bg, 9%);
+    background-color: lighten($_restart_bg, 9%);
+    background-image: none;
+  }
+  &:active, &:checked {
+    color: $selected_fg_color;
+    outline-color: transparentize($selected_fg_color, 0.7);
+    border-color: darken($_restart_bg, 7%);
+    background-color: darken($_restart_bg, 7%);
+    background-image: none;
+  }
+}
+
+/* the warning, in case a wrong password is entered or something else goes wrong according to PAM */
+#greeter_infobar {
+  border-bottom-width: 0;
+  font: bold;
+}
diff --git a/common/gtk-3.0/3.16/sass/_transparent_widgets.scss b/common/gtk-3.0/3.16/sass/_transparent_widgets.scss
new file mode 100644
index 0000000..67f5b6c
--- /dev/null
+++ b/common/gtk-3.0/3.16/sass/_transparent_widgets.scss
@@ -0,0 +1,231 @@
+.titlebar .separator {
+  color: $header_border;  //fixes separator in gnome-tweak-tool
+}
+
+NemoWindow GtkEventBox { background-color: $bg_color; } // fixes nemo statusbar
+
+GtkFileChooserDialog *,
+NautilusWindow *,
+NemoWindow {
+  -GtkPaned-handle-size: 0;
+}
+
+@if $variant==dark {
+  GtkFileChooserDialog,
+  NautilusWindow ,
+  NemoWindow {
+    .sidebar { border-right: 1px solid $dark_sidebar_border; }
+
+    .sidebar:dir(rtl) { border-left: 1px solid $dark_sidebar_border; }
+  }
+}
+
+// Dark transparent sidebars
+GtkFileChooserDialog,
+NautilusWindow,
+NemoWindow,
+MarlinViewWindow {
+
+  &.csd.background,
+  .source-list, .source-list.view, .source-list.view:prelight { background-color: transparent; }
+
+  .sidebar, .source-list.sidebar.view {
+    background-color: $dark_sidebar_bg;
+
+    .view, row {
+      background-color: transparent;
+      color: $dark_sidebar_fg;
+
+      &.image { color: transparentize($dark_sidebar_fg, 0.4); }
+
+      &.cell:selected {
+        background-color: $selected_bg_color;
+        color: $selected_fg_color;
+      }
+    }
+
+    &.frame {
+      color: $dark_sidebar_fg;
+    }
+
+    .separator { color: transparent; }
+
+    .scrollbar {
+
+      &.overlay-indicator:not(.dragging):not(.hovering) .slider {
+        background-color: lighten($dark_sidebar_fg, 15%);
+        border: 1px solid transparentize(black, 0.7);
+      }
+
+      // trough coloring
+      .trough {
+        background-color: transparentize(black, 0.8);
+        border: none;
+      }
+
+      // slider coloring
+      .slider {
+        background-color: transparentize(lighten($dark_sidebar_fg, 15%), 0.3);
+
+        &:hover { background-color: lighten($dark_sidebar_fg, 20%); }
+
+        &:prelight:active { background-color: $selected_bg_color; }
+
+        &:insensitive {
+          background-color: transparent;
+        }
+      }
+    }
+  }
+  &.maximized .sidebar { background-color: opacify($dark_sidebar_bg, 1); }
+
+  .pane-separator { background-color: $dark_sidebar_border; }
+}
+
+GtkFileChooserDialog {
+
+  &.background.csd, .background { background-color: $dark_sidebar_bg }
+  .sidebar { background-color: transparent }
+
+  // Yeah, this is ugly, but prevents a transparent background in the image preview box
+  GtkPaned > .vertical > .horizontal { background-color: $bg_color; }
+
+  // fix for non gnome environments
+  .dialog-action-box { background-color: $bg_color }
+
+  .dialog-vbox > .frame {
+    color: $dark_sidebar_fg;
+    border-color: transparent;
+  }
+  .action-bar.frame {
+    background-color: transparent;
+    border-color: if($variant =='light', darken($dark_sidebar_bg, 7%), darken($dark_sidebar_bg, 15%));
+  }
+
+  .action-bar.frame,
+  .dialog-vbox > .frame {
+
+    .button { @extend %dark_sidebar_button; }
+    .entry { @extend %dark_sidebar_entry; }
+
+    GtkLabel, GtkComboBox { color: $dark_sidebar_fg; }
+  }
+}
+
+// Gedit sidebar
+GeditWindow.background.csd {
+  background-color: transparent;
+
+  .pane-separator,
+  .pane-separator:hover { background-color: $dark_sidebar_border; }
+
+  .titlebar .pane-separator,
+  &.maximized .titlebar .pane-separator,
+  .titlebar .pane-separator:backdrop,
+  &.maximized .titlebar .pane-separator:backdrop { background-color: $header_border; }
+}
+
+.gedit-bottom-panel-paned { background-color: $base_color; }
+
+.gedit-document-panel {
+  background-color: $dark_sidebar_bg;
+
+  .maximized & { background-color: opacify($dark_sidebar_bg, 1); }
+
+  .list-row { color: $dark_sidebar_fg; }
+
+  .list-row {
+    background-color: transparentize($dark_sidebar_fg, 1);
+    border: solid transparentize($dark_sidebar_fg, 1);
+    border-width: 3px 2px 3px 2px;
+  }
+  .list-row:hover {
+    border: solid transparentize($dark_sidebar_fg, 0.85);
+    border-width: 3px 2px 3px 2px;
+    background-color: transparentize($dark_sidebar_fg, 0.85);
+  }
+  .list-row:active {
+    color: $selected_fg_color;
+    background-color: $selected_bg_color;
+    border: solid $selected_bg_color;
+    border-width: 3px 2px 3px 2px;
+
+    .button { color: $selected_fg_color; }
+  }
+  .list-row:selected, .list-row:selected:hover {
+    color: $selected_fg_color;
+    background-color: $selected_bg_color;
+    border: solid $selected_bg_color;
+    border-width: 3px 2px 3px 2px;
+  }
+  .prelight-row .button:active {
+    color: $dark_sidebar_fg;
+  }
+}
+
+GeditWindow.background.csd GeditFileBrowserWidget {
+  background-color: $dark_sidebar_bg;
+
+  .maximized & { background-color: opacify($dark_sidebar_bg, 1); }
+
+  .scrollbar {
+
+    &.overlay-indicator:not(.dragging):not(.hovering) .slider {
+      background-color: lighten($dark_sidebar_fg, 15%);
+      border: 1px solid transparentize(black, 0.7);
+    }
+
+    // trough coloring
+    .trough {
+      background-color: transparentize(black, 0.8);
+      border: none;
+    }
+
+    // slider coloring
+    .slider {
+      background-color: transparentize(lighten($dark_sidebar_fg, 15%), 0.3);
+
+      &:hover { background-color: lighten($dark_sidebar_fg, 15%); }
+
+      &:prelight:active { background-color: $selected_bg_color; }
+
+      &:insensitive {
+        background-color: transparent;
+      }
+    }
+  }
+
+  .horizontal {
+    background-color: transparent;
+    border-color: darken($dark_sidebar_bg, 7%);
+
+    .button { @extend %dark_sidebar_button; }
+    GtkComboBox { color: $dark_sidebar_fg; }
+  }
+}
+
+GeditWindow.background.csd GeditFileBrowserView.view {
+
+  background-color: transparent;
+  color: $dark_sidebar_fg;
+
+  &.expander {
+    color: $dark_sidebar_fg;
+    &:hover { color: $selected_bg_color; }
+  }
+}
+
+%dark_sidebar_button {
+  @include button(osd);
+
+  &:hover { @include button(osd-hover) }
+  &:active, &:checked { @include button(osd-active); }
+  &:insensitive { @include button(osd-insensitive); }
+}
+
+%dark_sidebar_entry {
+  @include entry(osd);
+
+  &:focus { @include entry(osd-focus) }
+  &:insensitive { @include entry(osd-insensitive); }
+}
diff --git a/common/gtk-3.0/3.16/sass/_unity.scss b/common/gtk-3.0/3.16/sass/_unity.scss
new file mode 100644
index 0000000..d88377a
--- /dev/null
+++ b/common/gtk-3.0/3.16/sass/_unity.scss
@@ -0,0 +1,56 @@
+// Decorations
+UnityDecoration {
+  -UnityDecoration-extents: 28px 1 1 1;
+  -UnityDecoration-input-extents: 10px;
+
+  -UnityDecoration-shadow-offset-x: 0px;
+  -UnityDecoration-shadow-offset-y: 3px;
+  -UnityDecoration-active-shadow-color: rgba(0, 0, 0, 0.2);
+  -UnityDecoration-active-shadow-radius: 12px;
+  -UnityDecoration-inactive-shadow-color: rgba(0, 0, 0, 0.07);
+  -UnityDecoration-inactive-shadow-radius: 7px;
+
+  -UnityDecoration-glow-size: 10px;
+  -UnityDecoration-glow-color: $selected_bg_color;
+
+  -UnityDecoration-title-indent: 10px;
+  -UnityDecoration-title-fade: 35px;
+  -UnityDecoration-title-alignment: 0.0;
+
+  &.top {
+    border: 1px solid if($darker=='true' or $variant == 'dark', darken($header_bg, 7%), transparentize(black, 0.9));
+    border-bottom-width: 0;
+    border-radius: 4px 4px 0 0;
+    padding: 1px 6px 0 6px;
+
+    background-image: linear-gradient(to bottom, opacify($header_bg, 1));
+    color: $header_fg;                         // The foreground color will be used to paint the text
+
+    box-shadow: inset 0  1px lighten($header_bg, 3%);
+
+    &:backdrop {
+      border-bottom-width: 0;
+      background-image: linear-gradient(to bottom, opacify($header_bg_backdrop, 1));
+      color: transparentize($header_fg, 0.3);
+    }
+  }
+  &.left, &.right, &.bottom,
+  &.left:backdrop, &.right:backdrop, &.bottom:backdrop {
+    background-image: linear-gradient(to bottom, if($darker=='true' or $variant == 'dark', darken($header_bg, 7%), transparentize(black, 0.9)));
+  }
+}
+
+// Panel Style
+UnityPanelWidget,
+.unity-panel {
+  background-image: linear-gradient(to bottom, opacify($panel_bg, 1));
+  color: lighten($panel_fg, 20%);
+  box-shadow: none;
+}
+
+.unity-panel.menubar.menuitem:hover,
+.unity-panel.menubar .menuitem *:hover {
+  border-radius: 0;
+  color: $selected_bg_color;
+  border-bottom: none;
+}
diff --git a/common/gtk-3.0/3.16/sass/gtk-contained-dark.scss b/common/gtk-3.0/3.16/sass/gtk-contained-dark.scss
new file mode 100644
index 0000000..f47d7b5
--- /dev/null
+++ b/common/gtk-3.0/3.16/sass/gtk-contained-dark.scss
@@ -0,0 +1,18 @@
+// General guidelines:
+// - very unlikely you want to edit something else than _common.scss
+// - keep the number of defined colors to a minimum, use the color blending functions if
+//   you need a subtle shade
+
+$variant: 'dark';
+$darker: 'false';
+$transparency: 'true';
+
+@import 'colors';
+@import 'drawing';
+@import 'common';
+@import 'applications';
+@import 'unity';
+@import 'granite';
+@import 'lightdm';
+@import 'transparent_widgets';
+@import 'colors-public';
diff --git a/common/gtk-3.0/3.16/sass/gtk-contained-darker.scss b/common/gtk-3.0/3.16/sass/gtk-contained-darker.scss
new file mode 100644
index 0000000..63166d2
--- /dev/null
+++ b/common/gtk-3.0/3.16/sass/gtk-contained-darker.scss
@@ -0,0 +1,18 @@
+// General guidelines:
+// - very unlikely you want to edit something else than _common.scss
+// - keep the number of defined colors to a minimum, use the color blending functions if
+//   you need a subtle shade
+
+$variant: 'light';
+$darker: 'true';
+$transparency: 'true';
+
+@import 'colors';
+@import 'drawing';
+@import 'common';
+@import 'applications';
+@import 'unity';
+@import 'granite';
+@import 'lightdm';
+@import 'transparent_widgets';
+@import 'colors-public';
diff --git a/common/gtk-3.0/3.16/sass/gtk-contained-solid-dark.scss b/common/gtk-3.0/3.16/sass/gtk-contained-solid-dark.scss
new file mode 100644
index 0000000..157292d
--- /dev/null
+++ b/common/gtk-3.0/3.16/sass/gtk-contained-solid-dark.scss
@@ -0,0 +1,18 @@
+// General guidelines:
+// - very unlikely you want to edit something else than _common.scss
+// - keep the number of defined colors to a minimum, use the color blending functions if
+//   you need a subtle shade
+
+$variant: 'dark';
+$darker: 'false';
+$transparency: 'false';
+
+@import 'colors';
+@import 'drawing';
+@import 'common';
+@import 'applications';
+@import 'unity';
+@import 'granite';
+@import 'lightdm';
+@import 'transparent_widgets';
+@import 'colors-public';
diff --git a/common/gtk-3.0/3.16/sass/gtk-contained-solid-darker.scss b/common/gtk-3.0/3.16/sass/gtk-contained-solid-darker.scss
new file mode 100644
index 0000000..03ba34b
--- /dev/null
+++ b/common/gtk-3.0/3.16/sass/gtk-contained-solid-darker.scss
@@ -0,0 +1,18 @@
+// General guidelines:
+// - very unlikely you want to edit something else than _common.scss
+// - keep the number of defined colors to a minimum, use the color blending functions if
+//   you need a subtle shade
+
+$variant: 'light';
+$darker: 'true';
+$transparency: 'false';
+
+@import 'colors';
+@import 'drawing';
+@import 'common';
+@import 'applications';
+@import 'unity';
+@import 'granite';
+@import 'lightdm';
+@import 'transparent_widgets';
+@import 'colors-public';
diff --git a/common/gtk-3.0/3.16/sass/gtk-contained-solid.scss b/common/gtk-3.0/3.16/sass/gtk-contained-solid.scss
new file mode 100644
index 0000000..347cf2c
--- /dev/null
+++ b/common/gtk-3.0/3.16/sass/gtk-contained-solid.scss
@@ -0,0 +1,18 @@
+// General guidelines:
+// - very unlikely you want to edit something else than _common.scss
+// - keep the number of defined colors to a minimum, use the color blending functions if
+//   you need a subtle shade
+
+$variant: 'light';
+$darker: 'false';
+$transparency: 'false';
+
+@import 'colors';
+@import 'drawing';
+@import 'common';
+@import 'applications';
+@import 'unity';
+@import 'granite';
+@import 'lightdm';
+@import 'transparent_widgets';
+@import 'colors-public';
diff --git a/common/gtk-3.0/3.16/sass/gtk-contained.scss b/common/gtk-3.0/3.16/sass/gtk-contained.scss
new file mode 100644
index 0000000..c45d673
--- /dev/null
+++ b/common/gtk-3.0/3.16/sass/gtk-contained.scss
@@ -0,0 +1,18 @@
+// General guidelines:
+// - very unlikely you want to edit something else than _common.scss
+// - keep the number of defined colors to a minimum, use the color blending functions if
+//   you need a subtle shade
+
+$variant: 'light';
+$darker: 'false';
+$transparency: 'true';
+
+@import 'colors';
+@import 'drawing';
+@import 'common';
+@import 'applications';
+@import 'unity';
+@import 'granite';
+@import 'lightdm';
+@import 'transparent_widgets';
+@import 'colors-public';