Merge pull request #52 from NiceandGently/master

update to GTK3-3.10

10 files changed, 895 insertions, 473 deletions

diff --git a/desktop-themes/Menta/gtk-2.0/widgets/panel.rc b/desktop-themes/Menta/gtk-2.0/widgets/panel.rc
index 08a0b9a1..647d9d91 100644
--- a/desktop-themes/Menta/gtk-2.0/widgets/panel.rc
+++ b/desktop-themes/Menta/gtk-2.0/widgets/panel.rc
@@ -77,6 +77,12 @@ style "theme-panel-buttons"
 	}
 }
 
+style "theme-applet"
+{
+  fg[NORMAL] = "#000000"
+  bg[NORMAL] = @base_color
+}
+
 style "theme-panel-light"
 {
 	xthickness = 1
@@ -119,12 +125,13 @@ style "theme-panel-handle"
 }
 
 widget "*PanelWidget*"			style "theme-panel"
-widget "*PanelApplet*"			style "theme-panel"
+#widget "*PanelApplet*"			style "theme-panel"
 widget "*fast-user-switch*"		style "theme-panel"
 widget "*CPUFreq*Applet*"		style "theme-panel"
 widget "*indicator-applet*"		style "theme-panel"
-class "PanelApp*"			style "theme-panel"
+#class "PanelApp*"			style "theme-panel"
 class "PanelToplevel*"			style "theme-panel"
+widget_class "*MatePanelAppletFrameDBus*" style "theme-applet"
 widget_class "*PanelToplevel*"		style "theme-panel"
 widget_class "*PanelFrame*" 		style "theme-panel"
 widget_class "*PanelAppletFrame*" 	style "theme-panel"
diff --git a/desktop-themes/Menta/gtk-3.0/gnome-applications.css b/desktop-themes/Menta/gtk-3.0/gnome-applications.css
index 07471b63..6093925b 100644
--- a/desktop-themes/Menta/gtk-3.0/gnome-applications.css
+++ b/desktop-themes/Menta/gtk-3.0/gnome-applications.css
@@ -1,5 +1,7 @@
 @define-color documents_emblem_bg @theme_selected_bg_color;
 @define-color documents_collection_bg @theme_bg_color;
+@define-color gedit_not_found_bg rgb (237, 54, 54);
+@define-color gedit_not_found_fg white;
 
 /****************
  * Applications *
@@ -10,7 +12,7 @@ SushiFontWidget {
 }
 
 /* gnome-terminal */
