Menta GTK3: update to GTK3-3.12

10 files changed, 1534 insertions, 1043 deletions

diff --git a/desktop-themes/Menta/gtk-3.0/gnome-applications.css b/desktop-themes/Menta/gtk-3.0/gnome-applications.css
index fb403669..9813b725 100644
--- a/desktop-themes/Menta/gtk-3.0/gnome-applications.css
+++ b/desktop-themes/Menta/gtk-3.0/gnome-applications.css
@@ -3,15 +3,42 @@
 @define-color gedit_not_found_bg rgb (237, 54, 54);
 @define-color gedit_not_found_fg white;
 
+* {
+	-GtkIMHtml-hyperlink-color: @link_color;
+	-GtkHTML-link-color: @link_color;
+
+	-WnckTasklist-fade-overlay-rect: 0;
+}
+
+
 /****************
  * Applications *
  ****************/
+
+/*
+ * Evolution
+ */
+
+/* needed for webkit/GtkStyle/Evolution compatibility */
+GtkHTML:active,
+GtkHTML:active:backdrop {
+	color: @theme_unfocused_selected_fg_color;
+	background-color: @theme_unfocused_selected_bg_color;
+}
+
+/*
+ * Sushi
+ */
+
 /* used by gnome-font-viewer and sushi */
 SushiFontWidget {
 	padding: 6px 12px;
 }
 
