diff --git a/gtk-3.0/apps/gnome-applications.css b/gtk-3.0/apps/gnome-applications.css
index 5b51d39..387a0db 100644
--- a/gtk-3.0/apps/gnome-applications.css
+++ b/gtk-3.0/apps/gnome-applications.css
@@ -86,7 +86,7 @@ WnckPager, WnckTasklist {
 
 .nautilus-desktop.nautilus-canvas-item {
     color: white;
-    text-shadow: 1px 1px black;
+    text-shadow: 1 1 black;
 }
 
 .nautilus-desktop.nautilus-canvas-item:active {
@@ -147,10 +147,6 @@ NautilusQueryEditor .toolbar {
     background-color: shade(@toolbar_bg_color, 0.9);
 }
 
-NautilusQueryEditor .toolbar:nth-child(2) {
-    border-color: shade(@toolbar_bg_color, 0.8);
-}
-
 NautilusNotebook.notebook NautilusQueryEditor .primary-toolbar.toolbar {
     border-top-width: 0;
 }
@@ -165,6 +161,16 @@ NautilusNotebook.notebook NautilusQueryEditor .primary-toolbar.toolbar:only-chil
     padding: 1px 5px;
 }
 
+/* inactive pane */
+.nautilus-inactive-pane .view {
+    background-color: shade(@theme_base_color, 0.9);
+}
+
+/* pane separator */
+NautilusWindow .pane-separator {
+    background-color: shade(@theme_bg_color, 0.8);
+}
+
 /******************
  * gnome terminal *
  ******************/
@@ -319,3 +325,10 @@ GucharmapChartable:selected {
     background-color: @theme_selected_bg_color;
     color: @theme_selected_fg_color;
 }
+
+/***********************
+ * gnome control center *
+ ***********************/
+CcShellItemView.view {
+    background-color: @theme_bg_color;
+}
diff --git a/gtk-3.0/apps/granite-widgets.css b/gtk-3.0/apps/granite-widgets.css
new file mode 100644
index 0000000..afd033c
--- /dev/null
+++ b/gtk-3.0/apps/granite-widgets.css
@@ -0,0 +1,643 @@
+/********************
+ * dynamic notebook *
+ ********************/
+.dynamic-notebook {
+    background-color: shade(@theme_bg_color, 1.08);
+    background-image: none;
+}
+
+.dynamic-notebook GtkLabel,
+.dynamic-notebook GtkImage {
+    color: alpha(@theme_fg_color, 0.5);
+}
+
+.dynamic-notebook .notebook {
+    -GtkNotebook-tab-overlap: 3px;
+    -GtkNotebook-initial-gap: 12px;
+
+    border-width: 1px 0 0 0;
+    border-color: shade(@theme_bg_color, 0.8);
+    border-radius: 0;
+    padding: 0;
+}
+
+.dynamic-notebook .notebook tab {
+    padding: 3px;
+    border-color: shade(@theme_bg_color, 0.85);
+    border-radius: 2px;
+    background-color: shade(@theme_bg_color, 0.9);
+    background-image: none;
+}
+
+.dynamic-notebook .notebook tab:nth-child(first) {
+    border-width: 0 1px 0 1px;
+}
+
+.dynamic-notebook .notebook tab:active {
+    border-width: 1px;
+    border-color: shade(@theme_bg_color, 0.8);
+    border-radius: 2px;
+    background-color: shade(@theme_bg_color, 1.08);
+    color: @theme_fg_color;
+}
+
+.dynamic-notebook .notebook tab .entry {
+    border-radius: 2px;
+    padding: 4px 3px;
+}
+
+.dynamic-notebook .button:hover,
+.dynamic-notebook .button:hover:active,
+.dynamic-notebook .notebook .button,
+.dynamic-notebook .notebook .button:hover,
+.dynamic-notebook .notebook .button:hover:active {
+    border-color: shade(@theme_bg_color, 0.7);
+    background-color: shade(@theme_bg_color, 1.10);
+    background-image: none;
+}
+
+.dynamic-notebook .button:hover:active,
+.dynamic-notebook .notebook .button:hover:active {
+    border-color: shade(@theme_bg_color, 0.7);
+    color: shade(@theme_fg_color, 0.7);
+}
+
+.dynamic-notebook .menu GtkLabel {
+    color: @menu_fg;
+}
+
+/****************
+ * content view *
+ ****************/
+.content-view-window {
+    border-width: 1px;
+    border-style: solid;
+    border-color: shade(@theme_base_color, 0.8);
+    border-radius: 2px;
+    background-color:@theme_base_color;
+    color: @theme_text_color;
+}
+
+.content-view,
+.content-view GtkViewport {
+    background-color: @theme_base_color;
+}
+
+.content-view * {
+    background-color: transparent;
+    background-image: none;
+}
+
+.content-view .entry {
+    background-color: @theme_base_color;
+    background-image: none;
+    color: @theme_text_color;
+}
+
+.content-view .button {
+    border-width: 1px;
+    border-style: solid;
+    border-color: shade(@theme_base_color, 0.8);
+    border-radius: 2px;
+    background-color: shade(@theme_base_color, 1.08);
+    background-image: none;
+    color: @theme_text_color;
+}
+
+.content-view .button:hover {
+    border-color: shade(@theme_base_color, 0.7);
+    background-color: shade(@theme_base_color, 1.10);
+    background-image: none;
+}
+
+.content-view .button:active {
+    border-color: shade(@theme_base_color, 0.8);
+    background-color: shade(@theme_base_color, 0.95);
+    background-image: none;
+}
+
+.content-view .button:active:hover {
+    border-color: shade(@theme_base_color, 0.7);
+    color: shade(@theme_text_color, 0.7);
+}
+
+.content-view .button:insensitive {
+    background-color: shade(@theme_base_color, 0.9);
+    background-image: none;
+}
+
+.content-view .help_button * {
+    color: @theme_text_color;
+}   
+
+.content-view .toolbar {
+    -GtkWidget-window-dragging: true;
+
+    padding: 1px;
+    border-width: 0 0 1px 0;
+    border-style: solid;
+    border-color: shade(@theme_base_color, 0.8);
+    background-color: @theme_base_color;
+    background-image: none;
+}
+
+.content-view .menu {
+    padding: 0;
+    border-radius: 0;
+    border-style: none;
+    background-color: @menu_bg_color;
+    color: @menu_fg_color;
+}
+
+/**************
+ * sourcelist *
+ **************/
+.source-list,
+.source-list.view {
+    border-radius: 0;
+    background-color: @theme_bg_color;
+    color: mix(@theme_fg_color, @theme_bg_color, 0.1);
+}
+
+.source-list {
+    -GtkTreeView-horizontal-separator: 1;
+    -GtkTreeView-vertical-separator: 1;
+}
+
+.source-list.view:selected,
+.source-list.view:prelight:selected {
+    background-color: @theme_selected_bg_color;
+    color: @theme_selected_fg_color;
+}
+
+.source-list.view:prelight {
+    background-color: shade(@theme_bg_color, 1.08);
+}
+
+.source-list.badge,
+.source-list.badge:prelight,
+.source-list.badge:selected,
+.source-list.badge:prelight:selected {
+    margin: 0 3px;
+    padding: 0 6px;
+    border-width: 0;
+    border-radius: 10px;
+    background-color: @theme_selected_bg_color;
+    background-image: none;
+    color: @theme_selected_fg_color;
+}
+
+/******************
+ * no undo button *
+ ******************/
+.button.noundo,
+.content-view .button.noundo {
+    border-color: shade(@error_bg_color, 0.8);
+    background-color: shade(@error_bg_color, 1.08);
+    color: @error_fg_color;
+}
+
+.button.noundo:hover,
+.content-view .button.noundo:hover {
+    border-color: shade(@error_bg_color, 0.7);
+    background-color: @error_bg_color;
+}
+
+.button.noundo:active,
+.content-view .button.noundo:active {
+    border-color: shade(@error_bg_color, 0.8);
+    background-color: shade(@error_bg_color, 0.95);
+}
+
+.button.noundo:active:hover,
+.content-view .button.noundo:active:hover {
+    border-color: shade(@error_bg_color, 0.7);
+    background-color: shade(@error_bg_color, 0.97);
+}
+
+.button.noundo GtkLabel,
+.button.noundo Gtklabel:prelight {
+    color: @error_fg_color;
+}
+
+/**********************
+ * affirmative button *
+ **********************/
+.button.affirmative,
+.content-view .button.affirmative {
+    border-color: shade(@theme_selected_bg_color, 0.8);
+    background-color: shade(@theme_selected_bg_color, 1.08);
+    color: @theme_selected_fg_color;
+}
+
+.button.affirmative:hover,
+.content-view .button.affirmative:hover {
+    border-color: shade(@theme_selected_bg_color, 0.7);
+    background-color: @theme_selected_bg_color;
+}
+
+.button.affirmative:active,
+.content-view .button.affirmative:active {
+    border-color: shade(@theme_selected_bg_color, 0.8);
+    background-color: shade(@theme_selected_bg_color, 0.95);
+}
+
+.button.affirmative:active:hover,
+.content-view .button.affirmative:active:hover {
+    border-color: shade(@theme_selected_bg_color, 0.7);
+    background-color: shade(@theme_selected_bg_color, 0.97);
+}
+
+.button.affirmative GtkLabel,
+.button.affirmative Gtklabel:prelight {
+    color: @theme_selected_fg_color;
+}
+
+/**********************
+ * secondary toolbars *
+ **********************/
+.secondary-toolbar.toolbar {
+    padding: 2px;
+    border-color: shade(@toolbar_bg_color, 0.8);
+    background-color: @toolbar_bg_color;
+    background-image: none;
+}
+
+.secondary-toolbar.toolbar .button {
+    border-color: shade(@toolbar_bg_color, 0.8);
+    background-color: shade(@toolbar_bg_color, 1.08);
+    background-image: none;
+    color: @toolbar_fg_color;
+}
+
+.secondary-toolbar.toolbar .button:hover {
+    border-color: shade(@toolbar_bg_color, 0.7);
+    background-color: shade(@toolbar_bg_color, 1.10);
+    background-image: none;
+}
+
+.secondary-toolbar.toolbar .button:active {
+    border-color: shade(@toolbar_bg_color, 0.8);
+    background-color: shade(@toolbar_bg_color, 0.95);
+    background-image: none;
+}
+
+.secondary-toolbar.toolbar .button:active:hover {
+    border-color: shade(@toolbar_bg_color, 0.7);
+}
+
+.secondary-toolbar.toolbar .button:focus,
+.secondary-toolbar.toolbar .button:hover:focus,
+.secondary-toolbar.toolbar .button:active:focus,
+.secondary-toolbar.toolbar .button:active:hover:focus {
+    border-color: shade(@toolbar_bg_color, 0.7);
+}
+
+.secondary-toolbar.toolbar .button:insensitive {
+    border-color: shade(@toolbar_bg_color, 0.85);
+    background-color: shade(@toolbar_bg_color, 0.9);
+    background-image: none;
+}
+
+.secondary-toolbar.toolbar .button:active:insensitive {
+    border-color: shade(@toolbar_bg_color, 0.75);
+    background-color: shade(@toolbar_bg_color, 0.80);
+    background-image: none;
+}
+
+/*******************
+ * bottom toolbars *
+ *******************/
+.bottom-toolbar.toolbar {
+    padding: 6px;
+    border-width: 1px 0 0 0;
+    border-color: shade(@theme_bg_color, 0.8);
+    background-color: @theme_bg_color;
+    background-image: none;
+}
+
+.bottom-toolbar.toolbar .button {
+    border-color: shade(@theme_bg_color, 0.8);
+    background-color: shade(@theme_bg_color, 1.08);
+    background-image: none;
+    color: @theme_fg_color;
+}
+
+.bottom-toolbar.toolbar .button:hover {
+    border-color: shade(@theme_bg_color, 0.7);
+    background-color: shade(@theme_bg_color, 1.10);
+    background-image: none;
+}
+
+.bottom-toolbar.toolbar .button:active {
+    border-color: shade(@theme_bg_color, 0.8);
+    background-color: shade(@theme_bg_color, 0.95);
+    background-image: none;
+}
+
+.bottom-toolbar.toolbar .button:active:hover {
+    border-color: shade(@theme_bg_color, 0.7);
+}
+
+.bottom-toolbar.toolbar .button:focus,
+.bottom-toolbar.toolbar .button:hover:focus,
+.bottom-toolbar.toolbar .button:active:focus,
+.bottom-toolbar.toolbar .button:active:hover:focus {
+    border-color: shade(@theme_bg_color, 0.7);
+}
+
+.bottom-toolbar.toolbar .button:insensitive {
+    border-color: shade(@theme_bg_color, 0.85);
+    background-color: shade(@theme_bg_color, 0.9);
+    background-image: none;
+}
+
+.bottom-toolbar.toolbar .button:active:insensitive {
+    border-color: shade(@theme_bg_color, 0.75);
+    background-color: shade(@theme_bg_color, 0.80);
+    background-image: none;
+}
+
+/*************
+ * statusbar *
+ *************/
+GraniteWidgetsStatusBar {
+    padding: 1px;
+    background-color: @theme_bg_color;
+    background-image: none;
+    box-shadow: inset 0 1 shade(@theme_bg_color, 0.8);
+}
+
+/***********
+ * popover *
+ ***********/
+GraniteWidgetsPopOver {
+    -GraniteWidgetsPopOver-arrow-width: 21;
+    -GraniteWidgetsPopOver-arrow-height: 12;
+    -GraniteWidgetsPopOver-border-radius: 2px;
+    -GraniteWidgetsPopOver-border-width: 1;
+    -GraniteWidgetsPopOver-shadow-size: 12;
+
+    margin: 0;
+    border-style: solid;
+    border-color: shade(@menu_bg_color, 0.8);
+    color: @menu_fg_color;
+}
+
+.popover_bg {
+    background-color: transparent;
+    background-image: -gtk-gradient(linear,
+                     left top, left bottom,
+                     from (@menu_bg_color),
+                     to (@menu_bg_color));
+}
+
+GraniteWidgetsPopOver .sidebar.view,
+GraniteWidgetsPopOver * {
+    background-color: transparent;
+    color: @menu_fg_color;
+}
+
+GraniteWidgetsPopOver .sidebar.view:selected,
+GraniteWidgetsPopOver .sidebar.view:selected:focus,
+GraniteWidgetsPopOver *:selected,
+GraniteWidgetsPopOver *:selected:focus {
+    background-color: @theme_selected_bg_color;
+    color: @theme_selected_fg_color;
+}
+
+GraniteWidgetsPopOver .button {
+    border-color: shade(@menu_bg_color, 0.8);
+    background-color: shade(@menu_bg_color, 1.08);
+    background-image: none;
+    color: @menu_fg_color;
+
+}
+
+GraniteWidgetsPopOver .button:hover {
+    border-color: shade(@menu_bg_color, 0.7);
+    background-color: shade(@menu_bg_color, 1.10);
+    background-image: none;
+    color: shade(@menu_fg_color, 0.7);
+}
+
+GraniteWidgetsPopOver .button:active {
+    border-color: shade(@menu_bg_color, 0.8);
+    background-color: shade(@menu_bg_color, 0.95);
+    background-image: none;
+}
+
+GraniteWidgetsPopOver .button:active:hover {
+    border-color: shade(@menu_bg_color, 0.7);
+    color: shade(@menu_fg_color, 0.7);
+}
+
+/* linked buttons */
+GraniteWidgetsPopOver .linked .button {
+    box-shadow: inset -1 0 shade(@menu_bg, 0.9);
+}
+
+GraniteWidgetsPopOver .linked .button:active {
+    box-shadow: inset -1 0 shade(@menu_bg, 0.9),
+                inset 1 0 alpha(@dark_shadow, 0.07),
+                inset 0 1 alpha(@dark_shadow, 0.08),
+                inset 0 -1 alpha(@dark_shadow, 0.05);
+}
+
+GraniteWidgetsPopOver .linked .button:insensitive {
+    box-shadow: inset -1 0 shade(@menu_bg, 0.9);
+}
+
+/* remove box shadow from last-child and only-child */
+GraniteWidgetsPopOver .linked .button:last-child,
+GraniteWidgetsPopOver .linked .button:only-child,
+GraniteWidgetsPopOver .linked .button:insensitive:last-child,
+GraniteWidgetsPopOver .linked .button:insensitive:only-child,
+GraniteWidgetsPopOver .linked .button:active:insensitive:last-child,
+GraniteWidgetsPopOver .linked .button:active:insensitive:only-child {
+    box-shadow: none;
+}
+
+/* add back the inset shadow effect */
+GraniteWidgetsPopOver .linked .button:active:last-child,
+GraniteWidgetsPopOver .linked .button:active:only-child {
+    box-shadow: inset 1 0 alpha(@dark_shadow, 0.07),
+                inset 0 1 alpha(@dark_shadow, 0.08),
+                inset -1 0 alpha(@dark_shadow, 0.07);
+}
+
+GraniteWidgetsPopOver .entry {
+    border-color: shade(@menu_bg_color, 0.7);
+    background-color: @menu_bg_color;
+    background-image: none;
+    color: @menu_fg_color;
+}
+
+GraniteWidgetsPopOver .entry:active,
+GraniteWidgetsPopOver .entry:focus {
+    border-color: shade(@menu_bg_color, 0.7);
+}
+
+GraniteWidgetsPopOver *.separator {
+    border-color: shade(@menu_bg_color, 0.9);
+    color: transparent;
+}
+
+.button.app {
+    border-width: 0;
+    border-radius: 2px;
+    background-color: transparent;
+}
+
+.button.app:hover {
+    border-color: shade(@theme_selected_bg_color, 0.9);
+    background-color: @theme_selected_bg_color;
+    background-image: none;
+    color: @theme_selected_fg_color;
+}
+
+.button.app:focus {
+    border-color: shade(@theme_selected_bg_color, 0.9);
+    background-color: @theme_selected_bg_color;
+    background-image: none;
+    color: @theme_selected_fg_color;
+}
+
+/********
+ * gala *
+ ********/
+.gala-workspaces-background {
+    border-width: 1px 0 0 0;
+    border-color: shade(@panel_bg_color, 0.8);
+    background-color: @panel_bg_color;
+    background-image: none;
+}
+
+.gala-workspace-selected {
+    border-width: 1px;
+    border-radius: 2px;
+    border-color: shade(@theme_selected_bg_color, 0.9);
+    background-color: @theme_selected_bg_color;
+    background-image: none;
+}
+
+/*********
+ * files *
+ *********/
+.files-overlay-bar {
+    margin: 3px;
+    padding: 3px 6px;
+    border-width: 1px;
+    border-color: shade(@theme_base_color, 0.7);
+    border-radius: 2px;
+    background-color: @theme_base_color;
+}
+
+.files-overlay-bar GtkLabel {
+    color: @theme_text_color;
+}
+
+/*********
+ * noise *
+ *********/
+.album-list-view,
+.album-list-view * {
+    border-color: shade(@theme_base_color, 0.7);
+    border-radius: 0;
+    background-color: @theme_base_color;
+    color: @theme_text_color;
+}
+
+.album-list-view GtkTreeView {
+    -GtkTreeView-vertical-separator: 1;
+    -GtkTreeView-grid-line-width: 0;
+
+    background-color: @theme_base_color;
+    color: @theme_text_color;
+}
+
+.album-list-view GtkTreeView row:nth-child(even) {
+    border-width: 0;
+    border-style: none;
+    background-color: shade(@theme_base_color, 0.97);
+}
+
+
+.album-list-view GtkTreeView row:nth-child(odd) {
+    border-width: 0;
+    border-style: none;
+    background-color: shade(@theme_base_color, 1.0);
+}
+
+.album-list-view GtkTreeView row:selected {
+    background-color: @selected_bg_color;
+    color: @selected_fg_color;
+}
+
+/**********
+ * birdie *
+ **********/
+BirdieWidgetsTweetList * {
+    background-image: none;
+    background-color: transparent;
+}
+
+/*********
+ * tweet *
+ *********/
+.tweet {
+    padding: 0;
+}
+
+/**********
+ * notify *
+ **********/
+.notify {
+    border-width: 1px;
+    border-style: solid;
+    border-color: shade(@theme_base_color, 0.7);
+    border-radius: 2px;
+    background-color: @theme_base_color;
+    color: @theme_text_color;
+}
+
+.notify .low {
+}
+
+.notify .critical {
+}
+
+/*********
+ * panel *
+ *********/
+.panel {
+    background-color: @panel_bg_color;
+    color: @panel_fg_color;
+    font: bold;
+}
+
+.panel .menubar .menuitem {
+    padding: 2px 3px;
+}
+
+.shadow {
+    background-color: transparent;
+    background-image: -gtk-gradient(linear,
+                     left top, left bottom,
+                     from (rgba(0, 0, 0, 0.3)),
+                     to (transparent));
+}
+
+.composited-indicator,
+.wingpanel-app-button, 
+.wingpanel-indicator-button {
+    padding: 0 2px;
+    background-color: transparent;
+    color: @panel_fg_color;
+}
+
+.composited-indicator.menuitem:active,
+.composited-indicator.menuitem:prelight {
+    border-style: none;
+    background-image: none;
+}
diff --git a/gtk-3.0/gtk-dark.css b/gtk-3.0/gtk-dark.css
index b17ca68..2200c4d 100644
--- a/gtk-3.0/gtk-dark.css
+++ b/gtk-3.0/gtk-dark.css
@@ -61,4 +61,5 @@
 @import url("gtk-widgets.css");
 @import url("gtk-widgets-assets-dark.css");
 @import url("apps/gnome-applications.css");
+@import url("apps/granite-widgets.css");
 @import url("apps/unity.css");
diff --git a/gtk-3.0/gtk-widgets.css b/gtk-3.0/gtk-widgets.css
index a2eefa0..18f2074 100644
--- a/gtk-3.0/gtk-widgets.css
+++ b/gtk-3.0/gtk-widgets.css
@@ -73,6 +73,16 @@ GtkClutterOffscreen {
     color: @theme_fg_color;
 }
 
+GtkWindow {
+    color: @theme_fg_color;
+}
+
+* {
+    /* inherit from parent by default */
+    background-color: @theme_bg_color;
+    color: inherit;
+}
+
 *:selected,
 *:selected:focus {
     background-color: @theme_selected_bg_color;
@@ -116,35 +126,22 @@ GtkClutterOffscreen {
 /******************
  * visual effects *
  ******************/
-/* transitions */
-.button {
-    transition: border 100ms ease-in-out;
-}
-
-.entry {
-    transition: border 100ms ease-out;
-}
-
-.entry:focus {
-    transition: border 100ms ease-in;
-}
-
 /* inset shadows */
 .button:active,
 .primary-toolbar .button:active,
 .toolbar .button:active,
 .header-bar .button:active {
-    box-shadow: inset 1px 0 alpha(@dark_shadow, 0.07),
-                inset 0 1px alpha(@dark_shadow, 0.08),
-                inset -1px 0 alpha(@dark_shadow, 0.07),
-                inset 0 -1px alpha(@dark_shadow, 0.05);
+    box-shadow: inset 1 0 alpha(@dark_shadow, 0.07),
+                inset 0 1 alpha(@dark_shadow, 0.08),
+                inset -1 0 alpha(@dark_shadow, 0.07),
+                inset 0 -1 alpha(@dark_shadow, 0.05);
 }
 
 .entry {
-    box-shadow: inset 1px 0 alpha(@dark_shadow, 0.10),
-                inset 0 1px alpha(@dark_shadow, 0.12),
-                inset -1px 0 alpha(@dark_shadow, 0.10),
-                inset 0 -1px alpha(@dark_shadow, 0.05);
+    box-shadow: inset 1 0 alpha(@dark_shadow, 0.10),
+                inset 0 1 alpha(@dark_shadow, 0.12),
+                inset -1 0 alpha(@dark_shadow, 0.10),
+                inset 0 -1 alpha(@dark_shadow, 0.05);
 }
 
 .button:active:insensitive,
@@ -867,6 +864,15 @@ GtkTreeMenu .menuitem * {
     color: alpha(mix(@menu_fg_color, @menu_bg_color, 0.5), 0.6);
 }
 
+/* Workaround for lp:949368 */
+GtkComboBox .menuitem * {
+    color: @menu_fg_color;
+}
+
+GtkComboBox .menuitem *:hover {
+    color: @theme_selected_fg_color;
+}
+
 /************
  * notebook *
  ************/
@@ -1020,11 +1026,9 @@ GtkLevelBar.vertical {
 }
 
 .level-bar.indicator-discrete.fill-block.horizontal {
-    margin: 0 1px;
 }
 
 .level-bar.indicator-discrete.fill-block.vertical {
-    margin: 1px 0;
 }
 
 /* discrete indicator border rounding,
@@ -1086,27 +1090,28 @@ GtkLevelBar.vertical {
     border-radius: 7px;
     background-color: shade(@theme_bg_color, 1.08);
     background-image: none;
+    color: transparent;
     /* we will draw the border using box shadow for now */
-    box-shadow: inset 1px 0 shade(@theme_bg_color, 0.8),
-                inset 0 1px shade(@theme_bg_color, 0.8),
-                inset -1px 0 shade(@theme_bg_color, 0.8),
-                inset 0 -1px shade(@theme_bg_color, 0.8);
+    box-shadow: inset 1 0 shade(@theme_bg_color, 0.8),
+                inset 0 1 shade(@theme_bg_color, 0.8),
+                inset -1 0 shade(@theme_bg_color, 0.8),
+                inset 0 -1 shade(@theme_bg_color, 0.8);
 }
 
 .scale.slider:hover {
-    box-shadow: inset 1px 0 shade(@theme_bg_color, 0.7),
-                inset 0 1px shade(@theme_bg_color, 0.7),
-                inset -1px 0 shade(@theme_bg_color, 0.7),
-                inset 0 -1px shade(@theme_bg_color, 0.7);
+    box-shadow: inset 1 0 shade(@theme_bg_color, 0.7),
+                inset 0 1 shade(@theme_bg_color, 0.7),
+                inset -1 0 shade(@theme_bg_color, 0.7),
+                inset 0 -1 shade(@theme_bg_color, 0.7);
 }
 
 .scale.slider:insensitive {
     background-color: shade(@theme_bg_color, 0.9);
     background-image: none;
-    box-shadow: inset 1px 0 shade(@theme_bg_color, 0.85),
-                inset 0 1px shade(@theme_bg_color, 0.85),
-                inset -1px 0 shade(@theme_bg_color, 0.85),
-                inset 0 -1px shade(@theme_bg_color, 0.85);
+    box-shadow: inset 1 0 shade(@theme_bg_color, 0.85),
+                inset 0 1 shade(@theme_bg_color, 0.85),
+                inset -1 0 shade(@theme_bg_color, 0.85),
+                inset 0 -1 shade(@theme_bg_color, 0.85);
 }
 
 .scale.mark {
@@ -1114,40 +1119,64 @@ GtkLevelBar.vertical {
 }
 
 .scale.trough {
-    margin: 6px 0;
-    border-color: shade(@theme_bg_color, 0.8);
-    border-radius: 2px;
+    border-width: 6px 0;
+    border-color: transparent;
+    border-radius: 7px;
     background-color: shade(@theme_bg_color, 1.08);
     background-image: none;
+    /* we will draw the border using box shadow for now */
+    box-shadow: inset 1 0 shade(@theme_bg_color, 0.8),
+                inset 0 1 shade(@theme_bg_color, 0.8),
+                inset -1 0 shade(@theme_bg_color, 0.8),
+                inset 0 -1 shade(@theme_bg_color, 0.8);
 }
 
 .scale.trough.vertical {
-    margin: 0 6px;
+    border-width: 0 6px;
+    box-shadow: inset 1 0 shade(@theme_bg_color, 0.8),
+                inset 0 1 shade(@theme_bg_color, 0.8),
+                inset -1 0 shade(@theme_bg_color, 0.8),
+                inset 0 -1 shade(@theme_bg_color, 0.8);
 }
 
 .menubar .menuitem .scale.highlight.left,
 .scale.highlight.left {
-    border-color: @theme_selected_bg_color;
+    border-color: transparent;
     background-color: @theme_selected_bg_color;
     background-image: none;
+    box-shadow: inset 1 0 @theme_selected_bg_color,
+                inset 0 1 @theme_selected_bg_color,
+                inset -1 0 @theme_selected_bg_color,
+                inset 0 -1 @theme_selected_bg_color;
 }
 
 .menubar .menuitem .scale.highlight.left:hover {
-    border-color: shade(@theme_selected_bg_color, 0.8);
+    border-color: transparent;
     background-color: shade(@theme_selected_bg_color, 0.8);
+    box-shadow: inset 1 0 shade(@theme_selected_bg_color, 0.8),
+                inset 0 1 shade(@theme_selected_bg_color, 0.8),
+                inset -1 0 shade(@theme_selected_bg_color, 0.8),
+                inset 0 -1 shade(@theme_selected_bg_color, 0.8);
 }
 
 .scale.highlight.bottom {
-    border-color: @theme_selected_bg_color;
+    border-color: transparent;
     background-color: @theme_selected_bg_color;
     background-image: none;
+    box-shadow: inset 1 0 @theme_selected_bg_color,
+                inset 0 1 @theme_selected_bg_color,
+                inset -1 0 @theme_selected_bg_color,
+                inset 0 -1 @theme_selected_bg_color;
 }
 
 .scale.trough:insensitive,
 .scale.highlight.left:insensitive {
-    border-color: shade(@theme_bg_color, 0.85);
     background-color: shade(@theme_bg_color, 0.9);
     background-image: none;
+    box-shadow: inset 1 0 shade(@theme_bg_color, 0.85),
+                inset 0 1 shade(@theme_bg_color, 0.85),
+                inset -1 0 shade(@theme_bg_color, 0.85),
+                inset 0 -1 shade(@theme_bg_color, 0.85);
 }
 
 /*************
@@ -1306,12 +1335,12 @@ GtkComboBox .separator {
     border-style: none;
     background-color: transparent;
     background-image: none;
-    box-shadow: inset 1px 0 shade(@theme_base_color, 0.9);
+    box-shadow: inset 1 0 shade(@theme_base_color, 0.9);
 }
 
 .spinbutton .button:insensitive {
     color: mix(@theme_text_color, @theme_base_color, 0.7);
-    box-shadow: inset 1px 0 shade(@theme_bg_color, 0.95);
+    box-shadow: inset 1 0 shade(@theme_bg_color, 0.95);
 }
 
 .spinbutton .button:active,
@@ -1328,10 +1357,6 @@ GtkComboBox .separator {
     border-radius: 0 2px 2px 0;
 }
 
-.spinbutton .button:dir(rtl) {
-    box-shadow: inset -1px 0 shade(@theme_base_color, 0.9);
-}
-
 .spinbutton.vertical .button {
     border-width: 1px;
     border-style: solid;
@@ -1397,116 +1422,8 @@ GtkComboBox .separator {
 /***********
  * spinner *
  ***********/
-@keyframes spinner {
-    0.00% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
-                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)),
-                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)),
-                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)),
-                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)),
-                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)),
-                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)),
-                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)); }
-
-    12.5% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)),
-                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)),
-                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)),
-                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)),
-                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)),
-                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)),
-                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)),
-                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)); }
-
-    25.0% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)),
-                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)),
-                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)),
-                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)),
-                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)),
-                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)),
-                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
-                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)); }
-
-    37.5% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)),
-                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)),
-                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)),
-                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)),
-                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)),
-                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
-                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)),
-                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)); }
-
-    50.0% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)),
-                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)),
-                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)),
-                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)),
-                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
-                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)),
-                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)),
-                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)); }
-
-    62.5% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)),
-                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)),
-                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)),
-                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
-                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)),
-                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)),
-                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)),
-                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)); }
-
-    75.0% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)),
-                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)),
-                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
-                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)),
-                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)),
-                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)),
-                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)),
-                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)); }
-
-    87.5% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)),
-                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
-                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)),
-                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)),
-                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)),
-                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)),
-                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)),
-                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)); }
-
-    100%  { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
-                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)),
-                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)),
-                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)),
-                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)),
-                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)),
-                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)),
-                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)); }
-}
-
-.spinner {
-    background-color: transparent;
-    background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
-                      -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
-                      -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
-                      -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
-                      -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
-                      -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
-                      -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
-                      -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent));
-
-    background-position: 14% 14%, 0% 50%, 14% 86%, 50% 100%, 86% 86%, 100% 50%, 86% 14%, 50% 0%;
-    background-size: 15% 15%;
-    background-repeat: no-repeat;
-}
-
 .spinner:active {
-    background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)),
-                      -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)),
-                      -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)),
-                      -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)),
-                      -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)),
-                      -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)),
-                      -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)),
-                      -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent));
-
-    animation: spinner 1s infinite linear;
+     transition: 750ms linear loop;
 }
 
 .menu.spinner,
