Merge lp:~larsu/ubuntu-themes/gtk-314 into lp:ubuntu-themes

[Lars Karlitski]

light-themes: update for gtk 3.14

Also clean them a bit up.

light-themes: update for gtk 3.14

Also clean them a bit up.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:421
http://jenkins.qa.ubuntu.com/job/ubuntu-themes-ci/87/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-themes-vivid-amd64-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-themes-vivid-armhf-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-themes-vivid-i386-ci/1

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-themes-ci/87/rebuild

review: Approve (continuous-integration)

[Iain Lane (laney)]

Looks fine from cursory code review + exploratory testing, thanks!

Will upload alongside gtk 3.14 shortly

review: Approve

=== modified file 'Ambiance/gtk-3.0/gtk-widgets-assets.css'
--- Ambiance/gtk-3.0/gtk-widgets-assets.css	2013-07-28 23:01:08 +0000
+++ Ambiance/gtk-3.0/gtk-widgets-assets.css	2014-12-17 15:31:01 +0000
@@ -12,33 +12,28 @@
  *************************/
 
 /* draw regular check and radio items using our SVG assets */
-.radio,
-.check {
-    /*background-clip: border-box;*/
-}
-
-.check {
-    background-image: url("assets/check-unselected.png");
+.check {
+    -gtk-icon-source: url("assets/check-unselected.png");
 }
 
 .check:hover {
-    background-image: url("assets/check-unselected-hover.png");
+    -gtk-icon-source: url("assets/check-unselected-hover.png");
 }
 
 .check row,
 .check row:selected,
 .check row:selected:focus {
-    background-image: url("assets/check-unselected-alt.png");
+    -gtk-icon-source: url("assets/check-unselected-alt.png");
 }
 
 .check row:hover,
 .check row:selected:hover,
 .check row:selected:focus:hover {
-    background-image: url("assets/check-unselected-hover-alt.png");
+    -gtk-icon-source: url("assets/check-unselected-hover-alt.png");
 }
 
 .check:insensitive {
-    background-image: url("assets/check-unselected-disabled.png");
+    -gtk-icon-source: url("assets/check-unselected-disabled.png");
 }
 
 .check row:insensitive {
@@ -49,169 +44,169 @@
 .check row:selected:insensitive,
 .check row:selected:focus:insensitive {
     background-color: transparent;
-    background-image: url("assets/check-unselected-disabled-alt.png");
+    -gtk-icon-source: url("assets/check-unselected-disabled-alt.png");
 }
 
 .check:backdrop {
-    background-image: url("assets/backdrop-check-unselected.png");
+    -gtk-icon-source: url("assets/backdrop-check-unselected.png");
 }
 
 .check:hover:backdrop {
-    background-image: url("assets/backdrop-check-unselected-hover.png");
+    -gtk-icon-source: url("assets/backdrop-check-unselected-hover.png");
 }
 
 .check row:backdrop,
 .check row:selected:backdrop {
-    background-image: url("assets/backdrop-check-unselected-alt.png");
+    -gtk-icon-source: url("assets/backdrop-check-unselected-alt.png");
 }
 
 .check row:hover:backdrop,
 .check row:selected:hover:backdrop {
-    background-image: url("assets/backdrop-check-unselected-hover-alt.png");
+    -gtk-icon-source: url("assets/backdrop-check-unselected-hover-alt.png");
 }
 
 .check:insensitive:backdrop {
-    background-image: url("assets/backdrop-check-unselected-disabled.png");
+    -gtk-icon-source: url("assets/backdrop-check-unselected-disabled.png");
 }
 
 .check row:selected:insensitive:backdrop {
-    background-image: url("assets/backdrop-check-unselected-disabled-alt.png");
-}
-
-.check:active {
-    background-image: url("assets/check-selected.png");
-}
-
-.check:active:hover {
-    background-image: url("assets/check-selected-hover.png");
-}
-
-.check row:active,
-.check row:selected:active,
-.check row:selected:focus:active {
-    background-image: url("assets/check-selected-alt.png");
-}
-
-.check row:active:hover,
-.check row:selected:active:hover,
-.check row:selected:active:focus:hover {
-    background-image: url("assets/check-selected-hover-alt.png");
-}
-
-.check:active:insensitive {
-    background-image: url("assets/check-selected-disabled.png");
-}
-
-.check row:active:insensitive,
-.check row:selected:active:insensitive,
-.check row:selected:focus:active:insensitive {
-    background-image: url("assets/check-selected-disabled-alt.png");
-}
-
-.check:active:backdrop {
-    background-image: url("assets/backdrop-check-selected.png");
-}
-
-.check:active:backdrop {
-    background-image: url("assets/backdrop-check-selected-hover.png");
-}
-
-.check row:active:backdrop,
-.check row:selected:active:backdrop {
-    background-image: url("assets/backdrop-check-selected-alt.png");
-}
-
-.check row:active:hover:backdrop,
-.check row:selected:active:hover:backdrop {
-    background-image: url("assets/backdrop-check-selected-hover-alt.png");
-}
-
-.check:active:insensitive:backdrop {
-    background-image: url("assets/backdrop-check-selected-disabled.png");
-}
-
-.check row:selected:active:insensitive:backdrop {
-    background-image: url("assets/backdrop-check-selected-disabled-alt.png");
+    -gtk-icon-source: url("assets/backdrop-check-unselected-disabled-alt.png");
+}
+
+.check:checked {
+    -gtk-icon-source: url("assets/check-selected.png");
+}
+
+.check:checked:hover {
+    -gtk-icon-source: url("assets/check-selected-hover.png");
+}
+
+.check row:checked,
+.check row:selected:checked,
+.check row:selected:focus:checked {
+    -gtk-icon-source: url("assets/check-selected-alt.png");
+}
+
+.check row:checked:hover,
+.check row:selected:checked:hover,
+.check row:selected:checked:focus:hover {
+    -gtk-icon-source: url("assets/check-selected-hover-alt.png");
+}
+
+.check:checked:insensitive {
+    -gtk-icon-source: url("assets/check-selected-disabled.png");
+}
+
+.check row:checked:insensitive,
+.check row:selected:checked:insensitive,
+.check row:selected:focus:checked:insensitive {
+    -gtk-icon-source: url("assets/check-selected-disabled-alt.png");
+}
+
+.check:checked:backdrop {
+    -gtk-icon-source: url("assets/backdrop-check-selected.png");
+}
+
+.check:checked:backdrop {
+    -gtk-icon-source: url("assets/backdrop-check-selected-hover.png");
+}
+
+.check row:checked:backdrop,
+.check row:selected:checked:backdrop {
+    -gtk-icon-source: url("assets/backdrop-check-selected-alt.png");
+}
+
+.check row:checked:hover:backdrop,
+.check row:selected:checked:hover:backdrop {
+    -gtk-icon-source: url("assets/backdrop-check-selected-hover-alt.png");
+}
+
+.check:checked:insensitive:backdrop {
+    -gtk-icon-source: url("assets/backdrop-check-selected-disabled.png");
+}
+
+.check row:selected:checked:insensitive:backdrop {
+    -gtk-icon-source: url("assets/backdrop-check-selected-disabled-alt.png");
 }
 
 .check:inconsistent {
-    background-image: url("assets/check-mixed.png");
+    -gtk-icon-source: url("assets/check-mixed.png");
 }
 
 .check:inconsistent:hover {
-    background-image: url("assets/check-mixed-hover.png");
+    -gtk-icon-source: url("assets/check-mixed-hover.png");
 }
 
 .check row:inconsistent,
 .check row:selected:inconsistent,
 .check row:selected:focus:inconsistent {
-    background-image: url("assets/check-mixed-alt.png");
+    -gtk-icon-source: url("assets/check-mixed-alt.png");
 }
 
 .check row:inconsistent:hover,
 .check row:selected:inconsistent:hover,
 .check row:selected:focus:inconsistent:hover {
-    background-image: url("assets/check-mixed-hover-alt.png");
+    -gtk-icon-source: url("assets/check-mixed-hover-alt.png");
 }
 
 .check:inconsistent:insensitive {
-    background-image: url("assets/check-mixed-disabled.png");
+    -gtk-icon-source: url("assets/check-mixed-disabled.png");
 }
 
 .check row:inconsistent:insensitive,
 .check row:selected:inconsistent:insensitive,
 .check row:selected:focus:inconsistent:insensitive {
-    background-image: url("assets/check-mixed-disabled-alt.png");
+    -gtk-icon-source: url("assets/check-mixed-disabled-alt.png");
 }
 
 .check:inconsistent:backdrop {
-    background-image: url("assets/backdrop-check-mixed.png");
+    -gtk-icon-source: url("assets/backdrop-check-mixed.png");
 }
 
 .check:inconsistent:hover:backdrop {
-    background-image: url("assets/backdrop-check-mixed-hover.png");
+    -gtk-icon-source: url("assets/backdrop-check-mixed-hover.png");
 }
 
 .check row:inconsistent:backdrop,
 .check row:selected:inconsistent:backdrop {
-    background-image: url("assets/backdrop-check-mixed-alt.png");
+    -gtk-icon-source: url("assets/backdrop-check-mixed-alt.png");
 }
 
 .check row:inconsistent:hover:backdrop,
 .check row:selected:inconsistent:hover:backdrop {
-    background-image: url("assets/backdrop-check-mixed-hover-alt.png");
+    -gtk-icon-source: url("assets/backdrop-check-mixed-hover-alt.png");
 }
 
 .check:inconsistent:insensitive:backdrop {
-    background-image: url("assets/backdrop-check-mixed-disabled.png");
+    -gtk-icon-source: url("assets/backdrop-check-mixed-disabled.png");
 }
 
 .check row:selected:inconsistent:insensitive:backdrop {
-    background-image: url("assets/backdrop-check-mixed-disabled-alt.png");
+    -gtk-icon-source: url("assets/backdrop-check-mixed-disabled-alt.png");
 }
 
 .radio {
-    background-image: url("assets/radio-unselected.png");
+    -gtk-icon-source: url("assets/radio-unselected.png");
 }
 
 .radio:hover {
-    background-image: url("assets/radio-unselected-hover.png");
+    -gtk-icon-source: url("assets/radio-unselected-hover.png");
 }
 
 .radio row,
 .radio row:selected,
 .radio row:selected:focus {
-    background-image: url("assets/radio-unselected-alt.png");
+    -gtk-icon-source: url("assets/radio-unselected-alt.png");
 }
 
 .radio row:hover,
 .radio row:selected:hover,
 .radio row:selected:focus:hover {
-    background-image: url("assets/radio-unselected-hover-alt.png");
+    -gtk-icon-source: url("assets/radio-unselected-hover-alt.png");
 }
 
 .radio:insensitive {
-    background-image: url("assets/radio-unselected-disabled.png");
+    -gtk-icon-source: url("assets/radio-unselected-disabled.png");
 }
 
 .radio row:insensitive {
@@ -221,239 +216,219 @@
 .radio row:insensitive,
 .radio row:selected:insensitive,
 .radio row:selected:focus:insensitive {
-    background-image: url("assets/radio-unselected-disabled-alt.png");
+    -gtk-icon-source: url("assets/radio-unselected-disabled-alt.png");
 }
 
 .radio:backdrop {
-    background-image: url("assets/backdrop-radio-unselected.png");
+    -gtk-icon-source: url("assets/backdrop-radio-unselected.png");
 }
 
 .radio:hover:backdrop {
-    background-image: url("assets/backdrop-radio-unselected-hover.png");
+    -gtk-icon-source: url("assets/backdrop-radio-unselected-hover.png");
 }
 
 .radio row:backdrop,
 .radio row:selected:backdrop {
-    background-image: url("assets/backdrop-radio-unselected-alt.png");
+    -gtk-icon-source: url("assets/backdrop-radio-unselected-alt.png");
 }
 
 .radio row:hover:backdrop,
 .radio row:selected:hover:backdrop {
-    background-image: url("assets/backdrop-radio-unselected-hover-alt.png");
+    -gtk-icon-source: url("assets/backdrop-radio-unselected-hover-alt.png");
 }
 
 .radio:insensitive:backdrop {
-    background-image: url("assets/backdrop-radio-unselected-disabled.png");
+    -gtk-icon-source: url("assets/backdrop-radio-unselected-disabled.png");
 }
 
 .radio row:selected:insensitive:backdrop {
-    background-image: url("assets/backdrop-radio-unselected-disabled-alt.png");
-}
-
-.radio:active {
-    background-image: url("assets/radio-selected.png");
-}
-
-.radio:active:hover {
-    background-image: url("assets/radio-selected-hover.png");
-}
-
-.radio row:active,
-.radio row:selected:active,
-.radio row:selected:focus:active {
-    background-image: url("assets/radio-selected-alt.png");
-}
-
-.radio row:active:hover,
-.radio row:selected:active:hover,
-.radio row:selected:focus:active:hover {
-    background-image: url("assets/radio-selected-hover-alt.png");
-}
-
-.radio:active:insensitive {
-    background-image: url("assets/radio-selected-disabled.png");
+    -gtk-icon-source: url("assets/backdrop-radio-unselected-disabled-alt.png");
+}
+
+.radio:checked {
+    -gtk-icon-source: url("assets/radio-selected.png");
+}
+
+.radio:checked:hover {
+    -gtk-icon-source: url("assets/radio-selected-hover.png");
+}
+
+.radio row:checked,
+.radio row:selected:checked,
+.radio row:selected:focus:checked {
+    -gtk-icon-source: url("assets/radio-selected-alt.png");
+}
+
+.radio row:checked:hover,
+.radio row:selected:checked:hover,
+.radio row:selected:focus:checked:hover {
+    -gtk-icon-source: url("assets/radio-selected-hover-alt.png");
+}
+
+.radio:checked:insensitive {
+    -gtk-icon-source: url("assets/radio-selected-disabled.png");
 }
 
 .radio row:insensitive,
-.radio row:selected:active:insensitive,
-.radio row:selected:focus:active:insensitive {
-    background-image: url("assets/radio-selected-disabled-alt.png");
-}
-
-.radio:active:backdrop {
-    background-image: url("assets/backdrop-radio-selected.png");
-}
-
-.radio:active:hover:backdrop {
-    background-image: url("assets/backdrop-radio-selected-hover.png");
-}
-
-.radio row:active:backdrop,
-.radio row:selected:active:backdrop {
-    background-image: url("assets/backdrop-radio-selected-alt.png");
-}
-
-.radio row:active:hover:backdrop,
-.radio row:selected:active:hover:backdrop {
-    background-image: url("assets/backdrop-radio-selected-hover-alt.png");
-}
-
-.radio:active:insensitive:backdrop {
-    background-image: url("assets/backdrop-radio-selected-disabled.png");
-}
-
-.radio row:selected:active:insensitive:backdrop {
-    background-image: url("assets/backdrop-radio-selected-disabled-alt.png");
+.radio row:selected:checked:insensitive,
+.radio row:selected:focus:checked:insensitive {
+    -gtk-icon-source: url("assets/radio-selected-disabled-alt.png");
+}
+
+.radio:checked:backdrop {
+    -gtk-icon-source: url("assets/backdrop-radio-selected.png");
+}
+
+.radio:checked:hover:backdrop {
+    -gtk-icon-source: url("assets/backdrop-radio-selected-hover.png");
+}
+
+.radio row:checked:backdrop,
+.radio row:selected:checked:backdrop {
+    -gtk-icon-source: url("assets/backdrop-radio-selected-alt.png");
+}
+
+.radio row:checked:hover:backdrop,
+.radio row:selected:checked:hover:backdrop {
+    -gtk-icon-source: url("assets/backdrop-radio-selected-hover-alt.png");
+}
+
+.radio:checked:insensitive:backdrop {
+    -gtk-icon-source: url("assets/backdrop-radio-selected-disabled.png");
+}
+
+.radio row:selected:checked:insensitive:backdrop {
+    -gtk-icon-source: url("assets/backdrop-radio-selected-disabled-alt.png");
 }
 
 .radio:inconsistent {
-    background-image: url("assets/radio-mixed.png");
+    -gtk-icon-source: url("assets/radio-mixed.png");
 }
 
 .radio:inconsistent:hover {
-    background-image: url("assets/radio-mixed-hover.png");
+    -gtk-icon-source: url("assets/radio-mixed-hover.png");
 }
 
 .radio row:inconsistent,
 .radio row:selected:inconsistent,
 .radio row:selected:focus:inconsistent {
-    background-image: url("assets/radio-mixed-alt.png");
+    -gtk-icon-source: url("assets/radio-mixed-alt.png");
 }
 
 .radio row:inconsistent:hover,
 .radio row:selected:inconsistent:hover,
 .radio row:selected:focus:inconsistent:hover {
-    background-image: url("assets/radio-mixed-hover-alt.png");
+    -gtk-icon-source: url("assets/radio-mixed-hover-alt.png");
 }
 
 .radio:inconsistent:insensitive {
-    background-image: url("assets/radio-mixed-disabled.png");
+    -gtk-icon-source: url("assets/radio-mixed-disabled.png");
 }
 
 .radio row:inconsistent:insensitive,
 .radio row:selected:inconsistent:insensitive,
 .radio row:selected:focus:inconsistent:insensitive {
-    background-image: url("assets/radio-mixed-disabled-alt.png");
+    -gtk-icon-source: url("assets/radio-mixed-disabled-alt.png");
 }
 
 .radio:inconsistent:backdrop {
-    background-image: url("assets/backdrop-radio-mixed.png");
+    -gtk-icon-source: url("assets/backdrop-radio-mixed.png");
 }
 
 .radio:inconsistent:hover:backdrop {
-    background-image: url("assets/backdrop-radio-mixed-hover.png");
+    -gtk-icon-source: url("assets/backdrop-radio-mixed-hover.png");
 }
 
 .radio row:inconsistent:backdrop,
 .radio row:selected:inconsistent:backdrop {
-    background-image: url("assets/backdrop-radio-mixed-alt.png");
+    -gtk-icon-source: url("assets/backdrop-radio-mixed-alt.png");
 }
 
 .radio row:inconsistent:hover:backdrop,
 .radio row:selected:inconsistent:hover:backdrop {
-    background-image: url("assets/backdrop-radio-mixed-hover-alt.png");
+    -gtk-icon-source: url("assets/backdrop-radio-mixed-hover-alt.png");
 }
 
 .radio:inconsistent:insensitive:backdrop {
-    background-image: url("assets/backdrop-radio-mixed-disabled.png");
+    -gtk-icon-source: url("assets/backdrop-radio-mixed-disabled.png");
 }
 
 .radio row:selected:inconsistent:insensitive:backdrop {
-    background-image: url("assets/backdrop-radio-mixed-disabled-alt.png");
-}
-
-/*.sidebar .radio:active,
-.sidebar .radio:active:focus,
-.sidebar .radio:active:hover {
-    background-image: url("assets/sidebar-radio-selected.svg");
-}
-
-.sidebar .radio:hover {
-    background-image: url("assets/sidebar-radio-prelight.svg");
-}
-
-.sidebar .radio:active:selected,
-.sidebar .radio:active:selected:focus {
-    background-image: url("assets/sidebar-radio-selected.svg");
-}
-
-.sidebar .radio:selected:hover,
-.sidebar .radio:selected:focus {
-    background-image: url("assets/sidebar-radio-selected-prelight.svg");
-}*/
+    -gtk-icon-source: url("assets/backdrop-radio-mixed-disabled-alt.png");
+}
 
 .primary-toolbar .menu .check,
 .menubar.toolbar .menu .check,
 .header-bar .menu .check,
 .menu .check {
-    background-image: url("assets/check-menuitem-unselected.png");
+    -gtk-icon-source: url("assets/check-menuitem-unselected.png");
 }
 
 .primary-toolbar .menu .radio,
 .menubar.toolbar .menu .radio,
 .header-bar .menu .radio,
 .menu .radio {
-    background-image: url("assets/check-menuitem-unselected.png");
-}
-
-.primary-toolbar .menu .check:active,
-.menubar.toolbar .menu .check:active,
-.header-bar .menu .check:active,
-.toolbar .menu .check:active:hover,
-.menu .check:active,
-.menu .check:active:hover {
-    background-image: url("assets/check-menuitem.png");
-}
-
-.primary-toolbar .menu .check:active:insensitive,
-.menubar.toolbar .menu .check:active:insensitive,
-.header-bar .menu .check:active:insensitive,
-.toolbar .menu .check:active:hover:insensitive,
-.menu .check:active:insensitive,
-.menu .check:active:hover:insensitive {
-    background-image: url("assets/check-menuitem-insensitive.png");
-}
-
-.primary-toolbar .menu .radio:active,
-.menubar.toolbar .menu .radio:active,
-.header-bar .menu .radio:active,
-.toolbar .menu .radio:active:hover,
-.menu .radio:active,
-.menu .radio:active:hover {
-    background-image: url("assets/radio-menuitem.png");
-}
-
-.primary-toolbar .menu .radio:active:insensitive,
-.menubar.toolbar .menu .radio:active:insensitive,
-.header-bar .menu .radio:active:insensitive,
-.toolbar .menu .radio:active:hover:insensitive,
-.menu .radio:active:insensitive,
-.menu .radio:active:hover:insensitive {
-    background-image: url("assets/radio-menuitem-insensitive.png");
+    -gtk-icon-source: url("assets/check-menuitem-unselected.png");
+}
+
+.primary-toolbar .menu .check:checked,
+.menubar.toolbar .menu .check:checked,
+.header-bar .menu .check:checked,
+.toolbar .menu .check:checked:hover,
+.menu .check:checked,
+.menu .check:checked:hover {
+    -gtk-icon-source: url("assets/check-menuitem.png");
+}
+
+.primary-toolbar .menu .check:checked:insensitive,
+.menubar.toolbar .menu .check:checked:insensitive,
+.header-bar .menu .check:checked:insensitive,
+.toolbar .menu .check:checked:hover:insensitive,
+.menu .check:checked:insensitive,
+.menu .check:checked:hover:insensitive {
+    -gtk-icon-source: url("assets/check-menuitem-insensitive.png");
+}
+
+.primary-toolbar .menu .radio:checked,
+.menubar.toolbar .menu .radio:checked,
+.header-bar .menu .radio:checked,
+.toolbar .menu .radio:checked:hover,
+.menu .radio:checked,
+.menu .radio:checked:hover {
+    -gtk-icon-source: url("assets/radio-menuitem.png");
+}
+
+.primary-toolbar .menu .radio:checked:insensitive,
+.menubar.toolbar .menu .radio:checked:insensitive,
+.header-bar .menu .radio:checked:insensitive,
+.toolbar .menu .radio:checked:hover:insensitive,
+.menu .radio:checked:insensitive,
+.menu .radio:checked:hover:insensitive {
+    -gtk-icon-source: url("assets/radio-menuitem-insensitive.png");
 }
 
 .toolbar .menu .check {
-    background-image: url("assets/check-menuitem-unselected.png");
+    -gtk-icon-source: url("assets/check-menuitem-unselected.png");
 }
 
 .toolbar .menu .radio {
-    background-image: url("assets/check-menuitem-unselected.png");
-}
-
-.toolbar .menu .check:active {
-    background-image: url("assets/check-menuitem-dark.png");
-}
-
-.toolbar .menu .check:active:insensitive {
-    background-image: url("assets/check-menuitem-insensitive-dark.png");
-}
-
-.toolbar .menu .radio:active {
-    background-image: url("assets/radio-menuitem-dark.png");
-}
-
-.toolbar .menu .radio:active:insensitive {
-    background-image: url("assets/radio-menuitem-insensitive-dark.png");
+    -gtk-icon-source: url("assets/check-menuitem-unselected.png");
+}
+
+.toolbar .menu .check:checked {
+    -gtk-icon-source: url("assets/check-menuitem-dark.png");
+}
+
+.toolbar .menu .check:checked:insensitive {
+    -gtk-icon-source: url("assets/check-menuitem-insensitive-dark.png");
+}
+
+.toolbar .menu .radio:checked {
+    -gtk-icon-source: url("assets/radio-menuitem-dark.png");
+}
+
+.toolbar .menu .radio:checked:insensitive {
+    -gtk-icon-source: url("assets/radio-menuitem-insensitive-dark.png");
 }
 
 /*********************

=== modified file 'Ambiance/gtk-3.0/gtk-widgets-borders.css'
--- Ambiance/gtk-3.0/gtk-widgets-borders.css	2014-01-02 22:13:06 +0000
+++ Ambiance/gtk-3.0/gtk-widgets-borders.css	2014-12-17 15:31:01 +0000
@@ -1,148 +1,4 @@
 /* Borders */
-
-.frame {
-/*    border-radius: 7px;
-    border-width: 1px;*/
-
-    /*border-image: url("assets/frame.png") 8 10 8 10 / 8px 10px 8px 10px stretch;*/
-}
-
-/* focused element borders */
-.entry:focus,
-GtkComboBox.combobox-entry .entry:focus,
-.button:focus:active,
-.button.default:active,
-GtkSwitch.trough:active {
-}
-
-/**********
- * button *
- **********/
-.button {
-    border-radius: 8px;
-    border-width: 1px;
-    border-style: solid;
-    border-color: transparent;
-}
-
-.button {
-    border-image: url("assets/button.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
-}
-
-.button:backdrop {
-    border-image: url("assets/backdrop-button.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
-}
-
-.button:focus {
-    border-image: url("assets/button-focused.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
-}
-
-.button:hover {
-    border-image: url("assets/button-hover.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
-}
-
-.button:hover:backdrop {
-    border-image: url("assets/backdrop-button-hover.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
-}
-
-.button:hover:focus {
-    border-image: url("assets/button-focused-hover.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
-}
-
-.button:insensitive {
-    border-image: url("assets/button-disabled.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
-}
-
-.button:insensitive:backdrop {
-    border-image: url("assets/backdrop-button-disabled.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
-}
-
-.button:active {
-    border-image: url("assets/button-active.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
-}
-
-.button:active:backdrop {
-    border-image: url("assets/backdrop-button-active.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
-}
-
-.button:active:hover {
-    border-image: url("assets/button-active-hover.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
-}
-
-.button:active:hover:backdrop {
-    border-image: url("assets/backdrop-button-active-hover.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
-}
-
-.button:active:focus {
-    border-image: url("assets/button-active-focused.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
-}
-
-.button:active:hover:focus {
-    border-image: url("assets/button-active-focused-hover.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
-}
-
-.button:active:insensitive {
-    border-image: url("assets/button-active-disabled.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
-}
-
-.button:active:insensitive:backdrop {
-    border-image: url("assets/backdrop-button-active-disabled.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
-}
-
-/* focused button borders */
-
-.button.default {
-    border-image: url("assets/button-default.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
-}
-
-.button.default:hover {
-    border-image: url("assets/button-default-hover.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
-}
-
-.button.default:focus {
-    border-image: url("assets/button-default-focused.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
-}
-
-.button.default:focus:hover {
-    border-image: url("assets/button-default-focused-hover.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
-}
-
-.primary-toolbar .button,
-.menubar.toolbar .button,
-.header-bar .button {
-    border-image: url("assets/button-toolbar.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
-}
-
-.primary-toolbar .button:focused,
-.menubar.toolbar .button:focused,
-.header-bar .button:focused {
-    border-image: url("assets/button-toolbar-focused.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
-}
-
-.primary-toolbar .button:active,
-.menubar.toolbar .button:active,
-.header-bar .button:active {
-    border-image: url("assets/button-toolbar-active.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
-}
-
-.primary-toolbar .button:active:focused,
-.menubar.toolbar .button:active:focused,
-.header-bar .button:active:focused {
-    border-image: url("assets/button-toolbar-active-focused.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
-}
-
-.primary-toolbar .button:backdrop,
-.menubar.toolbar .button:backdrop,
-.header-bar .button:backdrop {
-    border-image: url("assets/backdrop-button-toolbar.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
-}
-
-.primary-toolbar .button:active:backdrop,
-.menubar.toolbar .button:active:backdrop,
-.header-bar .button:active:backdrop {
-    border-image: url("assets/backdrop-button-toolbar-active.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
-}
-
 .menubar.menuitem:hover,
 .menubar .menuitem:hover {
     border: 1px solid #2e2e2c;

=== modified file 'Ambiance/gtk-3.0/gtk-widgets.css'
--- Ambiance/gtk-3.0/gtk-widgets.css	2014-10-13 14:58:41 +0000
+++ Ambiance/gtk-3.0/gtk-widgets.css	2014-12-17 15:31:01 +0000
@@ -1,7 +1,3 @@
-/* NOTES to contributors:
- * use 4 spaces intends, and keep code ALIGNED and ORDERED */
-
-/* default */
 * {
     -GtkArrow-arrow-scaling: 0.6;
     -GtkButton-child-displacement-x: 1;
@@ -58,12 +54,9 @@
 
     background-origin: border-box;
     background-clip: padding-box;
-    border-width: 1px;
 
     engine: unico;
 
-    /*-unico-arrow-texture: url("assets/combobox-arrow.png");*/
-
     /* To avoid using custom attributes, unico looks at the outline attributes
      * to find out how to render the focus ring.
      */
@@ -96,13 +89,6 @@
     background-color: @bg_color;
 }
 
-/*********
- * arrow *
- *********/
-/*.arrow * {
-    background-image: url("assets/combobox-arrow.png");
-}*/
-
 /*************
  * assistant *
  *************/
@@ -132,10 +118,7 @@
     -GtkWidget-focus-line-width: 0;
 
     padding: 5px 6px;
-}
 
-GtkSwitch.slider,
-.button {
     background-image: -gtk-gradient (linear, left top, left bottom,
                                      from (shade (@button_bg_color, 1.08)),
                                      color-stop (0.5, @button_bg_color),
@@ -143,27 +126,54 @@
 
     color: @fg_color;
     text-shadow: 0 1px alpha (shade (@button_bg_color, 1.25), 0.4);
-}
-
-GtkSwitch.slider:backdrop,
+
+    border: 1px solid transparent;
+    border-radius: 8px;
+    border-image-source: url("assets/button.png");
+
+    /* all button border images have the same size and are sliced in the same way */
+    border-image-width: 10px 12px 10px 12px;
+    border-image-slice: 10 12 10 12;
+    border-image-repeat: stretch;
+}
+
+.button.flat {
+    background-image: none;
+    border-image-source: none;
+}
+
 .button:backdrop {
     background-image: none;
     background-color: @bg_color;
+    border-image-source: url("assets/backdrop-button.png");
 
     color: @backdrop_fg_color;
     text-shadow: 0 1px alpha (shade (@button_bg_color, 1.25), 0.2);
 }
 
+.button.flat:backdrop {
+    border-image-source: none;
+}
+
+.button:focus {
+    border-image-source: url("assets/button-focused.png");
+}
+
 .button:hover {
     background-image: -gtk-gradient (linear, left top, left bottom,
                                      from (shade (@button_bg_color, 1.12)),
                                      color-stop (0.5, @button_bg_color),
                                      to (shade (@button_bg_color, 0.96)));
+    border-image-source: url("assets/button-hover.png");
 }
 
 .button:hover:backdrop {
-    background-image: none;
     background-color: shade (@bg_color, 1.04);
+    border-image-source: url("assets/backdrop-button-hover.png");
+}
+
+.button:hover:focus {
+    border-image-source: url("assets/button-focused-hover.png");
 }
 
 .button:insensitive {
@@ -171,311 +181,137 @@
     background-color: mix (#ebebeb, @bg_color, 0.5);
 
     text-shadow: 0 1px alpha (shade (@button_bg_color, 1.25), 0.4);
+    border-image-source: url("assets/button-disabled.png");
 }
 
 .button:insensitive:backdrop {
-    background-image: none;
     background-color: #ebebeb;
 
     text-shadow: 0 1px alpha (shade (@button_bg_color, 1.25), 0.2);
+    border-image-source: url("assets/backdrop-button-disabled.png");
+}
+
+.button.flat:insensitive,
+.button.flat:insensitive:backdrop {
+    background-color: transparent;
+    border-image-source: none;
+}
+
+.button:checked {
+    background-image: -gtk-gradient (linear, left top, left bottom,
+                                     from (#cecece),
+                                     to (#e8e8e8));
+    border-image-source: url("assets/button-active.png");
+}
+
+.button:checked:focus {
+    border-image-source: url("assets/button-active-focused.png");
 }
 
 .button:active {
     background-image: -gtk-gradient (linear, left top, left bottom,
-                                     from (#cecece),
-                                     to (#e8e8e8));
-}
-
-.button:active:hover {
-    background-image: -gtk-gradient (linear, left top, left bottom,
                                      from (#dcdcdc),
                                      to (#f3f3f3));
+    border-image-source: url("assets/button-active-hover.png");
+}
+
+.button:active:focus {
+    border-image-source: url("assets/button-active-focused-hover.png");
 }
 
 .button:active:insensitive {
     background-image: -gtk-gradient (linear, left top, left bottom,
                                      from (#e3e3e3),
                                      to (#f3f3f3));
-}
-
-.button:active:insensitive:backdrop {
+    border-image-source: url("assets/button-active-disabled.png");
+}
+
+.button:checked:backdrop {
+    border-image-source: url("assets/backdrop-button-active.png");
+}
+
+.button:active:backdrop {
+    border-image-source: url("assets/backdrop-button-active-hover.png");
+}
+
+.button:checked:insensitive:backdrop {
     background-image: -gtk-gradient (linear, left top, left bottom,
                                      from (mix (#e3e3e3, @bg_color, 0.5)),
                                      to (mix (#f3f3f3, @bg_color, 0.5)));
+    border-image-source: url("assets/backdrop-button-active-disabled.png");
 }
 
-/* default button */
-
-/*
 .button.default {
-    background-image: -gtk-gradient (linear, left top, left bottom,
-                                     from (mix (shade (@selected_bg_color, 1.16), @bg_color, 0.3)),
-                                     to (mix (shade (@selected_bg_color, 0.84), @bg_color, 0.3)));
-
-    text-shadow: 0 1px alpha (shade (@selected_bg_color, 1.26), 0.4);
+    border-image-source: url("assets/button-default.png");
 }
 
 .button.default:hover {
-    background-image: -gtk-gradient (linear, left top, left bottom,
-                                     from (mix (shade (@selected_bg_color, 1.21), @bg_color, 0.3)),
-                                     to (mix (shade (@selected_bg_color, 0.89), @bg_color, 0.3)));
-}
-
-.button.default:active {
-    background-image: -gtk-gradient (linear, left top, left bottom,
-                                     from (mix (shade (@selected_bg_color, 0.95), @bg_color, 0.3)),
-                                     to (mix (shade (@selected_bg_color, 1.05), @bg_color, 0.3)));
-}
-
-.button.default:active:hover {
-    background-image: -gtk-gradient (linear, left top, left bottom,
-                                     from (mix (shade (@selected_bg_color, 1.0), @bg_color, 0.3)),
-                                     to (mix (shade (@selected_bg_color, 1.1), @bg_color, 0.3)));
-}
-*/
-
-/* Set up shadows and hilights for button visual separation */
-.linked .button,
-.toolbar .button.raised.linked,
-.toolbar .raised.linked .button,
-.inline-toolbar.toolbar .button,
-.inline-toolbar.toolbar GtkToolButton .button {
-    box-shadow: inset -1px 0 shade (@bg_color, 0.84);
-}
-
-.linked .button:first-child,
-.toolbar .button.raised.linked:first-child,
-.toolbar .raised.linked .button:first-child,
-.inline-toolbar.toolbar .button:first-child,
-.inline-toolbar.toolbar GtkToolButton:first-child .button {
-    box-shadow: inset -1px 0 shade (@bg_color, 0.84);
-}
-
-.linked .button:last-child,
-.toolbar .button.raised.linked:last-child,
-.toolbar .raised.linked .button:last-child,
-.inline-toolbar.toolbar .button:last-child,
-.inline-toolbar.toolbar GtkToolButton:last-child .button {
-    /*box-shadow: inset 1px 0 shade (@bg_color, 1.06);*/
-}
-
-.linked .button:active,
-.toolbar .button.raised.linked:active,
-.toolbar .raised.linked .button:active,
-.inline-toolbar.toolbar .button:active,
-.inline-toolbar.toolbar GtkToolButton .button:active {
-    /*box-shadow: inset 1px 0 shade (@bg_color, 0.76);*/
-}
-
-.linked .button:insensitive,
-.toolbar .button.raised.linked:insensitive,
-.toolbar .raised.linked .button:insensitive,
-.inline-toolbar.toolbar .button:insensitive,
-.inline-toolbar.toolbar GtkToolButton .button:insensitive {
-    box-shadow: inset -1px 0 shade (@bg_color, 0.84);
-}
-
-.linked .button:backdrop,
-.toolbar .button.raised.linked:backdrop,
-.toolbar .raised.linked .button:backdrop,
-.inline-toolbar.toolbar .button:backdrop,
-.inline-toolbar.toolbar GtkToolButton .button:backdrop {
-    /*box-shadow: inset -1px 0 @unfocused_borders;*/
-}
-
-.linked .button:insensitive:backdrop,
-.toolbar .button.raised.linked:insensitive:backdrop,
-.toolbar .raised.linked .button:insensitive:backdrop,
-.inline-toolbar.toolbar .button:insensitive:backdrop,
-.inline-toolbar.toolbar GtkToolButton .button:insensitive:backdrop {
-    /*box-shadow: inset -1px 0 @unfocused_insensitive_borders;*/
-}
-
-
-/* Middle button */
+    border-image-source: url("assets/button-default-hover.png");
+}
+
+.button.default:focus {
+    border-image-source: url("assets/button-default-focused.png");
+}
+
+.button.default:focus:hover {
+    border-image-source: url("assets/button-default-focused-hover.png");
+}
+
+/******************
+ * Linked Widgets *
+ *****************/
 .linked .entry,
-.linked .entry:active,
-.linked .entry:focus,
-.linked .entry:focus:active,
-.linked .button,
-.linked .button:active,
-.linked .button:active:hover,
-.linked .button:focus,
-.linked .button:focus:active,
-.linked .button:insensitive,
-.linked .button:backdrop,
-.linked .button:active:backdrop {
-    border-right-width: 0;
-    border-left-width: 0;
+.linked .button {
+    border-radius: 0;
     border-image-width: 10px 0 10px 0;
-    border-radius: 0;
+    border-width: 1px 0 1px 0;
+    box-shadow: inset -1px 0 shade (@bg_color, 0.84);
 }
 
-/* Leftmost button */
 .linked .entry:first-child,
-.linked .entry:active:first-child,
-.linked .entry:focus:first-child,
-.linked .entry:focus:active:first-child,
-.linked .button:first-child,
-.linked .button:active:first-child,
-.linked .button:active:hover:first-child,
-.linked .button:focus:first-child,
-.linked .button:focus:active:first-child,
-.linked .button:insensitive:first-child,
-.linked .button:backdrop:first-child,
-.linked .button:active:backdrop:first-child {
-    border-width: 1px;
-    border-right-width: 0;
+.linked .button:first-child {
     border-image-width: 10px 0 10px 12px;
-    border-radius: 8px;
-    border-bottom-right-radius: 0;
-    border-top-right-radius: 0;
+    border-radius: 8px 0 0 8px;
 }
 
-/* Rightmost button */
 .linked .entry:last-child,
-.linked .entry:active:last-child,
-.linked .entry:focus:last-child,
-.linked .entry:focus:active:last-child,
-.linked .button:last-child,
-.linked .button:active:last-child,
-.linked .button:active:hover:last-child,
-.linked .button:focus:last-child,
-.linked .button:focus:active:last-child,
-.linked .button:insensitive:last-child,
-.linked .button:backdrop:last-child,
-.linked .button:active:backdrop:last-child {
-    border-width: 1px;
-    border-left-width: 0;
+.linked .button:last-child {
     border-image-width: 10px 12px 10px 0;
-    border-radius: 8px;
-    border-bottom-left-radius: 0;
-    border-top-left-radius: 0;
+    border-radius: 0 8px 8px 0;
+    box-shadow: none;
 }
 
-/* Linked single button */
 .linked .entry:only-child,
-.linked .entry:active:only-child,
-.linked .entry:focus:only-child,
-.linked .entry:focus:active:only-child,
-.linked .button:only-child,
-.linked .button:active:only-child,
-.linked .button:active:hover:only-child,
-.linked .button:focus:only-child,
-.linked .button:focus:active:only-child,
-.linked .button:insensitive:only-child,
-.linked .button:backdrop:only-child,
-.linked .button:active:backdrop:only-child {
-    border-right-width: 1px;
-    border-left-width: 1px;
+.linked .button:only-child {
     border-image-width: 10px 12px 10px 12px;
     border-radius: 8px;
 }
 
-/* Set up shadows and hilights for button visual separation */
 .primary-toolbar .linked .button,
-.primary-toolbar .button.raised.linked,
-.primary-toolbar .raised.linked .button,
-.menubar.toolbar .linked .button,
-.menubar.toolbar .button.raised.linked,
-.menubar.toolbar .raised.linked .button,
-.header-bar .linked .button,
-.header-bar .button.raised.linked,
-.header-bar .raised.linked .button {
+.header-bar .linked .button {
     box-shadow: inset 1px 0 shade (@dark_bg_color, 1.4),
                 inset -1px 0 shade (@dark_bg_color, 0.9);
 }
 
 .primary-toolbar .linked .button:first-child,
-.primary-toolbar .button.raised.linked:first-child,
-.primary-toolbar .raised.linked .button:first-child,
-.menubar.toolbar .linked .button:first-child,
-.menubar.toolbar .button.raised.linked:first-child,
-.menubar.toolbar .raised.linked .button:first-child,
-.header-bar .linked .button:first-child,
-.header-bar .button.raised.linked:first-child,
-.header-bar .raised.linked .button:first-child {
+.header-bar .linked .button:first-child {
     box-shadow: inset -1px 0 shade (@dark_bg_color, 0.9);
 }
 
 .primary-toolbar .linked .button:last-child,
-.primary-toolbar .button.raised.linked:last-child,
-.primary-toolbar .raised.linked .button:last-child,
-.menubar.toolbar .linked .button:last-child,
-.menubar.toolbar .button.raised.linked:last-child,
-.menubar.toolbar .raised.linked .button:last-child,
-.header-bar .linked .button:last-child,s
-.header-bar .button.raised.linked:last-child,
-.header-bar .raised.linked .button:last-child {
+.header-bar .linked .button:last-child {
     box-shadow: inset 1px 0 shade (@dark_bg_color, 1.4)
 }
 
 .primary-toolbar .linked .button:active,
-.primary-toolbar .button.raised.linked:active,
-.primary-toolbar .raised.linked .button:active,
-.menubar.toolbar .linked .button:active,
-.menubar.toolbar .button.raised.linked:active
-.menubar.toolbar .raised.linked .button:active,
 .header-bar .linked .button:active,
-.header-bar .button.raised.linked:active,
-.header-bar .raised.linked .button:active {
-    box-shadow: inset 1px 0 shade (@dark_bg_color, 0.9);
-}
-
 .primary-toolbar .linked .button:insensitive,
-.primary-toolbar .button.raised.linked:insensitive,
-.primary-toolbar .raised.linked .button:insensitive,
-.menubar.toolbar .linked .button:insensitive,
-.menubar.toolbar .button.raised.linked:insensitive,
-.menubar.toolbar .raised.linked .button:insensitive,
-.header-bar .linked .button:insensitive,
-.header-bar .button.raised.linked:insensitive,
-.header-bar .raised.linked .button:insensitive {
-    box-shadow: inset -1px 0 shade (@dark_bg_color, 0.9);
-}
-
-.primary-toolbar .linked .button:backdrop:last-child,
-.primary-toolbar .button.raised.linked:backdrop:last-child,
-.primary-toolbar .raised.linked .button:backdrop:last-child,
-.menubar.toolbar .linked .button:backdrop:last-child,
-.menubar.toolbar .button.raised.linked:backdrop:last-child,
-.menubar.toolbar .raised.linked .button:backdrop:last-child,
-.header-bar .linked .button:backdrop:last-child,
-.header-bar .button.raised.linked:backdrop:last-child,
-.header-bar .raised.linked .button:backdrop:last-child {
-    box-shadow: inset 1px 0 shade (@dark_bg_color, 1.2);
-}
-
-/*.primary-toolbar .linked .button:insensitive:backdrop,
-.primary-toolbar .button.raised.linked:insensitive:backdrop,
-.primary-toolbar .raised.linked .button:insensitive:backdrop,
-.menubar.toolbar .linked .button:insensitive:backdrop,
-.menubar.toolbar .button.raised.linked:insensitive:backdrop,
-.menubar.toolbar .raised.linked .button:insensitive:backdrop,
-.header-bar .linked .button:insensitive:backdrop,
-.header-bar .button.raised.linked:insensitive:backdrop,
-.header-bar .raised.linked .button:insensitive:backdrop {
-    box-shadow: inset -1px 0 @unfocused_insensitive_borders;
-}*/
-
-
-/* Linked single button */
-.primary-toolbar .linked .entry:only-child,
+.header-bar .linked .button:insensitive {
+    box-shadow: none;
+}
+
 .primary-toolbar .linked .button:only-child,
-.primary-toolbar .linked .button:active:only-child,
-.primary-toolbar .linked .button:active:hover:only-child,
-.primary-toolbar .linked .button:insensitive:only-child,
-.menubar.toolbar .linked .entry:only-child,
-.menubar.toolbar .linked .button:only-child,
-.menubar.toolbar .linked .button:active:only-child,
-.menubar.toolbar .linked .button:active:hover:only-child,
-.menubar.toolbar .linked .button:insensitive:only-child,
-.header-bar .linked .entry:only-child,
-.header-bar .linked .button:only-child,
-.header-bar .linked .button:active:only-child,
-.header-bar .linked .button:active:hover:only-child,
-.header-bar .linked .button:insensitive:only-child {
-    border-radius: 8px;
+.header-bar .linked .button:only-child {
     box-shadow: none;
 }
 
@@ -498,8 +334,6 @@
     border-top-color: shade (@selected_bg_color, 0.88);
     border-style: solid;
     border-width: 1px 0 0 0;
-
-    /*text-shadow: 0 -1px shade (@selected_bg_color, 0.7);*/
 }
 
 row:selected:backdrop {
@@ -507,8 +341,6 @@
                                      from (shade (@backdrop_selected_bg_color, 1.06)),
                                      to (shade (@backdrop_selected_bg_color, 0.94)));
     border-top-color: shade (@backdrop_selected_bg_color, 0.9);
-
-    /*text-shadow: 0 -1px shade (@selected_bg_color, 0.7);*/
 }
 
 /*******************
@@ -627,17 +459,15 @@
 }
 
 GtkIconView.content-view.check {
-    /*background-image: url("assets/grid-selection-unchecked.svg");*/
     background-color: transparent;
 }
 
-GtkIconView.content-view.check:active {
-    /*background-image: url("assets/grid-selection-checked.svg");*/
+GtkIconView.content-view.check:checked {
     background-color: transparent;
 }
 
 .content-view.view.check,
-.content-view.view.check:active {
+.content-view.view.check:checked {
     background-color: transparent;
 }
 
@@ -648,22 +478,9 @@
     background-color: transparent;
 }
 
-/****************
- * drawing area *
- ****************/
-/* comment this out to fix applications like shotwell (LP: #931630)
-GtkDrawingArea {
-    background-color: transparent;
-}
-*/
-
 /*********
  * entry *
  *********/
-GtkComboBox.combobox-entry .button,
-.primary-toolbar GtkComboBox.combobox-entry .button,
-.menubar.toolbar GtkComboBox.combobox-entry .button,
-.header-bar GtkComboBox.combobox-entry .button,
 .entry {
     -GtkWidget-focus-line-width: 0;
 
@@ -675,10 +492,6 @@
     color: @text_color;
 }
 
-GtkComboBox.combobox-entry .button:backdrop,
-.primary-toolbar GtkComboBox.combobox-entry .button:backdrop,
-.menubar.toolbar GtkComboBox.combobox-entry .button:backdrop,
-.header-bar GtkComboBox.combobox-entry .button:backdrop,
 .entry:backdrop {
     background-image: -gtk-gradient (linear, left top, left bottom,
                                      from (mix (shade (@base_color, 0.96), @bg_color, 0.5)),
@@ -691,10 +504,6 @@
     background-color: @selected_bg_color;
 }
 
-GtkComboBox.combobox-entry .button:insensitive,
-.primary-toolbar GtkComboBox.combobox-entry .button:insensitive,
-.menubar.toolbar GtkComboBox.combobox-entry .button:insensitive,
-.header-bar GtkComboBox.combobox-entry .button:insensitive,
 .entry:insensitive {
     background-color: #f5f5f5;
     background-image: none;
@@ -707,10 +516,6 @@
     background-image: none;
 }
 
-GtkComboBox.combobox-entry .button:insensitive:backdrop,
-.primary-toolbar GtkComboBox.combobox-entry .button:insensitive:backdrop,
-.menubar.toolbar GtkComboBox.combobox-entry .button:insensitive:backdrop,
-.header-bar GtkComboBox.combobox-entry .button:insensitive:backdrop,
 .entry:insensitive:backdrop {
     background-color: mix (#f5f5f5, @bg_color, 0.5);
 
@@ -719,8 +524,6 @@
 
 .primary-toolbar .entry.progressbar,
 .primary-toolbar .entry.progressbar,
-.menubar.toolbar .entry.progressbar,
-.menubar.toolbar .entry.progressbar,
 .header-bar .entry.progressbar,
 .header-bar .entry.progressbar,
 .entry.progressbar {
@@ -752,6 +555,10 @@
     background: none;
 }
 
+.frame.flat {
+    border: none;
+}
+
 /************
  * iconview *
  ************/
@@ -777,6 +584,10 @@
                 inset 0 -1px shade (@selected_bg_color, 1.0);
 }
 
+GtkIconView.cell {
+    background-color: transparent;
+}
+
 .rubberband {
     background-color: alpha (@selected_bg_color, 0.35);
     border-color: @selected_bg_color;
@@ -889,12 +700,9 @@
  * menu *
  ********/
 GtkTreeMenu.menu,
-.toolbar .primary-toolbar .menu,
-.toolbar .menubar.toolbar .menu,
 .toolbar .header-bar .menu,
 GtkMenuToolButton.menu,
 .primary-toolbar .button .menu,
-.menubar.toolbar .button .menu,
 .header-bar .button .menu,
 .menu {
     background-image: none;
@@ -940,25 +748,10 @@
 }
 
 .menu.button:hover,
-.menu.button:active,
-.menu.button:active:insensitive,
+.menu.button:checked,
+.menu.button:checked:insensitive,
 .menu.button:insensitive,
 .menu.button
-/*.primary-toolbar .menu.button:hover,
-.primary-toolbar .menu.button:active,
-.primary-toolbar .menu.button:active:insensitive,
-.primary-toolbar .menu.button:insensitive,
-.primary-toolbar .menu.button,
-.menubar.toolbar .menu.button:hover,
-.menubar.toolbar .menu.button:active,
-.menubar.toolbar .menu.button:active:insensitive,
-.menubar.toolbar .menu.button:insensitive,
-.menubar.toolbar .menu.button,
-.header-bar .menu.button:hover,
-.header-bar .menu.button:active,
-.header-bar .menu.button:active:insensitive,
-.header-bar .menu.button:insensitive,
-.header-bar .menu.button */
 {
     background-color: shade (@dark_bg_color, 1.08);
     background-image: none;
@@ -1010,10 +803,6 @@
 /************
  * menuitem *
  ************/
-/*.menuitem {
-    color: @fg_color;
-}*/
-
 .menuitem {
     -GtkMenuItem-horizontal-padding: 0;
     background: transparent;
@@ -1023,10 +812,6 @@
     text-shadow: none;
 }
 
-.menuitem {
-    /*color: @dark_fg_color;*/
-}
-
 /* Workaround for lp:949368 */
 GtkComboBox .menuitem * {
     color: @fg_color;
@@ -1036,7 +821,7 @@
     color: @selected_fg_color;
 }
 
-.popover .menuitem:active:hover,
+.popover .menuitem:checked:hover,
 .menuitem:hover,
 .menu .menuitem:hover {
     border-radius: 0;
@@ -1056,8 +841,8 @@
     text-shadow: 0 -1px shade (@selected_bg_color, 0.7);
 }
 
-.menuitem.check:active,
-.menuitem.radio:active {
+.menuitem.check:checked,
+.menuitem.radio:checked {
     color: @fg_color;
 }
 
@@ -1066,26 +851,14 @@
     box-shadow: none;
 }
 
-/*.menuitem:insensitive,
-.menuitem *:insensitive {
-    color: mix (@fg_color, @bg_color, 0.5);
-    text-shadow: 0 1px shade (@bg_color, 1.14);
-}
-*/
 GtkTreeMenu.menu .menuitem:insensitive,
 GtkTreeMenu.menu .menuitem *:insensitive,
-.toolbar .primary-toolbar .menu .menuitem:insensitive,
-.toolbar .primary-toolbar .menu .menuitem *:insensitive,
-.toolbar .menubar.toolbar .menu .menuitem:insensitive,
-.toolbar .menubar.toolbar .menu .menuitem *:insensitive,
 .toolbar .header-bar .menu .menuitem:insensitive,
 .toolbar .header-bar .menu .menuitem *:insensitive,
 GtkMenuToolButton.menu .menuitem:insensitive,
 GtkMenuToolButton.menu .menuitem *:insensitive,
 .primary-toolbar .button .menu .menuitem:insensitive,
 .primary-toolbar .button .menu .menuitem *:insensitive,
-.menubar.toolbar .button .menu .menuitem:insensitive,
-.menubar.toolbar .button .menu .menuitem *:insensitive,
 .header-bar .button .menu .menuitem:insensitive,
 .header-bar .button .menu .menuitem *:insensitive,
 .menuitem:insensitive,
@@ -1139,8 +912,6 @@
 
 .primary-toolbar GtkScale.trough,
 .primary-toolbar GtkScale.trough:backdrop,
-.menubar.toolbar GtkScale.trough,
-.menubar.toolbar GtkScale.trough:backdrop,
 .header-bar GtkScale.trough,
 .header-bar GtkScale.trough:backdrop,
 .menuitem GtkScale.trough {
@@ -1369,28 +1140,6 @@
     margin: 1px 0;
 }
 
-/* discrete indicator border rounding,
-   uncomment when :nth-child will be working
-   on the widget
-
-.level-bar.indicator-discrete.fill-block.horizontal:first-child {
-    border-radius: 2px 0 0 2px;
-}
-
-.level-bar.indicator-discrete.fill-block.horizontal:last-child {
-    border-radius: 0 2px 2px 0;
-}
-
-.level-bar.indicator-discrete.fill-block.vertical:first-child {
-    border-radius: 2px 2px 0 0;
-}
-
-.level-bar.indicator-discrete.fill-block.vertical:last-child {
-    border-radius: 0 0 2px 2px;
-}
-
-*/
-
 .level-bar.fill-block.level-high {
     border-color: shade(@success_color, 0.85);
     background-image: linear-gradient(to bottom,
@@ -1453,7 +1202,6 @@
 .scale.trough.highlight:backdrop {
     background-color: #dcdcdc;
     background-image: none;
-    /*background-clip: padding-box;*/
 }
 
 
@@ -1607,12 +1355,9 @@
 }
 
 GtkTreeMenu .menuitem.separator,
-.toolbar .primary-toolbar .menuitem.separator,
-.toolbar .menubar.toolbar .menuitem.separator,
 .toolbar .header-bar .menuitem.separator,
 GtkMenuToolButton .menuitem.separator,
 .primary-toolbar .button .menuitem.separator,
-.menubar.toolbar .button .menuitem.separator,
 .header-bar .button .menuitem.separator,
 .menuitem.separator {
     border-color: shade (@dark_bg_color, 0.99);
@@ -1792,8 +1537,6 @@
 .menu .spinner:hover,
 .primary-toolbar .spinner,
 .primary-toolbar .spinner,
-.menubar.toolbar .spinner,
-.menubar.toolbar .spinner,
 .header-bar .spinner,
 .header-bar .spinner {
     color: @selected_bg_color;
@@ -1853,6 +1596,22 @@
     padding: 1px;
     border-radius: 6px;
     border-style: solid;
+
+    background-image: -gtk-gradient (linear, left top, left bottom,
+                                     from (shade (@button_bg_color, 1.08)),
+                                     color-stop (0.5, @button_bg_color),
+                                     to (shade (@button_bg_color, 0.94)));
+
+    color: @fg_color;
+    text-shadow: 0 1px alpha (shade (@button_bg_color, 1.25), 0.4);
+}
+
+GtkSwitch.slider:backdrop {
+    background-image: none;
+    background-color: @bg_color;
+
+    color: @backdrop_fg_color;
+    text-shadow: 0 1px alpha (shade (@button_bg_color, 1.25), 0.2);
 }
 
 /************
@@ -1933,16 +1692,10 @@
     color: @backdrop_fg_color;
 }
 
-.toolbar .button {
-    /*padding: 1px;*/
-    /*padding: 6px 8px;*/
-}
-
-/* primary-toolbar */
+/*******************
+ * primary-toolbar *
+ *******************/
 .primary-toolbar,
-.primary-toolbar .toolbar,
-.primary-toolbar.toolbar,
-.menubar.toolbar,
 .header-bar {
     -GtkWidget-window-dragging: true;
 
@@ -1961,10 +1714,7 @@
     box-shadow: inset 0 1px shade (@dark_bg_color, 0.94);
 }
 
-.primary-toolbar .toolbar:backdrop,
-.primary-toolbar.toolbar:backdrop,
-.menubar.toolbar .toolbar:backdrop,
-.menubar.toolbar.toolbar:backdrop,
+.primary-toolbar:backdrop,
 .header-bar:backdrop {
     background-image: none;
     background-color: @dark_bg_color;
@@ -1976,97 +1726,99 @@
 }
 
 .primary-toolbar :insensitive,
-.menubar.toolbar .toolbar :insensitive,
 .header-bar :insensitive {
     text-shadow: 0 -1px shade (@dark_bg_color, 0.7);
 }
 
-.primary-toolbar GtkComboBox,
 .primary-toolbar .button,
-.menubar.toolbar GtkComboBox,
-.menubar.toolbar .button,
-.header-bar GtkComboBox,
-.header-bar .button {
-    background-color: transparent;
-    background-image: none;
-    border-color: transparent;
-    /*border-radius: 3px;*/
-    /*border-width: 1px;*/
-    /*padding: 3px;*/
-
+.header-bar .button,
+.primary-toolbar .button.flat:hover {
+    background: transparent;
     color: @dark_fg_color;
     text-shadow: 0 -1px shade (@dark_bg_color, 0.7);
-}
-
-.primary-toolbar GtkComboBox:backdrop,
+    border-image-source: url("assets/button-toolbar.png");
+}
+
+.primary-toolbar .button.flat {
+    border-image-source: none;
+    background: transparent;
+}
+
+.primary-toolbar .button:focused,
+.header-bar .button:focused {
+    border-image-source: url("assets/button-toolbar-focused.png");
+}
+
+.primary-toolbar .button:active,
+.primary-toolbar .button:checked,
+.header-bar .button:active,
+.header-bar .button:checked {
+    border-image-source: url("assets/button-toolbar-active.png");
+}
+
+.primary-toolbar .button:active:focused,
+.primary-toolbar .button:checked:focused,
+.header-bar .button:active:focused,
+.header-bar .button:checked:focused {
+    border-image-source: url("assets/button-toolbar-active-focused.png");
+}
+
 .primary-toolbar .button:backdrop,
-.menubar.toolbar GtkComboBox:backdrop,
-.menubar.toolbar .button:backdrop,
-.header-bar GtkComboBox:backdrop,
 .header-bar .button:backdrop {
+    background-color: transparent;
     color: @backdrop_dark_fg_color;
     text-shadow: 0 -1px shade (@dark_bg_color, 0.9);
-}
-
-.primary-toolbar .raised .button,
-.primary-toolbar .raised.button,
+    border-image-source: url("assets/backdrop-button-toolbar.png");
+}
+
+.primary-toolbar .button.flat:backdrop {
+    border-image-source: none;
+}
+
+.primary-toolbar .button:active:backdrop,
+.primary-toolbar .button:checked:backdrop,
+.header-bar .button:active:backdrop,
+.header-bar .button:checked:backdrop {
+    border-image-source: url("assets/backdrop-button-toolbar-active.png");
+}
+
 .primary-toolbar .button:hover,
-.primary-toolbar .button:active,
-.primary-toolbar .button:insensitive,
-.menubar.toolbar .raised .button,
-.menubar.toolbar .raised.button,
-.menubar.toolbar .button:hover,
-.menubar.toolbar .button:active,
-.menubar.toolbar .button:insensitive,
-.header-bar .raised .button,
-.header-bar .raised.button,
+.primary-toolbar .button:checked,
 .header-bar .button:hover,
-.header-bar .button:active,
-.header-bar .button:insensitive {
+.header-bar .button:checked {
     background-image: -gtk-gradient (linear, left top, left bottom,
                                      from (shade (@dark_bg_color, 1.2)),
                                      to (shade (@dark_bg_color, 1.1)));
-    /*border-width: 1px;*/
 }
 
 .primary-toolbar .button:active,
-.menubar.toolbar .button:active,
 .header-bar .button:active {
     background-image: -gtk-gradient (linear, left top, left bottom,
-                                     from (shade (@dark_bg_color, 0.9)),
-                                     to (shade (@dark_bg_color, 0.95)));
-
-    text-shadow: 0 -1px shade (@dark_bg_color, 0.6);
-}
-
-.primary-toolbar .button:active:hover,
-.menubar.toolbar .button:active:hover,
-.header-bar .button:active:hover {
-    background-image: -gtk-gradient (linear, left top, left bottom,
                                      from (shade (@dark_bg_color, 0.95)),
                                      to (shade (@dark_bg_color, 1.0)));
+    text-shadow: 0 -1px shade (@dark_bg_color, 0.6);
 }
 
-.primary-toolbar .button:active:insensitive,
+.primary-toolbar .button:checked:insensitive,
 .primary-toolbar .button:insensitive,
-.menubar.toolbar .button:active:insensitive,
-.menubar.toolbar .button:insensitive,
-.header-bar .button:active:insensitive,
+.header-bar .button:checked:insensitive,
 .header-bar .button:insensitive {
     text-shadow: none;
 }
 
 .primary-toolbar .button:insensitive,
-.menubar.toolbar .button:insensitive,
 .header-bar .button:insensitive {
     background-image: -gtk-gradient (linear, left top, left bottom,
                                      from (shade (@dark_bg_color, 1.01)),
                                      to (shade (@dark_bg_color, 0.99)));
 }
 
-.primary-toolbar .button:active:insensitive,
-.menubar.toolbar .button:active:insensitive,
-.header-bar .button:active:insensitive {
+.primary-toolbar .button.flat:insensitive {
+    background-image: none;
+}
+
+.primary-toolbar .button:checked:insensitive,
+.header-bar .button:checked:insensitive {
     background-image: -gtk-gradient (linear, left top, left bottom,
                                      from (shade (@dark_bg_color, 0.94)),
                                      to (shade (@dark_bg_color, 1.02)));
@@ -2075,9 +1827,6 @@
 .primary-toolbar GtkSeparatorToolItem,
 .primary-toolbar .separator,
 .primary-toolbar .separator:insensitive,
-.menubar.toolbar GtkSeparatorToolItem,
-.menubar.toolbar .separator,
-.menubar.toolbar .separator:insensitive,
 .header-bar GtkSeparatorToolItem,
 .header-bar .separator,
 .header-bar .separator:insensitive {
@@ -2177,7 +1926,6 @@
     border-radius: 8px;
     border-bottom-left-radius: 0;
     border-top-left-radius: 0;
-    /*box-shadow: inset 1px 0 shade (@bg_color, 0.84);*/
 }
 
 /* Single button */
@@ -2199,7 +1947,6 @@
     border-left-width: 1px;
     border-image-width: 10px 12px 10px 12px;
     border-radius: 8px;
-    /*box-shadow: none;*/
 }
 
 /***********
@@ -2234,11 +1981,6 @@
 
 GtkTreeView .entry {
     background-image: none;
-    /*border-radius: 0;*/
-}
-
-.view row:nth-child(even){
-    /*background-color: @base_color;*/
 }
 
 .view row:nth-child(odd) {
@@ -2254,6 +1996,20 @@
 }
 
 /************
+ * listbox  *
+ ************/
+.list-row.button {
+    border-image: none;
+    border-style: none;
+    border-radius: 0;
+    background-image: none;
+}
+
+.list-row.button:selected {
+    text-shadow: none;
+}
+
+/************
  * popover  *
  ************/
 .popover {
@@ -2275,9 +2031,9 @@
  * the button styles for them.
  */
 .popover .menuitem,
-.popover .menuitem:active,
+.popover .menuitem:checked,
 .popover .menuitem:hover,
-.popover .menuitem:hover:active,
+.popover .menuitem:active,
 .popover .menuitem:insensitive,
 .popover .menuitem:backdrop {
     border-image: none;
@@ -2293,11 +2049,11 @@
     color: @fg_color;
 }
 
-.popover .menuitem:active,
+.popover .menuitem:checked,
 .popover .menuitem.check,
-.popover .menuitem.check:active,
+.popover .menuitem.check:checked,
 .popover .menuitem.radio,
-.popover .menuitem.radio:active {
+.popover .menuitem.radio:checked {
     background-image: none;
     border: none;
 }

=== modified file 'Radiance/gtk-3.0/gtk-widgets-assets.css'
--- Radiance/gtk-3.0/gtk-widgets-assets.css	2014-01-10 17:18:52 +0000
+++ Radiance/gtk-3.0/gtk-widgets-assets.css	2014-12-17 15:31:01 +0000
@@ -12,33 +12,28 @@
  *************************/
 
 /* draw regular check and radio items using our SVG assets */
-.radio,
-.check {
-    /*background-clip: border-box;*/
-}
-
-.check {
-    background-image: url("assets/check-unselected.png");
+.check {
+    -gtk-icon-source: url("assets/check-unselected.png");
 }
 
 .check:hover {
-    background-image: url("assets/check-unselected-hover.png");
+    -gtk-icon-source: url("assets/check-unselected-hover.png");
 }
 
 .check row,
 .check row:selected,
 .check row:selected:focus {
-    background-image: url("assets/check-unselected-alt.png");
+    -gtk-icon-source: url("assets/check-unselected-alt.png");
 }
 
 .check row:hover,
 .check row:selected:hover,
 .check row:selected:focus:hover {
-    background-image: url("assets/check-unselected-hover-alt.png");
+    -gtk-icon-source: url("assets/check-unselected-hover-alt.png");
 }
 
 .check:insensitive {
-    background-image: url("assets/check-unselected-disabled.png");
+    -gtk-icon-source: url("assets/check-unselected-disabled.png");
 }
 
 .check row:insensitive {
@@ -49,169 +44,169 @@
 .check row:selected:insensitive,
 .check row:selected:focus:insensitive {
     background-color: transparent;
-    background-image: url("assets/check-unselected-disabled-alt.png");
+    -gtk-icon-source: url("assets/check-unselected-disabled-alt.png");
 }
 
 .check:backdrop {
-    background-image: url("assets/backdrop-check-unselected.png");
+    -gtk-icon-source: url("assets/backdrop-check-unselected.png");
 }
 
 .check:hover:backdrop {
-    background-image: url("assets/backdrop-check-unselected-hover.png");
+    -gtk-icon-source: url("assets/backdrop-check-unselected-hover.png");
 }
 
 .check row:backdrop,
 .check row:selected:backdrop {
-    background-image: url("assets/backdrop-check-unselected-alt.png");
+    -gtk-icon-source: url("assets/backdrop-check-unselected-alt.png");
 }
 
 .check row:hover:backdrop,
 .check row:selected:hover:backdrop {
-    background-image: url("assets/backdrop-check-unselected-hover-alt.png");
+    -gtk-icon-source: url("assets/backdrop-check-unselected-hover-alt.png");
 }
 
 .check:insensitive:backdrop {
-    background-image: url("assets/backdrop-check-unselected-disabled.png");
+    -gtk-icon-source: url("assets/backdrop-check-unselected-disabled.png");
 }
 
 .check row:selected:insensitive:backdrop {
-    background-image: url("assets/backdrop-check-unselected-disabled-alt.png");
-}
-
-.check:active {
-    background-image: url("assets/check-selected.png");
-}
-
-.check:active:hover {
-    background-image: url("assets/check-selected-hover.png");
-}
-
-.check row:active,
-.check row:selected:active,
-.check row:selected:focus:active {
-    background-image: url("assets/check-selected-alt.png");
-}
-
-.check row:active:hover,
-.check row:selected:active:hover,
-.check row:selected:active:focus:hover {
-    background-image: url("assets/check-selected-hover-alt.png");
-}
-
-.check:active:insensitive {
-    background-image: url("assets/check-selected-disabled.png");
-}
-
-.check row:active:insensitive,
-.check row:selected:active:insensitive,
-.check row:selected:focus:active:insensitive {
-    background-image: url("assets/check-selected-disabled-alt.png");
-}
-
-.check:active:backdrop {
-    background-image: url("assets/backdrop-check-selected.png");
-}
-
-.check:active:backdrop {
-    background-image: url("assets/backdrop-check-selected-hover.png");
-}
-
-.check row:active:backdrop,
-.check row:selected:active:backdrop {
-    background-image: url("assets/backdrop-check-selected-alt.png");
-}
-
-.check row:active:hover:backdrop,
-.check row:selected:active:hover:backdrop {
-    background-image: url("assets/backdrop-check-selected-hover-alt.png");
-}
-
-.check:active:insensitive:backdrop {
-    background-image: url("assets/backdrop-check-selected-disabled.png");
-}
-
-.check row:selected:active:insensitive:backdrop {
-    background-image: url("assets/backdrop-check-selected-disabled-alt.png");
+    -gtk-icon-source: url("assets/backdrop-check-unselected-disabled-alt.png");
+}
+
+.check:checked {
+    -gtk-icon-source: url("assets/check-selected.png");
+}
+
+.check:checked:hover {
+    -gtk-icon-source: url("assets/check-selected-hover.png");
+}
+
+.check row:checked,
+.check row:selected:checked,
+.check row:selected:focus:checked {
+    -gtk-icon-source: url("assets/check-selected-alt.png");
+}
+
+.check row:checked:hover,
+.check row:selected:checked:hover,
+.check row:selected:checked:focus:hover {
+    -gtk-icon-source: url("assets/check-selected-hover-alt.png");
+}
+
+.check:checked:insensitive {
+    -gtk-icon-source: url("assets/check-selected-disabled.png");
+}
+
+.check row:checked:insensitive,
+.check row:selected:checked:insensitive,
+.check row:selected:focus:checked:insensitive {
+    -gtk-icon-source: url("assets/check-selected-disabled-alt.png");
+}
+
+.check:checked:backdrop {
+    -gtk-icon-source: url("assets/backdrop-check-selected.png");
+}
+
+.check:checked:backdrop {
+    -gtk-icon-source: url("assets/backdrop-check-selected-hover.png");
+}
+
+.check row:checked:backdrop,
+.check row:selected:checked:backdrop {
+    -gtk-icon-source: url("assets/backdrop-check-selected-alt.png");
+}
+
+.check row:checked:hover:backdrop,
+.check row:selected:checked:hover:backdrop {
+    -gtk-icon-source: url("assets/backdrop-check-selected-hover-alt.png");
+}
+
+.check:checked:insensitive:backdrop {
+    -gtk-icon-source: url("assets/backdrop-check-selected-disabled.png");
+}
+
+.check row:selected:checked:insensitive:backdrop {
+    -gtk-icon-source: url("assets/backdrop-check-selected-disabled-alt.png");
 }
 
 .check:inconsistent {
-    background-image: url("assets/check-mixed.png");
+    -gtk-icon-source: url("assets/check-mixed.png");
 }
 
 .check:inconsistent:hover {
-    background-image: url("assets/check-mixed-hover.png");
+    -gtk-icon-source: url("assets/check-mixed-hover.png");
 }
 
 .check row:inconsistent,
 .check row:selected:inconsistent,
 .check row:selected:focus:inconsistent {
-    background-image: url("assets/check-mixed-alt.png");
+    -gtk-icon-source: url("assets/check-mixed-alt.png");
 }
 
 .check row:inconsistent:hover,
 .check row:selected:inconsistent:hover,
 .check row:selected:focus:inconsistent:hover {
-    background-image: url("assets/check-mixed-hover-alt.png");
+    -gtk-icon-source: url("assets/check-mixed-hover-alt.png");
 }
 
 .check:inconsistent:insensitive {
-    background-image: url("assets/check-mixed-disabled.png");
+    -gtk-icon-source: url("assets/check-mixed-disabled.png");
 }
 
 .check row:inconsistent:insensitive,
 .check row:selected:inconsistent:insensitive,
 .check row:selected:focus:inconsistent:insensitive {
-    background-image: url("assets/check-mixed-disabled-alt.png");
+    -gtk-icon-source: url("assets/check-mixed-disabled-alt.png");
 }
 
 .check:inconsistent:backdrop {
-    background-image: url("assets/backdrop-check-mixed.png");
+    -gtk-icon-source: url("assets/backdrop-check-mixed.png");
 }
 
 .check:inconsistent:hover:backdrop {
-    background-image: url("assets/backdrop-check-mixed-hover.png");
+    -gtk-icon-source: url("assets/backdrop-check-mixed-hover.png");
 }
 
 .check row:inconsistent:backdrop,
 .check row:selected:inconsistent:backdrop {
-    background-image: url("assets/backdrop-check-mixed-alt.png");
+    -gtk-icon-source: url("assets/backdrop-check-mixed-alt.png");
 }
 
 .check row:inconsistent:hover:backdrop,
 .check row:selected:inconsistent:hover:backdrop {
-    background-image: url("assets/backdrop-check-mixed-hover-alt.png");
+    -gtk-icon-source: url("assets/backdrop-check-mixed-hover-alt.png");
 }
 
 .check:inconsistent:insensitive:backdrop {
-    background-image: url("assets/backdrop-check-mixed-disabled.png");
+    -gtk-icon-source: url("assets/backdrop-check-mixed-disabled.png");
 }
 
 .check row:selected:inconsistent:insensitive:backdrop {
-    background-image: url("assets/backdrop-check-mixed-disabled-alt.png");
+    -gtk-icon-source: url("assets/backdrop-check-mixed-disabled-alt.png");
 }
 
 .radio {
-    background-image: url("assets/radio-unselected.png");
+    -gtk-icon-source: url("assets/radio-unselected.png");
 }
 
 .radio:hover {
-    background-image: url("assets/radio-unselected-hover.png");
+    -gtk-icon-source: url("assets/radio-unselected-hover.png");
 }
 
 .radio row,
 .radio row:selected,
 .radio row:selected:focus {
-    background-image: url("assets/radio-unselected-alt.png");
+    -gtk-icon-source: url("assets/radio-unselected-alt.png");
 }
 
 .radio row:hover,
 .radio row:selected:hover,
 .radio row:selected:focus:hover {
-    background-image: url("assets/radio-unselected-hover-alt.png");
+    -gtk-icon-source: url("assets/radio-unselected-hover-alt.png");
 }
 
 .radio:insensitive {
-    background-image: url("assets/radio-unselected-disabled.png");
+    -gtk-icon-source: url("assets/radio-unselected-disabled.png");
 }
 
 .radio row:insensitive {
@@ -221,238 +216,218 @@
 .radio row:insensitive,
 .radio row:selected:insensitive,
 .radio row:selected:focus:insensitive {
-    background-image: url("assets/radio-unselected-disabled-alt.png");
+    -gtk-icon-source: url("assets/radio-unselected-disabled-alt.png");
 }
 
 .radio:backdrop {
-    background-image: url("assets/backdrop-radio-unselected.png");
+    -gtk-icon-source: url("assets/backdrop-radio-unselected.png");
 }
 
 .radio:hover:backdrop {
-    background-image: url("assets/backdrop-radio-unselected-hover.png");
+    -gtk-icon-source: url("assets/backdrop-radio-unselected-hover.png");
 }
 
 .radio row:backdrop,
 .radio row:selected:backdrop {
-    background-image: url("assets/backdrop-radio-unselected-alt.png");
+    -gtk-icon-source: url("assets/backdrop-radio-unselected-alt.png");
 }
 
 .radio row:hover:backdrop,
 .radio row:selected:hover:backdrop {
-    background-image: url("assets/backdrop-radio-unselected-hover-alt.png");
+    -gtk-icon-source: url("assets/backdrop-radio-unselected-hover-alt.png");
 }
 
 .radio:insensitive:backdrop {
-    background-image: url("assets/backdrop-radio-unselected-disabled.png");
+    -gtk-icon-source: url("assets/backdrop-radio-unselected-disabled.png");
 }
 
 .radio row:selected:insensitive:backdrop {
-    background-image: url("assets/backdrop-radio-unselected-disabled-alt.png");
-}
-
-.radio:active {
-    background-image: url("assets/radio-selected.png");
-}
-
-.radio:active:hover {
-    background-image: url("assets/radio-selected-hover.png");
-}
-
-.radio row:active,
-.radio row:selected:active,
-.radio row:selected:focus:active {
-    background-image: url("assets/radio-selected-alt.png");
-}
-
-.radio row:active:hover,
-.radio row:selected:active:hover,
-.radio row:selected:focus:active:hover {
-    background-image: url("assets/radio-selected-hover-alt.png");
-}
-
-.radio:active:insensitive {
-    background-image: url("assets/radio-selected-disabled.png");
+    -gtk-icon-source: url("assets/backdrop-radio-unselected-disabled-alt.png");
+}
+
+.radio:checked {
+    -gtk-icon-source: url("assets/radio-selected.png");
+}
+
+.radio:checked:hover {
+    -gtk-icon-source: url("assets/radio-selected-hover.png");
+}
+
+.radio row:checked,
+.radio row:selected:checked,
+.radio row:selected:focus:checked {
+    -gtk-icon-source: url("assets/radio-selected-alt.png");
+}
+
+.radio row:checked:hover,
+.radio row:selected:checked:hover,
+.radio row:selected:focus:checked:hover {
+    -gtk-icon-source: url("assets/radio-selected-hover-alt.png");
+}
+
+.radio:checked:insensitive {
+    -gtk-icon-source: url("assets/radio-selected-disabled.png");
 }
 
 .radio row:insensitive,
-.radio row:selected:active:insensitive,
-.radio row:selected:focus:active:insensitive {
-    background-image: url("assets/radio-selected-disabled-alt.png");
-}
-
-.radio:active:backdrop {
-    background-image: url("assets/backdrop-radio-selected.png");
-}
-
-.radio:active:hover:backdrop {
-    background-image: url("assets/backdrop-radio-selected-hover.png");
-}
-
-.radio row:active:backdrop,
-.radio row:selected:active:backdrop {
-    background-image: url("assets/backdrop-radio-selected-alt.png");
-}
-
-.radio row:active:hover:backdrop,
-.radio row:selected:active:hover:backdrop {
-    background-image: url("assets/backdrop-radio-selected-hover-alt.png");
-}
-
-.radio:active:insensitive:backdrop {
-    background-image: url("assets/backdrop-radio-selected-disabled.png");
-}
-
-.radio row:selected:active:insensitive:backdrop {
-    background-image: url("assets/backdrop-radio-selected-disabled-alt.png");
+.radio row:selected:checked:insensitive,
+.radio row:selected:focus:checked:insensitive {
+    -gtk-icon-source: url("assets/radio-selected-disabled-alt.png");
+}
+
+.radio:checked:backdrop {
+    -gtk-icon-source: url("assets/backdrop-radio-selected.png");
+}
+
+.radio:checked:hover:backdrop {
+    -gtk-icon-source: url("assets/backdrop-radio-selected-hover.png");
+}
+
+.radio row:checked:backdrop,
+.radio row:selected:checked:backdrop {
+    -gtk-icon-source: url("assets/backdrop-radio-selected-alt.png");
+}
+
+.radio row:checked:hover:backdrop,
+.radio row:selected:checked:hover:backdrop {
+    -gtk-icon-source: url("assets/backdrop-radio-selected-hover-alt.png");
+}
+
+.radio:checked:insensitive:backdrop {
+    -gtk-icon-source: url("assets/backdrop-radio-selected-disabled.png");
+}
+
+.radio row:selected:checked:insensitive:backdrop {
+    -gtk-icon-source: url("assets/backdrop-radio-selected-disabled-alt.png");
 }
 
 .radio:inconsistent {
-    background-image: url("assets/radio-mixed.png");
+    -gtk-icon-source: url("assets/radio-mixed.png");
 }
 
 .radio:inconsistent:hover {
-    background-image: url("assets/radio-mixed-hover.png");
+    -gtk-icon-source: url("assets/radio-mixed-hover.png");
 }
 
 .radio row:inconsistent,
 .radio row:selected:inconsistent,
 .radio row:selected:focus:inconsistent {
-    background-image: url("assets/radio-mixed-alt.png");
+    -gtk-icon-source: url("assets/radio-mixed-alt.png");
 }
 
 .radio row:inconsistent:hover,
 .radio row:selected:inconsistent:hover,
 .radio row:selected:focus:inconsistent:hover {
-    background-image: url("assets/radio-mixed-hover-alt.png");
+    -gtk-icon-source: url("assets/radio-mixed-hover-alt.png");
 }
 
 .radio:inconsistent:insensitive {
-    background-image: url("assets/radio-mixed-disabled.png");
+    -gtk-icon-source: url("assets/radio-mixed-disabled.png");
 }
 
 .radio row:inconsistent:insensitive,
 .radio row:selected:inconsistent:insensitive,
 .radio row:selected:focus:inconsistent:insensitive {
-    background-image: url("assets/radio-mixed-disabled-alt.png");
+    -gtk-icon-source: url("assets/radio-mixed-disabled-alt.png");
 }
 
 .radio:inconsistent:backdrop {
-    background-image: url("assets/backdrop-radio-mixed.png");
+    -gtk-icon-source: url("assets/backdrop-radio-mixed.png");
 }
 
 .radio:inconsistent:hover:backdrop {
-    background-image: url("assets/backdrop-radio-mixed-hover.png");
+    -gtk-icon-source: url("assets/backdrop-radio-mixed-hover.png");
 }
 
 .radio row:inconsistent:backdrop,
 .radio row:selected:inconsistent:backdrop {
-    background-image: url("assets/backdrop-radio-mixed-alt.png");
+    -gtk-icon-source: url("assets/backdrop-radio-mixed-alt.png");
 }
 
 .radio row:inconsistent:hover:backdrop,
 .radio row:selected:inconsistent:hover:backdrop {
-    background-image: url("assets/backdrop-radio-mixed-hover-alt.png");
+    -gtk-icon-source: url("assets/backdrop-radio-mixed-hover-alt.png");
 }
 
 .radio:inconsistent:insensitive:backdrop {
-    background-image: url("assets/backdrop-radio-mixed-disabled.png");
+    -gtk-icon-source: url("assets/backdrop-radio-mixed-disabled.png");
 }
 
 .radio row:selected:inconsistent:insensitive:backdrop {
-    background-image: url("assets/backdrop-radio-mixed-disabled-alt.png");
-}
-
-/*.sidebar .radio:active,
-.sidebar .radio:active:focus,
-.sidebar .radio:active:hover {
-    background-image: url("assets/sidebar-radio-selected.svg");
-}
-
-.sidebar .radio:hover {
-    background-image: url("assets/sidebar-radio-prelight.svg");
-}
-
-.sidebar .radio:active:selected,
-.sidebar .radio:active:selected:focus {
-    background-image: url("assets/sidebar-radio-selected.svg");
-}
-
-.sidebar .radio:selected:hover,
-.sidebar .radio:selected:focus {
-    background-image: url("assets/sidebar-radio-selected-prelight.svg");
-}*/
+    -gtk-icon-source: url("assets/backdrop-radio-mixed-disabled-alt.png");
+}
 
 .primary-toolbar .menu .check,
 .menubar.toolbar .menu .check,
 .header-bar .menu .check,
 .menu .check {
-    background-image: url("assets/check-menuitem-unselected.png");
+    -gtk-icon-source: url("assets/check-menuitem-unselected.png");
 }
 
 .primary-toolbar .menu .radio,
 .menubar.toolbar .menu .radio,
 .header-bar .menu .radio,
 .menu .radio {
-    background-image: url("assets/check-menuitem-unselected.png");
-}
-
-.primary-toolbar .menu .check:active,
-.menubar.toolbar .menu .check:active,
-.header-bar .menu .check:active,
-.menu .check:active {
-    background-image: url("assets/check-menuitem-dark.png");
-}
-
-.toolbar .menu .check:active:hover,
-.menu .check:active:hover {
-    background-image: url("assets/check-menuitem.png");
-}
-
-.primary-toolbar .menu .check:active:insensitive,
-.menubar.toolbar .menu .check:active:insensitive,
-.header-bar .menu .check:active:insensitive,
-.toolbar .menu .check:active:hover:insensitive,
-.menu .check:active:insensitive,
-.menu .check:active:hover:insensitive {
-    background-image: url("assets/check-menuitem-insensitive.png");
-}
-
-.toolbar .menu .radio:active:hover,
-.menu .radio:active {
-    background-image: url("assets/radio-menuitem.png");
-}
-
-.primary-toolbar .menu .radio:active:insensitive,
-.menubar.toolbar .menu .radio:active:insensitive,
-.header-bar .menu .radio:active:insensitive,
-.toolbar .menu .radio:active:hover:insensitive,
-.menu .radio:active:insensitive,
-.menu .radio:active:hover:insensitive {
-    background-image: url("assets/radio-menuitem-insensitive.png");
+    -gtk-icon-source: url("assets/check-menuitem-unselected.png");
+}
+
+.primary-toolbar .menu .check:checked,
+.menubar.toolbar .menu .check:checked,
+.header-bar .menu .check:checked,
+.menu .check:checked {
+    -gtk-icon-source: url("assets/check-menuitem-dark.png");
+}
+
+.toolbar .menu .check:checked:hover,
+.menu .check:checked:hover {
+    -gtk-icon-source: url("assets/check-menuitem.png");
+}
+
+.primary-toolbar .menu .check:checked:insensitive,
+.menubar.toolbar .menu .check:checked:insensitive,
+.header-bar .menu .check:checked:insensitive,
+.toolbar .menu .check:checked:hover:insensitive,
+.menu .check:checked:insensitive,
+.menu .check:checked:hover:insensitive {
+    -gtk-icon-source: url("assets/check-menuitem-insensitive.png");
+}
+
+.toolbar .menu .radio:checked:hover,
+.menu .radio:checked {
+    -gtk-icon-source: url("assets/radio-menuitem.png");
+}
+
+.primary-toolbar .menu .radio:checked:insensitive,
+.menubar.toolbar .menu .radio:checked:insensitive,
+.header-bar .menu .radio:checked:insensitive,
+.toolbar .menu .radio:checked:hover:insensitive,
+.menu .radio:checked:insensitive,
+.menu .radio:checked:hover:insensitive {
+    -gtk-icon-source: url("assets/radio-menuitem-insensitive.png");
 }
 
 .toolbar .menu .check {
-    background-image: url("assets/check-menuitem-unselected.png");
+    -gtk-icon-source: url("assets/check-menuitem-unselected.png");
 }
 
 .toolbar .menu .radio {
-    background-image: url("assets/check-menuitem-unselected.png");
-}
-
-.toolbar .menu .check:active {
-    background-image: url("assets/check-menuitem-dark.png");
-}
-
-.toolbar .menu .check:active:insensitive {
-    background-image: url("assets/check-menuitem-insensitive-dark.png");
-}
-
-.toolbar .menu .radio:active {
-    background-image: url("assets/radio-menuitem-dark.png");
-}
-
-.toolbar .menu .radio:active:insensitive {
-    background-image: url("assets/radio-menuitem-insensitive-dark.png");
+    -gtk-icon-source: url("assets/check-menuitem-unselected.png");
+}
+
+.toolbar .menu .check:checked {
+    -gtk-icon-source: url("assets/check-menuitem-dark.png");
+}
+
+.toolbar .menu .check:checked:insensitive {
+    -gtk-icon-source: url("assets/check-menuitem-insensitive-dark.png");
+}
+
+.toolbar .menu .radio:checked {
+    -gtk-icon-source: url("assets/radio-menuitem-dark.png");
+}
+
+.toolbar .menu .radio:checked:insensitive {
+    -gtk-icon-source: url("assets/radio-menuitem-insensitive-dark.png");
 }
 
 /*********************

=== modified file 'Radiance/gtk-3.0/gtk-widgets-borders-radiance.css'
--- Radiance/gtk-3.0/gtk-widgets-borders-radiance.css	2014-01-20 19:19:40 +0000
+++ Radiance/gtk-3.0/gtk-widgets-borders-radiance.css	2014-12-17 15:31:01 +0000
@@ -1,38 +1,3 @@
-.primary-toolbar .button,
-.menubar.toolbar .button,
-.header-bar .button {
-    border-image: url("assets/radiance-button-toolbar.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
-}
-
-.primary-toolbar .button:focused,
-.menubar.toolbar .button:focused,
-.header-bar .button:focused {
-    border-image: url("assets/radiance-button-toolbar-focused.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
-}
-
-.primary-toolbar .button:active,
-.menubar.toolbar .button:active,
-.header-bar .button:active {
-    border-image: url("assets/radiance-button-toolbar-active.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
-}
-
-.primary-toolbar .button:active:focused,
-.menubar.toolbar .button:active:focused,
-.header-bar .button:active:focused {
-    border-image: url("assets/radiance-button-toolbar-active-focused.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
-}
-
-.primary-toolbar .button:backdrop,
-.menubar.toolbar .button:backdrop,
-.header-bar .button:backdrop {
-    border-image: url("assets/radiance-backdrop-button-toolbar.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
-}
-
-.primary-toolbar .button:active:backdrop,
-.menubar.toolbar .button:active:backdrop,
-.header-bar .button:active:backdrop {
-    border-image: url("assets/radiance-backdrop-button-toolbar-active.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
-}
 
 .primary-toolbar .entry,
 .menubar.toolbar .entry,
@@ -70,4 +35,4 @@
 .menubar.menuitem:hover,
 .menubar .menuitem:hover {
     border-color: #b8ab9c;
-}
\ No newline at end of file
+}

=== modified file 'Radiance/gtk-3.0/gtk-widgets-borders.css'
--- Radiance/gtk-3.0/gtk-widgets-borders.css	2014-01-20 19:19:40 +0000
+++ Radiance/gtk-3.0/gtk-widgets-borders.css	2014-12-17 15:31:01 +0000
@@ -1,151 +1,4 @@
 /* Borders */
-
-.frame {
-/*    border-radius: 7px;
-    border-width: 1px;*/
-
-    /*border-image: url("assets/frame.png") 8 10 8 10 / 8px 10px 8px 10px stretch;*/
-}
-
-/* focused element borders */
-.entry:focus,
-GtkComboBox.combobox-entry .entry:focus,
-.button:focus:active,
-.button.default:active,
-GtkSwitch.trough:active {
-}
-
-/**********
- * button *
- **********/
-.button {
-    border-radius: 8px;
-    border-width: 1px;
-    border-style: solid;
-    border-color: transparent;
-}
-
-.button {
-    border-image: url("assets/button.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
-}
-
-.button:backdrop {
-    border-image: url("assets/backdrop-button.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
-}
-
-.button:focus {
-    border-image: url("assets/button-focused.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
-}
-
-.button:hover {
-    border-image: url("assets/button-hover.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
-}
-
-.button:hover:backdrop {
-    border-image: url("assets/backdrop-button-hover.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
-}
-
-.button:hover:focus {
-    border-image: url("assets/button-focused-hover.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
-}
-
-.button:insensitive {
-    border-image: url("assets/button-disabled.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
-}
-
-.button:insensitive:backdrop {
-    border-image: url("assets/backdrop-button-disabled.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
-}
-
-.button:active {
-    border-image: url("assets/button-active.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
-}
-
-.button:active:backdrop {
-    border-image: url("assets/backdrop-button-active.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
-}
-
-.button:active:hover {
-    border-image: url("assets/button-active-hover.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
-}
-
-.button:active:hover:backdrop {
-    border-image: url("assets/backdrop-button-active-hover.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
-}
-
-.button:active:focus {
-    border-image: url("assets/button-active-focused.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
-}
-
-.button:active:hover:focus {
-    border-image: url("assets/button-active-focused-hover.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
-}
-
-.button:active:insensitive {
-    border-image: url("assets/button-active-disabled.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
-}
-
-.button:active:insensitive:backdrop {
-    border-image: url("assets/backdrop-button-active-disabled.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
-}
-
-/* focused button borders */
-.button:focus,
-.button.default {
-}
-
-.button.default {
-    border-image: url("assets/button-default.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
-}
-
-.button.default:hover {
-    border-image: url("assets/button-default-hover.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
-}
-
-.button.default:focus {
-    border-image: url("assets/button-default-focused.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
-}
-
-.button.default:focus:hover {
-    border-image: url("assets/button-default-focused-hover.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
-}
-
-.primary-toolbar .button,
-.menubar.toolbar .button,
-.header-bar .button {
-    border-image: url("assets/button-toolbar.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
-}
-
-.primary-toolbar .button:focused,
-.menubar.toolbar .button:focused,
-.header-bar .button:focused {
-    border-image: url("assets/button-toolbar-focused.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
-}
-
-.primary-toolbar .button:active,
-.menubar.toolbar .button:active,
-.header-bar .button:active {
-    border-image: url("assets/button-toolbar-active.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
-}
-
-.primary-toolbar .button:active:focused,
-.menubar.toolbar .button:active:focused,
-.header-bar .button:active:focused {
-    border-image: url("assets/button-toolbar-active-focused.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
-}
-
-.primary-toolbar .button:backdrop,
-.menubar.toolbar .button:backdrop,
-.header-bar .button:backdrop {
-    border-image: url("assets/backdrop-button-toolbar.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
-}
-
-.primary-toolbar .button:active:backdrop,
-.menubar.toolbar .button:active:backdrop,
-.header-bar .button:active:backdrop {
-    border-image: url("assets/backdrop-button-toolbar-active.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
-}
-
 .menubar.menuitem:hover,
 .menubar .menuitem:hover {
     border: 1px solid #2e2e2c;

=== modified file 'Radiance/gtk-3.0/gtk-widgets.css'
--- Radiance/gtk-3.0/gtk-widgets.css	2014-10-13 14:58:41 +0000
+++ Radiance/gtk-3.0/gtk-widgets.css	2014-12-17 15:31:01 +0000
@@ -1,7 +1,3 @@
-/* NOTES to contributors:
- * use 4 spaces intends, and keep code ALIGNED and ORDERED */
-
-/* default */
 * {
     -GtkArrow-arrow-scaling: 0.6;
     -GtkButton-child-displacement-x: 1;
@@ -57,12 +53,9 @@
 
     background-origin: border-box;
     background-clip: padding-box;
-    border-width: 1px;
 
     engine: unico;
 
-    /*-unico-arrow-texture: url("assets/combobox-arrow.png");*/
-
     /* To avoid using custom attributes, unico looks at the outline attributes
      * to find out how to render the focus ring.
      */
@@ -95,13 +88,6 @@
     background-color: @bg_color;
 }
 
-/*********
- * arrow *
- *********/
-/*.arrow * {
-    background-image: url("assets/combobox-arrow.png");
-}*/
-
 /*************
  * assistant *
  *************/
@@ -131,10 +117,7 @@
     -GtkWidget-focus-line-width: 0;
 
     padding: 5px 6px;
-}
 
-GtkSwitch.slider,
-.button {
     background-image: -gtk-gradient (linear, left top, left bottom,
                                      from (shade (@button_bg_color, 1.08)),
                                      color-stop (0.5, @button_bg_color),
@@ -142,27 +125,54 @@
 
     color: @fg_color;
     text-shadow: 0 1px alpha (shade (@button_bg_color, 1.25), 0.4);
-}
-
-GtkSwitch.slider:backdrop,
+
+    border: 1px solid transparent;
+    border-radius: 8px;
+    border-image-source: url("assets/button.png");
+
+    /* all button border images have the same size and are sliced in the same way */
+    border-image-width: 10px 12px 10px 12px;
+    border-image-slice: 10 12 10 12;
+    border-image-repeat: stretch;
+}
+
+.button.flat {
+    background-image: none;
+    border-image-source: none;
+}
+
 .button:backdrop {
     background-image: none;
     background-color: @bg_color;
+    border-image-source: url("assets/backdrop-button.png");
 
     color: @backdrop_fg_color;
     text-shadow: 0 1px alpha (shade (@button_bg_color, 1.25), 0.2);
 }
 
+.button.flat:backdrop {
+    border-image-source: none;
+}
+
+.button:focus {
+    border-image-source: url("assets/button-focused.png");
+}
+
 .button:hover {
     background-image: -gtk-gradient (linear, left top, left bottom,
                                      from (shade (@button_bg_color, 1.12)),
                                      color-stop (0.5, @button_bg_color),
                                      to (shade (@button_bg_color, 0.96)));
+    border-image-source: url("assets/button-hover.png");
 }
 
 .button:hover:backdrop {
-    background-image: none;
     background-color: shade (@bg_color, 1.04);
+    border-image-source: url("assets/backdrop-button-hover.png");
+}
+
+.button:hover:focus {
+    border-image-source: url("assets/button-focused-hover.png");
 }
 
 .button:insensitive {
@@ -170,314 +180,137 @@
     background-color: mix (#ebebeb, @bg_color, 0.5);
 
     text-shadow: 0 1px alpha (shade (@button_bg_color, 1.25), 0.4);
+    border-image-source: url("assets/button-disabled.png");
 }
 
 .button:insensitive:backdrop {
-    background-image: none;
     background-color: #ebebeb;
 
     text-shadow: 0 1px alpha (shade (@button_bg_color, 1.25), 0.2);
+    border-image-source: url("assets/backdrop-button-disabled.png");
+}
+
+.button.flat:insensitive,
+.button.flat:insensitive:backdrop {
+    background-color: transparent;
+    border-image-source: none;
+}
+
+.button:checked {
+    background-image: -gtk-gradient (linear, left top, left bottom,
+                                     from (#cecece),
+                                     to (#e8e8e8));
+    border-image-source: url("assets/button-active.png");
+}
+
+.button:checked:focus {
+    border-image-source: url("assets/button-active-focused.png");
 }
 
 .button:active {
     background-image: -gtk-gradient (linear, left top, left bottom,
-                                     from (#cecece),
-                                     to (#e8e8e8));
-}
-
-.button:active:hover {
-    background-image: -gtk-gradient (linear, left top, left bottom,
                                      from (#dcdcdc),
                                      to (#f3f3f3));
+    border-image-source: url("assets/button-active-hover.png");
+}
+
+.button:active:focus {
+    border-image-source: url("assets/button-active-focused-hover.png");
 }
 
 .button:active:insensitive {
     background-image: -gtk-gradient (linear, left top, left bottom,
                                      from (#e3e3e3),
                                      to (#f3f3f3));
-}
-
-.button:active:insensitive:backdrop {
+    border-image-source: url("assets/button-active-disabled.png");
+}
+
+.button:checked:backdrop {
+    border-image-source: url("assets/backdrop-button-active.png");
+}
+
+.button:active:backdrop {
+    border-image-source: url("assets/backdrop-button-active-hover.png");
+}
+
+.button:checked:insensitive:backdrop {
     background-image: -gtk-gradient (linear, left top, left bottom,
                                      from (mix (#e3e3e3, @bg_color, 0.5)),
                                      to (mix (#f3f3f3, @bg_color, 0.5)));
+    border-image-source: url("assets/backdrop-button-active-disabled.png");
 }
 
-/* default button */
-
-/*
 .button.default {
-    background-image: -gtk-gradient (linear, left top, left bottom,
-                                     from (mix (shade (@selected_bg_color, 1.16), @bg_color, 0.3)),
-                                     to (mix (shade (@selected_bg_color, 0.84), @bg_color, 0.3)));
-
-    text-shadow: 0 1px alpha (shade (@selected_bg_color, 1.26), 0.4);
+    border-image-source: url("assets/button-default.png");
 }
 
 .button.default:hover {
-    background-image: -gtk-gradient (linear, left top, left bottom,
-                                     from (mix (shade (@selected_bg_color, 1.21), @bg_color, 0.3)),
-                                     to (mix (shade (@selected_bg_color, 0.89), @bg_color, 0.3)));
-}
-
-.button.default:active {
-    background-image: -gtk-gradient (linear, left top, left bottom,
-                                     from (mix (shade (@selected_bg_color, 0.95), @bg_color, 0.3)),
-                                     to (mix (shade (@selected_bg_color, 1.05), @bg_color, 0.3)));
-}
-
-.button.default:active:hover {
-    background-image: -gtk-gradient (linear, left top, left bottom,
-                                     from (mix (shade (@selected_bg_color, 1.0), @bg_color, 0.3)),
-                                     to (mix (shade (@selected_bg_color, 1.1), @bg_color, 0.3)));
-}
-
-.button.default:insensitive {
-}
-*/
-
-/* Set up shadows and hilights for button visual separation */
-.linked .button,
-.toolbar .button.raised.linked,
-.toolbar .raised.linked .button,
-.inline-toolbar.toolbar .button,
-.inline-toolbar.toolbar GtkToolButton .button {
-    box-shadow: inset -1px 0 shade (@bg_color, 0.84);
-}
-
-.linked .button:first-child,
-.toolbar .button.raised.linked:first-child,
-.toolbar .raised.linked .button:first-child,
-.inline-toolbar.toolbar .button:first-child,
-.inline-toolbar.toolbar GtkToolButton:first-child .button {
-    box-shadow: inset -1px 0 shade (@bg_color, 0.84);
-}
-
-.linked .button:last-child,
-.toolbar .button.raised.linked:last-child,
-.toolbar .raised.linked .button:last-child,
-.inline-toolbar.toolbar .button:last-child,
-.inline-toolbar.toolbar GtkToolButton:last-child .button {
-    /*box-shadow: inset 1px 0 shade (@bg_color, 1.06);*/
-}
-
-.linked .button:active,
-.toolbar .button.raised.linked:active,
-.toolbar .raised.linked .button:active,
-.inline-toolbar.toolbar .button:active,
-.inline-toolbar.toolbar GtkToolButton .button:active {
-    /*box-shadow: inset 1px 0 shade (@bg_color, 0.76);*/
-}
-
-.linked .button:insensitive,
-.toolbar .button.raised.linked:insensitive,
-.toolbar .raised.linked .button:insensitive,
-.inline-toolbar.toolbar .button:insensitive,
-.inline-toolbar.toolbar GtkToolButton .button:insensitive {
-    box-shadow: inset -1px 0 shade (@bg_color, 0.84);
-}
-
-.linked .button:backdrop,
-.toolbar .button.raised.linked:backdrop,
-.toolbar .raised.linked .button:backdrop,
-.inline-toolbar.toolbar .button:backdrop,
-.inline-toolbar.toolbar GtkToolButton .button:backdrop {
-    /*box-shadow: inset -1px 0 @unfocused_borders;*/
-}
-
-.linked .button:insensitive:backdrop,
-.toolbar .button.raised.linked:insensitive:backdrop,
-.toolbar .raised.linked .button:insensitive:backdrop,
-.inline-toolbar.toolbar .button:insensitive:backdrop,
-.inline-toolbar.toolbar GtkToolButton .button:insensitive:backdrop {
-    /*box-shadow: inset -1px 0 @unfocused_insensitive_borders;*/
-}
-
-
-/* Middle button */
+    border-image-source: url("assets/button-default-hover.png");
+}
+
+.button.default:focus {
+    border-image-source: url("assets/button-default-focused.png");
+}
+
+.button.default:focus:hover {
+    border-image-source: url("assets/button-default-focused-hover.png");
+}
+
+/******************
+ * Linked Widgets *
+ *****************/
 .linked .entry,
-.linked .entry:active,
-.linked .entry:focus,
-.linked .entry:focus:active,
-.linked .button,
-.linked .button:active,
-.linked .button:active:hover,
-.linked .button:focus,
-.linked .button:focus:active,
-.linked .button:insensitive,
-.linked .button:backdrop,
-.linked .button:active:backdrop {
-    border-right-width: 0;
-    border-left-width: 0;
+.linked .button {
+    border-radius: 0;
     border-image-width: 10px 0 10px 0;
-    border-radius: 0;
+    border-width: 1px 0 1px 0;
+    box-shadow: inset -1px 0 shade (@bg_color, 0.84);
 }
 
-/* Leftmost button */
 .linked .entry:first-child,
-.linked .entry:active:first-child,
-.linked .entry:focus:first-child,
-.linked .entry:focus:active:first-child,
-.linked .button:first-child,
-.linked .button:active:first-child,
-.linked .button:active:hover:first-child,
-.linked .button:focus:first-child,
-.linked .button:focus:active:first-child,
-.linked .button:insensitive:first-child,
-.linked .button:backdrop:first-child,
-.linked .button:active:backdrop:first-child {
-    border-width: 1px;
-    border-right-width: 0;
+.linked .button:first-child {
     border-image-width: 10px 0 10px 12px;
-    border-radius: 8px;
-    border-bottom-right-radius: 0;
-    border-top-right-radius: 0;
+    border-radius: 8px 0 0 8px;
 }
 
-/* Rightmost button */
 .linked .entry:last-child,
-.linked .entry:active:last-child,
-.linked .entry:focus:last-child,
-.linked .entry:focus:active:last-child,
-.linked .button:last-child,
-.linked .button:active:last-child,
-.linked .button:active:hover:last-child,
-.linked .button:focus:last-child,
-.linked .button:focus:active:last-child,
-.linked .button:insensitive:last-child,
-.linked .button:backdrop:last-child,
-.linked .button:active:backdrop:last-child {
-    border-width: 1px;
-    border-left-width: 0;
+.linked .button:last-child {
     border-image-width: 10px 12px 10px 0;
-    border-radius: 8px;
-    border-bottom-left-radius: 0;
-    border-top-left-radius: 0;
+    border-radius: 0 8px 8px 0;
+    box-shadow: none;
 }
 
-/* Linked single button */
 .linked .entry:only-child,
-.linked .entry:active:only-child,
-.linked .entry:focus:only-child,
-.linked .entry:focus:active:only-child,
-.linked .button:only-child,
-.linked .button:active:only-child,
-.linked .button:active:hover:only-child,
-.linked .button:focus:only-child,
-.linked .button:focus:active:only-child,
-.linked .button:insensitive:only-child,
-.linked .button:backdrop:only-child,
-.linked .button:active:backdrop:only-child {
-    border-right-width: 1px;
-    border-left-width: 1px;
+.linked .button:only-child {
     border-image-width: 10px 12px 10px 12px;
     border-radius: 8px;
 }
 
-/* Set up shadows and hilights for button visual separation */
 .primary-toolbar .linked .button,
-.primary-toolbar .button.raised.linked,
-.primary-toolbar .raised.linked .button,
-.menubar.toolbar .linked .button,
-.menubar.toolbar .button.raised.linked,
-.menubar.toolbar .raised.linked .button,
-.header-bar .linked .button,
-.header-bar .button.raised.linked,
-.header-bar .raised.linked .button {
+.header-bar .linked .button {
     box-shadow: inset 1px 0 shade (@dark_bg_color, 1.4),
                 inset -1px 0 shade (@dark_bg_color, 0.9);
 }
 
 .primary-toolbar .linked .button:first-child,
-.primary-toolbar .button.raised.linked:first-child,
-.primary-toolbar .raised.linked .button:first-child,
-.menubar.toolbar .linked .button:first-child,
-.menubar.toolbar .button.raised.linked:first-child,
-.menubar.toolbar .raised.linked .button:first-child,
-.header-bar .linked .button:first-child,
-.header-bar .button.raised.linked:first-child,
-.header-bar .raised.linked .button:first-child {
+.header-bar .linked .button:first-child {
     box-shadow: inset -1px 0 shade (@dark_bg_color, 0.9);
 }
 
 .primary-toolbar .linked .button:last-child,
-.primary-toolbar .button.raised.linked:last-child,
-.primary-toolbar .raised.linked .button:last-child,
-.menubar.toolbar .linked .button:last-child,
-.menubar.toolbar .button.raised.linked:last-child,
-.menubar.toolbar .raised.linked .button:last-child,
-.header-bar .linked .button:last-child,
-.header-bar .button.raised.linked:last-child,
-.header-bar .raised.linked .button:last-child {
+.header-bar .linked .button:last-child {
     box-shadow: inset 1px 0 shade (@dark_bg_color, 1.4)
 }
 
 .primary-toolbar .linked .button:active,
-.primary-toolbar .button.raised.linked:active,
-.primary-toolbar .raised.linked .button:active,
-.menubar.toolbar .linked .button:active,
-.menubar.toolbar .button.raised.linked:active,
-.menubar.toolbar .raised.linked .button:active,
 .header-bar .linked .button:active,
-.header-bar .button.raised.linked:active,
-.header-bar .raised.linked .button:active {
+.primary-toolbar .linked .button:insensitive,
+.header-bar .linked .button:insensitive {
     box-shadow: inset 1px 0 shade (@dark_bg_color, 0.9);
 }
 
-.primary-toolbar .linked .button:insensitive,
-.primary-toolbar .button.raised.linked:insensitive,
-.primary-toolbar .raised.linked .button:insensitive,
-.menubar.toolbar .linked .button:insensitive,
-.menubar.toolbar .button.raised.linked:insensitive,
-.menubar.toolbar .raised.linked .button:insensitive,
-.header-bar .linked .button:insensitive,
-.header-bar .button.raised.linked:insensitive,
-.header-bar .raised.linked .button:insensitive {
-    box-shadow: inset -1px 0 shade (@dark_bg_color, 0.9);
-}
-
-.primary-toolbar .linked .button:backdrop:last-child,
-.primary-toolbar .button.raised.linked:backdrop:last-child,
-.primary-toolbar .raised.linked .button:backdrop:last-child,
-.menubar.toolbar .linked .button:backdrop:last-child,
-.menubar.toolbar .button.raised.linked:backdrop:last-child,
-.menubar.toolbar .raised.linked .button:backdrop:last-child,
-.header-bar .linked .button:backdrop:last-child,
-.header-bar .button.raised.linked:backdrop:last-child,
-.header-bar .raised.linked .button:backdrop:last-child {
-    box-shadow: inset 1px 0 shade (@dark_bg_color, 1.2);
-}
-
-/*.primary-toolbar .linked .button:insensitive:backdrop,
-.primary-toolbar .button.raised.linked:insensitive:backdrop,
-.primary-toolbar .raised.linked .button:insensitive:backdrop,
-.menubar.toolbar .linked .button:insensitive:backdrop,
-.menubar.toolbar .button.raised.linked:insensitive:backdrop,
-.menubar.toolbar .raised.linked .button:insensitive:backdrop,
-.header-bar .linked .button:insensitive:backdrop,
-.header-bar .button.raised.linked:insensitive:backdrop,
-.header-bar .raised.linked .button:insensitive:backdrop {
-    box-shadow: inset -1px 0 @unfocused_insensitive_borders;
-}*/
-
-
-/* Linked single button */
-.primary-toolbar .linked .entry:only-child,
 .primary-toolbar .linked .button:only-child,
-.primary-toolbar .linked .button:active:only-child,
-.primary-toolbar .linked .button:active:hover:only-child,
-.primary-toolbar .linked .button:insensitive:only-child,
-.menubar.toolbar .linked .entry:only-child,
-.menubar.toolbar .linked .button:only-child,
-.menubar.toolbar .linked .button:active:only-child,
-.menubar.toolbar .linked .button:active:hover:only-child,
-.menubar.toolbar .linked .button:insensitive:only-child,
-.header-bar .linked .entry:only-child,
-.header-bar .linked .button:only-child,
-.header-bar .linked .button:active:only-child,
-.header-bar .linked .button:active:hover:only-child,
-.header-bar .linked .button:insensitive:only-child {
-    border-radius: 8px;
+.header-bar .linked .button:only-child {
     box-shadow: none;
 }
 
@@ -502,7 +335,6 @@
     border-width: 1px 0 0 0;
 
     color: @selected_fg_color;
-    /*text-shadow: 0 -1px shade (@selected_bg_color, 0.7);*/
 }
 
 row:selected:backdrop {
@@ -512,7 +344,6 @@
     border-top-color: shade (@backdrop_selected_bg_color, 0.9);
 
     color: @backdrop_selected_fg_color;
-    /*text-shadow: 0 -1px shade (@selected_bg_color, 0.7);*/
 }
 
 /*******************
@@ -631,17 +462,15 @@
 }
 
 GtkIconView.content-view.check {
-    /*background-image: url("assets/grid-selection-unchecked.svg");*/
     background-color: transparent;
 }
 
-GtkIconView.content-view.check:active {
-    /*background-image: url("assets/grid-selection-checked.svg");*/
+GtkIconView.content-view.check:checked {
     background-color: transparent;
 }
 
 .content-view.view.check,
-.content-view.view.check:active {
+.content-view.view.check:checked {
     background-color: transparent;
 }
 
@@ -652,22 +481,9 @@
     background-color: transparent;
 }
 
-/****************
- * drawing area *
- ****************/
-/*
-GtkDrawingArea {
-    background-color: transparent;
-}
-*/
-
 /*********
  * entry *
  *********/
-GtkComboBox.combobox-entry .button,
-.primary-toolbar GtkComboBox.combobox-entry .button,
-.menubar.toolbar GtkComboBox.combobox-entry .button,
-.header-bar GtkComboBox.combobox-entry .button,
 .entry {
     -GtkWidget-focus-line-width: 0;
 
@@ -679,10 +495,6 @@
     color: @text_color;
 }
 
-GtkComboBox.combobox-entry .button:backdrop,
-.primary-toolbar GtkComboBox.combobox-entry .button:backdrop,
-.menubar.toolbar GtkComboBox.combobox-entry .button:backdrop,
-.header-bar GtkComboBox.combobox-entry .button:backdrop,
 .entry:backdrop {
     background-image: -gtk-gradient (linear, left top, left bottom,
                                      from (mix (shade (@base_color, 0.96), @bg_color, 0.5)),
@@ -697,10 +509,6 @@
     color: @selected_fg_color;
 }
 
-GtkComboBox.combobox-entry .button:insensitive,
-.primary-toolbar GtkComboBox.combobox-entry .button:insensitive,
-.menubar.toolbar GtkComboBox.combobox-entry .button:insensitive,
-.header-bar GtkComboBox.combobox-entry .button:insensitive,
 .entry:insensitive {
     background-color: #f5f5f5;
     background-image: none;
@@ -708,10 +516,6 @@
     color: mix (@text_color, @base_color, 0.4);
 }
 
-GtkComboBox.combobox-entry .button:insensitive:backdrop,
-.primary-toolbar GtkComboBox.combobox-entry .button:insensitive:backdrop,
-.menubar.toolbar GtkComboBox.combobox-entry .button:insensitive:backdrop,
-.header-bar GtkComboBox.combobox-entry .button:insensitive:backdrop,
 .entry:insensitive:backdrop {
     background-color: mix (#f5f5f5, @bg_color, 0.5);
 
@@ -720,8 +524,6 @@
 
 .primary-toolbar .entry.progressbar,
 .primary-toolbar .entry.progressbar,
-.menubar.toolbar .entry.progressbar,
-.menubar.toolbar .entry.progressbar,
 .header-bar .entry.progressbar,
 .header-bar .entry.progressbar,
 .entry.progressbar {
@@ -753,6 +555,10 @@
     background: none;
 }
 
+.frame.flat {
+    border: none;
+}
+
 /************
  * iconview *
  ************/
@@ -780,6 +586,10 @@
                 inset 0 -1px shade (@selected_bg_color, 1.0);
 }
 
+GtkIconView.cell {
+    background-color: transparent;
+}
+
 .rubberband {
     background-color: alpha (@selected_bg_color, 0.35);
     border-color: @selected_bg_color;
@@ -892,12 +702,9 @@
  * menu *
  ********/
 GtkTreeMenu.menu,
-.toolbar .primary-toolbar .menu,
-.toolbar .menubar.toolbar .menu,
 .toolbar .header-bar .menu,
 GtkMenuToolButton.menu,
 .primary-toolbar .button .menu,
-.menubar.toolbar .button .menu,
 .header-bar .button .menu,
 .menu {
     background-image: none;
@@ -943,25 +750,10 @@
 }
 
 .menu.button:hover,
-.menu.button:active,
-.menu.button:active:insensitive,
+.menu.button:checked,
+.menu.button:checked:insensitive,
 .menu.button:insensitive,
 .menu.button
-/*.primary-toolbar .menu.button:hover,
-.primary-toolbar .menu.button:active,
-.primary-toolbar .menu.button:active:insensitive,
-.primary-toolbar .menu.button:insensitive,
-.primary-toolbar .menu.button,
-.menubar.toolbar .menu.button:hover,
-.menubar.toolbar .menu.button:active,
-.menubar.toolbar .menu.button:active:insensitive,
-.menubar.toolbar .menu.button:insensitive,
-.menubar.toolbar .menu.button,
-.header-bar .menu.button:hover,
-.header-bar .menu.button:active,
-.header-bar .menu.button:active:insensitive,
-.header-bar .menu.button:insensitive,
-.header-bar .menu.button */
 {
     background-color: shade (@dark_bg_color, 1.08);
     background-image: none;
@@ -1013,10 +805,6 @@
 /************
  * menuitem *
  ************/
-/*.menuitem {
-    color: @fg_color;
-}*/
-
 .menuitem {
     -GtkMenuItem-horizontal-padding: 0;
     background: transparent;
@@ -1026,10 +814,6 @@
     text-shadow: none;
 }
 
-.menuitem {
-    /*color: @dark_fg_color;*/
-}
-
 /* Workaround for lp:949368 */
 GtkComboBox .menuitem * {
     color: @fg_color;
@@ -1039,7 +823,7 @@
     color: @selected_fg_color;
 }
 
-.popover .menuitem:active:hover,
+.popover .menuitem:checked:hover,
 .menuitem:hover,
 .menu .menuitem:hover {
     border-radius: 0;
@@ -1059,8 +843,8 @@
     text-shadow: 0 -1px shade (@selected_bg_color, 0.7);
 }
 
-.menuitem.check:active,
-.menuitem.radio:active {
+.menuitem.check:checked,
+.menuitem.radio:checked {
     color: @fg_color;
 }
 
@@ -1069,26 +853,14 @@
     box-shadow: none;
 }
 
-/*.menuitem:insensitive,
-.menuitem *:insensitive {
-    color: mix (@fg_color, @bg_color, 0.5);
-    text-shadow: 0 1px shade (@bg_color, 1.14);
-}
-*/
 GtkTreeMenu.menu .menuitem:insensitive,
 GtkTreeMenu.menu .menuitem *:insensitive,
-.toolbar .primary-toolbar .menu .menuitem:insensitive,
-.toolbar .primary-toolbar .menu .menuitem *:insensitive,
-.toolbar .menubar.toolbar .menu .menuitem:insensitive,
-.toolbar .menubar.toolbar .menu .menuitem *:insensitive,
 .toolbar .header-bar .menu .menuitem:insensitive,
 .toolbar .header-bar .menu .menuitem *:insensitive,
 GtkMenuToolButton.menu .menuitem:insensitive,
 GtkMenuToolButton.menu .menuitem *:insensitive,
 .primary-toolbar .button .menu .menuitem:insensitive,
 .primary-toolbar .button .menu .menuitem *:insensitive,
-.menubar.toolbar .button .menu .menuitem:insensitive,
-.menubar.toolbar .button .menu .menuitem *:insensitive,
 .header-bar .button .menu .menuitem:insensitive,
 .header-bar .button .menu .menuitem *:insensitive,
 .menuitem:insensitive,
@@ -1142,8 +914,6 @@
 
 .primary-toolbar GtkScale.trough,
 .primary-toolbar GtkScale.trough:backdrop,
-.menubar.toolbar GtkScale.trough,
-.menubar.toolbar GtkScale.trough:backdrop,
 .header-bar GtkScale.trough,
 .header-bar GtkScale.trough:backdrop,
 .menuitem GtkScale.trough {
@@ -1371,28 +1141,6 @@
     margin: 1px 0;
 }
 
-/* discrete indicator border rounding,
-   uncomment when :nth-child will be working
-   on the widget
-
-.level-bar.indicator-discrete.fill-block.horizontal:first-child {
-    border-radius: 2px 0 0 2px;
-}
-
-.level-bar.indicator-discrete.fill-block.horizontal:last-child {
-    border-radius: 0 2px 2px 0;
-}
-
-.level-bar.indicator-discrete.fill-block.vertical:first-child {
-    border-radius: 2px 2px 0 0;
-}
-
-.level-bar.indicator-discrete.fill-block.vertical:last-child {
-    border-radius: 0 0 2px 2px;
-}
-
-*/
-
 .level-bar.fill-block.level-high {
     border-color: shade(@success_color, 0.85);
     background-image: linear-gradient(to bottom,
@@ -1455,10 +1203,8 @@
 .scale.trough.highlight:backdrop {
     background-color: #dcdcdc;
     background-image: none;
-    /*background-clip: padding-box;*/
 }
 
-
 .scale.trough.highlight.bottom {
     margin: 0 7px 0 7px;
 }
@@ -1613,12 +1359,9 @@
 }
 
 GtkTreeMenu .menuitem.separator,
-.toolbar .primary-toolbar .menuitem.separator,
-.toolbar .menubar.toolbar .menuitem.separator,
 .toolbar .header-bar .menuitem.separator,
 GtkMenuToolButton .menuitem.separator,
 .primary-toolbar .button .menuitem.separator,
-.menubar.toolbar .button .menuitem.separator,
 .header-bar .button .menuitem.separator,
 .menuitem.separator {
     border-color: shade (@dark_bg_color, 0.99);
@@ -1802,8 +1545,6 @@
 .menu .spinner:hover,
 .primary-toolbar .spinner,
 .primary-toolbar .spinner,
-.menubar.toolbar .spinner,
-.menubar.toolbar .spinner,
 .header-bar .spinner,
 .header-bar .spinner {
     color: @selected_bg_color;
@@ -1863,6 +1604,22 @@
     padding: 1px;
     border-radius: 6px;
     border-style: solid;
+
+    background-image: -gtk-gradient (linear, left top, left bottom,
+                                     from (shade (@button_bg_color, 1.08)),
+                                     color-stop (0.5, @button_bg_color),
+                                     to (shade (@button_bg_color, 0.94)));
+
+    color: @fg_color;
+    text-shadow: 0 1px alpha (shade (@button_bg_color, 1.25), 0.4);
+}
+
+GtkSwitch.slider:backdrop {
+    background-image: none;
+    background-color: @bg_color;
+
+    color: @backdrop_fg_color;
+    text-shadow: 0 1px alpha (shade (@button_bg_color, 1.25), 0.2);
 }
 
 /************
@@ -1942,16 +1699,10 @@
     color: @backdrop_fg_color;
 }
 
-.toolbar .button {
-    /*padding: 1px;*/
-    /*padding: 6px 8px;*/
-}
-
-/* primary-toolbar */
+/*******************
+ * primary-toolbar *
+ *******************/
 .primary-toolbar,
-.primary-toolbar .toolbar,
-.primary-toolbar.toolbar,
-.menubar.toolbar,
 .header-bar {
     -GtkWidget-window-dragging: true;
 
@@ -1970,10 +1721,7 @@
     box-shadow: inset 0 1px shade (@dark_bg_color, 0.94);
 }
 
-.primary-toolbar .toolbar:backdrop,
-.primary-toolbar.toolbar:backdrop,
-.menubar.toolbar .toolbar:backdrop,
-.menubar.toolbar.toolbar:backdrop,
+.primary-toolbar:backdrop,
 .header-bar:backdrop {
     background-image: none;
     background-color: @dark_bg_color;
@@ -1985,97 +1733,99 @@
 }
 
 .primary-toolbar :insensitive,
-.menubar.toolbar .toolbar :insensitive,
 .header-bar :insensitive {
     text-shadow: 0 -1px shade (@dark_bg_color, 0.7);
 }
 
-.primary-toolbar GtkComboBox,
 .primary-toolbar .button,
-.menubar.toolbar GtkComboBox,
-.menubar.toolbar .button,
-.header-bar GtkComboBox,
-.header-bar .button {
-    background-color: transparent;
-    background-image: none;
-    border-color: transparent;
-    /*border-radius: 3px;*/
-    /*border-width: 1px;*/
-    /*padding: 3px;*/
-
+.header-bar .button,
+.primary-toolbar .button.flat:hover {
+    background: transparent;
     color: @dark_fg_color;
     text-shadow: 0 -1px shade (@dark_bg_color, 0.7);
-}
-
-.primary-toolbar GtkComboBox:backdrop,
+    border-image-source: url("assets/radiance-button-toolbar.png");
+}
+
+.primary-toolbar .button.flat {
+    border-image-source: none;
+    background: transparent;
+}
+
+.primary-toolbar .button:focused,
+.header-bar .button:focused {
+    border-image-source: url("assets/radiance-button-toolbar-focused.png");
+}
+
+.primary-toolbar .button:active,
+.primary-toolbar .button:checked,
+.header-bar .button:active,
+.header-bar .button:checked {
+    border-image-source: url("assets/radiance-button-toolbar-active.png");
+}
+
+.primary-toolbar .button:active:focused,
+.primary-toolbar .button:checked:focused,
+.header-bar .button:active:focused,
+.header-bar .button:checked:focused {
+    border-image-source: url("assets/radiance-button-toolbar-active-focused.png");
+}
+
 .primary-toolbar .button:backdrop,
-.menubar.toolbar GtkComboBox:backdrop,
-.menubar.toolbar .button:backdrop,
-.header-bar GtkComboBox:backdrop,
 .header-bar .button:backdrop {
+    background-color: transparent;
     color: @backdrop_dark_fg_color;
     text-shadow: 0 -1px shade (@dark_bg_color, 0.9);
-}
-
-.primary-toolbar .raised .button,
-.primary-toolbar .raised.button,
+    border-image-source: url("assets/radiance-backdrop-button-toolbar.png");
+}
+
+.primary-toolbar .button.flat:backdrop {
+    border-image-source: none;
+}
+
+.primary-toolbar .button:active:backdrop,
+.primary-toolbar .button:checked:backdrop,
+.header-bar .button:active:backdrop,
+.header-bar .button:checked:backdrop {
+    border-image-source: url("assets/radiance-backdrop-button-toolbar-active.png");
+}
+
 .primary-toolbar .button:hover,
-.primary-toolbar .button:active,
-.primary-toolbar .button:insensitive,
-.menubar.toolbar .raised .button,
-.menubar.toolbar .raised.button,
-.menubar.toolbar .button:hover,
-.menubar.toolbar .button:active,
-.menubar.toolbar .button:insensitive,
-.header-bar .raised .button,
-.header-bar .raised.button,
+.primary-toolbar .button:checked,
 .header-bar .button:hover,
-.header-bar .button:active,
-.header-bar .button:insensitive {
+.header-bar .button:checked {
     background-image: -gtk-gradient (linear, left top, left bottom,
                                      from (shade (@dark_bg_color, 1.2)),
                                      to (shade (@dark_bg_color, 1.1)));
-    /*border-width: 1px;*/
 }
 
 .primary-toolbar .button:active,
-.menubar.toolbar .button:active,
 .header-bar .button:active {
     background-image: -gtk-gradient (linear, left top, left bottom,
-                                     from (shade (@dark_bg_color, 0.9)),
-                                     to (shade (@dark_bg_color, 0.95)));
-
-    text-shadow: 0 -1px shade (@dark_bg_color, 0.6);
-}
-
-.primary-toolbar .button:active:hover,
-.menubar.toolbar .button:active:hover,
-.header-bar .button:active:hover {
-    background-image: -gtk-gradient (linear, left top, left bottom,
                                      from (shade (@dark_bg_color, 0.95)),
                                      to (shade (@dark_bg_color, 1.0)));
+    text-shadow: 0 -1px shade (@dark_bg_color, 0.6);
 }
 
-.primary-toolbar .button:active:insensitive,
+.primary-toolbar .button:checked:insensitive,
 .primary-toolbar .button:insensitive,
-.menubar.toolbar .button:active:insensitive,
-.menubar.toolbar .button:insensitive,
-.header-bar .button:active:insensitive,
+.header-bar .button:checked:insensitive,
 .header-bar .button:insensitive {
     text-shadow: none;
 }
 
 .primary-toolbar .button:insensitive,
-.menubar.toolbar .button:insensitive,
 .header-bar .button:insensitive {
     background-image: -gtk-gradient (linear, left top, left bottom,
                                      from (shade (@dark_bg_color, 1.01)),
                                      to (shade (@dark_bg_color, 0.99)));
 }
 
-.primary-toolbar .button:active:insensitive,
-.menubar.toolbar .button:active:insensitive,
-.header-bar .button:active:insensitive {
+.primary-toolbar .button.flat:insensitive {
+    background-image: none;
+}
+
+.primary-toolbar .button:checked:insensitive,
+.header-bar .button:checked:insensitive {
     background-image: -gtk-gradient (linear, left top, left bottom,
                                      from (shade (@dark_bg_color, 0.94)),
                                      to (shade (@dark_bg_color, 1.02)));
@@ -2084,9 +1834,6 @@
 .primary-toolbar GtkSeparatorToolItem,
 .primary-toolbar .separator,
 .primary-toolbar .separator:insensitive,
-.menubar.toolbar GtkSeparatorToolItem,
-.menubar.toolbar .separator,
-.menubar.toolbar .separator:insensitive,
 .header-bar GtkSeparatorToolItem,
 .header-bar .separator,
 .header-bar .separator:insensitive {
@@ -2190,7 +1937,6 @@
     border-radius: 8px;
     border-bottom-left-radius: 0;
     border-top-left-radius: 0;
-    /*box-shadow: inset 1px 0 shade (@bg_color, 0.84);*/
 }
 
 /* Single button */
@@ -2212,7 +1958,6 @@
     border-left-width: 1px;
     border-image-width: 10px 12px 10px 12px;
     border-radius: 8px;
-    /*box-shadow: none;*/
 }
 
 /***********
@@ -2246,15 +1991,6 @@
 
 GtkTreeView .entry {
     background-image: none;
-    /*border-radius: 0;*/
-}
-
-GtkTreeView row:nth-child(even){
-    /*background-color: @base_color;*/
-}
-
-GtkTreeView row:nth-child(odd) {
-    /*background-color: shade (@base_color, 0.965);*/
 }
 
 /************
@@ -2264,6 +2000,19 @@
     border-width: 0;
 }
 
+/************
+ * listbox  *
+ ************/
+.list-row.button {
+    border-image: none;
+    border-style: none;
+    border-radius: 0;
+    background-image: none;
+}
+
+.list-row.button:selected {
+    text-shadow: none;
+}
 
 /************
  * popover  *
@@ -2287,9 +2036,9 @@
  * the button styles for them.
  */
 .popover .menuitem,
-.popover .menuitem:active,
+.popover .menuitem:checked,
 .popover .menuitem:hover,
-.popover .menuitem:hover:active,
+.popover .menuitem:active,
 .popover .menuitem:insensitive,
 .popover .menuitem:backdrop {
     border-image: none;
@@ -2306,11 +2055,11 @@
 }
 
 
-.popover .menuitem:active,
+.popover .menuitem:checked,
 .popover .menuitem.check,
-.popover .menuitem.check:active,
+.popover .menuitem.check:checked,
 .popover .menuitem.radio,
-.popover .menuitem.radio:active {
+.popover .menuitem.radio:checked {
     background-image: none;
     border: none;
 }