-/* gnome-terminal */
+/*
+ * GNOME Terminal
+ */
+
 VteTerminal {
 	background-color: @theme_base_color;
 	color: @theme_fg_color;
@@ -24,7 +51,10 @@ TerminalWindow GtkNotebook.notebook {
 	border-left-width: 0;
 }
 
-/* nautilus */
+/*
+ * Nautilus
+ */
+
 .nautilus-canvas-item {
 	border-radius: 5px;
 }
@@ -96,7 +126,7 @@ NautilusToolbar .button:active *:insensitive {
 	icon-shadow: none;
 }
 
-NautilusQueryEditor .primary-toolbar.toolbar {
+NautilusQueryEditor .search-bar.toolbar {
 	border-top-width: 0;
 	border-bottom-width: 0;
 }
@@ -107,9 +137,6 @@ NautilusQueryEditor .toolbar {
 
 	border-width: 1px 0 0 0;
 	border-style: solid;
-	border-color: @theme_bg_color;
-	
-	background-color: mix(@theme_bg_color, @theme_base_color, 0.5);
 }
 
 NautilusQueryEditor .toolbar:nth-child(2) {
@@ -117,173 +144,130 @@ NautilusQueryEditor .toolbar:nth-child(2) {
 }
 
 NautilusQueryEditor .toolbar:last-child,
-NautilusQueryEditor .primary-toolbar.toolbar:only-child {
+NautilusQueryEditor .search-bar.toolbar:only-child {
 	border-bottom-width: 1px;
 	border-bottom-color: @borders;
 }
 
-/* nemo */
-.nemo-canvas-item {
-	border-radius: 5px;
-}
-
-.nemo-desktop.nemo-canvas-item {
-	color: @theme_selected_fg_color;
-	text-shadow: 1px 1px black;
+NautilusQueryEditor .toolbar:backdrop:nth-child(2) {
+	border-color: @unfocused_borders;
 }
 
-.nemo-desktop.nemo-canvas-item:active {
-	color: @theme_text_color;
-}
+/*
+ * Gedit
+ */
 
-.nemo-desktop.nemo-canvas-item:selected {
-	color: @theme_selected_fg_color;
-}
-
-.nemo-desktop.nemo-canvas-item:active,
-.nemo-desktop.nemo-canvas-item:prelight,
-.nemo-desktop.nemo-canvas-item:selected {
-	text-shadow: none;
-}
-
-NemoWindow .sidebar .frame {
-	border-width: 1px 0 0 0;
-	border-style: solid;
-	border-color: @borders;
-	border-radius: 0;
-}
-
-NemoWindow * {
+GeditWindow * {
 	-GtkPaned-handle-size: 1;
 }
 
-NemoWindow .pane-separator {
-	background-image: url("assets/null.png");
-}
-
-NemoWindow > GtkGrid > .pane-separator,
-NemoWindow > GtkGrid > .pane-separator:hover {
-	border-width: 1px 1px 0 0;
+GeditWindow .pane-separator,
+GeditWindow .pane-separator:hover {
+	border-width: 0 1px 1px 1px;
 	border-style: solid;
 	border-color: @borders;
 	background-color: @sidebar_bg;
-	color: shade (@theme_bg_color, 0.9);
-}
-
-NemoView.frame,
-NemoNotebook.notebook {
-	border-right-width: 0;
-	border-left-width: 0;
-	border-bottom-width: 0;
-}
-
-NemoNotebook.notebook tab.top,
-NemoNotebook.notebook tab.bottom {
-	border-right-width: 1px;
-	border-left-width: 1px;
-	padding-top: 0;
-	padding-bottom: 0;
-}
-
-NemoNotebook.notebook tab.top:active {
-	padding-top: 2px;
-}
-NemoNotebook.notebook tab.bottom:active {
-	padding-bottom: 2px;
-}
-
-NemoNotebook .frame {
-	border-width: 1px 0 0 0;
-}
-
-NemoToolbar .button {
-	icon-shadow: 0 1px @button_text_shadow;
+	background-image: url("assets/null.png");
+	color: @borders;
 }
 
-NemoToolbar .toolbar {
-	background-image: linear-gradient(to bottom,
-		@theme_bg_color,
-		shade (@theme_bg_color, 0.94));
+.gedit-document-panel {
+	background-color: @sidebar_bg;
 }
 
-NemoToolbar .button:active {
-	icon-shadow: 0 1px @button_active_text_shadow;
+.gedit-document-panel-group-row,
+.gedit-document-panel-group-row:hover {
+	border-top: 1px solid shade(@sidebar_bg, 0.90);
+	background-color: @sidebar_bg;
 }
 
-NemoToolbar .button:insensitive,
-NemoToolbar .button:active:insensitive {
-	text-shadow: none;
+.gedit-document-panel-document-row:hover {
+	background-color: shade(@sidebar_bg, 0.95);
 }
 
-NemoQueryEditor .primary-toolbar.toolbar {
-	border-bottom-width: 0;
+.gedit-document-panel-document-row:selected,
+.gedit-document-panel-document-row:selected:hover {
+	background-color: @theme_selected_bg_color;
 }
 
-NemoQueryEditor .toolbar {
-	padding-top: 3px;
-	padding-bottom: 2px;
-
-	border-width: 1px 0 0 0;
+/* sidepane close button styling (copied from the gtk tab close button) */
+.gedit-document-panel .list-row .button {
+	color: transparent;
+	border-image: none;
+	background-image: none;
+	background-color: transparent;
+	border-radius: 3px;
 	border-style: solid;
-	border-color: @theme_bg_color;
-	
-	background-color: mix(@theme_bg_color, @theme_base_color, 0.5);
-}
-
-NemoQueryEditor .toolbar:nth-child(2) {
-	border-color: @borders;
+	border-color: transparent;
+	border-width: 1px;
+	padding: 1px;
+	icon-shadow: none;
 }
 
-NemoNotebook.notebook NemoQueryEditor .primary-toolbar.toolbar {
-	border-top-width: 0;
+.gedit-document-panel .prelight-row .button  {
+	color: mix(@theme_fg_color, @sidebar_bg, 0.6);
+	border-color: alpha(black, 0.1);
+	transition: all 200ms ease-in;
 }
 
-NemoNotebook.notebook NemoQueryEditor .toolbar:last-child,
-NemoNotebook.notebook NemoQueryEditor .primary-toolbar.toolbar:only-child {
-	border-bottom-width: 1px;
-	border-bottom-color: @borders;
+.gedit-document-panel .list-row .button:hover,
+.gedit-document-panel .prelight-row .button:hover {
+	color: @theme_fg_color;
+	border-color: alpha(black, 0.1);
+	transition: all 200ms ease-in;
 }
 
+.gedit-document-panel .prelight-row .button:active {
+	color:  @button_active_text;
+	background-color: alpha(black, 0.08);
+	box-shadow: inset 0 1px alpha(black, 0.05);
+	icon-shadow: 0 1px @button_active_text_shadow;
 
-/* gedit */
-
-GeditWindow .pane-separator, 
-GeditWindow .pane-separator:hover {
-	border-width: 0 1px 1px 1px;
-	border-style: solid;
-	border-color: @borders;
-	background-color: shade(@theme_bg_color, 0.95);
-	color: @borders;
+	border-color: alpha(black, 0.27)
+		alpha(black, 0.13)
+		alpha(black, 0.13)
+		alpha(black, 0.13);
 }
 
-GeditPanel.vertical .title {
-	border-style: none;
-	padding: 7px 0 6px 3px;
+.gedit-document-panel .prelight-row .button:backdrop {
+	color: mix(@theme_unfocused_fg_color, @theme_unfocused_base_color, 0.7);
+	icon-shadow: none;
 }
 
-GeditDocumentsPanel .view {
-	background-color: @sidebar_bg;
+.gedit-document-panel .prelight-row .button:backdrop:hover {
+	color: @theme_unfocused_fg_color;
+	transition: all 200ms ease-out;
 }
 
-GeditPanel.vertical .notebook {
-	padding: 0px;
-	border-width: 1px 0;
+.gedit-document-panel-dragged-row {
+	border: 1px solid @borders;
+	background-color: shade(@sidebar_bg, 0.90);
+	color: @theme_fg_color;
 }
 
-GeditPanel.horizontal .notebook {
-	padding: 0px;
-	border-width: 0 1px 1px 0;
+.gedit-document-panel-placeholder-row {
+	border: none;
+	background-color: mix(@sidebar_bg, @theme_selected_bg_color, 0.20);
+	transition: all 200ms ease-in;
 }
 
-GeditPanel .notebook tab
-{
-	border-width: 0;
+GeditStatusbar {
+	border-top: 1px solid @borders;
 }
 
+GeditStatusbar GeditSmallButton,
 GeditStatusMenuButton {
 	text-shadow: none;
 }
 
+GeditStatusbar GeditSmallButton.button:backdrop,
+GeditStatusbar GeditSmallButton.button:backdrop:hover,
+GeditStatusbar GeditSmallButton.button,
+GeditStatusbar GeditSmallButton.button:hover,
+GeditStatusbar GeditSmallButton.button:active,
+GeditStatusbar GeditSmallButton.button:active:hover,
+GeditStatusMenuButton.button:backdrop,
+GeditStatusMenuButton.button:backdrop:hover,
 GeditStatusMenuButton.button,
 GeditStatusMenuButton.button:hover,
 GeditStatusMenuButton.button:active,
@@ -295,12 +279,16 @@ GeditStatusMenuButton.button:active:hover {
 	padding: 1px 8px 2px 4px;
 }
 
+GeditStatusbar GeditSmallButton.button:hover,
+GeditStatusbar GeditSmallButton.button:active,
+GeditStatusbar GeditSmallButton.button:active:hover,
 GeditStatusMenuButton.button:hover,
 GeditStatusMenuButton.button:active,
 GeditStatusMenuButton.button:active:hover {
 	border-color: @borders;
 }
 
+GeditStatusbar GeditSmallButton.button:active,
 GeditStatusMenuButton.button:active {
 	background-image: linear-gradient(to bottom,
 		@borders,
@@ -310,6 +298,13 @@ GeditStatusMenuButton.button:active {
 	text-shadow: 0 1px @button_text_shadow;
 }
 
+GeditStatusbar GeditSmallButton.button:backdrop,
+GeditStatusbar GeditSmallButton.button:backdrop:hover,
+GeditStatusMenuButton.button:backdrop,
+GeditStatusMenuButton.button:backdrop:hover {
+	border-color: @unfocused_borders;
+}
+
 GeditViewFrame .gedit-search-slider {
 	background-color: @theme_base_color;
 	padding: 6px;
@@ -330,11 +325,11 @@ GeditViewFrame .gedit-search-slider .not-found:selected {
 	color: @theme_selected_fg_color;
 }
 
-GeditFileBrowserWidget .primary-toolbar.toolbar  {
-	background-image: none;
-	background-color: @theme_bg_color;
-	border-top: none;
-	padding: 2px;
+GeditFileBrowserWidget .toolbar {
+	padding: 3px;
+	border-bottom: 1px solid @borders;
+	box-shadow: inset 0 3px alpha(black, 0.03), inset 0 2px alpha(black, 0.03), inset 0 1px alpha(black, 0.03);
+	background-color: shade(@theme_bg_color, 0.95);
 }
 
 .gedit-search-entry-occurrences-tag {
@@ -343,7 +338,10 @@ GeditFileBrowserWidget .primary-toolbar.toolbar  {
 	padding: 2px;
 }
 
-/* gnome-documents */
+/*
+ * GNOME Documents
+ */
+
 .documents-dropdown,
 .documents-dropdown .view {
 	background-color: shade (@theme_bg_color, 1.02);
@@ -450,7 +448,9 @@ GeditFileBrowserWidget .primary-toolbar.toolbar  {
 	color: shade(@entry_tag_bg, 2.10);
 }
 
-/* baobab */
+/*
+ * Baobab
+ */
 
 .cell.baobab-level-cell,
 .cell.baobab-level-cell:hover,
@@ -479,6 +479,13 @@ GeditFileBrowserWidget .primary-toolbar.toolbar  {
 	background-color: #cc0000;
 }
 
+.cell.baobab-level-cell.fill-block:backdrop,
+.cell.baobab-level-cell.fill-block:hover:backdrop,
+.cell.baobab-level-cell.fill-block.level-low:backdrop,
+.cell.baobab-level-cell.fill-block.level-high:backdrop {
+	background-color: @theme_unfocused_text_color;
+}
+
 .cell.baobab-cell-error {
 	color: @error_color;
 }
@@ -492,6 +499,13 @@ GeditFileBrowserWidget .primary-toolbar.toolbar  {
 	color: @theme_selected_fg_color;
 }
 
+.cell.baobab-cell-warning:backdrop,
+.cell.baobab-cell-error:backdrop,
+.cell.baobab-cell-warning:selected:backdrop,
+.cell.baobab-cell-error:selected:backdrop {
+	color: @theme_unfocused_text_color;
+}
+
 BaobabWindow.background GtkStack > GtkGrid > GtkScrolledWindow.frame {
 	border-radius: 0;
 	border-width: 0 1px 0 0;
@@ -520,11 +534,14 @@ BaobabRingschart.subfolder-tip {
 	text-shadow: 1px 1px black;
 }
 
-/* epiphany */
+/*
+ * Epiphany
+ */
 
 EphyToolbar .entry:first-child,
-EphyToolbar .entry:focus:first-child {
-	border-image-width: 3px 0 4px 3px;
+EphyToolbar .entry:focus:first-child,
+EphyToolbar .entry:backdrop:first-child {
+	border-image-width: 3px 0 3px 3px;
 	border-right-width: 0;
 	border-bottom-right-radius: 0;
 	border-top-right-radius: 0;
@@ -533,8 +550,9 @@ EphyToolbar .entry:focus:first-child {
 }
 
 EphyToolbar .entry:last-child,
-EphyToolbar .entry:focus:last-child {
-	border-image-width: 3px 3px 4px 0;
+EphyToolbar .entry:focus:last-child,
+EphyToolbar .entry:backdrop:last-child {
+	border-image-width: 3px 3px 3px 0;
 	border-left-width: 0;
 	border-bottom-left-radius: 0;
 	border-top-left-radius: 0;
@@ -557,11 +575,11 @@ EphyToolbar .entry:focus:last-child {
 EphyToolbar .location-entry .button {
 	color: @internal_element_color;
 	-GtkButton-child-displacement-y: 0;
-	border-image-source: url("borders/button-active.png");
-	border-image-slice: 3 3 4 3;
+	border-image-source: url("borders/entry.png");
+	border-image-slice: 3 3 3 3;
 	border-image-repeat: stretch;
 	border-width: 2px;
-	border-radius: 4px;
+	border-radius: 3px;
 	padding-left: 4px;
 	padding-right: 4px;
 	box-shadow: inset 1px 0 @inset_dark_color,
@@ -570,14 +588,14 @@ EphyToolbar .location-entry .button {
 }
 
 EphyToolbar .location-entry .button:last-child {
-	border-image-width: 3px 3px 4px 0;
+	border-image-width: 3px 3px 3px 0;
 	border-left-width: 0;
 	border-bottom-left-radius: 0;
 	border-top-left-radius: 0;
 }
 
 EphyToolbar .location-entry .button:first-child {
-	border-image-width: 3px 0 4px 3px;
+	border-image-width: 3px 0 3px 3px;
 	border-right-width: 0;
 	border-bottom-right-radius: 0;
 	border-top-right-radius: 0;
@@ -628,13 +646,17 @@ EphyToolbar.toolbar .button {
 
 	border-image: none;
 	border-color: @menu_bg_color;
-	border-radius: 4px 4px 0 0;
+	border-radius: 3px;
 }
 
 EphyOverview GtkScrolledWindow {
 	background-color: @theme_base_color;
 }
 
+EphyOverview GtkScrolledWindow:backdrop {
+	background-color: @theme_unfocused_base_color;
+}
+
 /* sets top and bottom borders on the main scrolled window for toolbar visual
  * division and search/downloadbar */
 EphyWindow.background EphyEmbed.vertical GtkScrolledWindow.frame {
@@ -655,17 +677,23 @@ EphyWindow.background EphyNotebook.notebook EphyEmbed.vertical GtkScrolledWindow
 }
 
 /* remove bottom borders from the  main scrolled window when no bars at the bottom of the screen are shown */
-EphyWindow.background EphyNotebook:last-child EphyEmbed.vertical GtkScrolledWindow,
-EphyWindow.background EphyNotebook.notebook:last-child {
+EphyWindow.background EphyEmbed.vertical GtkScrolledWindow,
+EphyWindow.background  {
 	border-bottom-width: 0;
 }
 
-/* Gnome Contacts */
+/*
+ * GNOME Contacts
+ */
 
 /* Line at top in contacts pane, similar to .documents-scrolledwin.frame */
-.contacts-content.frame {
- border-width: 1px 0 0 0;
- border-radius: 0;
+.contacts-spinner.frame {
+	border-width: 0 1px 0 0;
+	border-style: solid;
+	border-color: @borders;
+	border-image: none;
+	border-radius: 0;
+	padding: 0;
 }
 
 /* Background color in contacts pane, similar to .documents-main-view.view */
@@ -793,13 +821,18 @@ ContactsWindow .primary-toolbar.toolbar {
 	text-shadow: 1px 1px alpha(white, 0.6);
 }
 
-/* gnome-photos */
+/*
+ * GNOME Photos
+ */
 
 .photos-icon-bg {
 	icon-shadow: 0 1px #000000;
 }
 
-/* Gucharmap */
+/*
+ * Gucharmap
+ */
+
 GucharmapChartable:active,
 GucharmapChartable:focus,
 GucharmapChartable:selected {
@@ -807,7 +840,10 @@ GucharmapChartable:selected {
 	color: @theme_selected_fg_color;
 }
 
-/* evince */
+/*
+ * Evince
+ */
+
 EvWindow.background > GtkBox.vertical > GtkPaned.horizontal > GtkBox.vertical > GtkScrolledWindow.frame {
 	border-width: 0;
 	border-radius: 0;
@@ -856,3 +892,360 @@ MathWindow.background > GtkBox.vertical > GtkBox.vertical > GtkScrolledWindow {
 	background-color: @theme_base_color;
 	border-radius: 3px;
 }
+
+MathWindow.background > GtkBox.vertical > GtkBox.vertical > GtkScrolledWindow:backdrop {
+	padding: 4px;	
+	background-color:  @theme_unfocused_base_color;
+	border-radius: 3px;
+}
+
+/*
+ * GNOME Bluetooth
+ */
+
+GtkEntry.entry.pin-entry {
+	font: regular 50;
+	padding-left: 25px;
+	padding-right: 25px;
+}
+
+GtkLabel.pin-label {
+	font: regular 50;
+}
+
+/*
+ * Fallback Mode Panel
+ */
+
+.gnome-panel-menu-bar,
+PanelApplet > GtkMenuBar.menubar,
+PanelToplevel,
+PanelWidget,
+PanelAppletFrame,
+PanelApplet {
+	background-color: @os_chrome_bg_color;
+	background-image: none;
+	color: @os_chrome_fg_color;
+}
+
+ClockBox,
+.gnome-panel-menu-bar.menubar,
+PanelApplet > GtkMenuBar.menubar {
+	font: bold;
+}
+
+.gnome-panel-menu-bar.menubar .menuitem:hover,
+PanelApplet > GtkMenuBar.menubar .menuitem:hover {
+	text-shadow: 0 1px @os_chrome_bg_color;
+}
+
+.gnome-panel-menu-bar.menubar .menu,
+PanelApplet > GtkMenuBar.menubar .menu {
+	font: regular;
+}
+
+.gnome-panel-menu-bar.menubar .menu:hover,
+PanelApplet > GtkMenuBar.menubar .menu:hover {
+	text-shadow: none;
+}
+
+.gnome-panel-menu-bar .menuitem:hover,
+PanelApplet > GtkMenuBar.menubar .menuitem:hover,
+.gnome-panel-menu-bar .menuitem:hover,
+PanelApplet > GtkMenuBar.menubar .menuitem:hover {
+	background-color: @os_chrome_selected_bg_color;
+	color: @os_chrome_selected_fg_color;
+}
+
+.gnome-panel-menu-bar .menuitem:hover,
+PanelApplet > GtkMenuBar.menubar .menuitem:hover {
+	color: @os_chrome_selected_fg_color;
+}
+
+PanelApplet .button,
+PanelApplet .button:hover {
+	padding: 4px;
+
+	border-image: none;
+	border-width: 0;
+	border-radius: 0;
+
+	background-image: none;
+	background-color: @os_chrome_bg_color;
+
+	color: @os_chrome_fg_color;
+	text-shadow: none;
+}
+
+PanelApplet .button:active:hover,
+PanelApplet .button:active {
+	border-image: none;
+	background-image: none;
+	background-color: @os_chrome_selected_bg_color;
+	border-width: 0;
+	border-radius: 0;
+}
+
+PanelApplet:hover {
+	color: @os_chrome_selected_fg_color;
+}
+
+PanelApplet:active,
+PanelApplet:hover:active {
+	color: @os_chrome_selected_fg_color;
+	text-shadow: 0 1px @os_chrome_bg_color;
+}
+
+WnckPager {
+	background-color: lighter(@os_chrome_selected_bg_color);
+}
+
+NaTrayApplet {
+	-NaTrayApplet-icon-padding: 12;
+	-NaTrayApplet-icon-size: 16;
+}
+
+/*
+ * Fail Whale
+ */
+
+GsmFailWhaleDialog {
+	background-color: @os_chrome_bg_color;
+	background-image: none;
+	color: @os_chrome_fg_color;
+}
+
+GsmFailWhaleDialog .button,
+GsmFailWhaleDialog .button:active {
+	border-image: none;
+	border-color: @borders;
+	border-width: 1px;
+}
+
+
+/****************
+ * Widgets	  *
+ ****************/
+
+/*
+ * Floating Bar
+ */
+
+.floating-bar {
+	background-image: linear-gradient(to bottom, 
+		@theme_base_color 20%, 
+		shade(@theme_base_color, 0.9)
+		);
+	background-color: @theme_base_color;
+	border-color: @borders;
+
+	color: @theme_text_color;
+	text-shadow: 0 1px @button_text_shadow;
+
+	border-radius: 3px;
+	border-width: 1px;
+	border-style: solid;
+	box-shadow: inset 1px 1px @inset_light_color, -1px -1px @inset_light_color;
+}
+
+.floating-bar.top {
+	border-top-width: 0;
+	border-top-right-radius: 0;
+	border-top-left-radius: 0;
+}
+
+.floating-bar.right {
+	border-right-width: 0;
+	border-top-right-radius: 0;
+	border-bottom-right-radius: 0;
+}
+
+.floating-bar.bottom {
+	border-bottom-width: 0;
+	border-bottom-right-radius: 0;
+	border-bottom-left-radius: 0;
+}
+
+.floating-bar.left {
+	border-left-width: 0;
+	border-top-left-radius: 0;
+	border-bottom-left-radius: 0;
+}
+
+.floating-bar.bottom.right {
+	box-shadow: inset 1px 1px @inset_light_color;
+}
+
+.floating-bar.bottom.left {
+	box-shadow: inset -1px 1px @inset_light_color;
+}
+
+.floating-bar:backdrop {
+	background-color: @theme_unfocused_base_color;
+	border-color: shade(@theme_unfocused_base_color, 0.9);
+	background-image: none;
+	box-shadow: none;
+}
+
+.floating-bar .button {
+	background-color: alpha (@theme_base_color, 0.0);
+	background-image: none;
+
+	border-style: none;
+	border-image: none;
+
+	-GtkButton-image-spacing: 0;
+	-GtkButton-inner-border: 0;
+}
+
+/* FIXME: why do we still need this? */
+GtkClutterOffscreen {
+	background-color: @theme_bg_color;
+	color: @theme_fg_color;
+}
+
+/*
+ * Egg
+ */
+
+EggListBox {
+	background-color: @list_box_bg;
+}
+
+EggListBox:hover {
+	background-color: @content_view_bg;
+}
+
+EggListBox:selected {
+	background-color: @theme_selected_bg_color;
+}
+
+
+/*
+ * Content view
+ */
+
+.content-view.subtitle {
+	font: 9;
+	padding: 0px 12px 0px 12px;
+}
+
+.content-view.view.rubberband {
+	background-color: alpha (@theme_selected_bg_color, 0.35);
+
+	border-color: @theme_selected_bg_color;
+	border-style: solid;
+	border-width: 1px;
+	border-radius: 0px;
+}
+
+.content-view.view {
+	background-color: @content_view_bg;
+}
+
+.content-view.view:insensitive {
+	background-color: @theme_unfocused_base_color;
+	background-image: none;
+}
+
+.content-view.view:selected {
+	background-color: @theme_selected_bg_color;
+	background-image: none;
+}
+
+.content-view.view:selected:backdrop {
+	background-color: @theme_unfocused_selected_bg_color;
+	background-image: none;
+}
+
+/* FIXME: EggListBox should set the .cell style class on
+ * the background it renders for the children, like
+ * GtkIconView and GtkTreeView do */
+.content-view.cell {
+	background-color: transparent;
+	background-image: none;
+}
+
+EggListBox.content-view:hover,
+.content-view.cell:hover {
+	background-color: @theme_bg_color;
+}
+
+EggListBox.content-view:selected,
+EggListBox.content-view:active,
+.content-view.cell:selected,
+.content-view.cell:active {
+	background-color: @theme_selected_bg_color;
+	background-image: none;
+}
+
+EggListBox.content-view:selected:backdrop,
+.content-view.cell:selected:backdrop {
+	background-color: @theme_unfocused_selected_bg_color;
+	background-image: none;
+}
+
+GdMainIconView.content-view {
+	-GdMainIconView-icon-size: 40;
+}
+
+GtkIconView.content-view.cell.check,
+GtkIconView.content-view.cell.check:backdrop {
+	background-image: url("assets/grid-selection-unchecked.svg");
+	background-color: transparent;
+}
+
+GtkIconView.content-view.cell.check:active {
+	background-image: url("assets/grid-selection-checked.svg");
+	background-color: transparent;
+}
+
+/* Make spinner visible on both dark and bright backgrounds w/o making
+ * it look ugly/weird.
+ */
+GdMainIconView.content-view.cell:active {
+	color: gray;
+}
+
+.content-view.view.check,
+.content-view.view.check:active {
+	background-color: transparent;
+}
+
+.content-view.view .separator:backdrop {
+	color: @theme_unfocused_bg_color;
+}
+
+GtkIconView.content-view.check:hover,
+GtkIconView.content-view.check:insensitive,
+GtkIconView.content-view.check:backdrop,
+GtkIconView.content-view.check:selected {
+	background-color: transparent;
+}
+
+/* used by Documents and Evince */
+.content-view.document-page {
+	border-style: solid;
+	border-width: 3px 3px 6px 4px;
+	border-image: url("assets/thumbnail-frame.png") 3 3 6 4;
+}
+
+/*
+ * App Notifications
+ */
+
+.app-notification {
+	border-style: solid;
+	border-color: @app_notification_border;
+	border-width: 0 1px 1px 1px;
+	border-radius: 0 0 5px 5px;
+	padding: 8px;
+
+	background-image: linear-gradient(to bottom,
+		@app_notification_a,
+		@app_notification_b 18%,
+		@app_notification_c);
+
+	color: @theme_text_color;
+	text-shadow: 0 1px @primary_toolbar_button_text_shadow;
+}
diff --git a/desktop-themes/Menta/gtk-3.0/gtk-main-common.css b/desktop-themes/Menta/gtk-3.0/gtk-main-common.css
index 04671fa4..f7d1f344 100644
--- a/desktop-themes/Menta/gtk-3.0/gtk-main-common.css
+++ b/desktop-themes/Menta/gtk-3.0/gtk-main-common.css
@@ -31,8 +31,8 @@
 @define-color osd_button_bg_b alpha(@osd_lowlight, 0.05);
 @define-color osd_button_bg_c alpha(@osd_highlight, 0.12);
 
-@define-color osd_button_bg_insensitive alpha(@osd_highlight, 0.25);
-@define-color osd_button_bg_insensitive_active alpha(@osd_highlight, 0.16);
+@define-color osd_button_bg_insensitive alpha(@osd_bg, 0.25);
+@define-color osd_button_bg_insensitive_active alpha(@osd_bg, 0.16);
 
 @define-color osd_button_bg_hover_a alpha(@osd_highlight, 0.28);
 @define-color osd_button_bg_hover_b alpha(@osd_lowlight, 0.14);
@@ -42,10 +42,10 @@
 @define-color osd_button_bg_active_b alpha(black, 0.4);
 @define-color osd_button_bg_active_c alpha(black, 0);
 
-@define-color osd_button_bg_backdrop alpha(@osd_highlight, 0.18);
-@define-color osd_button_bg_backdrop_hover alpha(@osd_highlight, 0.25);
-@define-color osd_button_bg_backdrop_active alpha(@osd_highlight, 0.35);
-@define-color osd_button_bg_backdrop_insensitive alpha(@osd_highlight, 0.08);
+@define-color osd_button_bg_backdrop alpha(@osd_bg, 0.18);
+@define-color osd_button_bg_backdrop_hover alpha(@osd_bg, 0.25);
+@define-color osd_button_bg_backdrop_active alpha(@osd_bg, 0.35);
+@define-color osd_button_bg_backdrop_insensitive alpha(@osd_bg, 0.08);
 
 @define-color osd_button_fg_backdrop shade(@osd_fg, 0.70);
 @define-color osd_button_fg_backdrop_active shade(@osd_fg, 0.95);
diff --git a/desktop-themes/Menta/gtk-3.0/gtk-main.css b/desktop-themes/Menta/gtk-3.0/gtk-main.css
index 02f20cab..50c12a70 100644
--- a/desktop-themes/Menta/gtk-3.0/gtk-main.css
+++ b/desktop-themes/Menta/gtk-3.0/gtk-main.css
@@ -1,10 +1,10 @@
 /* Default color scheme */
 @define-color theme_base_color #f7f7f7;
-@define-color theme_bg_color #dcdcdc;
+@define-color theme_bg_color #d4d4d4;
 @define-color theme_selected_bg_color #accd8a;
 @define-color theme_text_color #2c2c2c;
 @define-color theme_fg_color @theme_text_color;
-@define-color theme_selected_fg_color #f5f5f5;
+@define-color theme_selected_fg_color #ffffff;
 
 @define-color placeholder_text_color shade(@text_color, 3.5);
 
@@ -195,7 +195,7 @@
 @define-color wm_bg_a shade (@theme_bg_color, 1.1);
 @define-color wm_bg_b @theme_bg_color;
 
-@define-color wm_shadow alpha(black, 0.5);
+@define-color wm_shadow alpha(black, 0.18);
 
 @define-color wm_button_bg_a shade (@theme_bg_color, 1.0);
 @define-color wm_button_bg_b shade (@theme_bg_color, 0.85);
@@ -217,5 +217,6 @@
 @import url("gtk-widgets-assets.css");
 @import url("gtk-widgets.css");
 @import url("gnome-applications.css");
+@import url("mate-applications.css");
 @import url("other-applications.css");
 @import url("unity.css");
diff --git a/desktop-themes/Menta/gtk-3.0/gtk-widgets-assets.css b/desktop-themes/Menta/gtk-3.0/gtk-widgets-assets.css
index 392f33a5..76c2a67b 100644
--- a/desktop-themes/Menta/gtk-3.0/gtk-widgets-assets.css
+++ b/desktop-themes/Menta/gtk-3.0/gtk-widgets-assets.css
@@ -29,10 +29,26 @@
 }*/
 
 /*************************
+ * Header bar separator  *
+ *************************/
+
+.header-bar > GtkBox > .separator.vertical {
+	-GtkWidget-wide-separators: 1;
+	-GtkWidget-separator-width: 2px;
+	background: transparent;
+	border-width: 0 1px 0 1px;
+	border-style: solid;
+	border-color: transparent;
+	border-image: -gtk-scaled(url("assets/header-separator.png"),url("assets/[email protected]")) 0 1 0 1 / 0 1px 0 1px stretch;
+}
+
+/*************************
  * Check and Radio items *
  *************************/
 
 /* draw regular check and radio items using our SVG assets */
+GtkModelButton.button.check,
+GtkModelButton.button.check:hover,
 .check,
 .view.cell.check {
 	background-image: url("assets/check-normal.png");
@@ -40,11 +56,7 @@
 	background-position: center;
 }
 
-.check row:selected,
-.check row:selected:focus {
-	background-image: url("assets/check-normal.png");
-}
-
+GtkModelButton.button.check:insensitive,
 .check:insensitive {
 	background-image: url("assets/check-normal-ins.png");
 }
@@ -53,49 +65,28 @@
 	background-color: transparent;
 }
 
-.check row:selected:insensitive,
-.check row:selected:focus:insensitive {
-	background-color: transparent;
-	background-image: url("assets/check-normal-ins.png");
-}
-
+GtkModelButton.button.check:active,
+GtkModelButton.button.check:active:hover,
 .check:active,
 .view.cell.check:active {
 	background-image: url("assets/check-active.png");
 }
 
-.check row:selected:active,
-.check row:selected:focus:active {
-	background-image: url("assets/check-active.png");
-}
-
+GtkModelButton.button.check:active:insensitive,
 .check:active:insensitive {
 	background-image: url("assets/check-active-ins.png");
 }
 
-.check row:selected:active:insensitive,
-.check row:selected:focus:active:insensitive {
-	background-image: url("assets/check-active-ins.png");
-}
-
 .check:inconsistent {
 	background-image: url("assets/check-mixed-active.png");
 }
 
-.check row:selected:inconsistent,
-.check row:selected:focus:inconsistent {
-	background-image: url("assets/check-mixed-active.png");
-}
-
 .check:inconsistent:insensitive {
 	background-image: url("assets/check-mixed-active-ins.png");
 }
 
-.check row:selected:inconsistent:insensitive,
-.check row:selected:focus:inconsistent:insensitive {
-	background-image: url("assets/check-mixed-active-ins.png");
-}
-
+GtkModelButton.button.radio,
+GtkModelButton.button.radio:hover,
 .radio,
 .view.cell.radio {
 	background-image: url("assets/radio-normal.png");
@@ -103,11 +94,7 @@
 	background-position: center;
 }
 
-.radio row:selected,
-.radio row:selected:focus {
-	background-image: url("assets/radio-normal.png");
-}
-
+GtkModelButton.button.radio:insensitive,
 .radio:insensitive {
 	background-image: url("assets/radio-normal-ins.png");
 }
@@ -116,48 +103,23 @@
 	background-color: transparent;
 }
 
-.radio row:selected:insensitive,
-.radio row:selected:focus:insensitive {
-	background-image: url("assets/radio-normal-ins.png");
-}
-
 .radio:active,
 .view.cell.radio:active {
 	background-image: url("assets/radio-active.png");
 }
 
-.radio row:selected:active,
-.radio row:selected:focus:active {
-	background-image: url("assets/radio-active.png");
-}
-
 .radio:active:insensitive {
 	background-image: url("assets/radio-active-ins.png");
 }
 
-.radio row:selected:active:insensitive,
-.radio row:selected:focus:active:insensitive {
-	background-image: url("assets/radio-active-ins.png");
-}
-
 .radio:inconsistent {
 	background-image: url("assets/radio-mixed-active.png");
 }
 
-.radio row:selected:inconsistent,
-.radio row:selected:focus:inconsistent {
-	background-image: url("assets/radio-mixed-active.png");
-}
-
 .radio:inconsistent:insensitive {
 	background-image: url("assets/radio-mixed-active-ins.png");
 }
 
-.radio row:selected:inconsistent:insensitive,
-.radio row:selected:focus:inconsistent:insensitive {
-	background-image: url("assets/radio-mixed-active-ins.png");
-}
-
 .sidebar .view.radio:active,
 .sidebar .view.radio:active:focus,
 .sidebar .view.radio:active:hover {
@@ -182,19 +144,19 @@
  * GtkSwitch *
  *************/
 GtkSwitch.trough {
- 	background-image: url("assets/switch-off.svg");
+ 	background-image: url("assets/switch-off.png");
 }
 
 GtkSwitch.trough:active {
-	background-image: url("assets/switch-on.svg");
+	background-image: url("assets/switch-on.png");
 }
 
 GtkSwitch.trough:insensitive {
-	background-image: url("assets/switch-off-ins.svg");
+	background-image: url("assets/switch-off-ins.png");
 }
 
 GtkSwitch.trough:active:insensitive {
-	background-image: url("assets/switch-on-ins.svg");
+	background-image: url("assets/switch-on-ins.png");
 }
 
 /*********************
@@ -311,5 +273,5 @@ GtkSwitch.trough:active:insensitive {
  * Content view *
  ****************/
 .content-view.view {
-	/* background-image: url("assets/noise-texture-light.png"); */
+	/*background-image: url("assets/noise-texture-light.png");*/
 }
diff --git a/desktop-themes/Menta/gtk-3.0/gtk-widgets-backgrounds.css b/desktop-themes/Menta/gtk-3.0/gtk-widgets-backgrounds.css
index dfed2d98..d329496f 100644
--- a/desktop-themes/Menta/gtk-3.0/gtk-widgets-backgrounds.css
+++ b/desktop-themes/Menta/gtk-3.0/gtk-widgets-backgrounds.css
@@ -11,11 +11,16 @@
 }
 
 /* Pushed button and progressbar through background */
-.button:active, 
+.button:active,
+.button:active:hover,
 .spinbutton.vertical .button:active,
+.spinbutton.vertical .button:active:hover,
 .toolbar .button:active,
+.toolbar .button:active:hover,
 .toolbar .button.raised:active,
-.toolbar .raised .button:active {
+.toolbar .raised .button:active,
+.toolbar .button.raised:active:hover,
+.toolbar .raised .button:active:hover {
 	background-image: linear-gradient(to bottom,
 		@button_active_gradient_color_a,
 		@button_active_gradient_color_b);
@@ -43,13 +48,6 @@
 	background-color: transparent; 
 }
 
-/* Flipped pushed button background for vertical progressbar through and the like */
-.trough.vertical {
-	background-image: linear-gradient(to right,
-		@trough_bg_color_a,
-		@trough_bg_color_b);
-}
-
 /* Primary and inline toolbars pushed button background */
 .primary-toolbar .button:active,
 .inline-toolbar .button:active {
@@ -140,7 +138,7 @@ GtkComboBox.combobox-entry .button:active,
 column-header.button,
 column-header .button {
 	background-image: linear-gradient(to bottom,
-		shade(@entry_background_a, 0.96),
+		shade(@entry_background_a, 1.0),
 		@entry_background_b);
 	box-shadow: inset 0 2px 0 0 alpha(@borders, 0.3);
 }
@@ -148,15 +146,11 @@ column-header .button {
 column-header.button:hover,
 column-header .button:hover {
 	background-image: linear-gradient(to bottom,
-		shade(@entry_background_a, 1.0),
+		shade(@entry_background_a, 0.96),
 		@entry_background_b);
 	box-shadow: inset 0 2px 0 0 alpha(@theme_selected_bg_color, 0.3);
 }
 
-column-header.button:hover:backdrop,
-column-header .button:hover:backdrop {
-	box-shadow: inset 0 2px 0 0 alpha(@theme_fg_color, 0.18);
-}
 column-header.button:focus,
 column-header .button:focus,
 column-header.button:active,
diff --git a/desktop-themes/Menta/gtk-3.0/gtk-widgets-borders.css b/desktop-themes/Menta/gtk-3.0/gtk-widgets-borders.css
index 11a3c89a..699b058e 100644
--- a/desktop-themes/Menta/gtk-3.0/gtk-widgets-borders.css
+++ b/desktop-themes/Menta/gtk-3.0/gtk-widgets-borders.css
@@ -6,9 +6,9 @@ GtkComboBox.combobox-entry .entry,
 GtkComboBox.combobox-entry .button,
 .button:active,
 .spinbutton.vertical .button:active,
-.inline-toolbar.toolbar.vertical .button:active,
-.titlebar .titlebutton:active,
-.titlebar .titlebutton:active:hover {
+.inline-toolbar.toolbar.vertical .button:active
+/*.titlebar .titlebutton:active,
+.titlebar .titlebutton:hover:active*/ {
 	border-image: url("borders/button-active.png") 3 4 4 4 / 3px 4px 4px 4px stretch;
 	border-radius: 4px;
 	border-width: 2px;
@@ -16,6 +16,12 @@ GtkComboBox.combobox-entry .button,
 	border-color: transparent;
 }
 
+.trough,
+.trough.highlight {
+	border: 1px solid @borders;
+}
+
+
 .entry:insensitive,
 GtkComboBox.combobox-entry .entry:insensitive,
 GtkComboBox.combobox-entry .button:insensitive,
@@ -30,8 +36,22 @@ GtkComboBox.combobox-entry .button:insensitive,
 	border-color: transparent;
 }
 
+.button:insensitive,
+.button.default:insensitive,
+.spinbutton.vertical .button:insensitive,
+.inline-toolbar.toolbar.vertical .button:insensitive,
+.inline-toolbar.toolbar.vertical .button.default:insensitive,
+.inline-toolbar.toolbar .button.default:insensitive,
+.inline-toolbar.toolbar .button:insensitive {
+	border-image: url("borders/button-ins.png") 3 4 4 4 / 3px 4px 4px 4px stretch;
+	border-radius: 4px;
+	border-width: 2px;
+	border-style: solid;
+	border-color: transparent;
+}
+
 .trough row {
-	border-image: url("borders/nohl-generic-border.png") 3 / 3px stretch; /* Zuki note: figure out the heck it does */
+	border-image: url("borders/nohl-generic-border.png") 3 / 3px stretch; /* Zuki note: figure out what the heck it does */
 	border-radius: 4px;
 	border-width: 1px;
 	border-style: solid;
@@ -40,20 +60,25 @@ GtkComboBox.combobox-entry .button:insensitive,
 
 /* focused element borders */
 .entry:focus,
-GtkComboBox.combobox-entry .entry:focus,
+GtkComboBox.combobox-entry .button:focus,
 .button.default:active,
-.inline-toolbar.toolbar.vertical .button.default:active {
+.inline-toolbar.toolbar.vertical .button.default:active,
+.button:active:focus,
+.spinbutton.vertical .button:active:focus,
+.inline-toolbar.toolbar.vertical .button:active:focus
+/*.titlebar .titlebutton:active:focus,
+.titlebar .titlebutton:hover:active:focus*/ { 
 	border-image: url("borders/button-active-focus.png") 3 4 4 4 / 3px 4px 4px 4px stretch;
 	border-radius: 4px;
-	border-width: 2px;
+	border-width: 2px; /*1px 1px 2px 1px;*/
 	border-style: solid;
 	border-color: transparent;
 }
 
 /* generic button borders */
-.button,
-.titlebar .titlebutton:hover
-/*.spinbutton.vertical .button,
+.button
+/*.titlebar .titlebutton:hover
+.spinbutton.vertical .button,
 .inline-toolbar.toolbar.vertical .button*/ {
 	border-image: url("borders/button.png") 3 4 4 4 / 3px 4px 4px 4px stretch;
 	border-radius: 4px;
@@ -81,12 +106,6 @@ GtkComboBox.combobox-entry .entry:focus,
 	border-color: transparent;
 }
 
-/* insensitive button borders */
-.button:insensitive,
-.button.default:insensitive {
-	border-image: url("borders/button-ins.png") 3 4 4 4 / 3px 4px 4px 4px stretch;
-}
-
 /* primary toolbar button borders */
 .primary-toolbar .button:hover {
 	border-image: url("borders/button.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
@@ -129,6 +148,7 @@ GtkComboBox.combobox-entry .entry:focus,
 .primary-toolbar .button.raised:active,
 .primary-toolbar .raised .button:active,
 .inline-toolbar.toolbar .button:active,
+.primary-toolbar GtkSwitch.trough,
 .primary-toolbar GtkComboBox .button:active {
 	border-image: url("borders/button-active.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
 	border-radius: 4px;
@@ -141,8 +161,8 @@ GtkComboBox.combobox-entry .entry:focus,
 .primary-toolbar .raised .button:insensitive,
 .primary-toolbar .button.raised.default:insensitive,
 .primary-toolbar .raised .button.default:insensitive,
-.inline-toolbar.toolbar .button.default:insensitive,
-.inline-toolbar.toolbar .button:insensitive,
+.primary-toolbar GtkSwitch.trough:insensitive,
+.primary-toolbar GtkSwitch.trough:active:insensitive,
 .primary-toolbar GtkComboBox .button:insensitive {
 	border-image: url("borders/button-active-ins.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
 	border-radius: 4px;
@@ -158,6 +178,7 @@ GtkComboBox.combobox-entry .entry:focus,
 .primary-toolbar .button.raised.default:active,
 .primary-toolbar .raised .button.default:active,
 .inline-toolbar.toolbar .button.default:active {
+	/*border-image: url("borders/primary-toolbar-generic-border-focused.png") 4 / 4px stretch;*/
 	border-image: url("borders/button-active-focus.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
 	border-radius: 3px;
 	border-width: 2px;
@@ -182,17 +203,6 @@ GtkComboBox.combobox-entry .entry:focus,
 .primary-toolbar .raised .button.default,
 .inline-toolbar.toolbar .button.default {
 	border-image: url("borders/button-focus.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
-	border-radius: 3px;
-	border-width: 2px;
-	border-style: solid;
-	border-color: transparent;
-}
-
-.primary-toolbar .button.raised.default,
-.primary-toolbar .raised .button.default,
-.inline-toolbar.toolbar .button.default {
-	/*border-image: url("borders/primary-toolbar-button-border-default.png") 4 / 4px stretch;*/
-	border-image: url("borders/button-focus.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
 	border-radius: 4px;
 	border-width: 2px;
 	border-style: solid;
@@ -254,9 +264,9 @@ column-header .button:focus {
 /* pushed colored buttons borders */
 .selection-mode.toolbar .suggested-action.button,
 .selection-mode.toolbar GtkToolButton.suggested-action .button {
-	border-image: url("borders/button.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
-	border-radius: 4px;
-	border-width: 0px 0px 1px 0px;
+	border-image: url("borders/button-focus.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
+	border-radius: 3px;
+	border-width: 0px 0px 2px 0px;
 	border-style: solid;
 	border-color: transparent;
 
@@ -265,9 +275,9 @@ column-header .button:focus {
 /* suggested action buttons borders */
 .suggested-action.button,
 .suggested-action.button:active {
-	border-image: url("borders/button.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
-	border-radius: 4px;
-	border-width: 1px 1px 2px 1px;
+	border-image: url("borders/button-focus.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
+	border-radius: 3px;
+	border-width: 2px;
 	border-style: solid;
 	border-color: transparent;
 	/* Zuki note: figure out the heck it does */
@@ -276,9 +286,9 @@ column-header .button:focus {
 /* destructive action buttons borders */
 .destructive-action.button,
 .destructive-action.button:active {
-	border-image: url("borders/button.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
-	border-radius: 4px;
-	border-width: 1px 1px 2px 1px;
+	border-image: url("borders/button-focus.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
+	border-radius: 3px;
+	border-width: 2px;
 	border-style: solid;
 	border-color: transparent;
 	/* Zuki note: figure out the heck it does */
diff --git a/desktop-themes/Menta/gtk-3.0/gtk-widgets.css b/desktop-themes/Menta/gtk-3.0/gtk-widgets.css
index 3e2b425f..cbf0133d 100644
--- a/desktop-themes/Menta/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/Menta/gtk-3.0/gtk-widgets.css
@@ -37,20 +37,18 @@
 
 	-GtkWidget-link-color: @link_color;
 	-GtkWidget-visited-link-color: @link_color;
-	-GtkIMHtml-hyperlink-color: @link_color;
-	-GtkHTML-link-color: @link_color;
 
 	-WnckTasklist-fade-overlay-rect: 0;
 
 	-GtkWidget-focus-padding: 2;
 	-GtkWidget-focus-line-width: 1;
-	-GtkWindow-resize-grip-width: 0;
-	-GtkWindow-resize-grip-height: 0;
+	-GtkWindow-resize-grip-width: 18;
+	-GtkWindow-resize-grip-height: 18;
 
 	/* We use the outline properties to signal the focus properties
 	 * to the adwaita engine: using real CSS properties is faster,
 	 * and we don't use any outlines for now.
-     */
+	 */
 	outline-color: alpha(@theme_text_color, 0.3);
 	outline-style: dashed;
 	outline-offset: 2px;
@@ -70,20 +68,14 @@
 	icon-shadow: none;
 }
 
-/* FIXME: why do we still need this? */
-GtkClutterOffscreen {
-	background-color: @theme_bg_color;
-	color: @theme_fg_color;
-}
-
 *:selected,
 *:selected:focus {
 	background-color: @theme_selected_bg_color;
 	color: @theme_selected_fg_color;
 }
 
-*:selected:backdrop,
-*:selected:focus:backdrop {
+*:selected:backdrop {
+	/* I would like to remove colors from the backdrop state, next release*/
 	background-color: @theme_unfocused_selected_bg_color;
 	color: @theme_unfocused_selected_fg_color;
 }
@@ -94,12 +86,6 @@ GtkClutterOffscreen {
 	border-color: @insensitive_borders;
 }
 
-*:insensitive:backdrop {
-	text-shadow: none;
-	icon-shadow: none;
-	color: @unfocused_insensitive_fg_color;
-}
-
 /* Apply effects to insensitive and prelit images */
 *:insensitive {
 	-gtk-image-effect: dim;
@@ -137,7 +123,11 @@ GtkClutterOffscreen {
 GtkImage,
 GtkImage:insensitive,
 GtkLabel,
-GtkLabel:insensitive {
+GtkLabel:insensitive,
+GtkBox,
+GtkBox:insensitive,
+GtkGrid,
+GtkGrid:insensitive {
 	background-color: transparent;
 }
 
@@ -278,65 +268,6 @@ GtkLabel:insensitive {
 	color: @theme_fg_color;
 }
 
-.floating-bar {
-	background-image: linear-gradient(to bottom, 
-		@theme_base_color 20%, 
-		shade(@theme_base_color, 0.9));
-	background-color: @theme_base_color;
-	border-color: @borders;
-
-	color: @theme_text_color;
-	text-shadow: 0 1px @button_text_shadow;
-	border-radius: 3px;
-	border-width: 1px;
-	border-style: solid;
-	box-shadow: inset 1px 1px @inset_light_color, -1px -1px @inset_light_color;
-}
-
-.floating-bar.top {
-	border-top-width: 0;
-	border-top-right-radius: 0;
-	border-top-left-radius: 0;
-}
-
-.floating-bar.right {
-	border-right-width: 0;
-	border-top-right-radius: 0;
-	border-bottom-right-radius: 0;
-}
-
-.floating-bar.bottom {
-	border-bottom-width: 0;
-	border-bottom-right-radius: 0;
-	border-bottom-left-radius: 0;
-}
-
-.floating-bar.left {
-	border-left-width: 0;
-	border-top-left-radius: 0;
-	border-bottom-left-radius: 0;
-}
-
-.floating-bar.bottom.right {
-	box-shadow: inset 1px 1px @inset_light_color;
-}
-
-.floating-bar.bottom.left {
-	box-shadow: inset -1px 1px @inset_light_color;
-}
-
-.floating-bar .button {
-	background-color: alpha (@theme_base_color, 0.0);
-	background-image: none;
-
-	border-style: none;
-	border-image: none;
-
-	-GtkButton-image-spacing: 0;
-	-GtkButton-inner-border: 0;
-}
-
-.content-view.view.rubberband,
 .view.rubberband,
 .rubberband {
 	background-color: alpha (@theme_selected_bg_color, 0.35);
@@ -402,6 +333,10 @@ GtkTreeView.separator,
 	box-shadow: inset 0px 2px 3px 0px alpha(@theme_fg_color, 0.15);
 }
 
+.entry.image.left {
+	padding-right: 6px;
+}
+
 .entry:focus {
 	box-shadow: inset 1px 2px alpha(@theme_selected_bg_color, 0.1),
 		inset 1px 1px alpha(@theme_selected_bg_color, 0.1),
@@ -446,8 +381,6 @@ GtkTreeView.separator,
 	color: @insensitive_fg_color;
 }
 
-/* needed for webkit/GtkStyle/Evolution compatibility */
-GtkHTML:active,
 .entry:active {
 	color: @theme_unfocused_selected_fg_color;
 	background-color: @theme_unfocused_selected_bg_color;
@@ -495,7 +428,7 @@ GtkHTML:active,
  * GtkSpinButton *
  *****************/
 .spinbutton .button {
-	color: @theme_fg_color;
+	color: @internal_element_color;
 	padding: 2px 6px;
 	border-width: 0;
 	border-radius: 0;
@@ -510,21 +443,21 @@ GtkHTML:active,
 }
 
 .spinbutton .button:insensitive {
-	color: @insensitive_fg_color;
+	color: @internal_element_insensitive;
 }
 
 .spinbutton .button:active,
 .spinbutton .button:hover {
-	color: @internal_element_color;
+	color: @internal_element_prelight;
 }
 
 .spinbutton .button:first-child {
-	border-radius: 4px 0 0 4px;
+	border-radius: 3px 0 0 3px;
 	box-shadow: none;
 }
 
 .spinbutton .button:last-child {
-	border-radius: 0 4px 4px 0;
+	border-radius: 0 3px 3px 0;
 }
 
 .spinbutton .button:dir(rtl) {
@@ -584,47 +517,47 @@ GtkHTML:active,
 
 .spinbutton.vertical .button:first-child {
 	border-image-width: 3px 3px 0 3px;
-	border-width: 1px 1px 0 1px;
-	border-radius: 4px 4px 0 0;
+	border-width: 2px 1px 0 1px;
+	border-bottom-left-radius: 0; 
+	border-bottom-right-radius: 0;
 }
 
 .spinbutton.vertical .button:last-child {
 	border-image-width: 0 3px 4px 3px;
 	border-width: 0 1px 2px 1px;
-	border-radius: 0 0 4px 4px;
+	border-top-left-radius: 0; 
+	border-top-right-radius: 0;
 }
 
 .spinbutton.vertical.entry {
-	/*border-image: none;*/
-	border-image-width: 0px 3px 0 3px;
-	border-color: @borders;
-	border-width: 0 1px;
+	border-image: none;
+	border-color: alpha(@borders, 0.1);
+	border-width: 0 1px 0 1px;
 	border-style: solid;
 	border-radius: 0;
-	box-shadow: inset 0 2px @entry_inset, 
-		inset 0 3px alpha(@entry_inset, 0.4),
-		inset 0 1px @borders, 
-		inset 0 -1px @borders;
+	box-shadow: inset 1px 0 0 0 @borders, 
+		inset -1px 0 0 0 @borders,
+		inset 0 1px 0 0 @borders,
+		inset 0 -1px 0 0 @borders;
 
 	/* I'm using box-shadow as borders, so I need to compensate
-	   with padding. Those two values need to be entry padding +1 */
+	   with padding. Those two values need to be entry padding 1 */
 	padding-top: 5px;
 	padding-bottom: 5px;
 }
 
 .spinbutton.vertical.entry:insensitive {
-	border-color: @insensitive_borders;
-	box-shadow: inset 0 1px @insensitive_borders,
-		inset 0 -1px @insensitive_borders;
+	border-color: alpha(@borders, 0.1);
+	box-shadow: inset 0 1px alpha(@borders, 0.4),
+		inset 0 -1px alpha(@borders, 0.4);
 }
 
 .spinbutton.vertical.entry:focus {
-	border-color: @theme_selected_bg_color;
-	box-shadow: inset 1px 2px alpha(@theme_selected_bg_color, 0.1), 
-		inset 1px 3px alpha(@theme_selected_bg_color, 0.1),
-		inset -1px -2px alpha(@theme_selected_bg_color, 0.2),
-		inset 0 1px @theme_selected_bg_color,
-		inset 0 -1px @theme_selected_bg_color;
+	border-color: alpha(@borders, 0.1);
+	box-shadow: inset 1px 0 0 0 @theme_selected_bg_color, 
+		inset -1px 0 0 0 @theme_selected_bg_color,
+		inset 0 1px 0 0 @theme_selected_bg_color,
+		inset 0 -1px 0 0 @theme_selected_bg_color;
 }
 
 /*****************
@@ -782,7 +715,10 @@ GtkProgressBar {
 		);
 }
 
-/* level bars as used for password quality or remaining power */
+/****************
+ * Level Bar *
+ ****************/
+
 GtkLevelBar {
 	-GtkLevelBar-min-block-width: 34;
 	-GtkLevelBar-min-block-height: 3;
@@ -795,12 +731,12 @@ GtkLevelBar.vertical {
 
 .level-bar.trough {
 	padding: 2px;
-	border-radius: 8px;
+	border-radius: 2px;
 	background-image: linear-gradient(to bottom,
 		@trough_bg_color_a,
 		@trough_bg_color_b);
 	background-color: transparent;
-	box-shadow: inset 0 0 0 1px @borders;
+	box-shadow: none;
 }
 
 
@@ -816,7 +752,7 @@ GtkLevelBar.vertical {
 
 .level-bar.indicator-continuous.fill-block {
 	padding: 2px;
-	border-radius: 8px;
+	border-radius: 2px;
 }
 
 .level-bar.indicator-discrete.fill-block.horizontal {
@@ -1017,7 +953,8 @@ GtkComboBox.combobox-entry .button {
 	padding: 1px 4px;
 }
 
-.button.image-button {
+.button.image-button,
+.primary-toolbar.toolbar .button.image-button {
 	padding: 3px 4px 4px;
 }
 
@@ -1033,9 +970,15 @@ GtkComboBox.combobox-entry .button {
 	text-shadow: 0 1px @button_text_shadow;
 }
 
+.button.default {
+	text-shadow: none;
+	color: @theme_fg_color;
+}
+
 /* We may want a background for focused buttons, but in the meantime let's remove it too */
 .primary-toolbar .button,
-.primary-toolbar .button:insensitive {
+.primary-toolbar .button:insensitive,
+.primary-toolbar .button *:insensitive {
 	background-image: none;
 	background-color: transparent;
 }
@@ -1054,10 +997,6 @@ GtkComboBox.combobox-entry .button {
 	text-shadow: 0 1px @button_text_shadow;
 }
 
-.primary-toolbar.toolbar .button.image-button {
-	padding: 3px 4px 4px;
-}
-
 .primary-toolbar .button:active,
 .inline-toolbar .button:active,
 .button:active {
@@ -1177,6 +1116,20 @@ GtkComboBox.combobox-entry .button {
 	box-shadow: none; 
 }
 
+/* remove inset from first-child and only-child active buttons */
+.linked .button:only-child:active,
+.toolbar .button.raised.linked:only-child:active,
+.toolbar .raised.linked .button:only-child:active,
+.inline-toolbar.toolbar .button:only-child:active,
+.inline-toolbar.toolbar GtkToolButton > .button:only-child:active,
+.linked .button:first-child:active,
+.toolbar .button.raised.linked:first-child:active,
+.toolbar .raised.linked .button:first-child:active,
+.inline-toolbar.toolbar .button:first-child:active,
+.inline-toolbar.toolbar GtkToolButton > .button:first-child:active  {
+	box-shadow: inset 0 1px 1px alpha(black, 0.1);
+}
+
 /* Middle button */
 .linked .entry,
 .linked .button,
@@ -1195,6 +1148,7 @@ GtkComboBox.combobox-entry .button {
 .linked .button:active:first-child,
 .linked .button:active:hover:first-child,
 .linked .button:insensitive:first-child {
+	border-right-width: 0;
 	border-left-width: 2px;
 	border-image-width: 3px 0 4px 4px;
 	border-bottom-right-radius: 0;
@@ -1312,6 +1266,15 @@ GtkComboBox.combobox-entry .button {
 	box-shadow: none;
 }
 
+/* remove shadows from linked menu buttons */
+.linked GtkMenuButton.menu-button:active,
+.toolbar GtkMenuButton.menu-button.raised.linked:active,
+.toolbar .raised.linked GtkMenuButton.menu-button:active,
+.inline-toolbar.toolbar GtkMenuButton.menu-button:active,
+.inline-toolbar.toolbar GtkToolButton > GtkMenuButton.menu-button:active {
+	box-shadow: none;
+}
+
 /* Linked buttons on primary toolbars */
 
 /* Middle button */
@@ -1409,7 +1372,7 @@ GtkComboBox.combobox-entry .button {
 .inline-toolbar.toolbar GtkMenuToolButton:first-child .button:insensitive:first-child {
 	border-left-width: 2px;
 	border-right-width: 0;
-	border-image-width: 3px 0 4px 3px;
+	border-image-width: 3px 0 3px 3px;
 	border-bottom-right-radius: 0;
 	border-top-right-radius: 0;
 }
@@ -1478,6 +1441,11 @@ GtkComboBox.combobox-entry .button {
 	border-radius: 3px;
 }
 
+*:link,
+*:visited {
+  color: @link_color;
+}
+
 GtkLinkButton.button,
 GtkLinkButton.button:active {
 	text-shadow: none;
@@ -1489,28 +1457,33 @@ GtkLinkButton.button:active {
 
 /*****************
  * Notebooks and *
- * tabs		*
+ * tabs          *
  *****************/
 .notebook {
 	padding: 0;
-
 	border-color: @borders;
-	border-style: solid;
-	border-width: 1px;
+	border-top: 0px;
 
-	background-clip: border-box;
 	background-color: shade (@theme_bg_color, 1.1);
-
 	-GtkNotebook-initial-gap: 0;
 	-GtkNotebook-arrow-spacing: 5;
+	-GtkNotebook-tab-curvature: 0;
+	-GtkNotebook-tab-overlap: 0;
 	-GtkNotebook-has-tab-gap: false;
-	-GtkNotebook-tab-overlap: -1;
+	-GtkWidget-focus-padding: 0;
+	-GtkWidget-focus-line-width: 0;
+}
+
+.notebook.frame {
+	border-width: 1px;
 }
 
 .notebook.header {
-	background-color: shade(@theme_bg_color, 0.95);
-	box-shadow: inset 0 3px alpha(black, 0.03), inset 0 2px alpha(black, 0.03), inset 0 1px alpha(black, 0.03);
+	background-image: linear-gradient(to bottom,
+		shade(@theme_bg_color, 0.96),
+		shade(@theme_bg_color, 1.0));
 	border-width: 0px;
+	box-shadow: inset 0 1px 0 0 alpha(@borders, 0.4), inset 0 -1px 0 0 alpha(@borders, 1.0);
 }
 
 .notebook.header.frame.top {
@@ -1538,117 +1511,166 @@ GtkLinkButton.button:active {
 }
 
 .notebook GtkViewport {
-	background-color: shade (@theme_bg_color, 1.1);
+	background-color: @theme_base_color;
 	border-width: 0px;
 }
 
 .notebook tab {
-	padding: 2px;
-	border-style: solid;
-	border-width: 1px 1px 0px 1px;
-	border-color: @borders;
-	background-image: linear-gradient(to bottom,
-		@notebook_tab_gradient_a,
-		@notebook_tab_gradient_b);
-	border-radius: 4px 4px 0 0;
-	border-image: none;
-	box-shadow: inset 0 1px alpha (shade (@theme_base_color, 1.1), 0.4);
+	border-color: transparent;
+	border-width: 0px;
+	background-image: none;
+	background-color: transparent;
 }
 
+.notebook tab GtkLabel {
+	color: mix (@theme_fg_color, @theme_bg_color, 0.40);
+	font-weight: normal;
+}
+
+.notebook .prelight-page,
+.notebook .prelight-page GtkLabel {
+	color: mix (@theme_fg_color, @theme_bg_color, 0.15);
+}
+
+.notebook .active-page,
+.notebook tab .active-page GtkLabel {
+	color: @theme_fg_color;
+}
+
+/* horizontal tabs */
+
+.notebook tab.top,
 .notebook tab.bottom {
-	background-image: linear-gradient(to top,
-		@notebook_tab_gradient_a,
-		@notebook_tab_gradient_b);
-	border-width: 0px 1px 1px 1px;
-	border-radius: 0 0 4px 4px;
-	box-shadow: inset 0 -1px alpha (shade (@theme_base_color, 1.1), 0.4);
+	padding: 8px 20px 6px;
 }
 
-.notebook tab:active {
+.notebook tab.top:active,
+.notebook tab.top:active:hover {
 	background-image: linear-gradient(to bottom,
-		shade (@theme_bg_color, 1.18),
-		shade (@theme_bg_color, 1.1));
-	border-width: 1px 1px 0px 1px;
+		shade(@theme_bg_color, 1.18),
+		shade(@theme_bg_color, 1.1));
+	border-radius: 4px 4px 0 0;
+	border-width: 1px 1px 0 1px;
+	border-style: solid;
+	border-color: @borders;
+	box-shadow: none;
 }
 
-.notebook tab.bottom:active {
+.notebook tab.top:hover {
 	background-image: linear-gradient(to bottom,
-		shade (@theme_bg_color, 1.1),
-		shade (@theme_bg_color, 1.18));
+		alpha(@theme_base_color, 0.0),
+		alpha(@theme_base_color, 0.3));
+	border-radius: 0;
+	box-shadow: inset 1px 0 alpha(@borders, 0.6), inset -1px 0 alpha(@borders, 0.6);
+	border-style: none;
+}
+
+.notebook tab.top:active {
+	border-bottom-color: @notebook_active_tab_border;
+}
+
+.notebook tab.bottom:active,
+.notebook tab.bottom:active:hover {
+	background-image: linear-gradient(to top,
+		shade(@theme_bg_color, 1.18),
+		shade(@theme_bg_color, 1.1));
+	border-radius: 0;
+	border-style: solid;
 	border-width: 0px 1px 1px 1px;
+	box-shadow: none;
 }
 
-.notebook tab.left,
-.notebook tab.right {
-	background-image: none;
-	background-color: @theme_bg_color;
-	padding: 3px;
+.notebook tab.bottom:hover {
+	background-image: linear-gradient(to top,
+		alpha(@theme_base_color, 0.0),
+		alpha(@theme_base_color, 0.3));
+	border-radius: 0;
+	box-shadow: inset 1px 0 alpha(@borders, 0.6), inset -1px 0 alpha(@borders, 0.6);
+	border-style: none;
 }
 
-.notebook tab.left {
-	border-width: 1px 0 1px 1px;
-	border-radius: 4px 0 0 4px;
+.notebook tab.bottom:active {
+	border-top-color: @notebook_active_tab_border;
 }
 
+/* vertical tabs */
+
+.notebook tab.left,
 .notebook tab.right {
-	border-width: 1px 1px 1px 0;
-	border-radius: 0 4px 4px 0;
+	padding: 5px 20px;
 }
 
-.notebook tab.left:active,
-.notebook tab.right:active {
-	background-image: none;
-	background-color: shade (@theme_bg_color, 1.1);
+.notebook tab.left:hover,
+.notebook tab.left:active {
+	border-right-width: 2px;
 }
 
 .notebook tab.left:active {
-	border-width: 1px 0 1px 1px;
-	padding: 3px 3px 3px 5px;
-	border-radius: 4px 0 0 4px;
+	border-right-color: @notebook_active_tab_border;
 }
 
+.notebook tab.right:hover,
 .notebook tab.right:active {
-	border-width: 1px 1px 1px 0;
-	padding: 3px 5px 3px 3px;
-	border-radius: 0 4px 4px 0;
+	border-left-width: 2px;
 }
 
-.notebook tab GtkLabel {
-	color: @theme_fg_color;
+.notebook tab.right:active {
+	border-left-color: @notebook_active_tab_border;
 }
 
-.notebook .active-page,
-.notebook tab .active-page GtkLabel {
-	color: @theme_fg_color;
+.notebook tab.reorderable-page:hover {
+	background-image: linear-gradient(to bottom,
+		alpha(@theme_base_color, 0.0),
+		alpha(@theme_base_color, 0.3));
+	border-radius: 0;
+	box-shadow: inset 1px 0 alpha(@borders, 0.6), inset -1px 0 alpha(@borders, 0.6);
+	border-style: none;
 }
 
-.notebook tab:active {
-	border-bottom-width: 0px;
+.notebook tab.reorderable-page:active {
+	background-image: linear-gradient(to bottom,
+		shade(@theme_bg_color, 1.18),
+		shade(@theme_bg_color, 1.1));
+	border-radius: 4px 4px 0 0;
+	box-shadow: none;
+	border-style: solid;
 }
 
 /* close button styling */
-.notebook tab .button,
-.notebook tab .button:active,
-.notebook tab .button:hover {
+.notebook tab .button {
+	color: mix (@theme_fg_color, @theme_bg_color, 0.85);
 	border-image: none;
-	border: 1px solid transparent;
 	background-image: none;
 	background-color: transparent;
+	border-radius: 3px;
+	border-style: solid;
+	border-color: transparent;
+	border-width: 1px;
+	padding: 1px;
+	icon-shadow: none;
+}
+
+.notebook .prelight-page .button,
+.notebook tab.prelight-page .button,
+.notebook .active-page .button,
+.notebook tab.active-page .button {
+	color: mix(@theme_fg_color, @theme_base_color, 0.6);
+	icon-shadow: 0 1px @button_text_shadow;
 }
 
 .notebook tab .button:hover {
 	color: @theme_fg_color;
-	border: 1px solid alpha(black, 0.1);
+	border-color: alpha(black, 0.1);
 }
 
 .notebook tab .button:active,
 .notebook tab .button:active:hover {
+	color:  @button_active_text;
 	background-color: alpha(black, 0.08);
 	box-shadow: inset 0 1px alpha(black, 0.05);
-	color:  @button_active_text;
 	icon-shadow: 0 1px @button_active_text_shadow;
 
-	border-color: alpha(black, 0.27) 
+	border-color: alpha(black, 0.27)
 		alpha(black, 0.13) 
 		alpha(black, 0.13) 
 		alpha(black, 0.13);
@@ -1750,13 +1772,33 @@ GtkComboBox.combobox-entry .button:active:hover {
 }
 
 GtkComboBox .button {
-	color: @theme_text_color;
+	color: @internal_element_color;
 }
 
 GtkComboBox .button:hover {
 	color: @theme_text_color;
 }
 
+/********************
+ * Various choosers *
+ ********************/
+
+GtkFontButton .separator,
+GtkFileChooserButton .separator {
+	/* always disable separators */
+	-GtkWidget-wide-separators: true;
+	-GtkWidget-horizontal-separator: 0;
+	-GtkWidget-vertical-separator: 0;
+}
+
+GtkFontButton GtkLabel:last-child {
+	color: mix(@theme_fg_color, @theme_bg_color, 0.35);
+}
+
+GtkFileChooserButton GtkImage:last-child {
+	color: @internal_element_color;
+}
+
 /**************
  * Scrollbars *
  **************/
@@ -1767,10 +1809,10 @@ GtkComboBox .button:hover {
 	-GtkRange-trough-border: 0;
 	-GtkScrollbar-has-backward-stepper: true;
 	-GtkScrollbar-has-forward-stepper: true;
+	-GtkRange-stepper-size: 16;
 	-GtkRange-slider-width: 13;
 	-GtkScrollbar-min-slider-length: 42; /* minimum size for the slider. sadly can't be in '.slider' where it belongs */
 
-	-GtkRange-stepper-size: 16;
 	-GtkRange-stepper-spacing: 0;
 	-GtkRange-trough-under-steppers: 1;
 }
@@ -1781,6 +1823,7 @@ GtkComboBox .button:hover {
 	border-width: 0;
 	border-radius: 0;
 	border-image: none;
+	box-shadow: none;
 }
 
 .scrollbar.trough,
@@ -1929,7 +1972,6 @@ GtkTreeMenu .menuitem {
 	border-style: none;
 }
 
-/* FIXME: Figure out why menuitem:hover doesn't change anything here */
 GtkTreeMenu .menuitem {
 	color: @theme_text_color;
 }
@@ -1950,6 +1992,7 @@ GtkTreeMenu .menuitem,
 	color: @menu_fg_color;
 	padding: 0;
 	border: 1px solid @borders;
+	margin: 4px;
 }
 
 .menu.button {
@@ -1983,10 +2026,7 @@ GtkTreeMenu .menuitem,
 	background-image: linear-gradient(to bottom,
 		@theme_bg_color,
 		shade (@theme_bg_color, 0.96));
-	border-width: 0 0 1px 0;
-	border-style: solid;
-	border-color: alpha (@theme_base_color, 0.2);
-	box-shadow: inset 0 -1px shade(@theme_bg_color, 0.92);
+	border-width: 0;
 	-GtkWidget-window-dragging: true;
 }
 
@@ -2123,38 +2163,39 @@ GtkModelMenuItem GtkBox GtkImage {
 /***************
  * Menu Button *
  ***************/
-.toolbar GtkMenuButton.button:active,
-.toolbar GtkMenuButton.button.raised:active,
-GtkMenuButton.button:active,
-.linked GtkMenuButton.button:active,
-.toolbar .linked.raised GtkMenuButton.button:active,
-.toolbar GtkMenuButton.button.linked.raised:active {
+.toolbar GtkMenuButton.menu-button:active,
+.toolbar GtkMenuButton.menu-button.raised:active,
+GtkMenuButton.menu-button:active,
+.linked GtkMenuButton.menu-button:active,
+.toolbar .linked.raised GtkMenuButton.menu-button:active,
+.toolbar GtkMenuButton.menu-button.linked.raised:active {
 /*	background-image: none;
 	background-color: @menu_bg_color;
 
 	border-image: none;
 	border-color: @menu_bg_color;
 	border-radius: 4px 4px 0 0;
-	color: @theme_text_color; */
+	color: @theme_text_color;*/
 }
 
-GtkMenuButton.button:active,
-.linked GtkMenuButton.button:active,
-.toolbar .linked.raised GtkMenuButton.button:active,
-.toolbar GtkMenuButton.button.linked.raised:active {
+GtkMenuButton.menu-button:active,
+.linked GtkMenuButton.menu-button:active,
+.toolbar .linked.raised GtkMenuButton.menu-button:active,
+.toolbar GtkMenuButton.menu-button.linked.raised:active {
 	text-shadow: none;
 	icon-shadow: none;
+	box-shadow: none;
 }
 
-.linked GtkMenuButton.button:active:last-child,
-.toolbar .linked.raised GtkMenuButton.button:active:last-child,
-.toolbar GtkMenuButton.button.linked.raised:active:last-child {
+.linked GtkMenuButton.menu-button:active:last-child,
+.toolbar .linked.raised GtkMenuButton.menu-button:active:last-child,
+.toolbar GtkMenuButton.menu-button.linked.raised:active:last-child {
 	border-top-left-radius: 0;
 }
 
-.linked GtkMenuButton.button:active:first-child,
-.toolbar .linked.raised GtkMenuButton.button:active:first-child,
-.toolbar GtkMenuButton.button.linked.raised:active:first-child {
+.linked GtkMenuButton.menu-button:active:first-child,
+.toolbar .linked.raised GtkMenuButton.menu-button:active:first-child,
+.toolbar GtkMenuButton.menu-button.linked.raised:active:first-child {
 	border-top-right-radius: 0;
 }
 
@@ -2170,8 +2211,8 @@ GtkMenuButton.button:active,
 }
 
 .button.menuitem.menubar:active,
-GtkMenuButton.button:active,
-.toolbar GtkMenuButton.button:active {
+GtkMenuButton.menu-button:active,
+.toolbar GtkMenuButton.menu-button:active {
 	color: @theme_text_color;
 }
 
@@ -2179,7 +2220,6 @@ GtkMenuButton .menu {
 	text-shadow: none;
 }
 
-
 /****************
  * Radiobuttons *
  ****************/
@@ -2199,7 +2239,6 @@ GtkCheckButton:selected:focus {
 	background-color: transparent;
 }
 
-
 /************
  * Toolbars *
  ************/
@@ -2247,7 +2286,7 @@ GtkCheckButton:selected:focus {
 	border-style: solid;
 	border-color: shade(@borders, 0.90);
 
-	box-shadow: inset 0 -1px shade(@borders, 1.30);
+	box-shadow: inset 0 -1px shade(@wm_bg_b, 0.95);
 	background-color: @theme_bg_color;
 
 	padding: 6px 6px 5px 6px;
@@ -2258,15 +2297,124 @@ GtkCheckButton:selected:focus {
 }
 
 .header-bar .button.image-button {
-	padding: 5px 4px 5px 5px;
+	padding: 5px 5px 4px 5px;
 }
 
 .header-bar .title {
-	font: Bold 10;
+	font: Bold;
+	padding: 0px 12px 0px 12px;
 }
 
 .header-bar .subtitle {
+	font-size: 80%;
+	padding: 0px 12px 0px 12px;
+}
+
+/***************
+ * Action bars *
+ ***************/
+.action-bar {
+	border-width: 1px 0 0;
+	border-style: solid;
+	border-color: shade(@borders, 0.90);
+
+	box-shadow: inset 0 -1px shade(@borders, 1.30);
+	background-image: linear-gradient(to bottom,
+		shade(@theme_bg_color, 1.05),
+		shade(@theme_bg_color, 0.95));
+
+	padding: 6px 6px 5px 6px;
+}
+
+.action-bar .button.text-button {
+	padding: 2px 16px;
+}
+
+.action-bar .button.image-button {
+	padding: 5px 5px 4px 5px;
+}
+
+.action-bar .title {
+	font: Bold 10;
+	padding: 0px 12px 0px 12px;
+}
+
+.action-bar .subtitle {
 	font: 9;
+	padding: 0px 12px 0px 12px;
+}
+
+/***************
+ * Dialog	  *
+ ***************/
+
+.prompt,
+GtkMessageDialog {
+	-GtkDialog-content-area-border: 0;
+	-GtkDialog-action-area-border: 15;
+	-GtkDialog-button-spacing: 10;
+	margin: 0;
+	padding: 0;
+}
+
+.dialog-action-area.linked .button,
+.dialog-action-area.linked .button:active,
+.dialog-action-area.linked .button:active:hover,
+.dialog-action-area.linked .button:insensitive,
+.dialog-action-area.linked .button:only-child,
+.dialog-action-area.linked .button:active:only-child,
+.dialog-action-area.linked .button:active:hover:only-child,
+.dialog-action-area.linked .button:insensitive:only-child,
+.dialog-action-area.linked .button:first-child,
+.dialog-action-area.linked .button:active:first-child,
+.dialog-action-area.linked .button:active:hover:first-child,
+.dialog-action-area.linked .button:insensitive:first-child,
+.dialog-action-area.linked .button:last-child,
+.dialog-action-area.linked .button:active:last-child,
+.dialog-action-area.linked .button:active:hover:last-child,
+.dialog-action-area.linked .button:insensitive:last-child {
+	border-style: solid;
+	border-radius: 0;
+	border-width: 1px 0 0px 0;
+	border-color: @borders;
+	border-image: none;
+}
+
+.dialog-action-area.linked .button:only-child,
+.dialog-action-area.linked .button:active:only-child,
+.dialog-action-area.linked .button:active:hover:only-child,
+.dialog-action-area.linked .button:insensitive:only-child,
+.dialog-action-area.linked .button:last-child,
+.dialog-action-area.linked .button:active:last-child,
+.dialog-action-area.linked .button:active:hover:last-child,
+.dialog-action-area.linked .button:insensitive:last-child {
+	/*border-right-width: 1px;*/
+}
+
+.dialog-action-area.linked .button:only-child,
+.dialog-action-area.linked .button:active:only-child,
+.dialog-action-area.linked .button:active:hover:only-child,
+.dialog-action-area.linked .button:insensitive:only-child,
+.dialog-action-area.linked .button:first-child,
+.dialog-action-area.linked .button:active:first-child,
+.dialog-action-area.linked .button:active:hover:first-child,
+.dialog-action-area.linked .button:insensitive:first-child {
+	/*border-left-width: 1px;*/
+}
+
+.dialog-action-area.linked .button.default,
+.dialog-action-area.linked .button.default:active,
+.dialog-action-area.linked .button.default:insensitive,
+.dialog-action-area.linked .button:focus {
+	border-color: @theme_selected_bg_color;
+	border-width: 1px;
+	-GtkWidget-focus-line-width: 0;
+}
+
+.dialog-action-area.linked .button.suggested-action,
+.dialog-action-area.linked .button.suggested-action:active,
+.dialog-action-area.linked .button.suggested-action:insensitive {
+	box-shadow: none;
 }
 
 /***************
@@ -2276,9 +2424,11 @@ GtkCheckButton:selected:focus {
 .search-bar {
 	border-width: 0 0 1px;
 	border-style: solid;
-	border-color: shade(@borders, 0.90);
-
-	background-color: shade(@theme_bg_color, 0.98);
+	border-color: @borders;
+	background-image: linear-gradient(to bottom,
+		shade(@theme_bg_color, 0.96),
+		shade(@theme_bg_color, 1.0));
+	box-shadow: inset 0 1px 0 0 alpha(@borders, 0.4);
 }
 
 .search-bar .button.close-button {
@@ -2294,14 +2444,21 @@ GtkCheckButton:selected:focus {
  */
 .primary-toolbar .toolbar,
 .primary-toolbar.toolbar {
-	border-bottom-color: shade (@theme_bg_color, 0.92);
+	/*border-bottom-color: shade (@theme_bg_color, 0.92);*/
 	border-style: solid;
 	border-width: 0 0 1px 0;
+	border-color: alpha(@borders, 0.4);
 	-GtkWidget-window-dragging: true;
 	-GtkToolbar-button-relief: normal;
 	text-shadow: 0 1px @button_text_shadow;
-	padding-top: 3px;
-	padding-bottom: 3px;
+	padding-top: 1px;
+	padding-bottom: 1px;
+	box-shadow: inset 0 1px 0 0 alpha(@borders, 0.4);
+}
+
+.primary-toolbar .toolbar .separator,
+.primary-toolbar.toolbar .separator {
+	-GtkWidget-window-dragging: true;
 }
 
 .primary-toolbar .toolbar:insensitive,
@@ -2427,6 +2584,10 @@ GtkOverlay.osd {
 	border-color: @osd_button_border;
 }
 
+.osd .button:insensitive {
+	border-color: alpha(@osd_button_border,0.5);
+}
+
 .osd .button:active {
 	border-color: @osd_button_border_active;
 }
@@ -2514,19 +2675,20 @@ GtkOverlay.osd {
 .osd.button:active:hover,
 .osd .button:active,
 .osd .button:active:hover,
-.osd GtkMenuButton.button:active {
+.osd GtkMenuButton.menu-button:active {
 	background-image: linear-gradient(to bottom,
 		@osd_button_bg_active_a,
 		@osd_button_bg_active_b 20%,
-		@osd_button_bg_active_c);
+		@osd_button_bg_active_c
+		);
 }
 
-.osd GtkMenuButton.button:active {
+.osd GtkMenuButton.menu-button:active {
 	background-color: transparent;
 	border-color: @osd_button_border;
 }
 
-.osd GtkMenuButton.button:active {
+.osd GtkMenuButton.menu-button:active {
 	color: @osd_button_fg_active;
 	text-shadow: 0 -1px @osd_button_shadow;
 }
@@ -2586,6 +2748,7 @@ GtkOverlay.osd {
 /* used by gnome-settings-daemon's media-keys OSD */
 .osd.trough {
 	background-color: @osd_trough_bg;
+	border-width: 0;
 }
 
 .osd.progressbar {
@@ -2593,25 +2756,19 @@ GtkOverlay.osd {
 }
 
 .osd .scale.trough {
-	border-color: @osd_button_border;
-	background-image: linear-gradient(to bottom,
-		shade(@osd_button_border, 0.70),
-		shade(@osd_button_border, 0.90)
-		);
+	border: 1px solid rgba(0,0,0,0.1);
+	border-image: none;
+	/* this defines the bg color of the played segment */
 	background-color: transparent;
 }
 
 .osd .scale.trough.highlight {
-	border-color: mix(@osd_button_border, @theme_selected_bg_color, 0.70);
-	background-image: linear-gradient(to bottom,
-		mix(shade(@osd_button_border, 0.55), @theme_selected_bg_color, 0.70),
-		mix(shade(@osd_button_border, 0.90), @theme_selected_bg_color, 0.70)
-		);
+	background-image: none;
+	background-color: @theme_selected_bg_color;
 }
 
 .osd .scale.trough:insensitive,
 .osd .scale.trough.highlight:insensitive {
-	border-color: shade(@osd_button_border, 0.60);
 	background-image: none;
 	background-color: transparent;
 }
@@ -2733,6 +2890,19 @@ GtkProgressBar.osd.progressbar {
 	icon-shadow: 0 1px shade(@suggested_action_button_shadow, 1.15);
 }
 
+.suggested-action.button:insensitive,
+.suggested-action.button:active *:insensitive {
+	icon-shadow: none;
+	background-image: none;
+	background-color: @insentitive_bg_color;
+	border: 1px solid @insensitive_borders;
+}
+
+.suggested-action.button GtkLabel:insensitive {
+	color: @insensitive_fg_color;
+	text-shadow: none;
+}
+
 /******************************
  * Destructive action buttons *
  ******************************/
@@ -2967,10 +3137,10 @@ GtkAssistant .sidebar .highlight {
 }
 
 GtkAssistant .sidebar {
-	padding: 12px;
+	padding: 12px 18px 12px;
 
-	border-width: 1px;
-	border-radius: 2px;
+	border-width: 0 1px 0 0;
+	border-radius: 0px;
 	border-style: solid;
 	border-color: @inactive_frame_color;
 
@@ -2998,7 +3168,7 @@ GtkSwitch.trough:insensitive {
 	color: transparent;
 	box-shadow: none;
 	background-color: transparent;
-	background-size: 48px 26px;
+	background-size: /*48px 26px*/ 50px 28px; /* Size + 2 to adjust to the padding. */
 	background-position: center center;
 	background-repeat: no-repeat;
 	text-shadow: none;
@@ -3085,7 +3255,7 @@ GtkIconView.cell:selected:focus {
 
 row:selected,
 row:selected:focus {
-	border-width: 1px 0 0 0;
+	border-width: 1px 0 1px 0;
 	border-style: solid;
 	border-color: shade (@theme_selected_bg_color, 0.85);
 	background-image: linear-gradient(to bottom,
@@ -3145,6 +3315,8 @@ column-header .button:insensitive {
 	background-color: @insensitive_bg_color;
 }
 
+column-header.button:hover,
+column-header .button:hover,
 column-header.button:active,
 column-header .button:active,
 column-header.button:active:hover,
@@ -3199,17 +3371,6 @@ column-header .button.dnd {
 /**************
  * List boxes *
  **************/
-EggListBox {
-	background-color: @list_box_bg;
-}
-
-EggListBox:hover {
-	background-color: @content_view_bg;
-}
-
-EggListBox:selected {
-	background-color: @theme_selected_bg_color;
-}
 
 .list {
 	background-color: @list_box_bg;
@@ -3223,103 +3384,10 @@ EggListBox:selected {
 	background-color: @theme_selected_bg_color;
 }
 
-/****************
- * Content view *
- ****************/
-.content-view.view {
-	background-color: @content_view_bg;
-}
-
-.content-view.view:insensitive {
-	background-color: @theme_unfocused_base_color;
-	background-image: none;
-}
-
-.content-view.view:selected {
-	background-color: @theme_selected_bg_color;
-	background-image: none;
-}
-
-/* FIXME: EggListBox should set the .cell style class on
- * the background it renders for the children, like
- * GtkIconView and GtkTreeView do */
-.content-view.cell {
-	background-color: transparent;
-	background-image: none;
-}
-
-EggListBox.content-view:hover,
-.content-view.cell:hover {
-	background-color: @theme_bg_color;
-}
-
-EggListBox.content-view:selected,
-EggListBox.content-view:active,
-.content-view.cell:selected,
-.content-view.cell:active {
-	background-color: @theme_selected_bg_color;
-	background-image: none;
-}
-
-GdMainIconView.content-view {
-	-GdMainIconView-icon-size: 40;
-}
-
-GtkIconView.content-view.cell.check {
-	background-image: url("assets/grid-selection-unchecked.svg");
-	background-color: transparent;
-}
-
-GtkIconView.content-view.cell.check:active {
-	background-image: url("assets/grid-selection-checked.svg");
-	background-color: transparent;
-}
-
-/* Make spinner visible on both dark and bright backgrounds w/o making
- * it look ugly/weird.
- */
-GdMainIconView.content-view.cell:active {
-	color: gray;
-}
-
-.content-view.view.check,
-.content-view.view.check:active {
-	background-color: transparent;
-}
-
-GtkIconView.content-view.check:hover,
-GtkIconView.content-view.check:insensitive,
-GtkIconView.content-view.check:selected {
-	background-color: transparent;
-}
-
-/* used by Documents and Evince */
-.content-view.document-page {
-	border-style: solid;
-	border-width: 3px 3px 6px 4px;
-	border-image: url("assets/thumbnail-frame.png") 3 3 6 4;
-}
-
-/*********************
- * App Notifications *
- *********************/
-.app-notification {
-	border-style: solid;
-	border-color: @app_notification_border;
-	border-width: 0 1px 1px 1px;
-	border-radius: 0 0 5px 5px;
-	padding: 8px;
-
-	background-image: linear-gradient(to bottom,
-		@app_notification_a,
-		@app_notification_b 18%,
-		@app_notification_c);
-
-	color: @theme_text_color;
-	text-shadow: 0 1px @primary_toolbar_button_text_shadow;
-}
+/**************
+ * Calendar   *
+ **************/
 
-/* Calendars */
 GtkCalendar {
 	padding: 2px;
 }
@@ -3439,19 +3507,81 @@ GtkInfoBar {
 /*************************
  * Touch text selections *
  *************************/
-GtkBubbleWindow {
+GtkPopover {
 	border-radius: 5px;
 	background-clip: border-box;
+	/*
+	background-color: @osd_popover_bg;
+	*/
+	background-color: @theme_bg_color;
+
+	border-color: darker(@theme_bg_color);
+	border-width: 1px;
+	border-style: solid;
+
+	box-shadow: 0 2px 3px @wm_shadow;
+	margin: 10px;
+	padding: 2px;
 }
 
-GtkBubbleWindow.osd.background {
+GtkPopover.osd {
 	background-color: @osd_popover_bg;
+	border-color: @theme_bg_color;
+	box-shadow: 0 2px 8px 3px alpha(@wm_shadow, 0.4);
+	color: darker(white);
+}
+
+GtkPopover > .list,
+GtkPopover > .view,
+GtkPopover > .toolbar {
+	background-color: transparent;
 }
 
-GtkBubbleWindow .toolbar {
+GtkPopover.osd > .toolbar .button {
+	border-radius: 0px;
+	border-width: 0px;
+	background-image: none;
 	background-color: transparent;
 }
 
+GtkModelButton.button
+{
+	color: @theme_fg_color;
+}
+
+GtkModelButton.button:active,
+GtkModelButton.button:insensitive,
+GtkModelButton.button:active:insensitive,
+GtkModelButton.button {
+	background-color: transparent;
+	background-image: none;
+	border-color: transparent;
+	border-image: none;
+	border-style: none;
+	box-shadow: none;
+}
+
+GtkPopover .separator {
+	font-size: 80%;
+	font-weight: bold;
+	color: alpha(@theme_text_color,0.4);
+	text-shadow: none;
+	background-color: transparent;
+	icon-shadow: none;
+	border: 0;
+}
+
+GtkModelButton.button:active:hover,
+GtkModelButton.button:hover,
+GtkModelButton.button:selected {
+	background-image: none;
+	background-color: @theme_selected_bg_color;
+	color: @theme_selected_fg_color;
+	text-shadow: none;
+	border-width: 0;
+	border-color: transparent;
+}
+
 /*******
  * CSD *
  *******/
@@ -3462,6 +3592,8 @@ GtkBubbleWindow .toolbar {
 		@wm_bg_a,
 		@wm_bg_b);
 	border-radius: 6px 6px 0px 0px;
+	box-shadow: inset 0 -1px alpha(@theme_base_color, 0.4);
+	border-color: @borders;
 }
 
 .tiled .titlebar {
@@ -3486,36 +3618,39 @@ GtkBubbleWindow .toolbar {
 }
 
 .titlebar:backdrop {
-	text-shadow: none;
-	background-image: none;
-	background-color: @wm_bg_b;
+	color: @theme_unfocused_fg_color;
 }
 
 .titlebar .titlebutton {
-	icon-shadow: 0px 1px @wm_title_shadow;
+	/*icon-shadow: 0px 1px @wm_title_shadow;*/
 	color: @wm_title;
-	background: none;
-	padding: 5px 5px 6px 5px;
-
-	border-radius: 4px;
+	/*background: none;
+	padding: 5px 5px 6px 5px;*/
+	padding: 2px 6px 3px 3px; /* important for background size */
+	/*border-radius: 3px;
 	border-width: 2px;
 	border-color: transparent;
-	border-style: solid;
+	border-style: solid;*/
+	border: none;
 	border-image: none;
 }
 
 .titlebar .titlebutton:hover {
-	background-image: linear-gradient(to bottom,
+	/*background-image: linear-gradient(to bottom,
 		@button_hover_gradient_color_a,
-		@button_hover_gradient_color_b);
+		@button_hover_gradient_color_b);*/
+	border: none;
+	border-image: none;
 }
 
 .titlebar .titlebutton:active {
-	background-image: linear-gradient(to bottom,
+	/*background-image: linear-gradient(to bottom,
 		@borders,
 		shade(@theme_bg_color, 0.95));
 	color: @theme_selected_fg_color;
-	icon-shadow: none;
+	icon-shadow: none;*/
+	border: none;
+	border-image: none;
 }
 
 .titlebar .right .titlebutton:first-child {
@@ -3540,12 +3675,10 @@ GtkBubbleWindow .toolbar {
 }
 
 .window-frame {
-	border-color: darker(@theme_bg_color);
 	border-radius: 6px 6px 0 0;
-	border-width: 1px;
-	border-style: solid;
-
-	box-shadow: 0 2px 8px 3px @wm_shadow;
+	/* lamefun trick to get rounded borders regardless of CSD use */
+	border-width: 0px;	
+	box-shadow: 0 0 0 1px @wm_border, 0 2px 8px 3px @wm_shadow;
 
 	/* this is used for the resize cursor area */
 	margin: 10px;
@@ -3557,119 +3690,6 @@ GtkBubbleWindow .toolbar {
 }
 
 .window-frame:backdrop {
-	box-shadow: 0 2px 5px 1px @wm_shadow;
-}
-
-
-/**********************
- * Fallback Mode Panel
- **********************/
-
-.gnome-panel-menu-bar,
-PanelApplet > GtkMenuBar.menubar,
-PanelToplevel,
-PanelWidget,
-PanelAppletFrame,
-PanelApplet {
-	background-color: @os_chrome_bg_color;
-	background-image: none;
-	color: @os_chrome_fg_color;
-}
-
-ClockBox,
-.gnome-panel-menu-bar.menubar,
-PanelApplet > GtkMenuBar.menubar {
-	font: bold;
-}
-
-.gnome-panel-menu-bar.menubar .menuitem:hover,
-PanelApplet > GtkMenuBar.menubar .menuitem:hover {
-	text-shadow: 0 1px @os_chrome_bg_color;
-}
-
-.gnome-panel-menu-bar.menubar .menu,
-PanelApplet > GtkMenuBar.menubar .menu {
-	font: regular;
-}
-
-.gnome-panel-menu-bar.menubar .menu:hover,
-PanelApplet > GtkMenuBar.menubar .menu:hover {
-	text-shadow: none;
-}
-
-.gnome-panel-menu-bar .menuitem:hover,
-PanelApplet > GtkMenuBar.menubar .menuitem:hover,
-.gnome-panel-menu-bar .menuitem:hover,
-PanelApplet > GtkMenuBar.menubar .menuitem:hover {
-	background-color: @os_chrome_selected_bg_color;
-	color: @os_chrome_selected_fg_color;
-}
-
-.gnome-panel-menu-bar .menuitem:hover,
-PanelApplet > GtkMenuBar.menubar .menuitem:hover {
-	color: @os_chrome_selected_fg_color;
-}
-
-PanelApplet .button,
-PanelApplet .button:hover {
-	padding: 4px;
-
-	border-image: none;
-	border-width: 0;
-	border-radius: 0;
-
-	background-image: none;
-	background-color: @os_chrome_bg_color;
-
-	color: @os_chrome_fg_color;
-	text-shadow: none;
-}
-
-PanelApplet .button:active:hover,
-PanelApplet .button:active {
-	border-image: none;
-	background-image: none;
-	background-color: @os_chrome_selected_bg_color;
-	border-width: 0;
-	border-radius: 0;
-}
-
-PanelApplet:hover {
-	color: @os_chrome_selected_fg_color;
-}
-
-PanelApplet:active,
-PanelApplet:hover:active {
-	color: @os_chrome_selected_fg_color;
-	text-shadow: 0 1px @os_chrome_bg_color;
-}
-
-/* Fixes the indicator applet text */
-PanelApplet > GtkMenuBar > GtkMenuItem > GtkBox > GtkLabel {
-	color: @os_chrome_fg_color;
-	text-shadow: none;
-	border-image: none;
-}
-
-WnckPager {
-	background-color: lighter(@os_chrome_selected_bg_color);
-}
-
-NaTrayApplet {
-	-NaTrayApplet-icon-padding: 12;
-	-NaTrayApplet-icon-size: 16;
-}
-
-GsmFailWhaleDialog {
-	background-color: @os_chrome_bg_color;
-	background-image: none;
-	color: @os_chrome_fg_color;
-}
-
-GsmFailWhaleDialog .button,
-GsmFailWhaleDialog .button:active {
-	border-image: none;
-	border-color: @borders;
-	border-width: 1px;
+	box-shadow: 0 0 0 1px shade(@wm_border,1.1), 0 2px 5px 1px @wm_shadow;
 }
 
diff --git a/desktop-themes/Menta/gtk-3.0/mate-applications.css b/desktop-themes/Menta/gtk-3.0/mate-applications.css
new file mode 100644
index 00000000..b02be324
--- /dev/null
+++ b/desktop-themes/Menta/gtk-3.0/mate-applications.css
@@ -0,0 +1,345 @@
+/*********************
+ * CAJA File manager *
+ *********************/
+/* for breadcrumbs path bar */
+
+.caja-pathbar-button,
+CajaPathbarButton {
+	background-image: -gtk-gradient(linear, left top, left bottom,
+		color-stop (0, shade(alpha(@theme_bg_color, 0.8), 1.1)),
+		color-stop (.3, shade(alpha(@theme_bg_color, 0.8), 1.1)),
+		color-stop (.7, shade(alpha(@theme_bg_color, 0.8), 0.98)),
+		color-stop (1, shade(alpha(@theme_bg_color, 0.8), 0.90)));
+	border-color: #979797;
+	color: @theme_fg_color;
+	-CajaPathbarButton-border-radius: 3px;
+}
+
+CajaPathbarButton:active {
+	background-image: -gtk-gradient(linear, left top, left bottom,
+		color-stop (0, shade(alpha(@theme_bg_color, 0.8), .8)),
+		color-stop (.3, shade(alpha(@theme_bg_color, 0.8), .9)),
+		color-stop (1, shade(alpha(@theme_bg_color, 0.8), 1.0)));
+}
+
+CajaPathbarButton:hover {
+	background-image: -gtk-gradient(linear, left top, left bottom,
+		color-stop (0, shade(alpha(@theme_selected_bg_color, 0.8), 1.25)),
+		color-stop (.3, shade(alpha(@theme_selected_bg_color, 0.8), 1.25)),
+		color-stop (.7, shade(alpha(@theme_selected_bg_color, 0.8), 0.95)),
+		color-stop (1, shade(alpha(@theme_selected_bg_color, 0.8), 0.85)));
+}
+
+CajaPathbarButton:active:hover {
+	background-image: -gtk-gradient(linear, left top, left bottom,
+		color-stop (0, shade(alpha(@theme_selected_bg_color, 0.8), .80)),
+		color-stop (.3, shade(alpha(@theme_selected_bg_color, 0.8), .95)),
+		color-stop (1, shade(alpha(@theme_selected_bg_color, 0.8), 1.25)));
+}
+
+
+/* For Places Sidebar diskfull indicators */
+
+CajaPlacesTreeView {
+	-CajaPlacesTreeView-disk-full-bg-color: shade(@theme_bg_color, .65);
+	-CajaPlacesTreeView-disk-full-fg-color: shade(@theme_selected_bg_color, 1.0);
+	-CajaPlacesTreeView-disk-full-bar-width: 2px;
+	-CajaPlacesTreeView-disk-full-bar-radius: 1px;
+	-CajaPlacesTreeView-disk-full-bottom-padding: 1px;
+	-CajaPlacesTreeView-disk-full-max-length: 70px;
+}
+
+CajaPlacesTreeView:selected {
+	-CajaPlacesTreeView-disk-full-bg-color: shade(@theme_bg_color, 2.0);
+	-CajaPlacesTreeView-disk-full-fg-color: shade(@theme_fg_color, 2.0);
+}
+
+CajaPlacesTreeView:hover {
+}
+
+CajaPlacesTreeView:selected:hover {
+}
+
+@define-color cluebar_color shade (@theme_base_color, 0.9);
+
+CajaWindow * {
+	-GtkPaned-handle-size: 0;
+}
+
+/*FIXME normaly this isn't the right entry for adjusting
+the sidebar background color*/
+CajaWindow .view {
+	background-color: shade (@theme_bg_color, 1.08);
+}
+
+CajaWindow .rubberband,
+CajaWindow .view.rubberband {
+	background-color: alpha (@theme_selected_bg_color, 0.35);
+}
+
+/* sidebar */
+
+CajaWindow .sidebar .view {
+	background-color: shade (@theme_bg_color, 1.08);
+	color: @theme_fg_color;
+}
+
+CajaWindow .sidebar .frame {
+	border-right-width: 1px;
+	border-style: solid;
+	border-color: shade (@theme_bg_color, 0.90);
+	border-left: none;
+	border-top: none;
+	border-bottom: none;
+}
+
+CajaWindow .sidebar row:selected {
+	color: @theme_selected_fg_color;
+}
+
+CajaWindow .sidebar row:backdrop:selected {
+	color: @theme_fg_color;
+	text-shadow: none; 
+}
+
+CajaWindow .sidebar row:hover {
+	background-color: shade (@theme_bg_color, 0.97);
+}
+
+/* desktop mode */
+.caja-desktop.caja-canvas-item {
+	color: @theme_bg_color;
+	text-shadow: 1px 1px alpha (#000000, 0.8);
+}
+
+.caja-desktop.caja-canvas-item:active {
+	background-image: none;
+	background-color: alpha (@theme_bg_color, 0.84);
+	color: @theme_fg_color;
+}
+
+.caja-desktop.caja-canvas-item:selected {
+	background-image: none;
+	background-color: alpha (@theme_selected_bg_color, 0.84);
+	color: @theme_selected_fg_color;
+}
+
+.caja-desktop.caja-canvas-item:active,
+.caja-desktop.caja-canvas-item:prelight,
+.caja-desktop.caja-canvas-item:selected {
+	text-shadow: none;
+}
+
+/* inactive pane */
+
+.caja-inactive-pane .view {
+	background-color: shade(@theme_base_color, 0.9);
+}
+
+/* Toolbar */
+CajaWindow .toolbar .button {
+	border-image: none;
+}
+
+/* Misc */
+CajaView.frame,
+CajaNotebook.notebook {
+	border-right-width: 0;
+	border-left-width: 0;
+	border-bottom-width: 0;
+}
+
+CajaNotebook.notebook tab.top,
+CajaNotebook.notebook tab.bottom {
+	border-right-width: 1px;
+	border-left-width: 1px;
+}
+
+CajaNotebook .frame {
+	border-width: 1px 0 0 0;
+}
+
+.caja-cluebar-label {
+	font: normal;
+	text-shadow: 0 1px shade (@cluebar_color, 1.06);
+}
+
+CajaTrashBar.info,
+CajaXContentBar.info,
+CajaSearchBar.info,
+CajaQueryEditor.info {
+	background-color: @cluebar_color;
+	border-bottom-color: shade (@cluebar_color, 0.92);
+	border-radius: 0;
+	border-style: solid;
+	border-width: 0px 0px 1px 0px;
+	color: @theme_fg_color;
+}
+
+CajaTrashBar .button,
+CajaXContentBar .button,
+CajaSearchBar .button,
+CajaQueryEditor .button {
+	border-radius: 0;
+}
+
+/****************
+ * Mate-Panel *
+ ****************/
+
+PanelWidget,
+PanelApplet,
+PanelToplevel,
+.desktop-panel {
+/*	background-image: -gtk-gradient (linear, left top, left bottom,
+		from (shade (@theme_bg_color, 1.5)),
+		to (shade (@theme_bg_color, 1.05)));*/
+	background-color: @theme_bg_color;
+	padding: 0;
+	-unico-inner-stroke-width: 0;
+	-unico-outer-stroke-width: 0;
+	color: @theme_fg_color;
+	text-shadow: none;
+}
+
+PanelApplet {
+	border-width: 0;
+}
+
+PanelSeparator {
+	border-width: 0;
+	background-image: -gtk-gradient (linear, left top, left bottom,
+		from (shade (@theme_bg_color, 0.96)),
+		to (shade (@theme_bg_color, 1.05)));
+	-unico-inner-stroke-width: 0;
+	-unico-outer-stroke-width: 0;
+	color: shade (@theme_bg_color, 0.85);
+	text-shadow: none;
+}
+
+.mate-panel-menu-bar,
+PanelApplet > GtkMenuBar.menubar,
+PanelApplet > GtkMenuBar.menubar.menuitem,
+PanelMenuBar.menubar,
+PanelMenuBar.menubar.menuitem,
+.desktop-panel .menubar,
+.desktop-panel .menubar .menuitem {
+	/*background-image: -gtk-gradient (linear, left top, left bottom,
+		from (shade (@theme_bg_color, 1.5)),
+		to (shade (@theme_bg_color, 1.05)));*/
+	background-color: @theme_bg_color;
+	-unico-inner-stroke-width: 0;
+	-unico-outer-stroke-width: 0;
+	text-shadow: none;
+}
+
+PanelAppletFrame {
+	background-color: @color;
+	background-image: -gtk-gradient (linear, left top, left bottom,
+		from (shade (@theme_bg_color, 1.5)),
+		to (shade (@theme_bg_color, 1.05)));
+	border-width: 0;
+	-unico-inner-stroke-width: 0;
+	-unico-outer-stroke-width: 0;
+	text-shadow: none;
+}
+
+PanelApplet .button,
+.desktop-panel .button {
+	-GtkButton-inner-border: 2;
+
+	background-image: -gtk-gradient (linear, left top, left bottom,
+		from (shade (@theme_bg_color, 1.5)),
+		to (shade (@theme_bg_color, 1.05)));
+
+	border-color: @transparent;
+	border-radius: 0;
+	border-width: 0 1px 0 1px;
+
+	color: @theme_fg_color;
+	text-shadow: none;
+
+	-unico-border-gradient: none;
+	-unico-glow-radius: 0;
+	-unico-inner-stroke-width: 0;
+	-unico-outer-stroke-width: 0;
+}
+
+PanelApplet .button:prelight:active,
+PanelApplet .button:active,
+.desktop-panel .button:prelight:active,
+.desktop-panel .button:active {
+	background-image: -gtk-gradient (linear, left top, left bottom,
+		from (shade (@theme_bg_color, 0.85)),
+		to (shade (@theme_bg_color, 1.0)));
+	border-color: shade (@theme_bg_color, 0.78);
+	border-radius: 0;
+	border-width: 0 1px 0 1px;
+
+	-unico-border-gradient: none;
+	-unico-glow-radius: 0;
+	-unico-inner-stroke-width: 0;
+	-unico-outer-stroke-width: 0;
+	text-shadow: none;
+}
+
+PanelApplet .button:prelight,
+.desktop-panel .button:prelight {
+	background-image: -gtk-gradient (linear, left top, left bottom,
+		from (shade (@theme_bg_color, 1.7)),
+		to (shade (@theme_bg_color, 1.25)));
+	border-color: @transparent;
+	border-radius: 0;
+	border-width: 0 1px 0 1px;
+
+	-unico-border-gradient: none;
+	-unico-glow-radius: 0;
+	-unico-inner-stroke-width: 0;
+	-unico-outer-stroke-width: 0;
+	text-shadow: none;
+}
+
+ClockBox,
+.mate-panel-menu-bar.menubar,
+PanelApplet > GtkMenuBar.menubar {
+	font: normal;
+}
+
+WnckPager, WnckTasklist {
+	background-color: @theme_bg_color;
+	text-shadow: none;
+}
+
+/* Classic icon style */
+.mate-panel-menu-bar {
+	-PanelMenuBar-icon-visible: true;
+}
+
+/* Makes the text color on the light panel black */
+.mate-panel-menu-bar .menuitem {
+	color: @theme_fg_color;
+	text-shadow: none;
+}
+
+.mate-panel-menu-bar .menuitem:hover {
+	background-image: -gtk-gradient (linear, left top, left bottom,
+		from (shade (@theme_selected_bg_color, 1.0)),
+		to (shade (@theme_selected_bg_color, 0.85)));
+	border-width: 0;
+	color: @theme_fg_color;
+	text-shadow: none;
+	-unico-inner-stroke-width: 0;
+	-unico-outer-stroke-width: 0;
+}
+
+.mate-panel-menu-bar .menu.menuitem:hover,
+.mate-panel-menu-bar .menu .menuitem:hover {
+	color: @theme_selected_fg_color;
+}
+
+
+/****************
+ * Pluma *
+ ****************/
+
+
diff --git a/desktop-themes/Menta/gtk-3.0/other-applications.css b/desktop-themes/Menta/gtk-3.0/other-applications.css
index 18ae2cdc..f906af74 100644
--- a/desktop-themes/Menta/gtk-3.0/other-applications.css
+++ b/desktop-themes/Menta/gtk-3.0/other-applications.css
@@ -79,7 +79,7 @@ NemoWindow .view.rubberband {
 /* sidebar */
 
 NemoWindow .sidebar .view {
-	background-color: @theme_bg_color;
+	background-color: shade (@theme_bg_color, 1.08);
 	color: @theme_fg_color;
 }
 
@@ -182,125 +182,6 @@ NemoQueryEditor .button {
 	border-radius: 0;
 }
 
-/*********************
- * CAJA File manager *
- *********************/
-@define-color cluebar_color shade (@theme_base_color, 0.9);
-
-CajaWindow * {
-	-GtkPaned-handle-size: 1;
-}
-
-CajaWindow .view {
-	background-color: @theme_base_color;
-}
-
-CajaWindow .rubberband,
-CajaWindow .view.rubberband {
-	background-color: alpha (@theme_selected_bg_color, 0.35);
-}
-
-/* sidebar */
-
-CajaWindow .sidebar .view {
-	background-color: @theme_bg_color;
-	color: @theme_fg_color;
-	text-shadow: 0 1px shade (shade (@theme_bg_color, 0.95), 1.04);
-}
-
-CajaWindow .sidebar .frame {
-	border-right-width: 1px;
-	border-style: solid;
-	border-color: shade (@theme_bg_color, 0.82);
-}
-
-CajaWindow .sidebar row:selected {
-	color: @theme_selected_fg_color;
-	text-shadow: 0 -1px shade (@theme_selected_bg_color, 0.8);
-}
-
-CajaWindow .sidebar row:backdrop:selected {
-	color: @theme_fg_color;
-	text-shadow: none;
-}
-
-/* desktop mode */
-.caja-desktop.caja-canvas-item {
-	color: @theme_bg_color;
-	text-shadow: 1px 1px alpha (#000000, 0.8);
-}
-
-.caja-desktop.caja-canvas-item:active {
-	background-image: none;
-	background-color: alpha (@theme_bg_color, 0.84);
-	color: @theme_fg_color;
-}
-
-.caja-desktop.caja-canvas-item:selected {
-	background-image: none;
-	background-color: alpha (@theme_selected_bg_color, 0.84);
-	color: @theme_selected_fg_color;
-}
-
-.caja-desktop.caja-canvas-item:active,
-.caja-desktop.caja-canvas-item:prelight,
-.caja-desktop.caja-canvas-item:selected {
-	text-shadow: none;
-}
-
-/* inactive pane */
-
-.caja-inactive-pane .view {
-	background-color: shade(@theme_base_color, 0.9);
-}
-
-/* Toolbar */
-CajaWindow .toolbar .button {
-	border-image: none;
-}
-
-/* Misc */
-CajaView.frame,
-CajaNotebook.notebook {
-	border-right-width: 0;
-	border-left-width: 0;
-	border-bottom-width: 0;
-}
-
-CajaNotebook.notebook tab.top,
-CajaNotebook.notebook tab.bottom {
-	border-right-width: 1px;
-	border-left-width: 1px;
-}
-
-CajaNotebook .frame {
-	border-width: 1px 0 0 0;
-}
-
-.caja-cluebar-label {
-	font: normal;
-	text-shadow: 0 1px shade (@cluebar_color, 1.06);
-}
-
-CajaTrashBar.info,
-CajaXContentBar.info,
-CajaSearchBar.info,
-CajaQueryEditor.info {
-	background-color: @cluebar_color;
-	border-bottom-color: shade (@cluebar_color, 0.92);
-	border-radius: 0;
-	border-style: solid;
-	border-width: 0px 0px 1px 0px;
-	color: @theme_fg_color;
-}
-
-CajaTrashBar .button,
-CajaXContentBar .button,
-CajaSearchBar .button,
-CajaQueryEditor .button {
-	border-radius: 0;
-}
-
 /****************
  * PopOver menu *
  ****************/
@@ -388,156 +269,3 @@ OsScrollbar:insensitive {
 .ubuntu-online-accounts.frame {
 	border-top-width: 0;
 }
-
-/* MATE Panel */
-PanelWidget,
-PanelApplet,
-PanelToplevel,
-.desktop-panel {
-	background-image: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@theme_bg_color, 1.5)),
-		to (shade (@theme_bg_color, 1.05)));
-	padding: 0;
-	-unico-inner-stroke-width: 0;
-	-unico-outer-stroke-width: 0;
-	color: @theme_fg_color;
-	text-shadow: none;
-}
-
-PanelApplet {
-	border-width: 0;
-}
-
-PanelSeparator {
-	border-width: 0;
-	background-image: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@menu_bg_color, 0.96)),
-		to (shade (@menu_bg_color, 1.05)));
-	-unico-inner-stroke-width: 0;
-	-unico-outer-stroke-width: 0;
-	color: @dark_fg_color;
-	text-shadow: none;
-}
-
-.mate-panel-menu-bar,
-PanelApplet > GtkMenuBar.menubar,
-PanelApplet > GtkMenuBar.menubar.menuitem,
-PanelMenuBar.menubar,
-PanelMenuBar.menubar.menuitem,
-.desktop-panel .menubar,
-.desktop-panel .menubar .menuitem {
-	background-image: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@theme_bg_color, 1.5)),
-		to (shade (@theme_bg_color, 1.05)));
-	-unico-inner-stroke-width: 0;
-	-unico-outer-stroke-width: 0;
-	text-shadow: none;
-}
-
-PanelAppletFrame {
-	background-color: @color;
-	background-image: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@theme_bg_color, 1.5)),
-		to (shade (@theme_bg_color, 1.05)));
-	border-width: 0;
-	-unico-inner-stroke-width: 0;
-	-unico-outer-stroke-width: 0;
-	text-shadow: none;
-}
-
-PanelApplet .button,
-.desktop-panel .button {
-	-GtkButton-inner-border: 2;
-
-	background-image: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@theme_bg_color, 1.5)),
-		to (shade (@theme_bg_color, 1.05)));
-
-	border-color: @transparent;
-	border-radius: 0;
-	border-width: 0 1px 0 1px;
-
-	color: @theme_fg_color;
-	text-shadow: none;
-
-	-unico-border-gradient: none;
-	-unico-glow-radius: 0;
-	-unico-inner-stroke-width: 0;
-	-unico-outer-stroke-width: 0;
-}
-
-PanelApplet .button:prelight:active,
-PanelApplet .button:active,
-.desktop-panel .button:prelight:active,
-.desktop-panel .button:active {
-	background-image: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@theme_bg_color, 0.85)),
-		to (shade (@theme_bg_color, 1.0)));
-	border-color: shade (@theme_bg_color, 0.78);
-	border-radius: 0;
-	border-width: 0 1px 0 1px;
-
-	-unico-border-gradient: none;
-	-unico-glow-radius: 0;
-	-unico-inner-stroke-width: 0;
-	-unico-outer-stroke-width: 0;
-	text-shadow: none;
-}
-
-PanelApplet .button:prelight,
-.desktop-panel .button:prelight {
-	background-image: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@theme_bg_color, 1.7)),
-		to (shade (@theme_bg_color, 1.25)));
-	border-color: @transparent;
-	border-radius: 0;
-	border-width: 0 1px 0 1px;
-
-	-unico-border-gradient: none;
-	-unico-glow-radius: 0;
-	-unico-inner-stroke-width: 0;
-	-unico-outer-stroke-width: 0;
-	text-shadow: none;
-}
-
-ClockBox {
-	text-shadow: none;
-}
-
-WnckPager, WnckTasklist {
-	background-color: @theme_bg_color;
-	text-shadow: none;
-}
-
-/* Classic icon style */
-.mate-panel-menu-bar {
-	-PanelMenuBar-icon-visible: true;
-}
-
-/* Makes the text color on the light panel black */
-.mate-panel-menu-bar .menuitem {
-	color: @theme_fg_color;
-	text-shadow: none;
-}
-
-.mate-panel-menu-bar .menuitem:hover {
-	background-image: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@theme_selected_bg_color, 1.0)),
-		to (shade (@theme_selected_bg_color, 0.85)));
-	border-width: 0;
-	color: @theme_fg_color;
-	text-shadow: none;
-	-unico-inner-stroke-width: 0;
-	-unico-outer-stroke-width: 0;
-}
-
-.mate-panel-menu-bar .menu.menuitem:hover,
-.mate-panel-menu-bar .menu .menuitem:hover {
-	color: @theme_selected_fg_color;
-}
-
-/* FIXME - Need to figure out what id or class the indicator applet use */
-/* IndicatorSession {
-	color: @dark_fg_color;
-	text-shadow: none;
-} */
diff --git a/desktop-themes/Menta/gtk-3.0/unity.css b/desktop-themes/Menta/gtk-3.0/unity.css
index b3bd5f68..b038d994 100644
--- a/desktop-themes/Menta/gtk-3.0/unity.css
+++ b/desktop-themes/Menta/gtk-3.0/unity.css
@@ -1,11 +1,10 @@
 UnityPanelWidget,
 .unity-panel {
 	background-image: linear-gradient(to bottom,
-		shade (@theme_bg_color, 1.15),
-		shade (@theme_bg_color, 1.0));
-	border-top-color: shade (@theme_bg_color, 1.6);
-	border-style: solid;
+		@wm_bg_a,
+		@wm_bg_b);
 	border-width: 0;
+	color: @theme_fg_color;
 }
 
 .unity-panel.menubar,
@@ -25,5 +24,44 @@ UnityPanelWidget,
 	background-image: linear-gradient(to bottom,
 		shade (@theme_selected_bg_color, 0.96),
 		shade (@theme_selected_bg_color, 1.15));
-	color: @selected_fg_color;
+	color: @theme_selected_fg_color;
+}
+
+/* This will theme the top decoration, so the whole space above the window */
+UnityDecoration.top {
+	border: 0px solid shade (@theme_bg_color, 0.5);
+	border-bottom-width: 0;
+	border-radius: 6px 6px 0 0; /* Corner radius, only the top ones should be */
+	padding: 1px 8px 0 8px; /* This padding will be applied to the content of the top layout */
+	background-color: @theme_bg_color; /* Decoration background */
+	background-image: linear-gradient(to bottom,
+		@wm_bg_a,
+		@wm_bg_b);
+	color: @theme_fg_color; /* The foreground color will be used to paint the text */
+	text-shadow: 0 1px @wm_title_shadow;
+	box-shadow: inset 0 1px alpha(@theme_base_color, 0.6);
+}
+
+/* Top decoration for inactive windows */
+UnityDecoration.top:backdrop {
+	border: 0px solid @theme_bg_color;
+	border-bottom-width: 0;
+	background-color: @theme_bg_color;
+	color: @theme_unfocused_fg_color;
+}
+
+/* Left decoration, it themes only the space at the left of the window */
+UnityDecoration.left,
+/* Right decoration, it themes only the space at the right of the window */
+UnityDecoration.right,
+/* Bottom decoration, it themes all the space below the window */
+UnityDecoration.bottom {
+	background-color: @theme_bg_color;
+}
+
+/* Left, right and bottom decorations themes for inactive windows */
+UnityDecoration.left:backdrop,
+UnityDecoration.right:backdrop,
+UnityDecoration.bottom:backdrop {
+	background-color: @theme_bg_color;
 }