@@ -1903,24 +1820,24 @@ GtkColorButton.button {
 .inline-toolbar.toolbar .button,
 .inline-toolbar.toolbar GtkToolButton .button,
 .inline-toolbar.toolbar GtkToolButton > .button {
-    box-shadow: inset -1px 0 shade(@theme_bg_color, 0.9);
+    box-shadow: inset -1 0 shade(@theme_bg_color, 0.9);
 }
 
 .linked .button:active,
 .inline-toolbar.toolbar .button:active,
 .inline-toolbar.toolbar GtkToolButton .button:active,
 .inline-toolbar.toolbar GtkToolButton > .button:active {
-    box-shadow: inset -1px 0 shade(@theme_bg_color, 0.9),
-                inset 1px 0 alpha(@dark_shadow, 0.07),
-                inset 0 1px alpha(@dark_shadow, 0.08),
-                inset 0 -1px alpha(@dark_shadow, 0.05);
+    box-shadow: inset -1 0 shade(@theme_bg_color, 0.9),
+                inset 1 0 alpha(@dark_shadow, 0.07),
+                inset 0 1 alpha(@dark_shadow, 0.08),
+                inset 0 -1 alpha(@dark_shadow, 0.05);
 }
 
 .linked .button:insensitive,
 .inline-toolbar.toolbar .button:insensitive,
 .inline-toolbar.toolbar GtkToolButton .button:insensitive,
 .inline-toolbar.toolbar GtkToolButton > .button:insensitive {
-    box-shadow: inset -1px 0 shade(@theme_bg_color, 0.9);
+    box-shadow: inset -1 0 shade(@theme_bg_color, 0.9);
 }
 
 /* remove box shadow from last-child and only-child */
@@ -1952,9 +1869,9 @@ GtkColorButton.button {
 .inline-toolbar.toolbar .button:active:only-child,
 .inline-toolbar.toolbar GtkToolButton:last-child > .button:active,
 .inline-toolbar.toolbar GtkToolButton:only-child > .button:active {
-    box-shadow: inset 1px 0 alpha(@dark_shadow, 0.07),
-                inset 0 1px alpha(@dark_shadow, 0.08),
-                inset -1px 0 alpha(@dark_shadow, 0.07);
+    box-shadow: inset 1 0 alpha(@dark_shadow, 0.07),
+                inset 0 1 alpha(@dark_shadow, 0.08),
+                inset -1 0 alpha(@dark_shadow, 0.07);
 }
 
 /* middle button */
@@ -2033,22 +1950,22 @@ GtkColorButton.button {
 .linked.vertical .button,
 .inline-toolbar.toolbar.vertical .button,
 .inline-toolbar.toolbar.vertical GtkToolButton > .button {
-    box-shadow: inset 0 -1px shade(@theme_bg_color, 0.9);
+    box-shadow: inset 0 -1 shade(@theme_bg_color, 0.9);
 }
 
 .linked.vertical .button:active,
 .inline-toolbar.toolbar.vertical .button:active,
 .inline-toolbar.toolbar.vertical GtkToolButton > .button:active {
-    box-shadow: inset 0 -1px shade(@theme_bg_color, 0.9),
-                inset 1px 0 alpha(@dark_shadow, 0.07),
-                inset 0 1px alpha(@dark_shadow, 0.08),
-                inset -1px 0 alpha(@dark_shadow, 0.07);
+    box-shadow: inset 0 -1 shade(@theme_bg_color, 0.9),
+                inset 1 0 alpha(@dark_shadow, 0.07),
+                inset 0 1 alpha(@dark_shadow, 0.08),
+                inset -1 0 alpha(@dark_shadow, 0.07);
 }
 
 .linked.vertical .button:insensitive,
 .inline-toolbar.toolbar.vertical .button:insensitive,
 .inline-toolbar.toolbar.vertical GtkToolButton > .button:insensitive {
-    box-shadow: inset 0 -1px shade(@theme_bg_color, 0.9);
+    box-shadow: inset 0 -1 shade(@theme_bg_color, 0.9);
 }
 
 /* remove box shadow from last-child and only-child */
@@ -2080,9 +1997,9 @@ GtkColorButton.button {
 .inline-toolbar.toolbar.vertical .button:active:only-child,
 .inline-toolbar.toolbar.vertical GtkToolButton:last-child > .button:active,
 .inline-toolbar.toolbar.vertical GtkToolButton:only-child > .button:active {
-    box-shadow: inset 1px 0 alpha(@dark_shadow, 0.07),
-                inset 0 1px alpha(@dark_shadow, 0.08),
-                inset -1px 0 alpha(@dark_shadow, 0.07);
+    box-shadow: inset 1 0 alpha(@dark_shadow, 0.07),
+                inset 0 1 alpha(@dark_shadow, 0.08),
+                inset -1 0 alpha(@dark_shadow, 0.07);
 }
 
 /* middle button (vertical) */
@@ -2140,7 +2057,7 @@ GtkColorButton.button {
 .toolbar .raised.linked .button,
 .header-bar .button.raised.linked,
 .header-bar .raised.linked .button {
-    box-shadow: inset -1px 0 shade(@toolbar_bg_color, 0.9);
+    box-shadow: inset -1 0 shade(@toolbar_bg_color, 0.9);
 }
 
 .primary-toolbar .button.raised.linked:active,
@@ -2149,10 +2066,10 @@ GtkColorButton.button {
 .toolbar .raised.linked .button:active,
 .header-bar .button.raised.linked:active,
 .header-bar .raised.linked .button:active {
-    box-shadow: inset -1px 0 shade(@toolbar_bg_color, 0.9),
-                inset 1px 0 alpha(@dark_shadow, 0.07),
-                inset 0 1px alpha(@dark_shadow, 0.08),
-                inset 0 -1px alpha(@dark_shadow, 0.05);
+    box-shadow: inset -1 0 shade(@toolbar_bg_color, 0.9),
+                inset 1 0 alpha(@dark_shadow, 0.07),
+                inset 0 1 alpha(@dark_shadow, 0.08),
+                inset 0 -1 alpha(@dark_shadow, 0.05);
 }
 
 .primary-toolbar .button.raised.linked:insensitive,
@@ -2161,7 +2078,7 @@ GtkColorButton.button {
 .toolbar .raised.linked .button:insensitive,
 .header-bar .button.raised.linked:insensitive,
 .header-bar .raised.linked .button:insensitive {
-    box-shadow: inset -1px 0 shade(@toolbar_bg_color, 0.9);
+    box-shadow: inset -1 0 shade(@toolbar_bg_color, 0.9);
 }
 
 /* remove box shadow from last-child and only-child */
@@ -2217,9 +2134,9 @@ GtkColorButton.button {
 .header-bar .button:active.raised.linked:only-child,
 .header-bar .raised.linked .button:active:last-child,
 .header-bar .raised.linked .button:active:only-child {
-    box-shadow: inset 1px 0 alpha(@dark_shadow, 0.07),
-                inset 0 1px alpha(@dark_shadow, 0.08),
-                inset -1px 0 alpha(@dark_shadow, 0.07);
+    box-shadow: inset 1 0 alpha(@dark_shadow, 0.07),
+                inset 0 1 alpha(@dark_shadow, 0.08),
+                inset -1 0 alpha(@dark_shadow, 0.07);
 }
 
 /* middle button */
@@ -2364,6 +2281,10 @@ GtkTreeView .entry {
 /************
  * viewport *
  ************/
+GtkViewport {
+    background-color: transparent;
+}
+
 GtkViewport.frame {
     border-width: 0;
 }
@@ -2525,7 +2446,7 @@ GtkOverlay.osd {
 .osd.toolbar .button:first-child {
     border-radius: 2px 0 0 2px;
     border-width: 1px 0 1px 1px;
-    box-shadow: inset -1px 0 shade(@osd_bg, 0.9);
+    box-shadow: inset -1 0 shade(@osd_bg, 0.9);
 }
 
 .osd.toolbar .button:last-child {
@@ -2561,46 +2482,60 @@ GtkOverlay.osd {
     border-radius: 7px;
     background-color: shade(@osd_bg, 1.08);
     background-image: none;
+    color: transparent;
     /* we will draw the border using box shadow for now */
-    box-shadow: inset 1px 0 shade(@osd_bg, 0.8),
-                inset 0 1px shade(@osd_bg, 0.8),
-                inset -1px 0 shade(@osd_bg, 0.8),
-                inset 0 -1px shade(@osd_bg, 0.8);
+    box-shadow: inset 1 0 shade(@osd_bg, 0.8),
+                inset 0 1 shade(@osd_bg, 0.8),
+                inset -1 0 shade(@osd_bg, 0.8),
+                inset 0 -1 shade(@osd_bg, 0.8);
 }
 
 .osd .scale.slider:hover {
-    box-shadow: inset 1px 0 shade(@osd_bg, 0.7),
-                inset 0 1px shade(@osd_bg, 0.7),
-                inset -1px 0 shade(@osd_bg, 0.7),
-                inset 0 -1px shade(@osd_bg, 0.7);
+    box-shadow: inset 1 0 shade(@osd_bg, 0.7),
+                inset 0 1 shade(@osd_bg, 0.7),
+                inset -1 0 shade(@osd_bg, 0.7),
+                inset 0 -1 shade(@osd_bg, 0.7);
 }
 
 .osd .scale.slider:insensitive {
     background-color: shade(@osd_bg, 0.9);
     background-image: none;
-    box-shadow: inset 1px 0 shade(@osd_bg, 0.85),
-                inset 0 1px shade(@osd_bg, 0.85),
-                inset -1px 0 shade(@osd_bg, 0.85),
-                inset 0 -1px shade(@osd_bg, 0.85);
+    box-shadow: inset 1 0 shade(@osd_bg, 0.85),
+                inset 0 1 shade(@osd_bg, 0.85),
+                inset -1 0 shade(@osd_bg, 0.85),
+                inset 0 -1 shade(@osd_bg, 0.85);
 }
 
 .osd .scale.trough {
-    border-color: shade(@osd_bg, 0.8);
+    border-color: transparent;
     background-color: shade(@osd_bg, 1.08);
     background-image: none;
+    /* we will draw the border using box shadow for now */
+    box-shadow: inset 1 0 shade(@osd_bg, 0.8),
+                inset 0 1 shade(@osd_bg, 0.8),
+                inset -1 0 shade(@osd_bg, 0.8),
+                inset 0 -1 shade(@osd_bg, 0.8);
 }
 
 .osd .scale.trough.highlight {
-    border-color: @theme_selected_bg_color;
+    border-color: transparent;
     background-color: @theme_selected_bg_color;
     background-image: none;
+    box-shadow: inset 1 0 @theme_selected_bg_color,
+                inset 0 1 @theme_selected_bg_color,
+                inset -1 0 @theme_selected_bg_color,
+                inset 0 -1 @theme_selected_bg_color;
 }
 
 .osd .scale.trough:insensitive,
 .osd .scale.trough.highlight:insensitive {
-    border-color: shade(@osd_bg, 0.85);
+    border-color: transparent;
     background-color: shade(@osd_bg, 0.9);
     background-image: none;
+    box-shadow: inset 1 0 shade(@osd_bg, 0.85),
+                inset 0 1 shade(@osd_bg, 0.85),
+                inset -1 0 shade(@osd_bg, 0.85),
+                inset 0 -1 shade(@osd_bg, 0.85);
 }
 
 .osd GtkProgressBar,
diff --git a/gtk-3.0/gtk.css b/gtk-3.0/gtk.css
index bdba3cc..aed917c 100644
--- a/gtk-3.0/gtk.css
+++ b/gtk-3.0/gtk.css
@@ -61,4 +61,5 @@
 @import url("gtk-widgets.css");
 @import url("gtk-widgets-assets.css");
 @import url("apps/gnome-applications.css");
+@import url("apps/granite-widgets.css");
 @import url("apps/unity.css");