-TerminalScreen {
+VteTerminal {
 	background-color: @theme_base_color;
 	color: @theme_fg_color;
 	-TerminalScreen-background-darkness: 0.95;
@@ -47,10 +49,7 @@ TerminalWindow GtkNotebook.notebook {
 }
 
 NautilusWindow .sidebar .frame {
-	border-width: 1px 0 0 0;
-	border-style: solid;
-	border-color: @borders;
-	border-radius: 0;
+	border-style: none;
 }
 
 NautilusWindow * {
@@ -63,63 +62,160 @@ NautilusWindow .pane-separator {
 
 NautilusWindow > GtkGrid > .pane-separator,
 NautilusWindow > GtkGrid > .pane-separator:hover {
-	border-width: 1px 1px 0 0;
+	border-width: 0 1px 0 0;
 	border-style: solid;
 	border-color: @borders;
 	background-color: @sidebar_bg;
 	color: shade (@theme_bg_color, 0.9);
 }
 
-NautilusView.frame,
 NautilusNotebook.notebook {
 	border-right-width: 0;
 	border-left-width: 0;
 	border-bottom-width: 0;
 }
 
-NautilusNotebook.notebook tab.top,
-NautilusNotebook.notebook tab.bottom {
+NautilusNotebook .frame {
+	border-width: 0;
+}
+
+NautilusToolbar .button {
+	icon-shadow: 0 1px @button_text_shadow;
+}
+
+NautilusToolbar .button:active {
+	icon-shadow: 0 1px @button_active_text_shadow;
+}
+
+NautilusToolbar .button:insensitive,
+NautilusToolbar .button:active *:insensitive {
+	icon-shadow: none;
+}
+
+NautilusQueryEditor .primary-toolbar.toolbar {
+	border-top-width: 0;
+	border-bottom-width: 0;
+}
+
+NautilusQueryEditor .toolbar {
+	padding-top: 3px;
+	padding-bottom: 2px;
+
+	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) {
+	border-color: @borders;
+}
+
+NautilusQueryEditor .toolbar:last-child,
+NautilusQueryEditor .primary-toolbar.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;
+}
+
+.nemo-desktop.nemo-canvas-item:active {
+	color: @theme_text_color;
+}
+
+.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 * {
+	-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;
+	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;
 }
 
-NautilusNotebook.notebook tab.top:active {
+NemoNotebook.notebook tab.top:active {
 	padding-top: 2px;
 }
-NautilusNotebook.notebook tab.bottom:active {
+NemoNotebook.notebook tab.bottom:active {
 	padding-bottom: 2px;
 }
 
-NautilusNotebook .frame {
+NemoNotebook .frame {
 	border-width: 1px 0 0 0;
 }
 
-NautilusToolbar .button {
+NemoToolbar .button {
 	icon-shadow: 0 1px @button_text_shadow;
 }
 
-NautilusToolbar .toolbar {
+NemoToolbar .toolbar {
 	background-image: linear-gradient(to bottom,
 		@theme_bg_color,
 		shade (@theme_bg_color, 0.94));
 }
 
-NautilusToolbar .button *:active {
+NemoToolbar .button:active {
 	icon-shadow: 0 1px @button_active_text_shadow;
 }
 
-NautilusToolbar .button *:insensitive,
-NautilusToolbar .button *:active:insensitive {
+NemoToolbar .button:insensitive,
+NemoToolbar .button:active:insensitive {
 	text-shadow: none;
 }
 
-NautilusQueryEditor .primary-toolbar.toolbar {
+NemoQueryEditor .primary-toolbar.toolbar {
 	border-bottom-width: 0;
 }
 
-NautilusQueryEditor .toolbar {
+NemoQueryEditor .toolbar {
 	padding-top: 3px;
 	padding-bottom: 2px;
 
@@ -130,20 +226,21 @@ NautilusQueryEditor .toolbar {
 	background-color: mix(@theme_bg_color, @theme_base_color, 0.5);
 }
 
-NautilusQueryEditor .toolbar:nth-child(2) {
+NemoQueryEditor .toolbar:nth-child(2) {
 	border-color: @borders;
 }
 
-NautilusNotebook.notebook NautilusQueryEditor .primary-toolbar.toolbar {
+NemoNotebook.notebook NemoQueryEditor .primary-toolbar.toolbar {
 	border-top-width: 0;
 }
 
-NautilusNotebook.notebook NautilusQueryEditor .toolbar:last-child,
-NautilusNotebook.notebook NautilusQueryEditor .primary-toolbar.toolbar:only-child {
+NemoNotebook.notebook NemoQueryEditor .toolbar:last-child,
+NemoNotebook.notebook NemoQueryEditor .primary-toolbar.toolbar:only-child {
 	border-bottom-width: 1px;
 	border-bottom-color: @borders;
 }
 
+
 /* gedit */
 
 GeditWindow .pane-separator, 
@@ -155,41 +252,38 @@ GeditWindow .pane-separator:hover {
 	color: @borders;
 }
 
-GeditPanel.title GtkLabel {
-	padding: 7px 0 6px 0;
-}
-
-GeditPanel .toolbar {
+GeditPanel.vertical .title {
 	border-style: none;
-	background-color: transparent;
+	padding: 7px 0 6px 3px;
 }
 
 GeditDocumentsPanel .view {
 	background-color: @sidebar_bg;
 }
 
-GeditPanel .notebook {
+GeditPanel.vertical .notebook {
 	padding: 0px;
 	border-width: 1px 0;
 }
 
-GeditWindow .notebook {
-	border-width: 1px 0;
+GeditPanel.horizontal .notebook {
+	padding: 0px;
+	border-width: 0 1px 1px 0;
 }
 
-GeditPanel .notebook tab,
-GeditWindow .notebook tab {
-	border-width: 1px 1px 0 1px;
+GeditPanel .notebook tab
+{
+	border-width: 0;
 }
 
-GeditStatusComboBox .button {
+GeditStatusMenuButton {
 	text-shadow: none;
 }
 
-GeditStatusComboBox .button,
-GeditStatusComboBox .button:hover,
-GeditStatusComboBox .button:active,
-GeditStatusComboBox .button:active:hover {
+GeditStatusMenuButton.button,
+GeditStatusMenuButton.button:hover,
+GeditStatusMenuButton.button:active,
+GeditStatusMenuButton.button:active:hover {
 	border-image: none;
 	border-style: solid;
 	border-width: 0 1px;
@@ -197,12 +291,21 @@ GeditStatusComboBox .button:active:hover {
 	padding: 1px 8px 2px 4px;
 }
 
-GeditStatusComboBox .button:hover,
-GeditStatusComboBox .button:active,
-GeditStatusComboBox .button:active:hover {
+GeditStatusMenuButton.button:hover,
+GeditStatusMenuButton.button:active,
+GeditStatusMenuButton.button:active:hover {
 	border-color: @borders;
 }
 
+GeditStatusMenuButton.button:active {
+	background-image: linear-gradient(to bottom,
+		@borders,
+		shade(@theme_bg_color, 0.95));
+	background-color: transparent;
+	color: @theme_selected_fg_color;
+	text-shadow: 0 1px @button_text_shadow;
+}
+
 GeditViewFrame .gedit-search-slider {
 	background-color: @theme_base_color;
 	padding: 6px;
@@ -213,9 +316,9 @@ GeditViewFrame .gedit-search-slider {
 }
 
 GeditViewFrame .gedit-search-slider .not-found {
-	color: @error_fg_color;
+	color: @gedit_not_found_fg;
 	background-image: none;
-	background-color: @error_bg_color;
+	background-color: @gedit_not_found_bg;
 }
 
 GeditViewFrame .gedit-search-slider .not-found:selected {
@@ -223,6 +326,19 @@ 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;
+}
+
+.gedit-search-entry-occurrences-tag {
+	color: shade (@theme_unfocused_fg_color, 0.8);
+	margin: 2px;
+	padding: 2px;
+}
+
 /* gnome-documents */
 .documents-dropdown,
 .documents-dropdown .view {
@@ -295,8 +411,8 @@ GeditViewFrame .gedit-search-slider .not-found:selected {
 	font: bold;
 }
 
-.documents-favorite.button *:active,
-.documents-favorite.button *:active:hover {
+.documents-favorite.button:active,
+.documents-favorite.button:active:hover {
 	color: shade(@theme_selected_bg_color, 1.20);
 }
 
@@ -332,12 +448,6 @@ GeditViewFrame .gedit-search-slider .not-found:selected {
 
 /* baobab */
 
-.baobab-toolbar.toolbar {
-	border-style: solid;
-	border-width: 0 0 1px 0;
-	border-radius: 0;
-}
-
 .cell.baobab-level-cell,
 .cell.baobab-level-cell:hover,
 .cell.baobab-level-cell:selected,
@@ -378,7 +488,7 @@ GeditViewFrame .gedit-search-slider .not-found:selected {
 	color: @theme_selected_fg_color;
 }
 
-BaobabWindow.background GdStack > GtkGrid > GtkScrolledWindow.frame {
+BaobabWindow.background GtkStack > GtkGrid > GtkScrolledWindow.frame {
 	border-radius: 0;
 	border-width: 0 1px 0 0;
 }
@@ -390,6 +500,22 @@ BaobabWindow GtkInfoBar.error {
 	border-bottom-color: @borders;
 }
 
+BaobabRingschart {
+	background-color: @theme_bg_color;
+	padding: 13px 13px 13px 13px;
+}
+
+BaobabRingschart.subfolder-tip {
+	border-radius: 3px;
+	border-style: none;
+	padding: 3px 3px 3px 3px;
+
+	background-color: alpha(@theme_tooltip_bg_color, 0.90);
+	color: @theme_tooltip_fg_color;
+
+	text-shadow: 1px 1px black;
+}
+
 /* epiphany */
 
 EphyToolbar .entry:first-child,
@@ -431,7 +557,7 @@ EphyToolbar .location-entry .button {
 	border-image-slice: 3 3 4 3;
 	border-image-repeat: stretch;
 	border-width: 2px;
-	border-radius: 3px;
+	border-radius: 4px;
 	padding-left: 4px;
 	padding-right: 4px;
 	box-shadow: inset 1px 0 @inset_dark_color,
@@ -475,8 +601,7 @@ EphyToolbar .location-entry .button:active:hover {
 }
 
 EphyToolbar .location-entry .button:hover,
-EphyToolbar .location-entry .button:active,
-EphyToolbar .location-entry .button *:active {
+EphyToolbar .location-entry .button:active {
 	color: @theme_text_color;
 }
 
@@ -494,11 +619,12 @@ EphyToolbar.toolbar .button {
 }
 
 #ephy-page-menu-button.active-menu {
-	background-image: linear-gradient(to bottom,
-		@button_active_gradient_color_a,
-		@button_active_gradient_color_b);
-	background-color: transparent;
-	border-image: url("borders/button-active.png") 3 4 4 4 / 3px 4px 4px 4px stretch;
+	background-image: none;
+	background-color: @menu_bg_color;
+
+	border-image: none;
+	border-color: @menu_bg_color;
+	border-radius: 4px 4px 0 0;
 }
 
 EphyOverview GtkScrolledWindow {
@@ -540,29 +666,31 @@ EphyWindow.background EphyNotebook.notebook:last-child {
 
 /* Background color in contacts pane, similar to .documents-main-view.view */
 .contacts-main-view.view {
- background-color: #f1f2f1;
+	background-color: #f1f2f1;
 }
 
 .contacts-suggestion {
- background-color: #D3D7CF;
- border-radius: 4px;
+	background-color: #D3D7CF;
+	border-radius: 4px;
 }
 
 /* Border on the right in the left menu toolbar */
-.contacts-left-toolbar.toolbar.menubar {
-	border-image: linear-gradient(to bottom, @theme_bg_color, shade(@borders, 1.2));
-	border-image-width: 0 1px 0 0;
-	border-image-slice: 1;
+.contacts-left-header-bar:dir(ltr) {
+	border-right-width: 1px;
 }
 
-/* Sidebar with line at top and the left */
-ContactsWindow .sidebar.frame {
-	border-width: 1px 1px 0 0;
-	border-style: solid;
-	border-color: @borders;
-	border-image: none;
-	border-radius: 0;
-	padding: 0;
+.contacts-left-header-bar:dir(rtl) {
+	border-left-width: 1px;
+}
+
+.contacts-left-header-bar:dir(ltr),
+.contacts-right-header-bar:dir(rtl) {
+	border-top-right-radius: 0;
+}
+
+.contacts-right-header-bar:dir(ltr),
+.contacts-left-header-bar:dir(rtl) {
+	border-top-left-radius: 0;
 }
 
 .contacts-avatar-frame.frame {
@@ -574,19 +702,18 @@ ContactsWindow .sidebar.frame {
 	padding: 0;
 }
 
+.main-avatar-frame.frame {
+	border-width: 1px;
+	border-style: solid;
+	border-color: @borders;
+	border-radius: 6px;
+}
+
 /* Primary toolbar with no line at top to avoid conflicts with frame border */
 ContactsWindow .primary-toolbar.toolbar {
 	border-width: 0 0 1px 0;
 }
 
-ContactsWindow .sidebar .view {
-	background-color: #ebebeb;
-}
-ContactsWindow .sidebar .view:selected,
-ContactsWindow .sidebar .view:selected:focus {
-	background-color: @theme_selected_bg_color;
-}
-
 .contacts-button:active {
 	border-color: #000000;
 	border-image: none;
@@ -657,6 +784,17 @@ ContactsWindow .sidebar .view:selected:focus {
 	border-image: none;
 }
 
+.contacts-watermark {
+	color: #bebebe;
+	text-shadow: 1px 1px alpha(white, 0.6);
+}
+
+/* gnome-photos */
+
+.photos-icon-bg {
+	icon-shadow: 0 1px #000000;
+}
+
 /* Gucharmap */
 GucharmapChartable:active,
 GucharmapChartable:focus,
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 b2950463..04671fa4 100644
--- a/desktop-themes/Menta/gtk-3.0/gtk-main-common.css
+++ b/desktop-themes/Menta/gtk-3.0/gtk-main-common.css
@@ -1,11 +1,20 @@
 /* common color definitions to the light and dark variations */
 
+/******************************
+ * Destructive action buttons *
+ ******************************/
+@define-color destructive_action_button_a #e03d3d;
+@define-color destructive_action_button_b #ef2929;
+@define-color destructive_action_button_border #9d4242;
+@define-color destructive_action_button_fg #ffffff;
+@define-color destructive_action_button_shadow shade(@destructive_action_button_border, 1.15);
+
 /*******
  * OSD *
  *******/
 @define-color osd_highlight #ffffff;
 @define-color osd_lowlight #525252;
-@define-color osd_base #252621;
+@define-color osd_base #212526;
 @define-color osd_base_backdrop shade(@osd_base, 1.40);
 
 @define-color osd_fg #ededed;
@@ -77,18 +86,8 @@
 @define-color error_color #cc0000;
 @define-color success_color #4e9a06;
 
-@define-color info_fg_color black;
-@define-color info_text_shadow alpha(black, 0.1);
-@define-color info_bg_color rgb (252, 252, 189);
-@define-color warning_fg_color black;
-@define-color warning_text_shadow alpha(black, 0.1);
-@define-color warning_bg_color rgb (250, 173, 61);
-@define-color question_fg_color white;
-@define-color question_text_shadow alpha(black, 0.3);
-@define-color question_bg_color rgb (138, 173, 212);
-@define-color error_fg_color white;
-@define-color error_text_shadow alpha(black, 0.5);
-@define-color error_bg_color rgb (237, 54, 54);
+@define-color infobar_fg_color white;
+@define-color infobar_text_shadow alpha(black, 0.3);
 
 /*****************
  * Fallback Mode *
diff --git a/desktop-themes/Menta/gtk-3.0/gtk-main.css b/desktop-themes/Menta/gtk-3.0/gtk-main.css
index 9e30fac6..02f20cab 100644
--- a/desktop-themes/Menta/gtk-3.0/gtk-main.css
+++ b/desktop-themes/Menta/gtk-3.0/gtk-main.css
@@ -59,6 +59,8 @@
 @define-color trough_bg_color_a shade(@theme_bg_color, 0.89);
 @define-color trough_bg_color_b shade(@theme_bg_color, 0.96);
 
+@define-color infobar_bg_color rgb (104, 193, 25);
+
 @define-color scrollbar_trough shade(@theme_bg_color, 0.98);
 @define-color scrollbar_trough_insensitive shade(@theme_bg_color, 1.0);
 @define-color scrollbar_trough_unfocused shade(@theme_unfocused_bg_color, 0.9);
@@ -91,9 +93,12 @@
 @define-color internal_element_prelight @theme_text_color;
 @define-color internal_element_insensitive mix(@internal_element_color, @theme_base_color, 0.7);
 
-@define-color scale_progress_fill shade(@theme_selected_bg_color, 0.96);
-@define-color scale_highlight_border shade(@theme_selected_bg_color, 0.82);
-@define-color scale_highlight_bg shade(@theme_selected_bg_color, 0.89);
+@define-color scale_trough_bg_a shade(@theme_bg_color, 0.9);
+@define-color scale_trough_bg_b shade(@theme_bg_color, 0.76);
+@define-color scale_shadow alpha(white, 0.50);
+@define-color scale_progress_fill @theme_selected_bg_color;
+@define-color scale_highlight_border @theme_selected_bg_color;
+@define-color scale_highlight_bg @theme_selected_bg_color;
 @define-color scale_highlight_shadow alpha(white, 0.50);
 
 @define-color notebook_active_tab_border shade(@theme_selected_bg_color, 0.89);
@@ -107,8 +112,10 @@
 @define-color toolbar_gradient_b shade(@borders, 1.25);
 @define-color toolbar_gradient_c shade(@borders, 1.3);
 
+/* start for zukitwo */
 @define-color toolbar_border_top shade(@borders, 0.9);
 @define-color toolbar_border_bottom shade(@borders, 1.1);
+/* end for zukitwo */
 
 @define-color toolbar_active_button_color shade(@theme_bg_color, 0.8);
 @define-color toolbar_button_prelight alpha(white, 0.4);
@@ -127,7 +134,7 @@
 
 @define-color treeview_focus_border #78CB2A;
 
-@define-color view_separators shade(@borders, 1.30);
+@define-color view_separators shade(@borders, 1.1);
 @define-color view_symbolic_color shade(@internal_element_color, 0.80);
 
 @define-color expander_row_selected_color shade(@theme_selected_bg_color, 1.2);
@@ -160,7 +167,7 @@
 
 @define-color selection_toolbar_suggested_button_a @theme_base_color;
 @define-color selection_toolbar_suggested_button_b @theme_bg_color;
-@define-color selection_toolbar_suggested_button_c #f3f3f3;
+@define-color selection_toolbar_suggested_button_c #f3f4f3;
 @define-color selection_toolbar_suggested_button_fg @theme_text_color;
 @define-color selection_toolbar_suggested_button_border @selection_toolbar_button_border;
 @define-color selection_toolbar_suggested_button_border_backdrop @selection_toolbar_button_border_backdrop;
@@ -183,10 +190,13 @@
 @define-color wm_highlight #ffffff;
 @define-color wm_title_highlight_dark alpha(#ffffff, 0.0);
 @define-color wm_title_highlight #ffffff;
+@define-color wm_title_shadow @wm_title_highlight;
 
 @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_button_bg_a shade (@theme_bg_color, 1.0);
 @define-color wm_button_bg_b shade (@theme_bg_color, 0.85);
 @define-color wm_button_bg_c shade (@theme_bg_color, 0.8);
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 d8a8f64a..392f33a5 100644
--- a/desktop-themes/Menta/gtk-3.0/gtk-widgets-assets.css
+++ b/desktop-themes/Menta/gtk-3.0/gtk-widgets-assets.css
@@ -7,6 +7,27 @@
 	background-image: url("assets/resize-grip.svg");
 }
 
+/*******************
+ * Pane separators *
+ *******************/
+/*.pane-separator {
+	background-image: url("assets/pane-separator-grip.svg");
+	background-repeat: no-repeat;
+	background-position: center;
+}
+
+.pane-separator:hover {
+	background-image: url("assets/pane-separator-grip-prelight.svg");
+}
+
+.pane-separator.vertical {
+	background-image: url("assets/pane-separator-grip-vertical.svg");
+}
+
+.pane-separator.vertical:hover {
+	background-image: url("assets/pane-separator-grip-vertical-prelight.svg");
+}*/
+
 /*************************
  * Check and Radio items *
  *************************/
@@ -290,5 +311,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 5c40e20c..1521978a 100644
--- a/desktop-themes/Menta/gtk-3.0/gtk-widgets-backgrounds.css
+++ b/desktop-themes/Menta/gtk-3.0/gtk-widgets-backgrounds.css
@@ -65,7 +65,7 @@
 		shade (@button_active_gradient_color_a, 1.05),
 		shade (@button_active_gradient_color_b, 1.05));
 	background-color: transparent;
-}	
+}
 
 /* Prelit button background */
 .button:hover,
@@ -195,7 +195,20 @@ GtkComboBox.combobox-entry .button:insensitive,
 	background-color: transparent;
 }
 
+.scale.trough {
+	background-image: linear-gradient(to bottom,
+		@scale_trough_bg_a,
+		@scale_trough_bg_b);
+}
+
+.scale.trough.vertical {
+	background-image: linear-gradient(to right,
+		@scale_trough_bg_a,
+		@scale_trough_bg_b);
+}
+
 /* Active switch background*/
+GtkSwitch.trough:active,
 .scale.progressbar {
 	background-image: linear-gradient(to bottom,
 		@switch_trough_active_bg_a,
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 21ffee6a..d430300c 100644
--- a/desktop-themes/Menta/gtk-3.0/gtk-widgets-borders.css
+++ b/desktop-themes/Menta/gtk-3.0/gtk-widgets-borders.css
@@ -1,11 +1,14 @@
 /* Borders */
+
 /* generic element borders */
 .entry,
 GtkComboBox.combobox-entry .entry,
 GtkComboBox.combobox-entry .button,
 .button:active,
 .spinbutton.vertical .button:active,
-.inline-toolbar.toolbar.vertical .button:active {
+.inline-toolbar.toolbar.vertical .button:active,
+.titlebar .titlebutton:active,
+.titlebar .titlebutton:active:hover {
 	border-image: url("borders/button-active.png") 3 4 4 4 / 3px 4px 4px 4px stretch;
 	border-radius: 4px;
 	border-width: 2px;
@@ -35,10 +38,6 @@ GtkComboBox.combobox-entry .button:insensitive,
 	border-color: transparent;
 }
 
-GtkProgressBar.trough {
-	box-shadow: inset 0 0 0 1px @borders;
-}
-
 /* focused element borders */
 .entry:focus,
 GtkComboBox.combobox-entry .entry:focus,
@@ -52,7 +51,8 @@ GtkComboBox.combobox-entry .entry:focus,
 }
 
 /* generic button borders */
-.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;
@@ -81,15 +81,6 @@ GtkComboBox.combobox-entry .entry:focus,
 	border-color: transparent;
 }
 
-.button.default:active,
-.button: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-style: solid;
-	border-color: transparent;
-}
-
 /* insensitive button borders */
 .button:insensitive,
 .button.default:insensitive {
@@ -139,7 +130,6 @@ GtkComboBox.combobox-entry .entry:focus,
 .primary-toolbar .raised .button:active,
 .inline-toolbar.toolbar .button:active,
 .primary-toolbar GtkComboBox .button:active {
-	/*border-image: url("borders/primary-toolbar-generic-border.png") 4 / 4px stretch;*/
 	border-image: url("borders/button-active.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
 	border-radius: 4px;
 	border-width: 2px;
@@ -168,9 +158,8 @@ 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: 4px;
+	border-radius: 3px;
 	border-width: 2px;
 	border-style: solid;
 	border-color: transparent;
@@ -181,7 +170,6 @@ GtkComboBox.combobox-entry .entry:focus,
 .primary-toolbar .raised .button,
 .inline-toolbar.toolbar .button,
 .primary-toolbar GtkComboBox .button {
-	/*border-image: url("borders/primary-toolbar-button-border.png") 4 / 4px stretch;*/
 	border-image: url("borders/button.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
 	border-radius: 4px;
 	border-width: 2px;
@@ -193,6 +181,16 @@ GtkComboBox.combobox-entry .entry:focus,
 .primary-toolbar .button.raised.default,
 .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;
@@ -222,26 +220,17 @@ column-header.button:active,
 column-header .button:active,
 column-header.button:active:hover,
 column-header .button:active:hover,
-column-header .button.dnd,
-column-header.button:focus,
-column-header .button:focus,
-column-header.button:active:focus,
-column-header .button:active:focus,
-column-header .button.dnd:focus {
-	border-image: linear-gradient(to bottom,
-		mix(@borders, @theme_base_color, 0.1),
-		@theme_base_color
-		) 0 1 1 0;
-	border-width: 0 1px 1px 0;
-	border-radius: 0;
+column-header .button.dnd {
+	border-image: linear-gradient(to top,
+		alpha(@theme_base_color, 0.0),
+		@theme_bg_color) 0 1 1 0;
 }
 
 column-header.button:insensitive,
 column-header .button:insensitive {
-	border-image: linear-gradient(to bottom,
-		mix(@insensitive_borders, @insensitive_bg_color, 0.5),
-		@insensitive_bg_color
-		) 0 1 1 0;
+	border-image: linear-gradient(to top,
+		alpha(@theme_base_color, 0.0),
+		@insensitive_bg_color) 0 1 1 0;
 }
 
 column-header.button:last-child,
@@ -256,10 +245,32 @@ column-header:last-child .button:active:hover {
 /* pushed colored buttons borders */
 .selection-mode.toolbar .suggested-action.button,
 .selection-mode.toolbar GtkToolButton.suggested-action .button {
-	/*border-image: url("borders/generic-border-transparent.png") 3 3 4 3 / 3px 3px 4px 3px stretch;*/
+	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-style: solid;
 	border-color: transparent;
+
+}
+
+/* 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-style: solid;
+	border-color: transparent;
+	/* Zuki note: figure out the heck it does */
+}
+
+/* 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-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 f499a834..8d6d552f 100644
--- a/desktop-themes/Menta/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/Menta/gtk-3.0/gtk-widgets.css
@@ -49,7 +49,8 @@
 
 	/* 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. */
+	 * and we don't use any outlines for now.
+     */
 	outline-color: alpha(@theme_text_color, 0.3);
 	outline-style: dashed;
 	outline-offset: 2px;
@@ -64,6 +65,11 @@
 	background-color: @theme_bg_color;
 }
 
+.background:backdrop {
+	text-shadow: none;
+	icon-shadow: none;
+}
+
 /* FIXME: why do we still need this? */
 GtkClutterOffscreen {
 	background-color: @theme_bg_color;
@@ -88,6 +94,21 @@ 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;
+}
+
+*:hover {
+	-gtk-image-effect: highlight;
+}
+
 .gtkstyle-fallback {
 	background-color: @theme_bg_color;
 	color: @theme_fg_color;
@@ -266,7 +287,6 @@ GtkLabel:insensitive {
 
 	color: @theme_text_color;
 	text-shadow: 0 1px @button_text_shadow;
-
 	border-radius: 3px;
 	border-width: 1px;
 	border-style: solid;
@@ -316,6 +336,7 @@ GtkLabel:insensitive {
 	-GtkButton-inner-border: 0;
 }
 
+.content-view.view.rubberband,
 .view.rubberband,
 .rubberband {
 	background-color: alpha (@theme_selected_bg_color, 0.35);
@@ -323,7 +344,7 @@ GtkLabel:insensitive {
 	border-color: @theme_selected_bg_color;
 	border-style: solid;
 	border-width: 1px;
-	border-radius: 2px;
+	border-radius: 0px;
 }
 
 GtkStatusbar {
@@ -348,10 +369,12 @@ GtkTreeView.separator,
 }
 
 .toolbar .separator {
+	/*color: @toolbar_separator;*/
 	color: transparent;
 }
 
 .pane-separator {
+	background-color: @theme_bg_color;
 	color: shade (@inactive_frame_color, 0.80);
 }
 
@@ -360,17 +383,6 @@ GtkTreeView.separator,
 	color: @theme_text_color;
 }
 
-.pane-separator {
-	background-color: @theme_bg_color;
-	background-repeat: no-repeat;
-	background-position: center;
-	background-image: url("assets/pane-separator-grip.svg");
-}
-
-.pane-separator.vertical {
-	background-image: url("assets/pane-separator-grip-vertical.svg");
-}
-
 .notebook .pane-separator,
 .notebook .pane-separator:hover {
 	background-color: @theme_base_color;
@@ -434,7 +446,8 @@ GtkTreeView.separator,
 	color: @insensitive_fg_color;
 }
 
-/* needed for webkit/GtkStyle compatibility */
+/* needed for webkit/GtkStyle/Evolution compatibility */
+GtkHTML:active,
 .entry:active {
 	color: @theme_unfocused_selected_fg_color;
 	background-color: @theme_unfocused_selected_bg_color;
@@ -514,10 +527,9 @@ GtkTreeView.separator,
 	border-radius: 0 4px 4px 0;
 }
 
-/* FIXME: GtkWarning, bad pseudo-class */
-/*.spinbutton .button:dir(rtl) {
+.spinbutton .button:dir(rtl) {
 	box-shadow: inset -1px 0 @inset_dark_color;
-}*/
+}
 
 /* Add back the glowy effect from the entry covered by the pushed button background*/
 .spinbutton .button:active {
@@ -602,8 +614,8 @@ GtkTreeView.separator,
 
 .spinbutton.vertical.entry:insensitive {
 	border-color: @insensitive_borders;
-	box-shadow: inset 0 1px @entry_inset, 
-		inset 0 -1px @entry_inset;
+	box-shadow: inset 0 1px @insensitive_borders,
+		inset 0 -1px @insensitive_borders;
 }
 
 .spinbutton.vertical.entry:focus {
@@ -639,13 +651,15 @@ GtkColorSwatch:selected:hover {
 GtkColorSwatch.color-dark:hover {
 	background-image: linear-gradient(to bottom,
 		alpha(white, 0) 40%,
-		alpha(white, 0.3));
+		alpha(white, 0.3)
+		);
 }
 
 GtkColorSwatch.color-light:hover {
 	background-image: linear-gradient(to top,
 		alpha(black, 0) 40%,
-		alpha(black, 0.1));
+		alpha(black, 0.1)
+		);
 }
 
 GtkColorSwatch.color-light:selected:hover,
@@ -764,7 +778,8 @@ GtkProgressBar {
 .trough row:selected:focus {
 	background-image: linear-gradient(to bottom,
 		mix(@trough_bg_color_a, @theme_selected_bg_color, 0.25),
-		mix(@trough_bg_color_b, @theme_selected_bg_color, 0.25));
+		mix(@trough_bg_color_b, @theme_selected_bg_color, 0.25)
+		);
 }
 
 /* level bars as used for password quality or remaining power */
@@ -806,12 +821,10 @@ GtkLevelBar.vertical {
 
 .level-bar.indicator-discrete.fill-block.horizontal {
 	margin: 0 1px;
-	border-radius: 8px;
 }
 
 .level-bar.indicator-discrete.fill-block.vertical {
 	margin: 1px 0;
-	border-radius: 8px;
 }
 
 /* discrete indicator border rounding,
@@ -845,11 +858,11 @@ GtkLevelBar.vertical {
 }
 
 .level-bar.fill-block.level-low {
-	border-color: shade(@warning_bg_color, 0.80);
+	border-color: shade(@warning_color, 0.80);
 	background-image: linear-gradient(to bottom,
-		shade(@warning_bg_color, 1.3),
-		@warning_bg_color 75%,
-		shade(@warning_bg_color, 0.90));
+		shade(@warning_color, 1.3),
+		@warning_color 75%,
+		shade(@warning_color, 0.90));
 }
 
 .level-bar.fill-block.empty-fill-block {
@@ -879,21 +892,40 @@ GtkLevelBar.vertical {
 	/* background-image in -assets variant */
 }
 
+.scale.slider.fine-tune:active,
+.scale.slider.fine-tune:active:hover,
+.scale.slider.fine-tune.horizontal:active,
+.scale.slider.fine-tune.horizontal:active:hover {
+	background-size: 50%;
+	background-repeat: no-repeat;
+	background-position: center;
+}
+
 .scale.trough {
-	margin: 7px 0;
+	margin: 6px 0;
 	border-radius: 6px;
 }
 
 .scale.trough.vertical {
-	margin: 0 7px;
+	margin: 0 6px;
 }
 
 .scale.trough,
-.scale.trough.highlight,
-.scale.trough.vertical {
-	border-width: 1px;
-	border-image: none;
-	border-style: solid;
+.scale.trough.highlight {
+	border-color: alpha(@theme_base_color, 0.0);
+	border-top: 0;
+	border-left: 0;
+	border-right: 0;
+	border-bottom: 1px;
+}
+
+.scale.trough.vertical,
+.scale.trough.highlight.vertical {
+	border-color: alpha(@theme_base_color, 0.0);
+	border-top: 0;
+	border-left: 0;
+	border-right: 1px;
+	border-bottom: 0;
 }
 
 .scale.trough,
@@ -910,8 +942,8 @@ GtkLevelBar.vertical {
 .scale.trough.highlight:insensitive,
 .scale.trough.vertical:insensitive,
 .scale.trough.highlight.vertical:insensitive {
-	background-color: shade(@insensitive_bg_color, 0.85);
-	border-color: shade(@insensitive_scale_borders, 0.85);
+	background-color: shade(@insensitive_bg_color, 0.96);
+	border-color: shade(@insensitive_scale_borders, 1.0);
 	box-shadow: none;
 	background-image: none;
 }
@@ -932,19 +964,23 @@ GtkLevelBar.vertical {
 }
 
 .scale.trough {
-	box-shadow: inset 0 -1px @theme_bg_color;
+	box-shadow: inset 0 1px shade(@theme_bg_color, 0.85),
+		inset 0 -1px alpha(@theme_base_color, 0.4);
 }
 
 .scale.trough.vertical {
-	box-shadow: inset -1px 0 @theme_bg_color;
+	box-shadow: inset 1px 0 shade(@theme_bg_color, 0.85),
+		inset -1px 0 alpha(@theme_base_color, 0.4);
 }
 
 .scale.trough.highlight {
-	box-shadow: inset 0 -1px @scale_highlight_shadow;
+	box-shadow: inset 0 1px alpha(@theme_base_color, 0.2),
+		inset 0 -1px shade(@theme_selected_bg_color, 0.7);
 }
 
 .scale.trough.vertical.highlight {
-	box-shadow: inset -1px 0 @scale_highlight_shadow;
+	box-shadow: inset 1px 0 alpha(@theme_base_color, 0.2),
+		inset -1px 0 shade(@theme_selected_bg_color, 0.7);
 }
 
 /**********
@@ -971,17 +1007,6 @@ GtkScrolledWindow GtkViewport.frame {
 	border-style: none;
 }
 
-/* FIXME: May have to remove this. */
-GtkViewport.frame {
-	border-width: 0;
-}
-
-/* GtkViewport, FIXME: Same as above. */
-GtkViewport,
-GtkIconView {
-	background-color: @theme_base_color;	
-}
-
 /***********
  * Buttons *
  ***********/
@@ -1002,8 +1027,6 @@ GtkComboBox.combobox-entry .button {
 	-GtkButton-default-border: 0;
 	-GtkButton-inner-border: 3;
 
-	color: @theme_text_color;
-
 	border-style: solid;
 	border-color: transparent;
 
@@ -1035,36 +1058,36 @@ GtkComboBox.combobox-entry .button {
 	padding: 3px 4px 4px;
 }
 
-.primary-toolbar .button *:active,
-.inline-toolbar .button *:active,
-.button *:active {
+.primary-toolbar .button:active,
+.inline-toolbar .button:active,
+.button:active {
 	color: @button_active_text;
 	text-shadow: 0 1px @button_active_text_shadow;
 }
 
-.button *:insensitive,
-.button *:active:insensitive {
+.button:insensitive,
+.button:active *:insensitive {
 	color: @insensitive_fg_color;
 	text-shadow: none;
 }
 
-.toolbar .button.raised *,
-.toolbar .raised .button *,
-.inline-toolbar .button * {
+.toolbar .button.raised,
+.toolbar .raised .button,
+.inline-toolbar .button {
 	icon-shadow: 0 1px @button_text_shadow;
 	text-shadow: 0 1px @button_text_shadow;
 }
 
-.toolbar .button.raised *:active,
-.toolbar .raised .button *:active,
-.inline-toolbar .button *:active {
+.toolbar .button.raised:active,
+.toolbar .raised .button:active,
+.inline-toolbar .button:active {
 	icon-shadow: 0 1px @button_active_text_shadow;
 	text-shadow: 0 1px @button_active_text_shadow;
 }
 
-.toolbar .button.raised *:insensitive,
-.toolbar .raised .button *:insensitive,
-.inline-toolbar .button *:insensitive {
+.toolbar .button.raised:insensitive,
+.toolbar .raised .button:insensitive,
+.inline-toolbar .button:insensitive {
 	icon-shadow: none;
 	text-shadow: none;
 }
@@ -1116,20 +1139,6 @@ GtkComboBox.combobox-entry .button {
 .inline-toolbar.toolbar .button:first-child,
 .inline-toolbar.toolbar GtkToolButton:first-child > .button {
 	box-shadow: inset -1px 0 @inset_dark_color;
-	border-left-width: 2px;
-}
-
-.linked .button:active:first-child,
-.toolbar .button.raised.linked:active:first-child,
-.toolbar .raised.linked .button:active:first-child,
-.inline-toolbar.toolbar .button:active:first-child,
-.inline-toolbar.toolbar GtkToolButton > .button:active:first-child,
-.linked .button:active:hover:first-child,
-.toolbar .button.raised.linked:active:hover:first-child,
-.toolbar .raised.linked .button:active:hover:first-child,
-.inline-toolbar.toolbar .button:active:hover:first-child,
-.inline-toolbar.toolbar GtkToolButton > .button:active:hover:first-child {
-	border-left-width: 2px;
 }
 
 .linked .button:last-child,
@@ -1138,20 +1147,6 @@ GtkComboBox.combobox-entry .button {
 .inline-toolbar.toolbar .button:last-child,
 .inline-toolbar.toolbar GtkToolButton:last-child > .button {
 	box-shadow: inset 1px 0 @inset_light_color;
-	border-right-width: 2px;
-}
-
-.linked .button:active:last-child,
-.toolbar .button.raised.linked:active:last-child,
-.toolbar .raised.linked .button:active:last-child,
-.inline-toolbar.toolbar .button:active:last-child,
-.inline-toolbar.toolbar GtkToolButton > .button:active:last-child,
-.linked .button:active:hover:last-child,
-.toolbar .button.raised.linked:active:hover:last-child,
-.toolbar .raised.linked .button:active:hover:last-child,
-.inline-toolbar.toolbar .button:active:hover:last-child,
-.inline-toolbar.toolbar GtkToolButton > .button:active:hover:last-child {
-	border-right-width: 2px;
 }
 
 .linked .button:active,
@@ -1200,7 +1195,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;
 	border-top-right-radius: 0;
@@ -1212,6 +1207,7 @@ GtkComboBox.combobox-entry .button {
 .linked .button:active:last-child,
 .linked .button:active:hover:last-child,
 .linked .button:insensitive:last-child {
+	border-right-width: 2px;
 	border-left-width: 0;
 	border-image-width: 3px 4px 4px 0;
 	border-bottom-left-radius: 0;
@@ -1227,7 +1223,7 @@ GtkComboBox.combobox-entry .button {
 	border-right-width: 1px;
 	border-left-width: 1px;
 	border-image-width: 3px 4px 4px 4px;
-	border-radius: 4px;
+	border-radius: 3px;
 }
 
 /* Middle button (vertical) */
@@ -1450,7 +1446,7 @@ GtkComboBox.combobox-entry .button {
 .inline-toolbar.toolbar.vertical GtkToolButton:first-child > .button,
 .inline-toolbar.toolbar.vertical GtkToolButton:first-child > .button:active,
 .inline-toolbar.toolbar.vertical GtkToolButton:first-child > .button:insensitive {
-	border-width: 2px 2px 0 2px;
+	border-width: 1px 1px 0 1px;
 	border-image-width: 3px 3px 0 3px;
 	border-bottom-left-radius: 0;
 	border-bottom-right-radius: 0;
@@ -1463,7 +1459,7 @@ GtkComboBox.combobox-entry .button {
 .inline-toolbar.toolbar.vertical GtkToolButton:last-child > .button,
 .inline-toolbar.toolbar.vertical GtkToolButton:last-child > .button:active,
 .inline-toolbar.toolbar.vertical GtkToolButton:last-child > .button:insensitive {
-	border-width: 0 2px 2px 2px;
+	border-width: 0 1px 2px 1px;
 	border-image-width: 0 3px 4px 3px;
 	border-top-left-radius: 0;
 	border-top-right-radius: 0;
@@ -1476,14 +1472,14 @@ GtkComboBox.combobox-entry .button {
 .inline-toolbar.toolbar.vertical GtkToolButton:only-child > .button,
 .inline-toolbar.toolbar.vertical GtkToolButton:only-child > .button:active,
 .inline-toolbar.toolbar.vertical GtkToolButton:only-child > .button:insensitive {
-	border-top-width: 2px;
+	border-top-width: 1px;
 	border-bottom-width: 2px;
 	border-image-width: 3px 3px 3px 4px;
-	border-radius: 4px;
+	border-radius: 3px;
 }
 
 GtkLinkButton.button,
-GtkLinkButton.button *:active {
+GtkLinkButton.button:active {
 	text-shadow: none;
 }
 
@@ -1503,17 +1499,48 @@ GtkLinkButton.button *:active {
 	border-color: @borders;
 	border-style: solid;
 	border-width: 1px;
-	border-radius: 4px;
 
-	background-clip: border-box;
 	background-color: shade (@theme_bg_color, 1.1);
 
-	-GtkNotebook-tab-overlap: -1;
 	-GtkNotebook-initial-gap: 0;
+	-GtkNotebook-arrow-spacing: 5;
+	-GtkNotebook-has-tab-gap: false;
+	-GtkNotebook-tab-overlap: -1;
+}
+
+.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);
+	border-width: 0px;
+}
+
+.notebook.header.frame.top {
+	border-top: 1px solid @borders;
+	border-left: 1px solid @borders;
+	border-right: 1px solid @borders;
+}
+
+.notebook.header.frame.bottom {
+	border-bottom: 1px solid @borders;
+	border-left: 1px solid @borders;
+	border-right: 1px solid @borders;
+}
+
+.notebook.header.frame.left {
+	border-top: 1px solid @borders;
+	border-bottom: 1px solid @borders;
+	border-left: 1px solid @borders;
+}
+
+.notebook.header.frame.right {
+	border-top: 1px solid @borders;
+	border-bottom: 1px solid @borders;
+	border-right: 1px solid @borders;
 }
 
 .notebook GtkViewport {
-	background-color: @theme_base_color;
+	background-color: shade (@theme_bg_color, 1.1);
+	border-width: 0px;
 }
 
 .notebook tab {
@@ -1526,7 +1553,7 @@ GtkLinkButton.button *:active {
 		@notebook_tab_gradient_b);
 	border-radius: 4px 4px 0 0;
 	border-image: none;
-	box-shadow: inset 0 1px alpha (shade (@theme_bg_color, 1.26), 0.3);
+	box-shadow: inset 0 1px alpha (shade (@theme_base_color, 1.1), 0.4);
 }
 
 .notebook tab.bottom {
@@ -1535,7 +1562,7 @@ GtkLinkButton.button *:active {
 		@notebook_tab_gradient_b);
 	border-width: 0px 1px 1px 1px;
 	border-radius: 0 0 4px 4px;
-	box-shadow: inset 0 -1px alpha (shade (@theme_bg_color, 1.26), 0.3);
+	box-shadow: inset 0 -1px alpha (shade (@theme_base_color, 1.1), 0.4);
 }
 
 .notebook tab:active {
@@ -1552,22 +1579,6 @@ GtkLinkButton.button *:active {
 	border-width: 0px 1px 1px 1px;
 }
 
-.notebook tab.top {
-	padding: 4px 2px 0;
-}
-
-.notebook tab.top:active {
-	padding: 6px 2px 0;
-}
-
-.notebook tab.bottom {
-	padding: 0 2px 4px;
-}
-
-.notebook tab.bottom:active {
-	padding: 0 2px 6px;
-}
-
 .notebook tab.left,
 .notebook tab.right {
 	background-image: none;
@@ -1592,46 +1603,50 @@ GtkLinkButton.button *:active {
 }
 
 .notebook tab.left:active {
+	border-width: 1px 0 1px 1px;
 	padding: 3px 3px 3px 5px;
 	border-radius: 4px 0 0 4px;
 }
 
 .notebook tab.right:active {
+	border-width: 1px 1px 1px 0;
 	padding: 3px 5px 3px 3px;
 	border-radius: 0 4px 4px 0;
 }
 
+.notebook tab GtkLabel {
+	color: @theme_fg_color;
+}
+
+.notebook .active-page,
+.notebook tab .active-page GtkLabel {
+	color: @theme_fg_color;
+}
+
+.notebook tab:active {
+	border-bottom-width: 0px;
+}
+
 /* close button styling */
 .notebook tab .button,
 .notebook tab .button:active,
 .notebook tab .button:hover {
 	border-image: none;
-	border-style: none;
+	border: 1px solid transparent;
 	background-image: none;
 	background-color: transparent;
 }
 
-.notebook tab .button GtkImage {
-	border-radius: 3px;
-	color: @theme_fg_color;
-	border-style: solid;
-	border-color: transparent;
-	border-width: 1px;
-	padding: 1px;
-
-	icon-shadow: 0 1px @button_text_shadow;
-}
-
-.notebook tab .button GtkImage:hover {
+.notebook tab .button:hover {
 	color: @theme_fg_color;
-	border-color: alpha(black, 0.1);
+	border: 1px solid alpha(black, 0.1);
 }
 
-.notebook tab .button GtkImage:active,
-.notebook tab .button GtkImage:active:hover {
+.notebook tab .button:active,
+.notebook tab .button:active:hover {
 	background-color: alpha(black, 0.08);
 	box-shadow: inset 0 1px alpha(black, 0.05);
-	color: @button_active_text;
+	color:  @button_active_text;
 	icon-shadow: 0 1px @button_active_text_shadow;
 
 	border-color: alpha(black, 0.27) 
@@ -1652,7 +1667,7 @@ GtkComboBox {
 	text-shadow: 0 1px @button_text_shadow;
 }
 
-GtkComboBox *:insensitive {
+GtkComboBox:insensitive {
 	text-shadow: none;
 	color: @insensitive_fg_color;
 }
@@ -1730,8 +1745,8 @@ GtkComboBox.combobox-entry .button:insensitive:last-child {
 	box-shadow: inset 1px 0 @inset_dark_color;
 }
 
-GtkComboBox.combobox-entry .button *:active,
-GtkComboBox.combobox-entry .button *:active:hover {
+GtkComboBox.combobox-entry .button:active,
+GtkComboBox.combobox-entry .button:active:hover {
 	color: @theme_text_color;
 }
 
@@ -1739,8 +1754,8 @@ GtkComboBox .button {
 	color: @theme_text_color;
 }
 
-GtkComboBox .button *:hover {
-	color: @internal_element_color;
+GtkComboBox .button:hover {
+	color: @theme_text_color;
 }
 
 /**************
@@ -1892,6 +1907,14 @@ GtkComboBox .button *:hover {
 	border-width: 1px;
 }
 
+.scrollbar.slider.fine-tune:prelight:active {
+	background-image: none;
+	border-style: solid;
+	border-image: none;
+	border-color: transparent;
+	border-width: 5px;
+}
+
 /*********
  * Menus *
  *********/
@@ -1902,17 +1925,22 @@ GtkTreeMenu.menu {
 
 GtkTreeMenu .menuitem {
 	padding: 2px;
-
 	border-style: none;
 }
 
-GtkTreeMenu .menuitem * {
+/* FIXME: Figure out why menuitem:hover doesn't change anything here */
+GtkTreeMenu .menuitem {
 	color: @theme_text_color;
 }
 
 GtkTreeMenu .menuitem,
 .button .menuitem,
-.toolbar .button .menuitem * {
+.toolbar .button .menuitem {
+	text-shadow: none;
+}
+
+.context-menu {
+	font: initial;
 	text-shadow: none;
 }
 
@@ -1920,7 +1948,7 @@ GtkTreeMenu .menuitem,
 	background-color: @menu_bg_color;
 	color: @menu_fg_color;
 	padding: 0;
-	border-style: none;
+	border: 1px solid @borders;
 }
 
 .menu.button {
@@ -1963,8 +1991,9 @@ GtkTreeMenu .menuitem,
 
 .menubar .menuitem {
 	border-style: none;
-	padding: 2px 6px;
+	padding: 4px 6px;
 	text-shadow: 0 1px @button_text_shadow;
+	/*padding: 3px 8px;*/
 }
 
 .menubar .menuitem:hover {
@@ -1973,7 +2002,7 @@ GtkTreeMenu .menuitem,
 		shade (@theme_bg_color, 0.82));
 }
 
-.menubar .menuitem *:hover {
+.menubar .menuitem:hover {
 	color: @menu_fg_color;
 }
 
@@ -1996,17 +2025,14 @@ GtkTreeMenu .menuitem,
 }
 
 .menu .menuitem:insensitive {
-	background-color: @menu_bg_color;
+	background-color: transparent;
 }
 
 .menu .menuitem:active,
-.menu .menuitem *:active,
-.menu .menuitem:hover,
-.menu .menuitem *:hover {
+.menu .menuitem:hover {
 	color: @theme_selected_fg_color;
 }
 
-.menu .menuitem:insensitive,
 .menu .menuitem *:insensitive {
 	color: mix (@menu_fg_color, @menu_bg_color, 0.6);
 }
@@ -2024,6 +2050,10 @@ GtkTreeMenu .menuitem,
 	color: alpha (@theme_selected_fg_color, 0.7);
 }
 
+GtkModelMenuItem GtkBox GtkImage {
+	padding-right: 6px;
+}
+
 .menuitem.arrow {
 	color: @menu_controls_color;
 }
@@ -2031,7 +2061,7 @@ GtkTreeMenu .menuitem,
 .menuitem.separator {
 	color: @menu_separator;
 
-	-GtkMenuItem-horizontal-padding: 0px;
+	-GtkMenuItem-horizontal-padding: 0;
 }
 
 .menuitem.check,
@@ -2088,6 +2118,7 @@ GtkTreeMenu .menuitem,
 	background-image: url("assets/menuitem-radio-checked-insensitive.svg");
 }
 
+
 /***************
  * Menu Button *
  ***************/
@@ -2103,13 +2134,13 @@ GtkMenuButton.button:active,
 	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.button:active,
+.linked GtkMenuButton.button:active,
+.toolbar .linked.raised GtkMenuButton.button:active,
+.toolbar GtkMenuButton.button.linked.raised:active {
 	text-shadow: none;
 	icon-shadow: none;
 }
@@ -2137,9 +2168,9 @@ GtkMenuButton.button *:active,
 	border-style: solid;
 }
 
-.button.menuitem.menubar *:active,
-GtkMenuButton.button *:active,
-.toolbar GtkMenuButton.button *:active {
+.button.menuitem.menubar:active,
+GtkMenuButton.button:active,
+.toolbar GtkMenuButton.button:active {
 	color: @theme_text_color;
 }
 
@@ -2147,6 +2178,7 @@ GtkMenuButton .menu {
 	text-shadow: none;
 }
 
+
 /****************
  * Radiobuttons *
  ****************/
@@ -2166,6 +2198,7 @@ GtkCheckButton:selected:focus {
 	background-color: transparent;
 }
 
+
 /************
  * Toolbars *
  ************/
@@ -2200,8 +2233,8 @@ GtkCheckButton:selected:focus {
 	-GtkToolbar-button-relief: normal;
 	
 	padding: 6px 6px 5px 6px; /* weird padding to compensate border-images
-				and eventual top border presence, 
-				see selection mode toolbars */
+					and eventual top border presence, 
+					see selection mode toolbars */
 
 }
 
@@ -2212,10 +2245,11 @@ GtkCheckButton:selected:focus {
 	border-width: 0 0 1px;
 	border-style: solid;
 	border-color: shade(@borders, 0.90);
-	padding: 0 1px;
 
 	box-shadow: inset 0 -1px shade(@borders, 1.30);
 	background-color: @theme_bg_color;
+
+	padding: 6px 6px 5px 6px;
 }
 
 .header-bar .button.text-button {
@@ -2223,7 +2257,31 @@ GtkCheckButton:selected:focus {
 }
 
 .header-bar .button.image-button {
-	padding: 5px 4px 4px 5px;
+	padding: 5px 4px 5px 5px;
+}
+
+.header-bar .title {
+	font: Bold 10;
+}
+
+.header-bar .subtitle {
+	font: 9;
+}
+
+/***************
+ * Search bars *
+ ***************/
+
+.search-bar {
+	border-width: 0 0 1px;
+	border-style: solid;
+	border-color: shade(@borders, 0.90);
+
+	background-color: shade(@theme_bg_color, 0.98);
+}
+
+.search-bar .button.close-button {
+	padding: 5px 4px 5px 5px;
 }
 
 /********************
@@ -2231,18 +2289,18 @@ GtkCheckButton:selected:focus {
  ********************/
 
 /* applications using EggEditableToolbar usually set the primary-toolbar
- * hint on the containing vbox, so we need to handle both these cases here. */
+ * hint on the containing vbox, so we need to handle both these cases here.
+ */
 .primary-toolbar .toolbar,
 .primary-toolbar.toolbar {
 	border-bottom-color: shade (@theme_bg_color, 0.92);
 	border-style: solid;
 	border-width: 0 0 1px 0;
-
 	-GtkWidget-window-dragging: true;
 	-GtkToolbar-button-relief: normal;
 	text-shadow: 0 1px @button_text_shadow;
-	padding-top: 1px;
-	padding-bottom: 1px;
+	padding-top: 3px;
+	padding-bottom: 3px;
 }
 
 .primary-toolbar .toolbar:insensitive,
@@ -2306,6 +2364,30 @@ GtkCheckButton:selected:focus {
 	background-color: @sidebar_bg;
 }
 
+.sidebar .scrollbar.trough {
+	box-shadow: none;
+	border-radius: 100px;
+	border-style: solid;
+	border-width: 2px;
+	border-color: transparent;
+}
+
+.sidebar .scrollbar.trough {
+	background-color: @sidebar_scrollbar_trough;
+}
+
+.sidebar .scrollbar.slider {
+	background-color: @sidebar_bg;
+}
+
+.sidebar .scrollbar.slider:hover {
+	background-color: mix (@sidebar_bg, @theme_base_color, 0.35);
+}
+
+.sidebar .scrollbar.slider:hover:active {
+	background-color: @theme_base_color;
+}
+
 .sidebar .radio,
 .sidebar .radio:focus,
 .sidebar .radio:selected {
@@ -2355,7 +2437,8 @@ GtkOverlay.osd {
 	background-image: linear-gradient(to bottom,
 		@osd_button_bg_a,
 		@osd_button_bg_b 68%,
-		@osd_button_bg_c);
+		@osd_button_bg_c
+		);
 
 	color: @osd_button_fg;
 
@@ -2396,22 +2479,22 @@ GtkOverlay.osd {
 	background-color: @osd_button_bg_insensitive_active;
 }
 
-.osd.button *:hover,
-.osd .button *:hover {
+.osd.button:hover,
+.osd .button:hover {
 	color: @osd_button_fg_hover;
 }
 
-.osd.button *:active,
-.osd.button *:hover:active,
-.osd .button *:active,
-.osd .button *:hover:active {
+.osd.button:active,
+.osd.button:hover:active,
+.osd .button:active,
+.osd .button:hover:active {
 	color: @osd_button_fg_active;
 }
 
-.osd.button *:insensitive,
-.osd.button *:insensitive:active,
-.osd .button *:insensitive,
-.osd .button *:insensitive:active {
+.osd.button:insensitive,
+.osd.button:active *:insensitive,
+.osd .button:insensitive,
+.osd .button:active *:insensitive {
 	color: @osd_button_fg_insensitive;
 	text-shadow: none;
 	icon-shadow: none;
@@ -2422,7 +2505,8 @@ GtkOverlay.osd {
 	background-image: linear-gradient(to bottom,
 		@osd_button_bg_hover_a,
 		@osd_button_bg_hover_b 68%,
-		@osd_button_bg_hover_c);
+		@osd_button_bg_hover_c
+		);
 }
 
 .osd.button:active,
@@ -2441,7 +2525,7 @@ GtkOverlay.osd {
 	border-color: @osd_button_border;
 }
 
-.osd GtkMenuButton.button *:active {
+.osd GtkMenuButton.button:active {
 	color: @osd_button_fg_active;
 	text-shadow: 0 -1px @osd_button_shadow;
 }
@@ -2456,7 +2540,8 @@ GtkOverlay.osd {
 	background-image: linear-gradient(to bottom,
 		@osd_toolbar_bg_a,
 		@osd_toolbar_bg_b 63%,
-		@osd_toolbar_bg_c);
+		@osd_toolbar_bg_c
+		);
 	background-color: transparent;
 
 	-GtkToolbar-button-relief: normal;
@@ -2510,7 +2595,8 @@ GtkOverlay.osd {
 	border-color: @osd_button_border;
 	background-image: linear-gradient(to bottom,
 		shade(@osd_button_border, 0.70),
-		shade(@osd_button_border, 0.90));
+		shade(@osd_button_border, 0.90)
+		);
 	background-color: transparent;
 }
 
@@ -2518,7 +2604,8 @@ GtkOverlay.osd {
 	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));
+		mix(shade(@osd_button_border, 0.90), @theme_selected_bg_color, 0.70)
+		);
 }
 
 .osd .scale.trough:insensitive,
@@ -2631,24 +2718,60 @@ GtkProgressBar.osd.progressbar {
 	color: @suggested_action_button_fg;
 }
 
-.toolbar .suggested-action.button *,
-.suggested-action.button * {
+.toolbar .suggested-action.button,
+.suggested-action.button {
 	text-shadow: 0 1px @suggested_action_button_shadow;
 	icon-shadow: 0 1px @suggested_action_button_shadow;
 }
 
-.toolbar .suggested-action.button *:active,
-.toolbar .suggested-action.button *:hover:active,
-.suggested-action.button *:active,
-.suggested-action.button *:hover:active {
+.toolbar .suggested-action.button:active,
+.toolbar .suggested-action.button:hover:active,
+.suggested-action.button:active,
+.suggested-action.button:hover:active {
 	text-shadow: 0 1px shade(@suggested_action_button_shadow, 1.15);
 	icon-shadow: 0 1px shade(@suggested_action_button_shadow, 1.15);
 }
 
+/******************************
+ * Destructive action buttons *
+ ******************************/
+.destructive-action.button {
+	background-image: linear-gradient(to bottom,
+		@destructive_action_button_a,
+		@destructive_action_button_b);
+
+	color: @destructive_action_button_fg;
+}
+
+.destructive-action.button:hover {
+	background-image: linear-gradient(to bottom,
+		shade(@destructive_action_button_a, 1.10),
+		shade(@destructive_action_button_b, 1.05));
+}
+
+.destructive-action.button:active,
+.destructive-action.button:hover:active {
+	background-image: linear-gradient(to bottom,
+		@destructive_action_button_b,
+		@destructive_action_button_a);
+
+	color: @destructive_action_button_fg;
+}
+
+.destructive-action.button {
+	text-shadow: 0 1px @destructive_action_button_shadow;
+	icon-shadow: 0 1px @destructive_action_button_shadow;
+}
+
+.destructive-action.button:active,
+.destructive-action.button:hover:active {
+	text-shadow: 0 1px shade(@destructive_action_button_shadow, 1.15);
+	icon-shadow: 0 1px shade(@destructive_action_button_shadow, 1.15);
+}
+
 /**************************
  * Selection Mode classes *
  **************************/
-/* FIXME: Currently not styled for Zuki-themes becuase I have no idea what it does. */
 .selection-mode.header-bar,
 .selection-mode.toolbar {
 	color: @selection_toolbar_fg;
@@ -2712,18 +2835,18 @@ GtkProgressBar.osd.progressbar {
 	box-shadow: none;
 }
 
-.selection-mode.header-bar .button *:active,
-.selection-mode.toolbar .button *:active,
-.selection-mode.toolbar GtkToolButton .button *:active {
+.selection-mode.header-bar .button:active,
+.selection-mode.toolbar .button:active,
+.selection-mode.toolbar GtkToolButton .button:active {
 	color: @selection_toolbar_button_fg;
 }
 
-.selection-mode.header-bar .button *,
-.selection-mode.header-bar .button *:active,
-.selection-mode.toolbar .button *,
-.selection-mode.toolbar .button *:active,
-.selection-mode.toolbar GtkToolButton .button *,
-.selection-mode.toolbar GtkToolButton .button *:active {
+.selection-mode.header-bar .button,
+.selection-mode.header-bar .button:active,
+.selection-mode.toolbar .button,
+.selection-mode.toolbar .button:active,
+.selection-mode.toolbar GtkToolButton .button,
+.selection-mode.toolbar GtkToolButton .button:active {
 	text-shadow: 0 1px @selection_toolbar_button_shadow;
 	icon-shadow: 0 1px @selection_toolbar_button_shadow;
 }
@@ -2768,18 +2891,18 @@ GtkProgressBar.osd.progressbar {
 	box-shadow: none;
 }
 
-.selection-mode.header-bar .suggested-action.button *:active,
-.selection-mode.toolbar .suggested-action.button *:active,
-.selection-mode.toolbar GtkToolButton.suggested-action *:active {
+.selection-mode.header-bar .suggested-action.button:active,
+.selection-mode.toolbar .suggested-action.button:active,
+.selection-mode.toolbar GtkToolButton.suggested-action:active {
 	color: @theme_text_color;
 }
 
-.selection-mode.header-bar .suggested-action.button *,
-.selection-mode.header-bar .suggested-action.button *:active,
-.selection-mode.toolbar .suggested-action.button *,
-.selection-mode.toolbar .suggested-action.button *:active,
-.selection-mode.toolbar GtkToolButton.suggested-action .button *,
-.selection-mode.toolbar GtkToolButton.suggested-action *:active {
+.selection-mode.header-bar .suggested-action.button,
+.selection-mode.header-bar .suggested-action.button:active,
+.selection-mode.toolbar .suggested-action.button,
+.selection-mode.toolbar .suggested-action.button:active,
+.selection-mode.toolbar GtkToolButton.suggested-action .button,
+.selection-mode.toolbar GtkToolButton.suggested-action:active {
 	text-shadow: 0 1px @button_text_shadow;
 	icon-shadow: 0 1px @button_text_shadow;
 }
@@ -2818,18 +2941,18 @@ GtkProgressBar.osd.progressbar {
 	background-color: transparent;
 }
 
-.selection-mode.header-bar .selection-menu.button *:active,
-.selection-mode.toolbar .selection-menu.button *:active {
+.selection-mode.header-bar .selection-menu.button:active,
+.selection-mode.toolbar .selection-menu.button:active {
 	color: @selection_menu_active;
 }
 
-.selection-mode.header-bar .selection-menu.button *,
-.selection-mode.toolbar .selection-menu.button * {
+.selection-mode.header-bar .selection-menu.button,
+.selection-mode.toolbar .selection-menu.button {
 	text-shadow: 0 1px @selection_toolbar_shadow;
 }
 
-.selection-mode.header-bar .selection-menu.button .menuitem *,
-.selection-mode.toolbar .selection-menu.button .menuitem * {
+.selection-mode.header-bar .selection-menu.button .menuitem,
+.selection-mode.toolbar .selection-menu.button .menuitem {
 	text-shadow: none;
 }
 
@@ -2944,6 +3067,7 @@ GtkIconView.cell:selected:focus {
 .cell {
 	color: @theme_text_color;
 	padding: 2px;
+	text-shadow: none;
 }
 
 .cell:selected,
@@ -3000,7 +3124,7 @@ GtkTreeView row:nth-child(even):backdrop:hover {
 
 column-header.button,
 column-header .button {
-	color: @theme_text_color;
+	color: @theme_fg_color;
 }
 
 column-header.button,
@@ -3009,6 +3133,7 @@ column-header.button:insensitive,
 column-header .button:insensitive,
 column-header.button:hover,
 column-header .button:hover {
+	background-image: none;
 	padding: 0 4px;
 	text-shadow: none;
 	icon-shadow: none;
@@ -3020,15 +3145,11 @@ 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,
-column-header .button:active:hover,
-column-header.button *:active,
-column-header .button *:active,
-column-header.button *:active:hover,
-column-header .button *:active:hover {
-	color: @internal_element_prelight;
+column-header .button:active:hover {
+	color: @theme_fg_color;
 	text-shadow: none;
 	icon-shadow: none;
 	border-radius: 0;
@@ -3090,6 +3211,18 @@ EggListBox:selected {
 	background-color: @theme_selected_bg_color;
 }
 
+.list {
+	background-color: @list_box_bg;
+}
+
+.list-row:hover {
+	background-color: @content_view_bg;
+}
+
+.list-row:selected {
+	background-color: @theme_selected_bg_color;
+}
+
 /****************
  * Content view *
  ****************/
@@ -3142,6 +3275,13 @@ GtkIconView.content-view.cell.check:active {
 	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;
@@ -3222,20 +3362,42 @@ GtkInfoBar {
 	border-style: none;
 }
 
-.info {
-	text-shadow: 0 1px @info_text_shadow;
+.info,
+.question,
+.warning,
+.error {
+	background-color: @infobar_bg_color;
+	color: @infobar_fg_color;
+	text-shadow: 0 1px @infobar_text_shadow;
+	border-color: darker(@infobar_bg_color);
 }
 
-.warning {
-	text-shadow: 0 1px @warning_text_shadow;
+.info .button.close,
+.warning .button.close,
+.question .button.close,
+.error .button.close {
+	color: @infobar_fg_color;
+	icon-shadow: 0 1px @infobar_text_shadow;
 }
 
-.question {
-	text-shadow: 0 1px @question_text_shadow;
+.info .button.close:hover,
+.warning .button.close:hover,
+.question .button.close:hover,
+.error .button.close:hover {
+	background-image: linear-gradient(to bottom,
+		alpha(white, 0.3),
+		alpha(white, 0.2) 30%,
+		alpha(black, 0.02));
 }
 
-.error {
-	text-shadow: 0 1px @error_text_shadow;
+.info .button.close:active,
+.warning .button.close:active,
+.question .button.close:active,
+.error .button.close:active {
+	color: @infobar_fg_color;
+	background-image: linear-gradient(to bottom,
+		alpha(black, 0.1),
+		transparent);
 }
 
 .info .entry,
@@ -3252,68 +3414,25 @@ GtkInfoBar {
 .error .entry:focus,
 .error .button,
 .error .button:insensitive,
-.error .button:active {
-	border-image: none;
-
-	border-color: shade(@borders, 0.9);
-	border-style: solid;
-	border-width: 1px;
-}
-
+.error .button:active,
 .question .entry,
 .question .entry:focus,
 .question .button,
 .question .button:insensitive,
 .question .button:active {
 	border-image: none;
-
-	border-color: darker(@question_bg_color);
+	color: @theme_fg_color;
+	border-color: darker(@infobar_bg_color);
 	border-style: solid;
 	border-width: 1px;
 }
 
-.info {
-	background-color: @info_bg_color;
-	color: @info_fg_color;
-
-	border-color: darker(@info_bg_color);
-}
-
-.warning {
-	background-color: @warning_bg_color;
-	color: @warning_fg_color;
-
-	border-color: darker(@warning_bg_color);
-}
-
-.question {
-	background-color: @question_bg_color;
-	color: @question_fg_color;
-
-	border-color: darker(@question_bg_color);
-}
-
-.error {
-	background-color: @error_bg_color;
-	color: @error_fg_color;
-
-	border-color: darker(@error_bg_color);
-}
-
 /**************
  * Dim labels *
  **************/
 .view.dim-label,
-.dim-label,
-.dim-label:hover,
-.dim-label:focus {
-	color: mix (@theme_fg_color, @theme_bg_color, 0.50);
-	text-shadow: none;
-}
-
-.dim-label:selected,
-.dim-label:selected:focus {
-	color: mix (@theme_selected_fg_color, @theme_base_color, 0.50);
+.dim-label {
+	color: alpha(currentColor, 0.55);
 	text-shadow: none;
 }
 
@@ -3333,6 +3452,116 @@ GtkBubbleWindow .toolbar {
 	background-color: transparent;
 }
 
+/*******
+ * CSD *
+ *******/
+.titlebar {
+	text-shadow: 0 1px @wm_title_shadow;
+
+	background-image: linear-gradient(to bottom,
+		@wm_bg_a,
+		@wm_bg_b);
+	border-radius: 6px 6px 0px 0px;
+}
+
+.tiled .titlebar {
+	border-radius: 0;
+}
+
+.maximized .titlebar {
+	border-radius: 0;
+}
+
+/* this is the default titlebar that is added by GTK
+ * when client-side decorations are in use and the application
+ * did not set a custom titlebar.
+ */
+.titlebar.default-decoration {
+	border: none;
+	box-shadow: none;
+}
+
+.titlebar .title {
+	font: Bold 10;
+}
+
+.titlebar:backdrop {
+	text-shadow: none;
+	background-image: none;
+	background-color: @wm_bg_b;
+}
+
+.titlebar .titlebutton {
+	icon-shadow: 0px 1px @wm_title_shadow;
+	color: @wm_title;
+	background: none;
+	padding: 5px 5px 6px 5px;
+
+	border-radius: 4px;
+	border-width: 2px;
+	border-color: transparent;
+	border-style: solid;
+	border-image: none;
+}
+
+.titlebar .titlebutton:hover {
+	background-image: linear-gradient(to bottom,
+		@button_hover_gradient_color_a,
+		@button_hover_gradient_color_b);
+}
+
+.titlebar .titlebutton:active {
+	background-image: linear-gradient(to bottom,
+		@borders,
+		shade(@theme_bg_color, 0.95));
+	color: @theme_selected_fg_color;
+	icon-shadow: none;
+}
+
+.titlebar .right .titlebutton:first-child {
+/*	border-left: 1px solid @menu_separator; */
+}
+
+.titlebar .right .titlebutton:last-child {
+
+}
+
+.titlebar .left .titlebutton:last-child {
+/*	border-right: 1px solid @menu_separator; */
+}
+
+.titlebar .left .titlebutton:first-child {
+
+}
+
+.titlebar .titlebutton:backdrop {
+	background-image: none;
+	color: @wm_unfocused_title;
+	icon-shadow: none;
+}
+
+.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;
+
+	/* this is used for the resize cursor area */
+	margin: 10px;
+}
+
+.window-frame.tiled {
+	border-radius: 0;
+	background-color: @theme_bg_color;
+}
+
+.window-frame:backdrop {
+	box-shadow: 0 2px 5px 1px @wm_shadow;
+}
+
+
 /**********************
  * Fallback Mode Panel
  **********************/
@@ -3354,8 +3583,8 @@ PanelApplet > GtkMenuBar.menubar {
 	font: bold;
 }
 
-.gnome-panel-menu-bar.menubar .menuitem *:hover,
-PanelApplet > GtkMenuBar.menubar .menuitem *:hover {
+.gnome-panel-menu-bar.menubar .menuitem:hover,
+PanelApplet > GtkMenuBar.menubar .menuitem:hover {
 	text-shadow: 0 1px @os_chrome_bg_color;
 }
 
@@ -3364,21 +3593,21 @@ PanelApplet > GtkMenuBar.menubar .menu {
 	font: regular;
 }
 
-.gnome-panel-menu-bar.menubar .menu *:hover,
-PanelApplet > GtkMenuBar.menubar .menu *:hover {
+.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 {
+.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 {
+.gnome-panel-menu-bar .menuitem:hover,
+PanelApplet > GtkMenuBar.menubar .menuitem:hover {
 	color: @os_chrome_selected_fg_color;
 }
 
@@ -3406,12 +3635,12 @@ PanelApplet .button:active {
 	border-radius: 0;
 }
 
-PanelApplet *:hover {
+PanelApplet:hover {
 	color: @os_chrome_selected_fg_color;
 }
 
-PanelApplet *:active,
-PanelApplet *:hover:active {
+PanelApplet:active,
+PanelApplet:hover:active {
 	color: @os_chrome_selected_fg_color;
 	text-shadow: 0 1px @os_chrome_bg_color;
 }
diff --git a/desktop-themes/Menta/metacity-1/metacity-theme-1.xml b/desktop-themes/Menta/metacity-1/metacity-theme-1.xml
index a2589835..3ea69a02 100644
--- a/desktop-themes/Menta/metacity-1/metacity-theme-1.xml
+++ b/desktop-themes/Menta/metacity-1/metacity-theme-1.xml
@@ -14,8 +14,8 @@
  	<distance name="left_width" value="1"/>
 	<distance name="right_width" value="1"/>
 	<distance name="bottom_height" value="1"/>
-	<distance name="left_titlebar_edge" value="6"/>
-	<distance name="right_titlebar_edge" value="6"/>
+	<distance name="left_titlebar_edge" value="4"/>
+	<distance name="right_titlebar_edge" value="1"/>
 	<distance name="button_width" value="24"/>
 	<distance name="button_height" value="24"/>
 	<distance name="title_vertical_pad" value="8"/>
@@ -27,8 +27,8 @@
   	<distance name="left_width" value="0"/>
   	<distance name="right_width" value="0"/>
   	<distance name="bottom_height" value="0"/>
-  	<distance name="left_titlebar_edge" value="6"/>
-  	<distance name="right_titlebar_edge" value="6"/>
+  	<distance name="left_titlebar_edge" value="4"/>
+  	<distance name="right_titlebar_edge" value="1"/>
   	<distance name="button_width" value="24"/>
  	<distance name="button_height" value="24"/>
   	<distance name="title_vertical_pad" value="2"/>
@@ -36,17 +36,17 @@
 	<border name="button_border" left="0" right="0" top="0" bottom="0"/>
 </frame_geometry>
 
-<frame_geometry name="geometry_maximized" rounded_top_left="false" rounded_top_right="false" rounded_bottom_left="false" rounded_bottom_right="false">
+<frame_geometry name="geometry_maximized" rounded_top_left="true" rounded_top_right="true" rounded_bottom_left="false" rounded_bottom_right="false">
 	<distance name="left_width" value="0"/>
 	<distance name="right_width" value="0"/>
 	<distance name="bottom_height" value="0"/>
 	<distance name="left_titlebar_edge" value="4"/>
-  	<distance name="right_titlebar_edge" value="4"/>
+  	<distance name="right_titlebar_edge" value="1"/>
   	<distance name="button_width" value="24"/>
   	<distance name="button_height" value="24"/>
   	<distance name="title_vertical_pad" value="8"/>
-  	<border name="title_border" left="2" right="2" top="0" bottom="0"/>
- 	<border name="button_border" left="0" right="0" top="0" bottom="0"/>
+  	<border name="title_border" left="2" right="2" top="4" bottom="0"/>
+ 	<border name="button_border" left="0" right="0" top="4" bottom="0"/>
 </frame_geometry>
 
 <frame_geometry name="border" has_title="false">
@@ -86,7 +86,6 @@
 
 	<!-- Topmost lines -->
 	<line color="shade/#3c3c3c/1.2" x1="0" x2="width" y1="0" y2="0"/>
-	<line color="shade/#f7f7f7/1.1" x1="0" x2="width" y1="1" y2="1"/>
 	
 	<!-- Darkening of the left arch -->
 	<line color="shade/#3c3c3c/1.2" x1="0" x2="4" y1="1" y2="1"/>
@@ -114,7 +113,6 @@
 
 	<!-- Topmost lines -->
 	<line color="shade/#3c3c3c/1.16" x1="0" x2="width" y1="0" y2="0"/>
-	<line color="shade/#f7f7f7/1.14" x1="0" x2="width" y1="1" y2="1"/>
 	
 	<!-- Darkening of the left arch -->
 	<line color="shade/#3c3c3c/1.2" x1="0" x2="4" y1="1" y2="1"/>
@@ -142,9 +140,7 @@
 	</gradient>
 	
 	<!-- Topmost dark line -->
-	<line color="shade/#f7f7f7/1.1" x1="0" x2="width" y1="0" y2="0"/>
-	
-	<line color="shade/#3c3c3c/0.94" x1="1" y1="top_height - 0" x2="width - 2" y2="top_height - 0"/>
+	<line color="shade/#3c3c3c/1.16" x1="0" x2="width" y1="0" y2="0"/>
 </draw_ops>
 
 <draw_ops name="draw_title_maximized_unfocused">
@@ -155,9 +151,7 @@
 	</gradient>
 	
 	<!-- Topmost dark line -->
-	<line color="shade/#f7f7f7/1.1" x1="0" x2="width" y1="0" y2="0"/>
-	
-	<line color="shade/#f7f7f7/0.94" x1="1" y1="top_height - 0" x2="width - 2" y2="top_height - 0"/>
+	<line color="shade/#3c3c3c/1.16" x1="0" x2="width" y1="0" y2="0"/>
 </draw_ops>
 
 <draw_ops name="draw_title_maximized_inactive">
diff --git a/desktop-themes/Menta/metacity-1/metacity-theme-3.xml b/desktop-themes/Menta/metacity-1/metacity-theme-3.xml
index b54dfdcb..4ab663d8 100644
--- a/desktop-themes/Menta/metacity-1/metacity-theme-3.xml
+++ b/desktop-themes/Menta/metacity-1/metacity-theme-3.xml
@@ -30,29 +30,29 @@
 	<distance name="right_width" value="1" />
 	<distance name="bottom_height" value="1" />
 	<distance name="left_titlebar_edge" value="4"/>
-	<distance name="right_titlebar_edge" value="4"/>
-	<distance name="title_vertical_pad" value="9"/>
-	<border name="title_border" left="10" right="10" top="2" bottom="2"/>
-	<border name="button_border" left="0" right="0" top="0" bottom="2"/>
+	<distance name="right_titlebar_edge" value="1"/>
+	<distance name="title_vertical_pad" value="8"/>
+	<border name="title_border" left="2" right="2" top="0" bottom="0"/>
+	<border name="button_border" left="0" right="0" top="4" bottom="0"/>
 	<aspect_ratio name="button" value="1"/>
 </frame_geometry>
 
 <frame_geometry name="normal_unfocused" title_scale="medium" rounded_top_left="4" rounded_top_right="4" parent="normal">
 	<distance name="left_titlebar_edge" value="4"/>
-	<distance name="right_titlebar_edge" value="4"/>
+	<distance name="right_titlebar_edge" value="1"/>
 </frame_geometry>
 
-<frame_geometry name="max" title_scale="medium" parent="normal" rounded_top_left="false" rounded_top_right="false">
+<frame_geometry name="max" title_scale="medium" parent="normal" rounded_top_left="true" rounded_top_right="true">
 	<distance name="left_width" value="0" />
 	<distance name="right_width" value="0" />
 	<distance name="left_titlebar_edge" value="4"/>
-	<distance name="right_titlebar_edge" value="4"/>
+	<distance name="right_titlebar_edge" value="1"/>
 	<distance name="title_vertical_pad" value="8"/> <!-- 
 							This needs to be 1 less then the
 							title_vertical_pad on normal state
 							or you'll have bigger buttons -->
-	<border name="title_border" left="10" right="10" top="1" bottom="2"/>
-	<border name="button_border" left="0" right="0" top="0" bottom="2"/>
+	<border name="title_border" left="2" right="2" top="4" bottom="0"/>
+	<border name="button_border" left="0" right="0" top="4" bottom="0"/>
 	<distance name="bottom_height" value="0" />
 </frame_geometry>
 
@@ -137,23 +137,23 @@
 
 <draw_ops name="titlebar_fill_focused">
 	<gradient type="vertical" x="0" y="0" width="width" height="top_height">
-		<color value="gtk:custom(wm_bg_a,blend/gtk:bg[NORMAL]/gtk:base[NORMAL]/0.4)" />
-		<color value="gtk:custom(wm_bg_b,gtk:bg[NORMAL])" />
+		<color value="#e8e8e8" />
+		<color value="#d2d2d2" />
 	</gradient>
 </draw_ops>
 
 
 <draw_ops name="titlebar_fill_attached_focused"> <!-- gradient for attached and modal dialogs titlebar-->
 	<gradient type="vertical" x="0" y="0" width="width" height="top_height">
-		<color value="gtk:custom(wm_bg_a,blend/gtk:bg[NORMAL]/gtk:base[NORMAL]/0.4)" />
-		<color value="gtk:custom(wm_bg_b,gtk:bg[NORMAL])" />
+		<color value="#e8e8e8" />
+		<color value="#d2d2d2" />
 	</gradient>
 </draw_ops>
 
 <draw_ops name="titlebar_fill_unfocused">
 	<gradient type="vertical" x="0" y="0" width="width" height="top_height">
-		<color value="gtk:custom(wm_bg_a,blend/gtk:bg[NORMAL]/gtk:base[NORMAL]/0.9)" />
-		<color value="gtk:custom(wm_bg_b,gtk:bg[NORMAL])" />
+		<color value="#e8e8e8" />
+		<color value="#d2d2d2" />
 	</gradient>
 </draw_ops>