Merge pull request #37 from NiceandGently/master

update Menta GTK-2/3 to latest Zukwito update from 2013.03.29 to support GTK3-3.8

84 files changed, 8815 insertions, 2328 deletions

diff --git a/desktop-themes/Menta/gtk-3.0/Makefile.am b/desktop-themes/Menta/gtk-3.0/Makefile.am
index 993fba8f..da84ab48 100644
--- a/desktop-themes/Menta/gtk-3.0/Makefile.am
+++ b/desktop-themes/Menta/gtk-3.0/Makefile.am
@@ -2,21 +2,25 @@
 themedir = $(datadir)/themes/Menta/gtk-3.0
 
 theme_DATA = \
+	gnome-applications.css \
 	gtk.css \
+	gtk-fallback.css \
 	gtk-main.css \
 	gtk-main-common.css \
 	gtk-widgets.css \
 	gtk-widgets-assets.css \
-	gtk-widgets-borders.css
+	gtk-widgets-backgrounds.css \
+	gtk-widgets-borders.css \
+	other-applications.css \
+	settings.ini \
+	unity.css
 
 EXTRA_DIST = $(theme_DATA)
 
 SUBDIRS = \
-	apps \
 	assets \
 	borders
 
 DIST_SUBDIRS =  \
-	apps \
 	assets \
 	borders
diff --git a/desktop-themes/Menta/gtk-3.0/apps/Makefile.am b/desktop-themes/Menta/gtk-3.0/apps/Makefile.am
deleted file mode 100644
index c42b2ee1..00000000
--- a/desktop-themes/Menta/gtk-3.0/apps/Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-
-themedir = $(datadir)/themes/Menta/gtk-3.0/apps
-
-theme_DATA = \
-	gedit.css \
-	gnome-panel.css \
-	gnome-terminal.css \
-	nautilus.css \
-	nemo.css \
-	popover.css \
-	unity.css
-
-EXTRA_DIST = $(theme_DATA)
diff --git a/desktop-themes/Menta/gtk-3.0/apps/gedit.css b/desktop-themes/Menta/gtk-3.0/apps/gedit.css
deleted file mode 100644
index 7967efa2..00000000
--- a/desktop-themes/Menta/gtk-3.0/apps/gedit.css
+++ /dev/null
@@ -1,38 +0,0 @@
-@define-color notebook_tab_gradient_b shade (@bg_color, 0.98);
-
-GeditWindow .pane-separator,
-GeditWindow .pane-separator:hover {
-}
-
-GeditPanel.title GtkLabel {
-}
-
-GeditPanel .toolbar {
-	border-style: none;
-	background-color: transparent;
-}
-
-GeditDocumentsPanel .view {
-}
-
-GeditWindow .notebook {
-	padding: 0px;
-	border-radius: 1px;
-	border-width: 1px 0 1px 0;
-}
-
-GeditWindow .notebook tab.top,
-GeditWindow .notebook tab.bottom {
-	border-right-width: 1px;
-	border-left-width: 1px;
-}
-
-GeditPanel .notebook {
-	padding: 3px;
-	border-radius: 1px;
-}
-
-GeditPanel .notebook tab,
-GeditWindow .notebook tab {
-	border-radius: 3px;
-}
diff --git a/desktop-themes/Menta/gtk-3.0/apps/gnome-panel.css b/desktop-themes/Menta/gtk-3.0/apps/gnome-panel.css
deleted file mode 100644
index 4a3ca2a9..00000000
--- a/desktop-themes/Menta/gtk-3.0/apps/gnome-panel.css
+++ /dev/null
@@ -1,146 +0,0 @@
-/* Fallback Mode Panel */
-PanelWidget,
-PanelApplet,
-PanelToplevel,
-.desktop-panel {
-	background-image: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@dark_bg_color, 1.5)),
-		to (shade (@dark_bg_color, 1.05)));
-	padding: 0;
-	color: @dark_fg_color;
-	text-shadow: none;
-	border-image: none;
-}
-
-PanelApplet {
-	border-width: 0;
-}
-
-PanelSeparator {
-	border-width: 0;
-	background-color: transparent;
-	color: @dark_fg_color;
-	text-shadow: none;
-	border-image: none;
-}
-
-.gnome-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 (@dark_bg_color, 1.5)),
-		to (shade (@dark_bg_color, 1.05)));
-	text-shadow: none;
-	border-image: none;
-}
-
-PanelAppletFrame { 
-	background-color: @dark_bg_color;
-	background-image: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@dark_bg_color, 1.5)),
-		to (shade (@dark_bg_color, 1.05)));
-	border-width: 0;
-	text-shadow: none;
-	border-image: none;
-}
-
-PanelApplet .button,
-.desktop-panel .button {
-	-GtkButton-inner-border: 2;
-
-	background-image: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@dark_bg_color, 1.5)),
-		to (shade (@dark_bg_color, 1.05)));
-
-	border-color: transparent;
-	border-radius: 0;
-	border-width: 0 1px 0 1px;
-
-	color: @dark_fg_color;
-	text-shadow: none;
-	border-image: none;
-}
-
-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 (@dark_bg_color, 0.85)),
-		to (shade (@dark_bg_color, 1.0))); 
-	border-color: shade (@dark_bg_color, 0.78);
-	border-radius: 0;
-	border-width: 0 1px 0 1px;
-	text-shadow: none;
-	border-image: none;
-	box-shadow: inset 0 0 2px 1px alpha (black, 0.5);
-}
-
-PanelApplet .button:prelight,
-.desktop-panel .button:prelight {
-	background-image: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@dark_bg_color, 1.7)),
-		to (shade (@dark_bg_color, 1.25)));
-	border-color: transparent;
-	border-radius: 0;
-	border-width: 0 1px 0 1px;
-	text-shadow: none;
-	border-image: none;
-}
-
-ClockBox {
-	text-shadow: none;
-}
-
-WnckPager, WnckTasklist {
-	background-color: @dark_bg_color;
-	text-shadow: none;
-}
-
-/* Classic icon style */
-.gnome-panel-menu-bar {
-	-PanelMenuBar-icon-visible: true;
-	border-image: none;
-}
-
-/* Makes the text color on the dark panel white */
-.gnome-panel-menu-bar .menuitem {
-	color: @dark_fg_color;
-	text-shadow: none;
-}
-
-.gnome-panel-menu-bar .menuitem:hover {
-	background-image: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@selected_bg_color, 1.0)),
-		to (shade (@selected_bg_color, 0.85)));
-	border-width: 0;
-	color: @dark_fg_color;
-	text-shadow: none;
-}
-
-/* Makes sure that the menus doesn't get white text */
-.gnome-panel-menu-bar .menu.menuitem,
-.gnome-panel-menu-bar .menu .menuitem {
-	color: @fg_color;
-}
-
-.gnome-panel-menu-bar .menu.menuitem:hover,
-.gnome-panel-menu-bar .menu .menuitem:hover {
-	color: @selected_fg_color;
-}
-
-NaTrayApplet {
-	-NaTrayApplet-icon-padding: 12;
-	-NaTrayApplet-icon-size: 16;
-}
-
-/* Fixes the indicator applet text */
-PanelApplet > GtkMenuBar > GtkMenuItem > GtkBox > GtkLabel {
-	color: @dark_fg_color;
-	text-shadow: none;
-	border-image: none;
-}
diff --git a/desktop-themes/Menta/gtk-3.0/apps/gnome-terminal.css b/desktop-themes/Menta/gtk-3.0/apps/gnome-terminal.css
deleted file mode 100644
index db7ea74d..00000000
--- a/desktop-themes/Menta/gtk-3.0/apps/gnome-terminal.css
+++ /dev/null
@@ -1,20 +0,0 @@
-/* gnome-terminal */
-/* TerminalScreen {
-	-TerminalScreen-background-darkness: 0.95;
-	background-color: @dark_bg_color;
-	color: #fff;
-} */
-
-TerminalWindow GtkNotebook.notebook {
-	border-bottom-width: 0;
-	border-right-width: 0;
-	border-left-width: 0;
-	border-radius: 0;
-}
-
-TerminalWindow GtkNotebook.notebook tab {
-	border-bottom-width: 1px;
-	border-right-width: 1px;
-	border-left-width: 1px;
-}
-
diff --git a/desktop-themes/Menta/gtk-3.0/apps/nautilus.css b/desktop-themes/Menta/gtk-3.0/apps/nautilus.css
deleted file mode 100644
index 487d01fc..00000000
--- a/desktop-themes/Menta/gtk-3.0/apps/nautilus.css
+++ /dev/null
@@ -1,144 +0,0 @@
-@define-color cluebar_color shade (@base_color, 0.9);
-
-NautilusWindow * {
-	-GtkPaned-handle-size: 1;
-}
-
-NautilusWindow .view {
-	background-color: @base_color;
-}
-
-NautilusWindow .view:selected {
-	background-color: @selected_bg_color;
-}
-
-NautilusWindow .view:selected:backdrop {
-	background-color: @backdrop_selected_bg_color;
-}
-
-NautilusWindow .view.rubberband {
-	background-color: alpha (@selected_bg_color, 0.35);
-}
-
-.nautilus-inactive-pane .view {
-	background-color: shade (@base_color, 0.96);
-}
-
-.nautilus-inactive-pane .view:selected,
-.nautilus-inactive-pane .nautilus-canvas-item:selected {
-	background-color: @backdrop_selected_bg_color;
-	color: @backdrop_selected_fg_color;
-}
-
-.nautilus-inactive-pane .expander.view:selected {
-	background-color: @backdrop_selected_bg_color;
-}
-
-.nautilus-canvas-item {
-	border-radius: 2px;
-}
-
-/* desktop mode */
-.nautilus-desktop.nautilus-canvas-item {
-	color: @bg_color;
-	text-shadow: 1px 1px alpha (#000000, 0.8);
-}
-
-.nautilus-desktop.nautilus-canvas-item:active {
-	background-image: none;
-	background-color: alpha (@bg_color, 0.84);
-	color: @fg_color;
-}
-
-.nautilus-desktop.nautilus-canvas-item:selected {
-	background-image: none;
-	background-color: alpha (@selected_bg_color, 0.84);
-	color: @selected_fg_color;
-}
-
-.nautilus-desktop.nautilus-canvas-item:active,
-.nautilus-desktop.nautilus-canvas-item:prelight,
-.nautilus-desktop.nautilus-canvas-item:selected {
-	text-shadow: none;
-}
-
-/* browser window */
-NautilusTrashBar.info,
-NautilusXContentBar.info,
-NautilusSearchBar.info,
-NautilusQueryEditor.info {
-	background-image: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@cluebar_color, 1.0)),
-		to (shade (@cluebar_color, 1.0)));
-	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: @fg_color;
-}
-
-#nautilus-search-button *:active,
-#nautilus-search-button *:active:prelight {
-	color: @fg_color;
-}
-
-NautilusWindow .toolbar {
-	padding: 2px;
-}
-
-NautilusWindow > GtkGrid > .pane-separator {
-	border-width: 1px 1px 0 0;
-	border-style: solid;
-	border-color: shade (@bg_color, 0.84);
-}
-
-NautilusWindow > GtkGrid > .pane-separator,
-NautilusWindow > GtkGrid > .pane-separator:hover {
-	border-width: 1px 1px 0 0;
-	border-style: solid;
-	border-color: shade (@bg_color, 0.84);
-	background-color: @bg_color;
-	color: shade (@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 {
-	border-right-width: 1px;
-	border-left-width: 1px;
-}
-
-NautilusNotebook .frame {
-	border-width: 1px 0 0 0;
-}
-
-/* sidebar */
-NautilusWindow .sidebar,
-NautilusWindow .sidebar .view {
-	background-color: shade (@bg_color, 1.08);
-	color: @fg_color;
-	text-shadow: 0 1px shade (shade (@bg_color, 0.95), 1.04);  
-}
-
-NautilusWindow .sidebar row:selected {
-	color: @selected_fg_color;
-	text-shadow: 0 -1px shade (@selected_bg_color, 0.8); 
-}
-
-NautilusWindow .sidebar row:backdrop:selected {
-	color: @backdrop_selected_fg_color;
-	text-shadow: none; 
-}
-
-NautilusWindow .sidebar .frame {
-	border-top-width: 1px;
-	border-style: solid;
-	border-color: shade (@bg_color, 0.82);
-}
diff --git a/desktop-themes/Menta/gtk-3.0/apps/nemo.css b/desktop-themes/Menta/gtk-3.0/apps/nemo.css
deleted file mode 100644
index d8cb5251..00000000
--- a/desktop-themes/Menta/gtk-3.0/apps/nemo.css
+++ /dev/null
@@ -1,144 +0,0 @@
-@define-color cluebar_color shade (@base_color, 0.9);
-
-NemoWindow * {
-	-GtkPaned-handle-size: 1;
-}
-
-NemoWindow .view {
-	background-color: @base_color;
-}
-
-NemoWindow .view:selected {
-	background-color: @selected_bg_color;
-}
-
-NemoWindow .view:selected:backdrop {
-	background-color: @backdrop_selected_bg_color;
-}
-
-NemoWindow .view.rubberband {
-	background-color: alpha (@selected_bg_color, 0.35);
-}
-
-.nemo-inactive-pane .view {
-	background-color: shade (@base_color, 0.96);
-}
-
-.nemo-inactive-pane .view:selected,
-.nemo-inactive-pane .nemo-canvas-item:selected {
-	background-color: @backdrop_selected_bg_color;
-	color: @backdrop_selected_fg_color;
-}
-
-.nemo-inactive-pane .expander.view:selected {
-	background-color: @backdrop_selected_bg_color;
-}
-
-.nemo-canvas-item {
-	border-radius: 2px;
-}
-
-/* desktop mode */
-.nemo-desktop.nemo-canvas-item {
-	color: @bg_color;
-	text-shadow: 1px 1px alpha (#000000, 0.8);
-}
-
-.nemo-desktop.nemo-canvas-item:active {
-	background-image: none;
-	background-color: alpha (@bg_color, 0.84);
-	color: @fg_color;
-}
-
-.nemo-desktop.nemo-canvas-item:selected {
-	background-image: none;
-	background-color: alpha (@selected_bg_color, 0.84);
-	color: @selected_fg_color;
-}
-
-.nemo-desktop.nemo-canvas-item:active,
-.nemo-desktop.nemo-canvas-item:prelight,
-.nemo-desktop.nemo-canvas-item:selected {
-	text-shadow: none;
-}
-
-/* browser window */
-NemoTrashBar.info,
-NemoXContentBar.info,
-NemoSearchBar.info,
-NemoQueryEditor.info {
-	background-image: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@cluebar_color, 1.0)),
-		to (shade (@cluebar_color, 1.0)));
-	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: @fg_color;
-}
-
-#nemo-search-button *:active,
-#nemo-search-button *:active:prelight {
-	color: @fg_color;
-}
-
-NemoWindow .toolbar {
-	padding: 2px;
-}
-
-NemoWindow > GtkGrid > .pane-separator {
-	border-width: 1px 1px 0 0;
-	border-style: solid;
-	border-color: shade (@bg_color, 0.84);
-}
-
-NemoWindow > GtkGrid > .pane-separator,
-NemoWindow > GtkGrid > .pane-separator:hover {
-	border-width: 1px 1px 0 0;
-	border-style: solid;
-	border-color: shade (@bg_color, 0.84);
-	background-color: @bg_color;
-	color: shade (@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;
-}
-
-NemoNotebook .frame {
-	border-width: 1px 0 0 0;
-}
-
-/* sidebar */
-NemoWindow .sidebar,
-NemoWindow .sidebar .view {
-	background-color: shade (@bg_color, 1.08);
-	color: @fg_color;
-	text-shadow: 0 1px shade (shade (@bg_color, 0.95), 1.04);  
-}
-
-NemoWindow .sidebar row:selected {
-	color: @selected_fg_color;
-	text-shadow: 0 -1px shade (@selected_bg_color, 0.8); 
-}
-
-NemoWindow .sidebar row:backdrop:selected {
-	color: @backdrop_selected_fg_color;
-	text-shadow: none; 
-}
-
-NemoWindow .sidebar .frame {
-	border-top-width: 1px;
-	border-style: solid;
-	border-color: shade (@bg_color, 0.82);
-}
diff --git a/desktop-themes/Menta/gtk-3.0/apps/popover.css b/desktop-themes/Menta/gtk-3.0/apps/popover.css
deleted file mode 100644
index 1b977909..00000000
--- a/desktop-themes/Menta/gtk-3.0/apps/popover.css
+++ /dev/null
@@ -1,50 +0,0 @@
-GraniteWidgetsPopOver {
-	-GraniteWidgetsPopOver-arrow-width: 24;
-	-GraniteWidgetsPopOver-arrow-height: 12;
-	-GraniteWidgetsPopOver-border-radius: 6;
-	-GraniteWidgetsPopOver-border-width: 1;
-	-GraniteWidgetsPopOver-shadow-size: 18;
-	
-	border-style: solid;
-	border-color: shade (@bg_color, 0.50);
-	background-color: @bg_color;
-	margin: 0;
-}
-
-GraniteWidgetsPopOver * {
-	background-color: @bg_color;
-}
-
-GraniteWidgetsPopOver .sidebar.view {
-	background-color: @bg_color;
-}
-
-GraniteWidgetsPopOver .button {
-	background-image: none;
-	background-color: alpha (#fff, 0.0);
-}
-
-GraniteWidgetsPopOver .button:active,
-GraniteWidgetsPopOver .button:hover:active {
-	background-image: none;
-	background-color: alpha (#000, 0.05);
-}
-
-GraniteWidgetsPopOver .entry {
-	background-image: -gtk-gradient (linear,
-		left top,
-		left bottom,
-		from (shade (@base_color, 0.88)),
-		color-stop (0.20, shade (@base_color, 0.94)),
-		to (shade (@base_color, 0.96)));
-}
-
-.button.app {
-	border-width: 0;
-	border-radius: 5px;
-}
-
-.app:hover,
-.app:focus {
-	background-color: alpha (#000, 0.15);
-}
diff --git a/desktop-themes/Menta/gtk-3.0/apps/unity.css b/desktop-themes/Menta/gtk-3.0/apps/unity.css
deleted file mode 100644
index ea8c9538..00000000
--- a/desktop-themes/Menta/gtk-3.0/apps/unity.css
+++ /dev/null
@@ -1,30 +0,0 @@
-UnityPanelWidget,
-.unity-panel {
-	background-image: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@bg_color, 1.15)),
-		to (shade (@bg_color, 1.0)));
-	border-top-color: shade (@bg_color, 1.6);
-	border-style: solid;
-	border-width: 0;
-}
-
-.unity-panel.menubar,
-.unity-panel .menubar {
-	color: @fg_color;
-	text-shadow: 0 1px alpha (shade (@button_bg_color, 1.25), 0.4);
-}
-
-.unity-panel.menuitem,
-.unity-panel .menuitem {
-	border-width: 1px 1px 0 1px;
-	text-shadow: 0 1px alpha (shade (@button_bg_color, 1.25), 0.4);
-}
-
-.unity-panel.menubar.menuitem:hover,
-.unity-panel.menubar .menuitem *:hover {
-	background-image: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@selected_bg_color, 0.96)),
-		to (shade (@selected_bg_color, 1.15)));
-
-	color: @selected_fg_color;
-}
diff --git a/desktop-themes/Menta/gtk-3.0/assets/Makefile.am b/desktop-themes/Menta/gtk-3.0/assets/Makefile.am
index 94ec935d..776d3a6b 100644
--- a/desktop-themes/Menta/gtk-3.0/assets/Makefile.am
+++ b/desktop-themes/Menta/gtk-3.0/assets/Makefile.am
@@ -4,30 +4,44 @@ themedir = $(datadir)/themes/Menta/gtk-3.0/assets
 theme_DATA = \
 	check-active-ins.png \
 	check-active.png \
-	check-menuitem-dark.png \
-	check-menuitem-insensitive-dark.png \
-	check-menuitem-insensitive.png \
-	check-menuitem.png \
-	check-menuitem-unselected.png \
 	check-mixed-active-ins.png \
 	check-mixed-active.png \
-	check-normal-hover.png \
 	check-normal-ins.png \
 	check-normal.png \
+	dnd-counter.svg \
+	grid-selection-checked.svg \
+	grid-selection-unchecked.svg \
+	menuitem-checkbox-checked-insensitive.svg \
+	menuitem-checkbox-checked-selected.svg \
+	menuitem-checkbox-checked.svg \
+	menuitem-checkbox-mixed-insensitive.svg \
+	menuitem-checkbox-mixed-selected.svg \
+	menuitem-checkbox-mixed.svg \
+	menuitem-radio-checked-insensitive.svg \
+	menuitem-radio-checked-selected.svg \
+	menuitem-radio-checked.svg \
+	null.png \
+	pane-separator-grip.svg \
+	pane-separator-grip-vertical.svg \
 	radio-active-ins.png \
 	radio-active.png \
-	radio-menuitem-dark.png \
-	radio-menuitem-insensitive-dark.png \
-	radio-menuitem-insensitive.png \
-	radio-menuitem.png \
 	radio-mixed-active-ins.png \
 	radio-mixed-active.png \
-	radio-normal-hover.png \
 	radio-normal-ins.png \
 	radio-normal.png \
-	switch-off-ins.png \
-	switch-off.png \
-	switch-on-ins.png \
-	switch-on.png
+	resize-grip.svg \
+	sidebar-radio-checked.svg \
+	sidebar-radio-prelight.svg \
+	sidebar-radio-selected-prelight.svg \
+	sidebar-radio-selected.svg \
+	slider-hover.png \
+	slider-ins.png \
+	slider.png \
+	switch-off-ins.svg \
+	switch-off.svg \
+	switch-on-ins.svg \
+	switch-on.png \
+	switch-on.svg \
+	thumbnail-frame.png
 
 EXTRA_DIST = $(theme_DATA)
diff --git a/desktop-themes/Menta/gtk-3.0/assets/check-active-ins.png b/desktop-themes/Menta/gtk-3.0/assets/check-active-ins.png
index cd56b7f5..819568ea 100644
--- a/desktop-themes/Menta/gtk-3.0/assets/check-active-ins.png
+++ b/desktop-themes/Menta/gtk-3.0/assets/check-active-ins.png
diff --git a/desktop-themes/Menta/gtk-3.0/assets/check-active.png b/desktop-themes/Menta/gtk-3.0/assets/check-active.png
index ddf40abd..83b2853b 100644
--- a/desktop-themes/Menta/gtk-3.0/assets/check-active.png
+++ b/desktop-themes/Menta/gtk-3.0/assets/check-active.png
diff --git a/desktop-themes/Menta/gtk-3.0/assets/check-menuitem-dark.png b/desktop-themes/Menta/gtk-3.0/assets/check-menuitem-dark.png
deleted file mode 100644
index 2466d43f..00000000
--- a/desktop-themes/Menta/gtk-3.0/assets/check-menuitem-dark.png
+++ /dev/null
diff --git a/desktop-themes/Menta/gtk-3.0/assets/check-menuitem-insensitive-dark.png b/desktop-themes/Menta/gtk-3.0/assets/check-menuitem-insensitive-dark.png
deleted file mode 100644
index 3a47458e..00000000
--- a/desktop-themes/Menta/gtk-3.0/assets/check-menuitem-insensitive-dark.png
+++ /dev/null
diff --git a/desktop-themes/Menta/gtk-3.0/assets/check-menuitem-insensitive.png b/desktop-themes/Menta/gtk-3.0/assets/check-menuitem-insensitive.png
deleted file mode 100644
index 51d3d9b3..00000000
--- a/desktop-themes/Menta/gtk-3.0/assets/check-menuitem-insensitive.png
+++ /dev/null
diff --git a/desktop-themes/Menta/gtk-3.0/assets/check-menuitem-unselected.png b/desktop-themes/Menta/gtk-3.0/assets/check-menuitem-unselected.png
deleted file mode 100644
index a0e8a305..00000000
--- a/desktop-themes/Menta/gtk-3.0/assets/check-menuitem-unselected.png
+++ /dev/null
diff --git a/desktop-themes/Menta/gtk-3.0/assets/check-menuitem.png b/desktop-themes/Menta/gtk-3.0/assets/check-menuitem.png
deleted file mode 100644
index 1b35fa0a..00000000
--- a/desktop-themes/Menta/gtk-3.0/assets/check-menuitem.png
+++ /dev/null
diff --git a/desktop-themes/Menta/gtk-3.0/assets/check-mixed-active-ins.png b/desktop-themes/Menta/gtk-3.0/assets/check-mixed-active-ins.png
index a8a6edfc..65465b96 100644
--- a/desktop-themes/Menta/gtk-3.0/assets/check-mixed-active-ins.png
+++ b/desktop-themes/Menta/gtk-3.0/assets/check-mixed-active-ins.png
diff --git a/desktop-themes/Menta/gtk-3.0/assets/check-mixed-active.png b/desktop-themes/Menta/gtk-3.0/assets/check-mixed-active.png
index 5ed9167b..1291cf13 100644
--- a/desktop-themes/Menta/gtk-3.0/assets/check-mixed-active.png
+++ b/desktop-themes/Menta/gtk-3.0/assets/check-mixed-active.png
diff --git a/desktop-themes/Menta/gtk-3.0/assets/check-normal-hover.png b/desktop-themes/Menta/gtk-3.0/assets/check-normal-hover.png
deleted file mode 100644
index 0fa7ff69..00000000
--- a/desktop-themes/Menta/gtk-3.0/assets/check-normal-hover.png
+++ /dev/null
diff --git a/desktop-themes/Menta/gtk-3.0/assets/check-normal-ins.png b/desktop-themes/Menta/gtk-3.0/assets/check-normal-ins.png
index cb5c5cd2..51abbca0 100644
--- a/desktop-themes/Menta/gtk-3.0/assets/check-normal-ins.png
+++ b/desktop-themes/Menta/gtk-3.0/assets/check-normal-ins.png
diff --git a/desktop-themes/Menta/gtk-3.0/assets/check-normal.png b/desktop-themes/Menta/gtk-3.0/assets/check-normal.png
index 098752e7..b175843f 100644
--- a/desktop-themes/Menta/gtk-3.0/assets/check-normal.png
+++ b/desktop-themes/Menta/gtk-3.0/assets/check-normal.png
diff --git a/desktop-themes/Menta/gtk-3.0/assets/dnd-counter.svg b/desktop-themes/Menta/gtk-3.0/assets/dnd-counter.svg
new file mode 100644
index 00000000..d16ea2fe
--- /dev/null
+++ b/desktop-themes/Menta/gtk-3.0/assets/dnd-counter.svg
@@ -0,0 +1,183 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="72"
+   height="72"
+   id="svg4267"
+   version="1.1"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="dnd-emblem.svg">
+  <defs
+     id="defs4269">
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient22968-2-3-0"
+       id="radialGradient26234"
+       gradientUnits="userSpaceOnUse"
+       cx="797"
+       cy="165"
+       fx="797"
+       fy="165"
+       r="20.5" />
+    <linearGradient
+       id="linearGradient22968-2-3-0"
+       inkscape:collect="always">
+      <stop
+         id="stop22970-0-16-4"
+         offset="0"
+         style="stop-color:#729fcf;stop-opacity:1" />
+      <stop
+         id="stop22972-8-3-4"
+         offset="1"
+         style="stop-color:#3465a4;stop-opacity:1" />
+    </linearGradient>
+    <filter
+       color-interpolation-filters="sRGB"
+       height="1.24"
+       y="-0.12"
+       width="1.24"
+       x="-0.12"
+       id="filter27236-2"
+       inkscape:collect="always">
+      <feGaussianBlur
+         id="feGaussianBlur27238-6"
+         stdDeviation="1.9"
+         inkscape:collect="always" />
+    </filter>
+    <linearGradient
+       id="linearGradient22968-2-3-0-6">
+      <stop
+         id="stop22970-0-16-4-2"
+         offset="0"
+         style="stop-color:#729fcf;stop-opacity:1" />
+      <stop
+         id="stop22972-8-3-4-6"
+         offset="1"
+         style="stop-color:#3465a4;stop-opacity:1" />
+    </linearGradient>
+    <clipPath
+       id="clipPath27307-6"
+       clipPathUnits="userSpaceOnUse">
+      <path
+         transform="matrix(0.88410615,0,0,0.88410615,92.255124,19.051446)"
+         d="m 806,169.78125 a 9.96875,9.96875 0 1 1 -19.9375,0 9.96875,9.96875 0 1 1 19.9375,0 z"
+         sodipodi:ry="9.96875"
+         sodipodi:rx="9.96875"
+         sodipodi:cy="169.78125"
+         sodipodi:cx="796.03125"
+         id="path27309-78"
+         style="opacity:0.5;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:3.39325762;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         sodipodi:type="arc" />
+    </clipPath>
+    <filter
+       color-interpolation-filters="sRGB"
+       id="filter27327-9"
+       inkscape:collect="always">
+      <feGaussianBlur
+         id="feGaussianBlur27329-7"
+         stdDeviation="0.598125"
+         inkscape:collect="always" />
+    </filter>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient22968-2-3-0-6"
+       id="radialGradient5163"
+       gradientUnits="userSpaceOnUse"
+       cx="797"
+       cy="165"
+       fx="797"
+       fy="165"
+       r="20.5" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="8.01"
+     inkscape:cx="46.532863"
+     inkscape:cy="38.421319"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     inkscape:window-width="1280"
+     inkscape:window-height="742"
+     inkscape:window-x="0"
+     inkscape:window-y="26"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata4272">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     transform="translate(0,8)">
+    <g
+       style="display:inline;overflow:visible"
+       id="g24889"
+       transform="matrix(1.5158363,0,0,1.5158363,-3157.4222,-2504.9125)">
+      <g
+         transform="matrix(1.276138,0,0,1.276138,1051.3404,1164.4268)"
+         id="g24145-0"
+         style="display:inline">
+        <g
+           style="display:inline"
+           transform="matrix(0.68076616,0,0,0.68076616,284.42937,281.22745)"
+           id="g27242-9">
+          <path
+             sodipodi:type="inkscape:offset"
+             inkscape:radius="0"
+             inkscape:original="M 797 151 C 786.50659 151 778 159.50659 778 170 C 778 180.49341 786.50659 189 797 189 C 807.49341 189 816 180.49341 816 170 C 816 159.50659 807.49341 151 797 151 z "
+             xlink:href="#path27224-3"
+             style="opacity:0.5;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.47955203;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter27236-2);enable-background:accumulate"
+             id="path27228-0"
+             inkscape:href="#path27224-3"
+             d="m 797,151 c -10.49341,0 -19,8.50659 -19,19 0,10.49341 8.50659,19 19,19 10.49341,0 19,-8.50659 19,-19 0,-10.49341 -8.50659,-19 -19,-19 z"
+             transform="translate(0,3)" />
+          <path
+             sodipodi:type="arc"
+             style="color:#000000;fill:url(#radialGradient5163);fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:1.47955203;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+             id="path27224-3"
+             sodipodi:cx="797"
+             sodipodi:cy="170"
+             sodipodi:rx="19"
+             sodipodi:ry="19"
+             d="m 816,170 c 0,10.49341 -8.50659,19 -19,19 -10.49341,0 -19,-8.50659 -19,-19 0,-10.49341 8.50659,-19 19,-19 10.49341,0 19,8.50659 19,19 z" />
+        </g>
+        <path
+           clip-path="url(#clipPath27307-6)"
+           sodipodi:type="arc"
+           style="opacity:0.5;color:#000000;fill:none;stroke:#000000;stroke-width:0.77596396;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter27327-9);enable-background:accumulate"
+           id="path27301-28"
+           sodipodi:cx="796.03125"
+           sodipodi:cy="169.78125"
+           sodipodi:rx="9.96875"
+           sodipodi:ry="9.96875"
+           d="m 806,169.78125 c 0,5.50559 -4.46316,9.96875 -9.96875,9.96875 -5.50559,0 -9.96875,-4.46316 -9.96875,-9.96875 0,-5.50559 4.46316,-9.96875 9.96875,-9.96875 5.50559,0 9.96875,4.46316 9.96875,9.96875 z"
+           transform="matrix(1.2980358,0,0,1.2980358,-206.24585,177.33558)" />
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/desktop-themes/Menta/gtk-3.0/assets/grid-selection-checked.svg b/desktop-themes/Menta/gtk-3.0/assets/grid-selection-checked.svg
new file mode 100644
index 00000000..248ebc96
--- /dev/null
+++ b/desktop-themes/Menta/gtk-3.0/assets/grid-selection-checked.svg
@@ -0,0 +1,237 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="40"
+   height="40"
+   id="svg5038"
+   version="1.1"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="grid-selection-checked.svg">
+  <defs
+     id="defs5040">
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5872"
+       id="linearGradient5891"
+       gradientUnits="userSpaceOnUse"
+       x1="205.84143"
+       y1="246.7094"
+       x2="206.74803"
+       y2="231.24142" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5872">
+      <stop
+         style="stop-color:#13508e;stop-opacity:1;"
+         offset="0"
+         id="stop5874" />
+      <stop
+         style="stop-color:#1862af;stop-opacity:1"
+         offset="1"
+         id="stop5876" />
+    </linearGradient>
+    <inkscape:path-effect
+       effect="spiro"
+       id="path-effect5837"
+       is_visible="true" />
+    <inkscape:path-effect
+       effect="spiro"
+       id="path-effect5012"
+       is_visible="true" />
+    <inkscape:path-effect
+       effect="spiro"
+       id="path-effect5884"
+       is_visible="true" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient10354-2-9-1"
+       id="linearGradient15341-5"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-1609.9926,-78.958432)"
+       x1="1205.5752"
+       y1="-186.45331"
+       x2="1205.5752"
+       y2="-202.34555" />
+    <linearGradient
+       id="linearGradient10354-2-9-1"
+       inkscape:collect="always">
+      <stop
+         id="stop10356-2-8-2"
+         offset="0"
+         style="stop-color:#bcbfb8;stop-opacity:1" />
+      <stop
+         id="stop10358-2-6-2"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient10332-5-3-3"
+       id="linearGradient15343-1"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.84941206,0,0,0.84794288,-623.98415,-483.16392)"
+       x1="260.92538"
+       y1="233.77748"
+       x2="260.92538"
+       y2="248.97633" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient10332-5-3-3">
+      <stop
+         style="stop-color:#d3d7cf;stop-opacity:1"
+         offset="0"
+         id="stop10334-5-3-1" />
+      <stop
+         style="stop-color:#8f9985;stop-opacity:1"
+         offset="1"
+         id="stop10336-29-3-4" />
+    </linearGradient>
+    <linearGradient
+       y2="1106.5294"
+       x2="808"
+       y1="1040.7369"
+       x1="806.39526"
+       gradientTransform="matrix(0.04728153,0,0,0.52063887,144.29163,-314.78125)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient5726"
+       xlink:href="#linearGradient85841-7-0"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient85841-7-0">
+      <stop
+         style="stop-color:#242424;stop-opacity:1"
+         offset="0"
+         id="stop85843-4-8" />
+      <stop
+         id="stop85845-0-5"
+         offset="0.63381755"
+         style="stop-color:#101010;stop-opacity:1;" />
+      <stop
+         style="stop-color:#262626;stop-opacity:1"
+         offset="1"
+         id="stop85847-7-3" />
+    </linearGradient>
+    <linearGradient
+       y2="1106.5294"
+       x2="808"
+       y1="1040.7369"
+       x1="806.39526"
+       gradientTransform="matrix(0.04849388,0,0,0.53398858,-4.8290974,-542.54487)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient5036"
+       xlink:href="#linearGradient85841-7-0"
+       inkscape:collect="always" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="7"
+     inkscape:cx="-27.714286"
+     inkscape:cy="24"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1920"
+     inkscape:window-height="1022"
+     inkscape:window-x="0"
+     inkscape:window-y="26"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata5043">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     transform="translate(0,-8)">
+    <rect
+       ry="7.1794877"
+       rx="7.1794877"
+       style="opacity:0.75;color:#000000;fill:url(#linearGradient5036);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect85718-2-9"
+       width="40"
+       height="40"
+       x="0"
+       y="8"
+       inkscape:export-filename="/home/jimmac/SparkleShare/gnome-mockups/boxes/interactive/img/checkbox-on.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
+    <g
+       style="display:inline;enable-background:new"
+       id="g15291-9"
+       transform="matrix(2.0481319,0,0,2.0481319,-949.79991,-333.53349)"
+       inkscape:export-filename="/home/jimmac/SparkleShare/gnome-mockups/boxes/interactive/img/checkbox-on.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90">
+      <g
+         style="enable-background:new"
+         id="g16853-4"
+         transform="translate(877.50354,-102.83507)">
+        <rect
+           ry="0.80653393"
+           rx="0.80653393"
+           y="-284.86218"
+           x="-409.50739"
+           height="11.023263"
+           width="11.042357"
+           id="rect6506-6"
+           style="color:#000000;fill:url(#linearGradient15341-5);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient15343-1);stroke-width:0.48824981;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           transform="scale(1,-1)" />
+      </g>
+    </g>
+    <g
+       style="display:inline;enable-background:new"
+       id="g5886"
+       transform="matrix(1.025641,0,0,1.025641,-189.74359,-219.69231)"
+       inkscape:export-filename="/home/jimmac/SparkleShare/gnome-mockups/boxes/interactive/img/checkbox-on.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90">
+      <path
+         inkscape:connector-curvature="0"
+         inkscape:original-d="m 198.5,240 5.25,5.25 13.875,-13.875"
+         inkscape:path-effect="#path-effect5837"
+         id="path5835"
+         d="m 198.5,240 5.25,5.25 13.875,-13.875"
+         style="fill:none;stroke:url(#linearGradient5891);stroke-width:5.8499999;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         style="fill:none;stroke:#4787c8;stroke-width:2.92499995;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         d="m 198.5,240 5.25,5.25 13.875,-13.875"
+         id="path5880"
+         inkscape:path-effect="#path-effect5837"
+         inkscape:original-d="m 198.5,240 5.25,5.25 13.875,-13.875"
+         inkscape:connector-curvature="0" />
+      <path
+         sodipodi:nodetypes="csccc"
+         inkscape:connector-curvature="0"
+         inkscape:original-d="m 197.71875,240.4375 c 0.65604,-0.56057 1.41045,-1.32862 1.90625,-0.8125 l 3.8125,3.96875 13.25,-12.65625 c 0.6875,-0.6875 1.90625,0.21875 1.90625,0.21875"
+         inkscape:path-effect="#path-effect5884"
+         id="path5882"
+         d="m 197.71875,240.4375 c -0.113,-0.1009 -0.19813,-0.23267 -0.24374,-0.37713 -0.0456,-0.14446 -0.0515,-0.30115 -0.0175,-0.44876 0.034,-0.14762 0.10786,-0.28567 0.21068,-0.39693 0.10281,-0.11125 0.23413,-0.19547 0.37723,-0.24518 0.1431,-0.0497 0.29748,-0.065 0.44812,-0.0491 0.15065,0.0159 0.29731,0.0628 0.43264,0.13085 0.27066,0.13614 0.48894,0.35524 0.69883,0.57373 l 3.8125,3.96875 13.25,-12.65625 c 0.14959,-0.14288 0.30236,-0.28546 0.48132,-0.38923 0.17895,-0.10377 0.38437,-0.16706 0.59112,-0.16016 0.20674,0.007 0.41161,0.0857 0.56458,0.22493 0.15297,0.13925 0.25142,0.33712 0.26923,0.54321"
+         style="fill:none;stroke:#7ea7d3;stroke-width:0.97499996px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    </g>
+  </g>
+</svg>
diff --git a/desktop-themes/Menta/gtk-3.0/assets/grid-selection-unchecked.svg b/desktop-themes/Menta/gtk-3.0/assets/grid-selection-unchecked.svg
new file mode 100644
index 00000000..622752df
--- /dev/null
+++ b/desktop-themes/Menta/gtk-3.0/assets/grid-selection-unchecked.svg
@@ -0,0 +1,278 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="40"
+   height="40"
+   id="svg5038"
+   version="1.1"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="grid-selection-unchecked.svg">
+  <defs
+     id="defs5040">
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5872"
+       id="linearGradient5891"
+       gradientUnits="userSpaceOnUse"
+       x1="205.84143"
+       y1="246.7094"
+       x2="206.74803"
+       y2="231.24142" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5872">
+      <stop
+         style="stop-color:#13508e;stop-opacity:1;"
+         offset="0"
+         id="stop5874" />
+      <stop
+         style="stop-color:#1862af;stop-opacity:1"
+         offset="1"
+         id="stop5876" />
+    </linearGradient>
+    <inkscape:path-effect
+       effect="spiro"
+       id="path-effect5837"
+       is_visible="true" />
+    <inkscape:path-effect
+       effect="spiro"
+       id="path-effect5012"
+       is_visible="true" />
+    <inkscape:path-effect
+       effect="spiro"
+       id="path-effect5884"
+       is_visible="true" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient10354-2-9-1"
+       id="linearGradient15341-5"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-1609.9926,-78.958432)"
+       x1="1205.5752"
+       y1="-186.45331"
+       x2="1205.5752"
+       y2="-202.34555" />
+    <linearGradient
+       id="linearGradient10354-2-9-1"
+       inkscape:collect="always">
+      <stop
+         id="stop10356-2-8-2"
+         offset="0"
+         style="stop-color:#bcbfb8;stop-opacity:1" />
+      <stop
+         id="stop10358-2-6-2"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient10332-5-3-3"
+       id="linearGradient15343-1"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.84941206,0,0,0.84794288,-623.98415,-483.16392)"
+       x1="260.92538"
+       y1="233.77748"
+       x2="260.92538"
+       y2="248.97633" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient10332-5-3-3">
+      <stop
+         style="stop-color:#d3d7cf;stop-opacity:1"
+         offset="0"
+         id="stop10334-5-3-1" />
+      <stop
+         style="stop-color:#8f9985;stop-opacity:1"
+         offset="1"
+         id="stop10336-29-3-4" />
+    </linearGradient>
+    <linearGradient
+       y2="1106.5294"
+       x2="808"
+       y1="1040.7369"
+       x1="806.39526"
+       gradientTransform="matrix(0.04728153,0,0,0.52063887,144.29163,-314.78125)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient5726"
+       xlink:href="#linearGradient85841-7-0"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient85841-7-0">
+      <stop
+         style="stop-color:#242424;stop-opacity:1"
+         offset="0"
+         id="stop85843-4-8" />
+      <stop
+         id="stop85845-0-5"
+         offset="0.63381755"
+         style="stop-color:#101010;stop-opacity:1;" />
+      <stop
+         style="stop-color:#262626;stop-opacity:1"
+         offset="1"
+         id="stop85847-7-3" />
+    </linearGradient>
+    <linearGradient
+       y2="1106.5294"
+       x2="808"
+       y1="1040.7369"
+       x1="806.39526"
+       gradientTransform="matrix(0.04849388,0,0,0.53398858,-4.8290974,-542.54487)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient5036"
+       xlink:href="#linearGradient85841-7-0"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient10354-2-9-1-7"
+       id="linearGradient15341-5-8"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.0481327,0,0,2.0481327,-2450.0351,382.43617)"
+       x1="1205.5752"
+       y1="-186.45331"
+       x2="1205.5752"
+       y2="-202.34555" />
+    <linearGradient
+       id="linearGradient10354-2-9-1-7"
+       inkscape:collect="always">
+      <stop
+         id="stop10356-2-8-2-9"
+         offset="0"
+         style="stop-color:#bcbfb8;stop-opacity:1" />
+      <stop
+         id="stop10358-2-6-2-3"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient10332-5-3-3-8"
+       id="linearGradient15343-1-8"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7397086,0,0,1.7366996,-430.55893,-445.43032)"
+       x1="260.92538"
+       y1="233.77748"
+       x2="260.92538"
+       y2="248.97633" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient10332-5-3-3-8">
+      <stop
+         style="stop-color:#d3d7cf;stop-opacity:1"
+         offset="0"
+         id="stop10334-5-3-1-4" />
+      <stop
+         style="stop-color:#8f9985;stop-opacity:1"
+         offset="1"
+         id="stop10336-29-3-4-0" />
+    </linearGradient>
+    <linearGradient
+       y2="1106.5294"
+       x2="808"
+       y1="1040.7369"
+       x1="806.39526"
+       gradientTransform="matrix(0.04728153,0,0,0.52063887,344.29163,-313.78125)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient5772"
+       xlink:href="#linearGradient85841-7-0-9"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient85841-7-0-9">
+      <stop
+         style="stop-color:#242424;stop-opacity:1"
+         offset="0"
+         id="stop85843-4-8-3" />
+      <stop
+         id="stop85845-0-5-1"
+         offset="0.63381755"
+         style="stop-color:#101010;stop-opacity:1;" />
+      <stop
+         style="stop-color:#262626;stop-opacity:1"
+         offset="1"
+         id="stop85847-7-3-3" />
+    </linearGradient>
+    <linearGradient
+       y2="1106.5294"
+       x2="808"
+       y1="1040.7369"
+       x1="806.39526"
+       gradientTransform="matrix(0.0484939,0,0,0.5339888,-4.8290988,-542.54512)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient5153"
+       xlink:href="#linearGradient85841-7-0-9"
+       inkscape:collect="always" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="7"
+     inkscape:cx="-27.714286"
+     inkscape:cy="24"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1920"
+     inkscape:window-height="1022"
+     inkscape:window-x="0"
+     inkscape:window-y="26"
+     inkscape:window-maximized="1"
+     showguides="true"
+     inkscape:guide-bbox="true" />
+  <metadata
+     id="metadata5043">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     transform="translate(0,-8)">
+    <rect
+       ry="7.179491"
+       rx="7.179491"
+       style="opacity:0.75;color:#000000;fill:url(#linearGradient5153);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect85718-2-9-0"
+       width="40.000019"
+       height="40.000019"
+       x="0"
+       y="7.9999809"
+       inkscape:export-filename="/home/jimmac/SparkleShare/gnome-mockups/boxes/interactive/img/checkbox-off.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
+    <rect
+       ry="1.6518886"
+       rx="1.6518886"
+       y="-39.282047"
+       x="8.7179489"
+       height="22.577105"
+       width="22.616215"
+       id="rect6506-6-8"
+       style="color:#000000;fill:url(#linearGradient15341-5-8);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient15343-1-8);stroke-width:1;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       transform="scale(1,-1)"
+       inkscape:export-filename="/home/jimmac/SparkleShare/gnome-mockups/boxes/interactive/img/checkbox-off.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
+  </g>
+</svg>
diff --git a/desktop-themes/Menta/gtk-3.0/assets/menuitem-checkbox-checked-insensitive.svg b/desktop-themes/Menta/gtk-3.0/assets/menuitem-checkbox-checked-insensitive.svg
new file mode 100644
index 00000000..049a09ff
--- /dev/null
+++ b/desktop-themes/Menta/gtk-3.0/assets/menuitem-checkbox-checked-insensitive.svg
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="12.077437"
+   height="12.008709"
+   id="svg4959"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="menuitem-checkbox-checked-selected.svg">
+  <defs
+     id="defs4961" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="7.9195959"
+     inkscape:cx="3.2189413"
+     inkscape:cy="10.941332"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="746"
+     inkscape:window-height="463"
+     inkscape:window-x="0"
+     inkscape:window-y="49"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata4964">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-398.2133,-533.50504)">
+    <path
+       sodipodi:nodetypes="ccc"
+       d="m 399.28571,541.29075 2.99485,3.21429 7.00515,-7.5"
+       style="color:#000000;fill:none;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:0.39215687;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new"
+       id="path6301-5"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff --git a/desktop-themes/Menta/gtk-3.0/assets/menuitem-checkbox-checked-selected.svg b/desktop-themes/Menta/gtk-3.0/assets/menuitem-checkbox-checked-selected.svg
new file mode 100644
index 00000000..fc75bfba
--- /dev/null
+++ b/desktop-themes/Menta/gtk-3.0/assets/menuitem-checkbox-checked-selected.svg
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="12.077437"
+   height="12.008709"
+   id="svg4959"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="menuitem-checkbox-checked.svg">
+  <defs
+     id="defs4961" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="7.9195959"
+     inkscape:cx="3.2189413"
+     inkscape:cy="10.941332"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="746"
+     inkscape:window-height="399"
+     inkscape:window-x="0"
+     inkscape:window-y="49"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata4964">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-398.2133,-533.50504)">
+    <path
+       sodipodi:nodetypes="ccc"
+       d="m 399.28571,541.29075 2.99485,3.21429 7.00515,-7.5"
+       style="color:#000000;fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new"
+       id="path6301-5"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff --git a/desktop-themes/Menta/gtk-3.0/assets/menuitem-checkbox-checked.svg b/desktop-themes/Menta/gtk-3.0/assets/menuitem-checkbox-checked.svg
new file mode 100644
index 00000000..4819b8fb
--- /dev/null
+++ b/desktop-themes/Menta/gtk-3.0/assets/menuitem-checkbox-checked.svg
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="12.077437"
+   height="12.008709"
+   id="svg4959"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="Nytt dokument 3">
+  <defs
+     id="defs4961" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="7.9195959"
+     inkscape:cx="25.06349"
+     inkscape:cy="10.941332"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="746"
+     inkscape:window-height="399"
+     inkscape:window-x="0"
+     inkscape:window-y="49"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata4964">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-398.2133,-533.50504)">
+    <path
+       sodipodi:nodetypes="ccc"
+       d="m 399.28571,541.29075 2.99485,3.21429 7.00515,-7.5"
+       style="color:#000000;fill:none;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new"
+       id="path6301-5"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff --git a/desktop-themes/Menta/gtk-3.0/assets/menuitem-checkbox-mixed-insensitive.svg b/desktop-themes/Menta/gtk-3.0/assets/menuitem-checkbox-mixed-insensitive.svg
new file mode 100644
index 00000000..e37b20b6
--- /dev/null
+++ b/desktop-themes/Menta/gtk-3.0/assets/menuitem-checkbox-mixed-insensitive.svg
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="12.077437"
+   height="12.008709"
+   id="svg4959"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="menuitem-checkbox-mixed-selected.svg">
+  <defs
+     id="defs4961" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="7.9195959"
+     inkscape:cx="3.2189413"
+     inkscape:cy="11.077361"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="746"
+     inkscape:window-height="463"
+     inkscape:window-x="0"
+     inkscape:window-y="49"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata4964">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-398.2133,-533.50504)">
+    <rect
+       style="color:#000000;fill:#000000;fill-opacity:0.39215687;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect5494-2"
+       width="8.9375"
+       height="2"
+       x="399.21329"
+       y="539.51373"
+       rx="1.8653847"
+       ry="1" />
+  </g>
+</svg>
diff --git a/desktop-themes/Menta/gtk-3.0/assets/menuitem-checkbox-mixed-selected.svg b/desktop-themes/Menta/gtk-3.0/assets/menuitem-checkbox-mixed-selected.svg
new file mode 100644
index 00000000..466f05f1
--- /dev/null
+++ b/desktop-themes/Menta/gtk-3.0/assets/menuitem-checkbox-mixed-selected.svg
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="12.077437"
+   height="12.008709"
+   id="svg4959"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="menuitem-checkbox-mixed.svg">
+  <defs
+     id="defs4961" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="7.9195959"
+     inkscape:cx="3.2189413"
+     inkscape:cy="11.077361"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="746"
+     inkscape:window-height="463"
+     inkscape:window-x="0"
+     inkscape:window-y="49"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata4964">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-398.2133,-533.50504)">
+    <rect
+       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect5494-2"
+       width="8.9375"
+       height="2"
+       x="399.21329"
+       y="539.51373"
+       rx="1.8653847"
+       ry="1" />
+  </g>
+</svg>
diff --git a/desktop-themes/Menta/gtk-3.0/assets/menuitem-checkbox-mixed.svg b/desktop-themes/Menta/gtk-3.0/assets/menuitem-checkbox-mixed.svg
new file mode 100644
index 00000000..da94c64e
--- /dev/null
+++ b/desktop-themes/Menta/gtk-3.0/assets/menuitem-checkbox-mixed.svg
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="12.077437"
+   height="12.008709"
+   id="svg4959"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="menuitem-checkbox-checked-insensitive.svg">
+  <defs
+     id="defs4961" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="7.9195959"
+     inkscape:cx="3.2189413"
+     inkscape:cy="11.077361"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="746"
+     inkscape:window-height="463"
+     inkscape:window-x="0"
+     inkscape:window-y="49"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata4964">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-398.2133,-533.50504)">
+    <rect
+       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect5494-2"
+       width="8.9375"
+       height="2"
+       x="399.21329"
+       y="539.51373"
+       rx="1.8653847"
+       ry="1" />
+  </g>
+</svg>
diff --git a/desktop-themes/Menta/gtk-3.0/assets/menuitem-radio-checked-insensitive.svg b/desktop-themes/Menta/gtk-3.0/assets/menuitem-radio-checked-insensitive.svg
new file mode 100644
index 00000000..3cd2cb09
--- /dev/null
+++ b/desktop-themes/Menta/gtk-3.0/assets/menuitem-radio-checked-insensitive.svg
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="12.077437"
+   height="12.008709"
+   id="svg4959"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="menuitem-radio-checked-selected.svg">
+  <defs
+     id="defs4961" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="7.9195959"
+     inkscape:cx="3.2189413"
+     inkscape:cy="11.077361"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="746"
+     inkscape:window-height="463"
+     inkscape:window-x="0"
+     inkscape:window-y="49"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata4964">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-398.2133,-533.50504)">
+    <path
+       style="color:#000000;fill:#000000;fill-opacity:0.39215687;fill-rule:nonzero;stroke:none;stroke-width:0.95535718999999997;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 407.2133,541.01375 c 0,1.93299 -1.567,3.5 -3.5,3.5 -1.93299,0 -3.5,-1.56701 -3.5,-3.5 0,-1.933 1.56701,-3.5 3.5,-3.5 1.933,0 3.5,1.567 3.5,3.5 z"
+       id="path4945"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff --git a/desktop-themes/Menta/gtk-3.0/assets/menuitem-radio-checked-selected.svg b/desktop-themes/Menta/gtk-3.0/assets/menuitem-radio-checked-selected.svg
new file mode 100644
index 00000000..15ee80b3
--- /dev/null
+++ b/desktop-themes/Menta/gtk-3.0/assets/menuitem-radio-checked-selected.svg
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="12.077437"
+   height="12.008709"
+   id="svg4959"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="menuitem-radio-checked.svg">
+  <defs
+     id="defs4961" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="7.9195959"
+     inkscape:cx="3.2189413"
+     inkscape:cy="11.077361"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="746"
+     inkscape:window-height="463"
+     inkscape:window-x="0"
+     inkscape:window-y="49"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata4964">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-398.2133,-533.50504)">
+    <path
+       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.95535718999999997;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 407.2133,541.01375 c 0,1.93299 -1.567,3.5 -3.5,3.5 -1.93299,0 -3.5,-1.56701 -3.5,-3.5 0,-1.933 1.56701,-3.5 3.5,-3.5 1.933,0 3.5,1.567 3.5,3.5 z"
+       id="path4945"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff --git a/desktop-themes/Menta/gtk-3.0/assets/menuitem-radio-checked.svg b/desktop-themes/Menta/gtk-3.0/assets/menuitem-radio-checked.svg
new file mode 100644
index 00000000..354c5855
--- /dev/null
+++ b/desktop-themes/Menta/gtk-3.0/assets/menuitem-radio-checked.svg
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="12.077437"
+   height="12.008709"
+   id="svg4959"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="menuitem-checkbox-mixed-insensitive.svg">
+  <defs
+     id="defs4961" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="7.9195959"
+     inkscape:cx="3.2189413"
+     inkscape:cy="11.077361"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="746"
+     inkscape:window-height="463"
+     inkscape:window-x="0"
+     inkscape:window-y="49"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata4964">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-398.2133,-533.50504)">
+    <path
+       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.95535719;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 407.2133,541.01375 c 0,1.93299 -1.567,3.5 -3.5,3.5 -1.93299,0 -3.5,-1.56701 -3.5,-3.5 0,-1.933 1.56701,-3.5 3.5,-3.5 1.933,0 3.5,1.567 3.5,3.5 z"
+       id="path4945"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff --git a/desktop-themes/Menta/gtk-3.0/assets/null.png b/desktop-themes/Menta/gtk-3.0/assets/null.png
new file mode 100644
index 00000000..8777a4cb
--- /dev/null
+++ b/desktop-themes/Menta/gtk-3.0/assets/null.png
diff --git a/desktop-themes/Menta/gtk-3.0/assets/pane-separator-grip-vertical.svg b/desktop-themes/Menta/gtk-3.0/assets/pane-separator-grip-vertical.svg
new file mode 100644
index 00000000..9d1190c7
--- /dev/null
+++ b/desktop-themes/Menta/gtk-3.0/assets/pane-separator-grip-vertical.svg
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="24"
+   height="2"
+   id="svg32934"
+   version="1.1"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="pane-separator-grip-vertical.svg">
+  <defs
+     id="defs32936" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="8"
+     inkscape:cx="-24.023431"
+     inkscape:cy="12.438041"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1280"
+     inkscape:window-height="741"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata32939">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     transform="translate(0,-14)">
+    <path
+       sodipodi:type="arc"
+       style="fill:#babdb6;fill-opacity:1;stroke:none;display:inline;enable-background:new"
+       id="path5824"
+       sodipodi:cx="868.63647"
+       sodipodi:cy="617.14966"
+       sodipodi:rx="1.9003495"
+       sodipodi:ry="1.9003495"
+       d="m 870.53682,617.14966 a 1.9003495,1.9003495 0 1 1 -3.80069,0 1.9003495,1.9003495 0 1 1 3.80069,0 z"
+       transform="matrix(-0.52621972,0,0,-0.52621861,469.09367,339.75564)" />
+    <path
+       transform="matrix(-0.52621972,0,0,-0.52621861,474.59365,339.75564)"
+       d="m 870.53682,617.14966 a 1.9003495,1.9003495 0 1 1 -3.80069,0 1.9003495,1.9003495 0 1 1 3.80069,0 z"
+       sodipodi:ry="1.9003495"
+       sodipodi:rx="1.9003495"
+       sodipodi:cy="617.14966"
+       sodipodi:cx="868.63647"
+       id="path5828"
+       style="fill:#babdb6;fill-opacity:1;stroke:none;display:inline;enable-background:new"
+       sodipodi:type="arc" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#babdb6;fill-opacity:1;stroke:none;display:inline;enable-background:new"
+       id="path5830"
+       sodipodi:cx="868.63647"
+       sodipodi:cy="617.14966"
+       sodipodi:rx="1.9003495"
+       sodipodi:ry="1.9003495"
+       d="m 870.53682,617.14966 a 1.9003495,1.9003495 0 1 1 -3.80069,0 1.9003495,1.9003495 0 1 1 3.80069,0 z"
+       transform="matrix(-0.52621972,0,0,-0.52621861,480.09364,339.75564)" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#babdb6;fill-opacity:1;stroke:none;display:inline;enable-background:new"
+       id="path5824-3"
+       sodipodi:cx="868.63647"
+       sodipodi:cy="617.14966"
+       sodipodi:rx="1.9003495"
+       sodipodi:ry="1.9003495"
+       d="m 870.53682,617.14966 a 1.9003495,1.9003495 0 1 1 -3.80069,0 1.9003495,1.9003495 0 1 1 3.80069,0 z"
+       transform="matrix(-0.52621972,0,0,-0.52621861,458.09369,339.75564)" />
+    <path
+       transform="matrix(-0.52621972,0,0,-0.52621861,463.59368,339.75564)"
+       d="m 870.53682,617.14966 a 1.9003495,1.9003495 0 1 1 -3.80069,0 1.9003495,1.9003495 0 1 1 3.80069,0 z"
+       sodipodi:ry="1.9003495"
+       sodipodi:rx="1.9003495"
+       sodipodi:cy="617.14966"
+       sodipodi:cx="868.63647"
+       id="path5828-7"
+       style="fill:#babdb6;fill-opacity:1;stroke:none;display:inline;enable-background:new"
+       sodipodi:type="arc" />
+  </g>
+</svg>
diff --git a/desktop-themes/Menta/gtk-3.0/assets/pane-separator-grip.svg b/desktop-themes/Menta/gtk-3.0/assets/pane-separator-grip.svg
new file mode 100644
index 00000000..e2fa9be0
--- /dev/null
+++ b/desktop-themes/Menta/gtk-3.0/assets/pane-separator-grip.svg
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="2"
+   height="24"
+   id="svg32934"
+   version="1.1"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="pane-separator-grip.svg">
+  <defs
+     id="defs32936" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="11.313708"
+     inkscape:cx="-31.057447"
+     inkscape:cy="11.379732"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1280"
+     inkscape:window-height="741"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata32939">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     transform="translate(0,8)">
+    <path
+       sodipodi:type="arc"
+       style="fill:#babdb6;fill-opacity:1;stroke:none;display:inline;enable-background:new"
+       id="path5824"
+       sodipodi:cx="868.63647"
+       sodipodi:cy="617.14966"
+       sodipodi:rx="1.9003495"
+       sodipodi:ry="1.9003495"
+       d="m 870.53682,617.14966 a 1.9003495,1.9003495 0 1 1 -3.80069,0 1.9003495,1.9003495 0 1 1 3.80069,0 z"
+       transform="matrix(0.52621899,0,0,0.52621789,-456.09301,-320.75518)" />
+    <path
+       transform="matrix(0.52621899,0,0,0.52621789,-456.09301,-326.25519)"
+       d="m 870.53682,617.14966 a 1.9003495,1.9003495 0 1 1 -3.80069,0 1.9003495,1.9003495 0 1 1 3.80069,0 z"
+       sodipodi:ry="1.9003495"
+       sodipodi:rx="1.9003495"
+       sodipodi:cy="617.14966"
+       sodipodi:cx="868.63647"
+       id="path5828"
+       style="fill:#babdb6;fill-opacity:1;stroke:none;display:inline;enable-background:new"
+       sodipodi:type="arc" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#babdb6;fill-opacity:1;stroke:none;display:inline;enable-background:new"
+       id="path5830"
+       sodipodi:cx="868.63647"
+       sodipodi:cy="617.14966"
+       sodipodi:rx="1.9003495"
+       sodipodi:ry="1.9003495"
+       d="m 870.53682,617.14966 a 1.9003495,1.9003495 0 1 1 -3.80069,0 1.9003495,1.9003495 0 1 1 3.80069,0 z"
+       transform="matrix(0.52621899,0,0,0.52621789,-456.09301,-331.75519)" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#babdb6;fill-opacity:1;stroke:none;display:inline;enable-background:new"
+       id="path5824-3"
+       sodipodi:cx="868.63647"
+       sodipodi:cy="617.14966"
+       sodipodi:rx="1.9003495"
+       sodipodi:ry="1.9003495"
+       d="m 870.53682,617.14966 c 0,1.04953 -0.85081,1.90035 -1.90035,1.90035 -1.04953,0 -1.90034,-0.85082 -1.90034,-1.90035 0,-1.04954 0.85081,-1.90035 1.90034,-1.90035 1.04954,0 1.90035,0.85081 1.90035,1.90035 z"
+       transform="matrix(0.52621899,0,0,0.52621789,-456.09301,-309.75517)" />
+    <path
+       transform="matrix(0.52621899,0,0,0.52621789,-456.09301,-315.25518)"
+       d="m 870.53682,617.14966 a 1.9003495,1.9003495 0 1 1 -3.80069,0 1.9003495,1.9003495 0 1 1 3.80069,0 z"
+       sodipodi:ry="1.9003495"
+       sodipodi:rx="1.9003495"
+       sodipodi:cy="617.14966"
+       sodipodi:cx="868.63647"
+       id="path5828-7"
+       style="fill:#babdb6;fill-opacity:1;stroke:none;display:inline;enable-background:new"
+       sodipodi:type="arc" />
+  </g>
+</svg>
diff --git a/desktop-themes/Menta/gtk-3.0/assets/radio-active-ins.png b/desktop-themes/Menta/gtk-3.0/assets/radio-active-ins.png
index 116d3654..a8f0a035 100644
--- a/desktop-themes/Menta/gtk-3.0/assets/radio-active-ins.png
+++ b/desktop-themes/Menta/gtk-3.0/assets/radio-active-ins.png
diff --git a/desktop-themes/Menta/gtk-3.0/assets/radio-active.png b/desktop-themes/Menta/gtk-3.0/assets/radio-active.png
index b8fe6301..bcfd5d70 100644
--- a/desktop-themes/Menta/gtk-3.0/assets/radio-active.png
+++ b/desktop-themes/Menta/gtk-3.0/assets/radio-active.png
diff --git a/desktop-themes/Menta/gtk-3.0/assets/radio-menuitem-dark.png b/desktop-themes/Menta/gtk-3.0/assets/radio-menuitem-dark.png
deleted file mode 100644
index fdfd17e5..00000000
--- a/desktop-themes/Menta/gtk-3.0/assets/radio-menuitem-dark.png
+++ /dev/null
diff --git a/desktop-themes/Menta/gtk-3.0/assets/radio-menuitem-insensitive-dark.png b/desktop-themes/Menta/gtk-3.0/assets/radio-menuitem-insensitive-dark.png
deleted file mode 100644
index f4290252..00000000
--- a/desktop-themes/Menta/gtk-3.0/assets/radio-menuitem-insensitive-dark.png
+++ /dev/null
diff --git a/desktop-themes/Menta/gtk-3.0/assets/radio-menuitem-insensitive.png b/desktop-themes/Menta/gtk-3.0/assets/radio-menuitem-insensitive.png
deleted file mode 100644
index 2adbfb11..00000000
--- a/desktop-themes/Menta/gtk-3.0/assets/radio-menuitem-insensitive.png
+++ /dev/null
diff --git a/desktop-themes/Menta/gtk-3.0/assets/radio-menuitem.png b/desktop-themes/Menta/gtk-3.0/assets/radio-menuitem.png
deleted file mode 100644
index b421559f..00000000
--- a/desktop-themes/Menta/gtk-3.0/assets/radio-menuitem.png
+++ /dev/null
diff --git a/desktop-themes/Menta/gtk-3.0/assets/radio-mixed-active-ins.png b/desktop-themes/Menta/gtk-3.0/assets/radio-mixed-active-ins.png
index 13e5fcdb..da7cb0f7 100644
--- a/desktop-themes/Menta/gtk-3.0/assets/radio-mixed-active-ins.png
+++ b/desktop-themes/Menta/gtk-3.0/assets/radio-mixed-active-ins.png
diff --git a/desktop-themes/Menta/gtk-3.0/assets/radio-mixed-active.png b/desktop-themes/Menta/gtk-3.0/assets/radio-mixed-active.png
index 8e360af6..2818bb64 100644
--- a/desktop-themes/Menta/gtk-3.0/assets/radio-mixed-active.png
+++ b/desktop-themes/Menta/gtk-3.0/assets/radio-mixed-active.png
diff --git a/desktop-themes/Menta/gtk-3.0/assets/radio-normal-hover.png b/desktop-themes/Menta/gtk-3.0/assets/radio-normal-hover.png
deleted file mode 100644
index 43bb239e..00000000
--- a/desktop-themes/Menta/gtk-3.0/assets/radio-normal-hover.png
+++ /dev/null
diff --git a/desktop-themes/Menta/gtk-3.0/assets/radio-normal-ins.png b/desktop-themes/Menta/gtk-3.0/assets/radio-normal-ins.png
index c83c0491..2c9af32e 100644
--- a/desktop-themes/Menta/gtk-3.0/assets/radio-normal-ins.png
+++ b/desktop-themes/Menta/gtk-3.0/assets/radio-normal-ins.png
diff --git a/desktop-themes/Menta/gtk-3.0/assets/radio-normal.png b/desktop-themes/Menta/gtk-3.0/assets/radio-normal.png
index 61090cf2..4aefd439 100644
--- a/desktop-themes/Menta/gtk-3.0/assets/radio-normal.png
+++ b/desktop-themes/Menta/gtk-3.0/assets/radio-normal.png
diff --git a/desktop-themes/Menta/gtk-3.0/assets/resize-grip.svg b/desktop-themes/Menta/gtk-3.0/assets/resize-grip.svg
new file mode 100644
index 00000000..fa1f5872
--- /dev/null
+++ b/desktop-themes/Menta/gtk-3.0/assets/resize-grip.svg
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="13"
+   height="13"
+   id="svg17653"
+   version="1.1"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="resize-grip.svg">
+  <defs
+     id="defs17655" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="21.311078"
+     inkscape:cx="-8.2186936"
+     inkscape:cy="8.0008486"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1920"
+     inkscape:window-height="1022"
+     inkscape:window-x="0"
+     inkscape:window-y="26"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata17658">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     transform="translate(0,-3)">
+    <path
+       transform="matrix(0.65777374,0,0,0.65777374,-560.57081,-392.19484)"
+       d="m 870.53682,617.14966 a 1.9003495,1.9003495 0 1 1 -3.80069,0 1.9003495,1.9003495 0 1 1 3.80069,0 z"
+       sodipodi:ry="1.9003495"
+       sodipodi:rx="1.9003495"
+       sodipodi:cy="617.14966"
+       sodipodi:cx="868.63647"
+       id="path5513"
+       style="fill:#b9beb3;fill-opacity:1;stroke:none;display:inline;enable-background:new"
+       sodipodi:type="arc" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#b9beb3;fill-opacity:1;stroke:none;display:inline;enable-background:new"
+       id="path5515"
+       sodipodi:cx="868.63647"
+       sodipodi:cy="617.14966"
+       sodipodi:rx="1.9003495"
+       sodipodi:ry="1.9003495"
+       d="m 870.53682,617.14966 a 1.9003495,1.9003495 0 1 1 -3.80069,0 1.9003495,1.9003495 0 1 1 3.80069,0 z"
+       transform="matrix(0.65777374,0,0,0.65777374,-563.84354,-392.19484)" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#b9beb3;fill-opacity:1;stroke:none;display:inline;enable-background:new"
+       id="path5517"
+       sodipodi:cx="868.63647"
+       sodipodi:cy="617.14966"
+       sodipodi:rx="1.9003495"
+       sodipodi:ry="1.9003495"
+       d="m 870.53682,617.14966 a 1.9003495,1.9003495 0 1 1 -3.80069,0 1.9003495,1.9003495 0 1 1 3.80069,0 z"
+       transform="matrix(0.65777374,0,0,0.65777374,-560.57081,-395.46756)" />
+    <path
+       transform="matrix(0.65777374,0,0,0.65777374,-560.57081,-398.74029)"
+       d="m 870.53682,617.14966 a 1.9003495,1.9003495 0 1 1 -3.80069,0 1.9003495,1.9003495 0 1 1 3.80069,0 z"
+       sodipodi:ry="1.9003495"
+       sodipodi:rx="1.9003495"
+       sodipodi:cy="617.14966"
+       sodipodi:cx="868.63647"
+       id="path5519"
+       style="fill:#b9beb3;fill-opacity:1;stroke:none;display:inline;enable-background:new"
+       sodipodi:type="arc" />
+    <path
+       transform="matrix(0.65777374,0,0,0.65777374,-567.11626,-392.19484)"
+       d="m 870.53682,617.14966 a 1.9003495,1.9003495 0 1 1 -3.80069,0 1.9003495,1.9003495 0 1 1 3.80069,0 z"
+       sodipodi:ry="1.9003495"
+       sodipodi:rx="1.9003495"
+       sodipodi:cy="617.14966"
+       sodipodi:cx="868.63647"
+       id="path5521"
+       style="fill:#b9beb3;fill-opacity:1;stroke:none;display:inline;enable-background:new"
+       sodipodi:type="arc" />
+    <path
+       transform="matrix(0.65777374,0,0,0.65777374,-563.84354,-395.46756)"
+       d="m 870.53682,617.14966 a 1.9003495,1.9003495 0 1 1 -3.80069,0 1.9003495,1.9003495 0 1 1 3.80069,0 z"
+       sodipodi:ry="1.9003495"
+       sodipodi:rx="1.9003495"
+       sodipodi:cy="617.14966"
+       sodipodi:cx="868.63647"
+       id="path5523"
+       style="fill:#b9beb3;fill-opacity:1;stroke:none;display:inline;enable-background:new"
+       sodipodi:type="arc" />
+  </g>
+</svg>
diff --git a/desktop-themes/Menta/gtk-3.0/assets/sidebar-radio-checked.svg b/desktop-themes/Menta/gtk-3.0/assets/sidebar-radio-checked.svg
new file mode 100644
index 00000000..ea4aca4d
--- /dev/null
+++ b/desktop-themes/Menta/gtk-3.0/assets/sidebar-radio-checked.svg
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   id="svg27352"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="sidebar-radio-checked.svg">
+  <defs
+     id="defs27354" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="8"
+     inkscape:cx="-3.6523764"
+     inkscape:cy="12.856863"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="958"
+     inkscape:window-height="587"
+     inkscape:window-x="38"
+     inkscape:window-y="91"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata27357">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <path
+       sodipodi:type="arc"
+       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.27423298;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path5784-4"
+       sodipodi:cx="660.96808"
+       sodipodi:cy="255.0668"
+       sodipodi:rx="4.5078058"
+       sodipodi:ry="7.2937827"
+       d="m 665.47588,255.0668 a 4.5078058,7.2937827 0 1 1 -9.01561,0 4.5078058,7.2937827 0 1 1 9.01561,0 z"
+       transform="matrix(0.88734967,0,0,0.54841228,-578.5098,-131.88177)" />
+  </g>
+</svg>
diff --git a/desktop-themes/Menta/gtk-3.0/assets/sidebar-radio-prelight.svg b/desktop-themes/Menta/gtk-3.0/assets/sidebar-radio-prelight.svg
new file mode 100644
index 00000000..ea4aca4d
--- /dev/null
+++ b/desktop-themes/Menta/gtk-3.0/assets/sidebar-radio-prelight.svg
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   id="svg27352"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="sidebar-radio-checked.svg">
+  <defs
+     id="defs27354" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="8"
+     inkscape:cx="-3.6523764"
+     inkscape:cy="12.856863"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="958"
+     inkscape:window-height="587"
+     inkscape:window-x="38"
+     inkscape:window-y="91"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata27357">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <path
+       sodipodi:type="arc"
+       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.27423298;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path5784-4"
+       sodipodi:cx="660.96808"
+       sodipodi:cy="255.0668"
+       sodipodi:rx="4.5078058"
+       sodipodi:ry="7.2937827"
+       d="m 665.47588,255.0668 a 4.5078058,7.2937827 0 1 1 -9.01561,0 4.5078058,7.2937827 0 1 1 9.01561,0 z"
+       transform="matrix(0.88734967,0,0,0.54841228,-578.5098,-131.88177)" />
+  </g>
+</svg>
diff --git a/desktop-themes/Menta/gtk-3.0/assets/sidebar-radio-selected-prelight.svg b/desktop-themes/Menta/gtk-3.0/assets/sidebar-radio-selected-prelight.svg
new file mode 100644
index 00000000..7ec4500f
--- /dev/null
+++ b/desktop-themes/Menta/gtk-3.0/assets/sidebar-radio-selected-prelight.svg
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   id="svg27352"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="sidebar-radio-selected.svg">
+  <defs
+     id="defs27354" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="8"
+     inkscape:cx="-3.6523764"
+     inkscape:cy="12.856863"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="958"
+     inkscape:window-height="587"
+     inkscape:window-x="38"
+     inkscape:window-y="91"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata27357">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <path
+       sodipodi:type="arc"
+       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.27423298000000007;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path5784-4"
+       sodipodi:cx="660.96808"
+       sodipodi:cy="255.0668"
+       sodipodi:rx="4.5078058"
+       sodipodi:ry="7.2937827"
+       d="m 665.47588,255.0668 a 4.5078058,7.2937827 0 1 1 -9.01561,0 4.5078058,7.2937827 0 1 1 9.01561,0 z"
+       transform="matrix(0.88734967,0,0,0.54841228,-578.5098,-131.88177)" />
+  </g>
+</svg>
diff --git a/desktop-themes/Menta/gtk-3.0/assets/sidebar-radio-selected.svg b/desktop-themes/Menta/gtk-3.0/assets/sidebar-radio-selected.svg
new file mode 100644
index 00000000..e6c11b1c
--- /dev/null
+++ b/desktop-themes/Menta/gtk-3.0/assets/sidebar-radio-selected.svg
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   id="svg27352"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="sidebar-radio-prelight.svg">
+  <defs
+     id="defs27354" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="8"
+     inkscape:cx="-3.6523764"
+     inkscape:cy="12.856863"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="958"
+     inkscape:window-height="587"
+     inkscape:window-x="38"
+     inkscape:window-y="91"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata27357">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <path
+       sodipodi:type="arc"
+       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.27423298000000007;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path5784-4"
+       sodipodi:cx="660.96808"
+       sodipodi:cy="255.0668"
+       sodipodi:rx="4.5078058"
+       sodipodi:ry="7.2937827"
+       d="m 665.47588,255.0668 a 4.5078058,7.2937827 0 1 1 -9.01561,0 4.5078058,7.2937827 0 1 1 9.01561,0 z"
+       transform="matrix(0.88734967,0,0,0.54841228,-578.5098,-131.88177)" />
+  </g>
+</svg>
diff --git a/desktop-themes/Menta/gtk-3.0/assets/slider-hover.png b/desktop-themes/Menta/gtk-3.0/assets/slider-hover.png
new file mode 100644
index 00000000..72c5437b
--- /dev/null
+++ b/desktop-themes/Menta/gtk-3.0/assets/slider-hover.png
diff --git a/desktop-themes/Menta/gtk-3.0/assets/slider-ins.png b/desktop-themes/Menta/gtk-3.0/assets/slider-ins.png
new file mode 100644
index 00000000..f31f5c90
--- /dev/null
+++ b/desktop-themes/Menta/gtk-3.0/assets/slider-ins.png
diff --git a/desktop-themes/Menta/gtk-3.0/assets/slider.png b/desktop-themes/Menta/gtk-3.0/assets/slider.png
new file mode 100644
index 00000000..3fdda2c9
--- /dev/null
+++ b/desktop-themes/Menta/gtk-3.0/assets/slider.png
diff --git a/desktop-themes/Menta/gtk-3.0/assets/switch-off-ins.png b/desktop-themes/Menta/gtk-3.0/assets/switch-off-ins.png
deleted file mode 100644
index 0de0ba10..00000000
--- a/desktop-themes/Menta/gtk-3.0/assets/switch-off-ins.png
+++ /dev/null
diff --git a/desktop-themes/Menta/gtk-3.0/assets/switch-off-ins.svg b/desktop-themes/Menta/gtk-3.0/assets/switch-off-ins.svg
new file mode 100644
index 00000000..e4b2dc90
--- /dev/null
+++ b/desktop-themes/Menta/gtk-3.0/assets/switch-off-ins.svg
@@ -0,0 +1,665 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48"
+   height="26"
+   id="svg3482"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="switch-off-ins.svg">
+  <defs
+     id="defs3484">
+    <linearGradient
+       id="linearGradient4125">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0.48627451;"
+         offset="0"
+         id="stop4127" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop4129" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4133">
+      <stop
+         style="stop-color:#000000;stop-opacity:0.1254902;"
+         offset="0"
+         id="stop4135" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0.0627451;"
+         offset="1"
+         id="stop4137" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4064">
+      <stop
+         id="stop4066"
+         offset="0"
+         style="stop-color:#4a79a5;stop-opacity:0.50980395;" />
+      <stop
+         id="stop4068"
+         offset="1"
+         style="stop-color:#4a79a5;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3965">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0.39285713;"
+         offset="0"
+         id="stop3967" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop3969" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3459">
+      <stop
+         id="stop3461"
+         offset="0"
+         style="stop-color:#4a79a5;stop-opacity:0.50980395;" />
+      <stop
+         id="stop3463"
+         offset="1"
+         style="stop-color:#4a79a5;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3466">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0.39285713;"
+         offset="0"
+         id="stop3468" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop3470" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3986">
+      <stop
+         style="stop-color:#878787;stop-opacity:1;"
+         offset="0"
+         id="stop3988" />
+      <stop
+         style="stop-color:#4b4b4b;stop-opacity:1;"
+         offset="1"
+         id="stop3990" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3953">
+      <stop
+         style="stop-color:#828282;stop-opacity:0.68627453;"
+         offset="0"
+         id="stop3955" />
+      <stop
+         style="stop-color:#828282;stop-opacity:0;"
+         offset="1"
+         id="stop3957" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3965-6">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0.39285713;"
+         offset="0"
+         id="stop3967-3" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop3969-2" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3668">
+      <stop
+         style="stop-color:#828282;stop-opacity:0.68627453;"
+         offset="0"
+         id="stop3670" />
+      <stop
+         style="stop-color:#828282;stop-opacity:0;"
+         offset="1"
+         id="stop3672" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3675">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0.39285713;"
+         offset="0"
+         id="stop3677" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop3679" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4133-1">
+      <stop
+         style="stop-color:#000000;stop-opacity:0.1254902;"
+         offset="0"
+         id="stop4135-3" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0.0627451;"
+         offset="1"
+         id="stop4137-6" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4198">
+      <stop
+         style="stop-color:#c0c0c0;stop-opacity:1;"
+         offset="0"
+         id="stop4200" />
+      <stop
+         style="stop-color:#d1d1d1;stop-opacity:1;"
+         offset="1"
+         id="stop4202" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3942">
+      <stop
+         id="stop3944"
+         offset="0"
+         style="stop-color:#878787;stop-opacity:1;" />
+      <stop
+         id="stop3946"
+         offset="1"
+         style="stop-color:#828282;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4125-9"
+       id="linearGradient3245"
+       gradientUnits="userSpaceOnUse"
+       x1="428.21423"
+       y1="548.57648"
+       x2="428.21423"
+       y2="541.57648"
+       gradientTransform="matrix(1.958336,0,0,1.2500004,-360.37115,-69.099883)" />
+    <linearGradient
+       id="linearGradient4125-9">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0.48627451;"
+         offset="0"
+         id="stop4127-6" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop4129-9" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4125-9"
+       id="linearGradient3816"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.958336,0,0,1.2500004,-452.52807,-115.86523)"
+       x1="428.21423"
+       y1="548.57648"
+       x2="428.21423"
+       y2="541.57648" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3942"
+       id="linearGradient3818"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.8750093,0,0,1.150008,-416.55472,-62.061548)"
+       x1="428.21423"
+       y1="548.57648"
+       x2="428.21423"
+       y2="541.57648" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4198"
+       id="linearGradient3820"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.1578947,0,0,1.1,-165.43988,-33.503598)"
+       x1="482.21423"
+       y1="526.57648"
+       x2="482.21423"
+       y2="546.57648" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4133-1"
+       id="linearGradient3822"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7916673,0,0,1.049997,-380.57475,-1121.7091)"
+       x1="428.21423"
+       y1="548.57648"
+       x2="428.21423"
+       y2="541.57648" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3953"
+       id="radialGradient3824"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.2051902,0,0,1.2051887,302.4183,579.58171)"
+       cx="66"
+       cy="-19"
+       fx="66"
+       fy="-19"
+       r="7" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3965-6"
+       id="radialGradient3826"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.2051902,0,0,1.2051887,302.4183,579.58171)"
+       cx="66"
+       cy="-19"
+       fx="66"
+       fy="-19"
+       r="7" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3953"
+       id="radialGradient3828"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1.0358675,0.32475847,0.33853201,1.2979227,456.76009,559.90988)"
+       cx="66"
+       cy="-19"
+       fx="66"
+       fy="-19"
+       r="7" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3965-6"
+       id="radialGradient3830"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.077388,0,0,1.0773891,-112.7912,8.7486417)"
+       cx="459.21423"
+       cy="508.57648"
+       fx="459.21423"
+       fy="508.57648"
+       r="7.8299899" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3986"
+       id="linearGradient3832"
+       gradientUnits="userSpaceOnUse"
+       x1="67.50013"
+       y1="-13.499995"
+       x2="67.50013"
+       y2="-29.500275" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4125-4"
+       id="linearGradient3403"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.958336,0,0,1.2500004,-360.37115,-97.099883)"
+       x1="428.21423"
+       y1="548.57648"
+       x2="428.21423"
+       y2="541.57648" />
+    <linearGradient
+       id="linearGradient4125-4">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0.48627451;"
+         offset="0"
+         id="stop4127-1" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop4129-5" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3972"
+       id="linearGradient3405"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.8750093,0,0,1.150008,-324.3978,-1194.288)"
+       x1="428.21423"
+       y1="548.57648"
+       x2="428.21423"
+       y2="541.57648" />
+    <linearGradient
+       id="linearGradient3972">
+      <stop
+         id="stop3974"
+         offset="0"
+         style="stop-color:#a0a0a0;stop-opacity:1;" />
+      <stop
+         id="stop3976"
+         offset="1"
+         style="stop-color:#bebebe;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4306"
+       id="linearGradient3409"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7916673,0,0,1.049997,-288.41783,-1140.4744)"
+       x1="428.21423"
+       y1="548.57648"
+       x2="428.21423"
+       y2="541.57648" />
+    <linearGradient
+       id="linearGradient4306">
+      <stop
+         id="stop4308"
+         offset="0"
+         style="stop-color:#000000;stop-opacity:0.03137255;" />
+      <stop
+         id="stop4310"
+         offset="1"
+         style="stop-color:#000000;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4284"
+       id="radialGradient3411"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.2051902,0,0,1.2051887,394.57522,598.34706)"
+       cx="66"
+       cy="-19"
+       fx="66"
+       fy="-19"
+       r="7" />
+    <linearGradient
+       id="linearGradient4284">
+      <stop
+         id="stop4286"
+         offset="0"
+         style="stop-color:#828282;stop-opacity:0.39215687;" />
+      <stop
+         id="stop4288"
+         offset="1"
+         style="stop-color:#828282;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3965-4"
+       id="radialGradient3413"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.2051902,0,0,1.2051887,394.57522,598.34706)"
+       cx="66"
+       cy="-19"
+       fx="66"
+       fy="-19"
+       r="7" />
+    <linearGradient
+       id="linearGradient3965-4">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0.39285713;"
+         offset="0"
+         id="stop3967-1" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop3969-7" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4284"
+       id="radialGradient3415"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1.0358675,0.32475847,0.33853201,1.2979227,548.91702,578.67523)"
+       cx="66"
+       cy="-19"
+       fx="66"
+       fy="-19"
+       r="7" />
+    <linearGradient
+       id="linearGradient3955">
+      <stop
+         id="stop3957-1"
+         offset="0"
+         style="stop-color:#828282;stop-opacity:0.39215687;" />
+      <stop
+         id="stop3959"
+         offset="1"
+         style="stop-color:#828282;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3965-4"
+       id="radialGradient3417"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.077388,0,0,1.0773891,-20.634277,27.513995)"
+       cx="459.21423"
+       cy="508.57648"
+       fx="459.21423"
+       fy="508.57648"
+       r="7.8299899" />
+    <linearGradient
+       id="linearGradient3962">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0.39285713;"
+         offset="0"
+         id="stop3964" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop3966" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4270"
+       id="linearGradient3419"
+       gradientUnits="userSpaceOnUse"
+       x1="67.50013"
+       y1="-13.499995"
+       x2="67.50013"
+       y2="-29.500275" />
+    <linearGradient
+       id="linearGradient4270">
+      <stop
+         id="stop4272"
+         offset="0"
+         style="stop-color:#bebebe;stop-opacity:1;" />
+      <stop
+         id="stop4274"
+         offset="1"
+         style="stop-color:#a0a0a0;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       y2="-29.500275"
+       x2="67.50013"
+       y1="-13.499995"
+       x1="67.50013"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3982"
+       xlink:href="#linearGradient4270"
+       inkscape:collect="always" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4284"
+       id="radialGradient3851"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1.0358675,0.32475847,0.33853201,1.2979227,438.83876,535.54569)"
+       cx="66"
+       cy="-19"
+       fx="66"
+       fy="-19"
+       r="7" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3965-4"
+       id="radialGradient3853"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.077388,0,0,1.0773891,-130.71254,-15.615547)"
+       cx="459.21423"
+       cy="508.57648"
+       fx="459.21423"
+       fy="508.57648"
+       r="7.8299899" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4284"
+       id="radialGradient3856"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.2051902,0,0,1.2051887,284.49696,555.21752)"
+       cx="66"
+       cy="-19"
+       fx="66"
+       fy="-19"
+       r="7" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3965-4"
+       id="radialGradient3858"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.2051902,0,0,1.2051887,284.49696,555.21752)"
+       cx="66"
+       cy="-19"
+       fx="66"
+       fy="-19"
+       r="7" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4306"
+       id="linearGradient3862"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7916673,0,0,1.049997,-398.49609,-1097.3449)"
+       x1="428.21423"
+       y1="548.57648"
+       x2="428.21423"
+       y2="541.57648" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3972"
+       id="linearGradient3866"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.8750093,0,0,1.150008,-434.47606,-1151.1585)"
+       x1="428.21423"
+       y1="548.57648"
+       x2="428.21423"
+       y2="541.57648" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4125-4"
+       id="linearGradient3869"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.958336,0,0,1.2500004,-470.44941,-140.22942)"
+       x1="428.21423"
+       y1="548.57648"
+       x2="428.21423"
+       y2="541.57648" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="11.2"
+     inkscape:cx="21.741069"
+     inkscape:cy="22.670358"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1064"
+     inkscape:window-height="751"
+     inkscape:window-x="0"
+     inkscape:window-y="22"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata3487">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-350.99212,-519.36632)">
+    <g
+       id="g3871">
+      <rect
+         style="fill:none;stroke:url(#linearGradient3869);stroke-width:1.00010014;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="rect3385"
+         width="46.999901"
+         height="24.999901"
+         x="351.49219"
+         y="519.86639"
+         rx="13.35611"
+         ry="12.499951" />
+      <rect
+         transform="scale(1,-1)"
+         ry="11.50003"
+         rx="12.356178"
+         y="-543.86639"
+         x="352.4921"
+         height="23.000061"
+         width="45.000061"
+         id="rect3387"
+         style="fill:none;stroke:url(#linearGradient3866);stroke-width:1.5;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <rect
+         style="fill:#cccccc;fill-opacity:1;stroke:none"
+         id="rect3389"
+         width="44"
+         height="22"
+         x="352.99213"
+         y="521.36633"
+         rx="11.856148"
+         ry="11" />
+      <rect
+         style="fill:none;stroke:url(#linearGradient3862);stroke-width:1.5;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="rect3391"
+         width="42.999847"
+         height="20.999849"
+         x="353.49219"
+         y="-542.86627"
+         rx="11.356056"
+         ry="10.499925"
+         transform="scale(1,-1)" />
+      <path
+         transform="matrix(1.5,0,0,1.3846154,265.03945,559.319)"
+         d="m 72,-19.5 a 6,6.5 0 1 1 -12,0 6,6.5 0 1 1 12,0 z"
+         sodipodi:ry="6.5"
+         sodipodi:rx="6"
+         sodipodi:cy="-19.5"
+         sodipodi:cx="66"
+         id="path3393"
+         style="fill:#ececec;fill-opacity:1;stroke:none"
+         sodipodi:type="arc" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3395"
+         d="m 364.03947,532.31901 -8.43634,4.21817 6.02596,4.21815 4.82076,-16.87265 6.02594,4.21815 -8.43632,4.21818 z"
+         style="fill:url(#radialGradient3856);fill-opacity:1;stroke:url(#radialGradient3858);stroke-width:1.12735164px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         style="fill:url(#radialGradient3851);fill-opacity:1;stroke:url(#radialGradient3853);stroke-width:1.12810218"
+         d="m 364.03946,532.319 8.43595,2.26944 -3.99451,6.16651 -8.88292,-16.8719 -3.99448,6.1665 8.43596,2.26945 z"
+         id="path3397"
+         inkscape:connector-curvature="0" />
+      <path
+         sodipodi:type="arc"
+         style="fill:none;stroke:#ffffff;stroke-width:0.88239956;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:0.54901961;stroke-dasharray:none"
+         id="path3399"
+         sodipodi:cx="67.5"
+         sodipodi:cy="-21.5"
+         sodipodi:rx="7.5"
+         sodipodi:ry="7.5"
+         d="m 75,-21.5 a 7.5,7.5 0 1 1 -15,0 7.5,7.5 0 1 1 15,0 z"
+         transform="matrix(1.13333,0,0,-1.13333,287.53967,507.95241)" />
+      <path
+         transform="matrix(1.2666816,0,0,-1.2666816,278.4911,505.13269)"
+         d="m 75,-21.5 a 7.5,7.5 0 1 1 -15,0 7.5,7.5 0 1 1 15,0 z"
+         sodipodi:ry="7.5"
+         sodipodi:rx="7.5"
+         sodipodi:cy="-21.5"
+         sodipodi:cx="67.5"
+         id="path3401"
+         style="fill:none;stroke:url(#linearGradient3982);stroke-width:0.78928715;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         sodipodi:type="arc" />
+    </g>
+  </g>
+</svg>
diff --git a/desktop-themes/Menta/gtk-3.0/assets/switch-off.png b/desktop-themes/Menta/gtk-3.0/assets/switch-off.png
deleted file mode 100644
index 559214f1..00000000
--- a/desktop-themes/Menta/gtk-3.0/assets/switch-off.png
+++ /dev/null
diff --git a/desktop-themes/Menta/gtk-3.0/assets/switch-off.svg b/desktop-themes/Menta/gtk-3.0/assets/switch-off.svg
new file mode 100644
index 00000000..b05dac32
--- /dev/null
+++ b/desktop-themes/Menta/gtk-3.0/assets/switch-off.svg
@@ -0,0 +1,651 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48"
+   height="26"
+   id="svg3482"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="switch-off.svg">
+  <defs
+     id="defs3484">
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4125"
+       id="linearGradient4207"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.958336,0,0,1.2500004,-360.37115,-41.099883)"
+       x1="428.21423"
+       y1="548.57648"
+       x2="428.21423"
+       y2="541.57648" />
+    <linearGradient
+       id="linearGradient4125">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0.48627451;"
+         offset="0"
+         id="stop4127" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop4129" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4133"
+       id="linearGradient4214"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7916673,0,0,1.049997,-288.41783,-1196.4744)"
+       x1="428.21423"
+       y1="548.57648"
+       x2="428.21423"
+       y2="541.57648" />
+    <linearGradient
+       id="linearGradient4133">
+      <stop
+         style="stop-color:#000000;stop-opacity:0.1254902;"
+         offset="0"
+         id="stop4135" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0.0627451;"
+         offset="1"
+         id="stop4137" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4064"
+       id="radialGradient4216"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.2051902,0,0,1.2051887,416.57522,654.34706)"
+       cx="66"
+       cy="-19"
+       fx="66"
+       fy="-19"
+       r="7" />
+    <linearGradient
+       id="linearGradient4064">
+      <stop
+         id="stop4066"
+         offset="0"
+         style="stop-color:#4a79a5;stop-opacity:0.50980395;" />
+      <stop
+         id="stop4068"
+         offset="1"
+         style="stop-color:#4a79a5;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3965"
+       id="radialGradient4218"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.2051902,0,0,1.2051887,416.57522,654.34706)"
+       cx="66"
+       cy="-19"
+       fx="66"
+       fy="-19"
+       r="7" />
+    <linearGradient
+       id="linearGradient3965">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0.39285713;"
+         offset="0"
+         id="stop3967" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop3969" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4064"
+       id="radialGradient4220"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1.0358675,0.32475847,0.33853201,1.2979227,570.91702,634.67523)"
+       cx="66"
+       cy="-19"
+       fx="66"
+       fy="-19"
+       r="7" />
+    <linearGradient
+       id="linearGradient3459">
+      <stop
+         id="stop3461"
+         offset="0"
+         style="stop-color:#4a79a5;stop-opacity:0.50980395;" />
+      <stop
+         id="stop3463"
+         offset="1"
+         style="stop-color:#4a79a5;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3965"
+       id="radialGradient4222"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.077388,0,0,1.0773891,1.365723,83.513995)"
+       cx="459.21423"
+       cy="508.57648"
+       fx="459.21423"
+       fy="508.57648"
+       r="7.8299899" />
+    <linearGradient
+       id="linearGradient3466">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0.39285713;"
+         offset="0"
+         id="stop3468" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop3470" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3986"
+       id="linearGradient4454"
+       gradientUnits="userSpaceOnUse"
+       x1="67.50013"
+       y1="-13.499995"
+       x2="67.50013"
+       y2="-29.500275" />
+    <linearGradient
+       id="linearGradient3986">
+      <stop
+         style="stop-color:#878787;stop-opacity:1;"
+         offset="0"
+         id="stop3988" />
+      <stop
+         style="stop-color:#4b4b4b;stop-opacity:1;"
+         offset="1"
+         id="stop3990" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3953"
+       id="radialGradient4450"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1.0358675,0.32475847,0.33853201,1.2979227,456.76009,559.90988)"
+       cx="66"
+       cy="-19"
+       fx="66"
+       fy="-19"
+       r="7" />
+    <linearGradient
+       id="linearGradient3953">
+      <stop
+         style="stop-color:#828282;stop-opacity:0.68627453;"
+         offset="0"
+         id="stop3955" />
+      <stop
+         style="stop-color:#828282;stop-opacity:0;"
+         offset="1"
+         id="stop3957" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3965-6"
+       id="radialGradient4452"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.077388,0,0,1.0773891,-112.7912,8.7486417)"
+       cx="459.21423"
+       cy="508.57648"
+       fx="459.21423"
+       fy="508.57648"
+       r="7.8299899" />
+    <linearGradient
+       id="linearGradient3965-6">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0.39285713;"
+         offset="0"
+         id="stop3967-3" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop3969-2" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3953"
+       id="radialGradient4446"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.2051902,0,0,1.2051887,302.4183,579.58171)"
+       cx="66"
+       cy="-19"
+       fx="66"
+       fy="-19"
+       r="7" />
+    <linearGradient
+       id="linearGradient3668">
+      <stop
+         style="stop-color:#828282;stop-opacity:0.68627453;"
+         offset="0"
+         id="stop3670" />
+      <stop
+         style="stop-color:#828282;stop-opacity:0;"
+         offset="1"
+         id="stop3672" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3965-6"
+       id="radialGradient4448"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.2051902,0,0,1.2051887,302.4183,579.58171)"
+       cx="66"
+       cy="-19"
+       fx="66"
+       fy="-19"
+       r="7" />
+    <linearGradient
+       id="linearGradient3675">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0.39285713;"
+         offset="0"
+         id="stop3677" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop3679" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4133-1"
+       id="linearGradient4034"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7916673,0,0,1.049997,-380.57475,-1121.7091)"
+       x1="428.21423"
+       y1="548.57648"
+       x2="428.21423"
+       y2="541.57648" />
+    <linearGradient
+       id="linearGradient4133-1">
+      <stop
+         style="stop-color:#000000;stop-opacity:0.1254902;"
+         offset="0"
+         id="stop4135-3" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0.0627451;"
+         offset="1"
+         id="stop4137-6" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4198"
+       id="linearGradient4030"
+       x1="482.21423"
+       y1="526.57648"
+       x2="482.21423"
+       y2="546.57648"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.1578947,0,0,1.1,-165.43988,-33.503598)" />
+    <linearGradient
+       id="linearGradient4198">
+      <stop
+         style="stop-color:#c0c0c0;stop-opacity:1;"
+         offset="0"
+         id="stop4200" />
+      <stop
+         style="stop-color:#d1d1d1;stop-opacity:1;"
+         offset="1"
+         id="stop4202" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3942"
+       id="linearGradient4020"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.8750093,0,0,1.150008,-416.55472,-62.061548)"
+       x1="428.21423"
+       y1="548.57648"
+       x2="428.21423"
+       y2="541.57648" />
+    <linearGradient
+       id="linearGradient3942">
+      <stop
+         id="stop3944"
+         offset="0"
+         style="stop-color:#878787;stop-opacity:1;" />
+      <stop
+         id="stop3946"
+         offset="1"
+         style="stop-color:#828282;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4125-9"
+       id="linearGradient3245"
+       gradientUnits="userSpaceOnUse"
+       x1="428.21423"
+       y1="548.57648"
+       x2="428.21423"
+       y2="541.57648"
+       gradientTransform="matrix(1.958336,0,0,1.2500004,-360.37115,-69.099883)" />
+    <linearGradient
+       id="linearGradient4125-9">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0.48627451;"
+         offset="0"
+         id="stop4127-6" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop4129-9" />
+    </linearGradient>
+    <linearGradient
+       y2="541.57648"
+       x2="428.21423"
+       y1="548.57648"
+       x1="428.21423"
+       gradientTransform="matrix(1.958336,0,0,1.2500004,-452.52807,-115.86523)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3706"
+       xlink:href="#linearGradient4125-9"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4125-9"
+       id="linearGradient3816"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.958336,0,0,1.2500004,-452.52807,-115.86523)"
+       x1="428.21423"
+       y1="548.57648"
+       x2="428.21423"
+       y2="541.57648" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3942"
+       id="linearGradient3818"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.8750093,0,0,1.150008,-416.55472,-62.061548)"
+       x1="428.21423"
+       y1="548.57648"
+       x2="428.21423"
+       y2="541.57648" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4198"
+       id="linearGradient3820"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.1578947,0,0,1.1,-165.43988,-33.503598)"
+       x1="482.21423"
+       y1="526.57648"
+       x2="482.21423"
+       y2="546.57648" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4133-1"
+       id="linearGradient3822"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7916673,0,0,1.049997,-380.57475,-1121.7091)"
+       x1="428.21423"
+       y1="548.57648"
+       x2="428.21423"
+       y2="541.57648" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3953"
+       id="radialGradient3824"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.2051902,0,0,1.2051887,302.4183,579.58171)"
+       cx="66"
+       cy="-19"
+       fx="66"
+       fy="-19"
+       r="7" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3965-6"
+       id="radialGradient3826"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.2051902,0,0,1.2051887,302.4183,579.58171)"
+       cx="66"
+       cy="-19"
+       fx="66"
+       fy="-19"
+       r="7" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3953"
+       id="radialGradient3828"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1.0358675,0.32475847,0.33853201,1.2979227,456.76009,559.90988)"
+       cx="66"
+       cy="-19"
+       fx="66"
+       fy="-19"
+       r="7" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3965-6"
+       id="radialGradient3830"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.077388,0,0,1.0773891,-112.7912,8.7486417)"
+       cx="459.21423"
+       cy="508.57648"
+       fx="459.21423"
+       fy="508.57648"
+       r="7.8299899" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3986"
+       id="linearGradient3832"
+       gradientUnits="userSpaceOnUse"
+       x1="67.50013"
+       y1="-13.499995"
+       x2="67.50013"
+       y2="-29.500275" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3953"
+       id="radialGradient3065"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1.0358675,0.32475847,0.33853201,1.2979227,438.83875,535.54566)"
+       cx="66"
+       cy="-19"
+       fx="66"
+       fy="-19"
+       r="7" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3965-6"
+       id="radialGradient3067"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.077388,0,0,1.0773891,-130.71254,-15.61558)"
+       cx="459.21423"
+       cy="508.57648"
+       fx="459.21423"
+       fy="508.57648"
+       r="7.8299899" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3953"
+       id="radialGradient3070"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.2051902,0,0,1.2051887,284.49696,555.21749)"
+       cx="66"
+       cy="-19"
+       fx="66"
+       fy="-19"
+       r="7" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3965-6"
+       id="radialGradient3072"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.2051902,0,0,1.2051887,284.49696,555.21749)"
+       cx="66"
+       cy="-19"
+       fx="66"
+       fy="-19"
+       r="7" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4133-1"
+       id="linearGradient3076"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7916673,0,0,1.049997,-398.49609,-1097.3449)"
+       x1="428.21423"
+       y1="548.57648"
+       x2="428.21423"
+       y2="541.57648" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4198"
+       id="linearGradient3079"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.1578947,0,0,1.1,-183.36122,-57.86782)"
+       x1="482.21423"
+       y1="526.57648"
+       x2="482.21423"
+       y2="546.57648" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3942"
+       id="linearGradient3082"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.8750093,0,0,1.150008,-434.47606,-86.42577)"
+       x1="428.21423"
+       y1="548.57648"
+       x2="428.21423"
+       y2="541.57648" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4125-9"
+       id="linearGradient3085"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.958336,0,0,1.2500004,-470.44941,-140.22945)"
+       x1="428.21423"
+       y1="548.57648"
+       x2="428.21423"
+       y2="541.57648" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1"
+     inkscape:cx="20.449712"
+     inkscape:cy="22.960427"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1092"
+     inkscape:window-height="682"
+     inkscape:window-x="0"
+     inkscape:window-y="22"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata3487">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-350.99212,-519.36632)">
+    <g
+       id="g3855">
+      <rect
+         ry="12.499951"
+         rx="13.35611"
+         y="519.86639"
+         x="351.49216"
+         height="24.999901"
+         width="46.999901"
+         id="rect3204"
+         style="fill:none;stroke:url(#linearGradient3085);stroke-width:1.00010014;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <rect
+         style="fill:none;stroke:url(#linearGradient3082);stroke-width:1.5;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="rect4018"
+         width="45.000061"
+         height="23.000061"
+         x="352.49207"
+         y="520.86633"
+         rx="12.356178"
+         ry="11.50003" />
+      <rect
+         ry="11"
+         rx="11.856148"
+         y="521.36633"
+         x="352.9921"
+         height="22"
+         width="44"
+         id="rect4022"
+         style="fill:url(#linearGradient3079);fill-opacity:1;stroke:none" />
+      <rect
+         transform="scale(1,-1)"
+         ry="10.499925"
+         rx="11.356056"
+         y="-542.86627"
+         x="353.49216"
+         height="20.999849"
+         width="42.999847"
+         id="rect4032"
+         style="fill:none;stroke:url(#linearGradient3076);stroke-width:1;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         sodipodi:type="arc"
+         style="fill:#ececec;fill-opacity:1;stroke:none"
+         id="path4436"
+         sodipodi:cx="66"
+         sodipodi:cy="-19.5"
+         sodipodi:rx="6"
+         sodipodi:ry="6.5"
+         d="m 72,-19.5 a 6,6.5 0 1 1 -12,0 6,6.5 0 1 1 12,0 z"
+         transform="matrix(1.5,0,0,1.3846154,265.03944,559.31897)" />
+      <path
+         style="fill:url(#radialGradient3070);fill-opacity:1;stroke:url(#radialGradient3072);stroke-width:1.12735164px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 364.03946,532.31898 -8.43633,4.21817 6.02595,4.21815 4.82076,-16.87265 6.02594,4.21815 -8.43632,4.21818 z"
+         id="path4438"
+         inkscape:connector-curvature="0" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path4440"
+         d="m 364.03945,532.31897 8.43596,2.26944 -3.99451,6.16651 -8.88292,-16.8719 -3.99448,6.1665 8.43595,2.26945 z"
+         style="fill:url(#radialGradient3065);fill-opacity:1;stroke:url(#radialGradient3067);stroke-width:1.12810218" />
+      <path
+         transform="matrix(1.13333,0,0,-1.13333,287.53967,507.95238)"
+         d="m 75,-21.5 a 7.5,7.5 0 1 1 -15,0 7.5,7.5 0 1 1 15,0 z"
+         sodipodi:ry="7.5"
+         sodipodi:rx="7.5"
+         sodipodi:cy="-21.5"
+         sodipodi:cx="67.5"
+         id="path4442"
+         style="fill:none;stroke:#ffffff;stroke-width:0.88239956;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:0.54901961;stroke-dasharray:none"
+         sodipodi:type="arc" />
+      <path
+         sodipodi:type="arc"
+         style="fill:none;stroke:url(#linearGradient3832);stroke-width:0.78928715;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="path4444"
+         sodipodi:cx="67.5"
+         sodipodi:cy="-21.5"
+         sodipodi:rx="7.5"
+         sodipodi:ry="7.5"
+         d="m 75,-21.5 a 7.5,7.5 0 1 1 -15,0 7.5,7.5 0 1 1 15,0 z"
+         transform="matrix(1.2666816,0,0,-1.2666816,278.49109,505.13266)" />
+    </g>
+  </g>
+</svg>
diff --git a/desktop-themes/Menta/gtk-3.0/assets/switch-on-ins.png b/desktop-themes/Menta/gtk-3.0/assets/switch-on-ins.png
deleted file mode 100644
index a25fcbb5..00000000
--- a/desktop-themes/Menta/gtk-3.0/assets/switch-on-ins.png
+++ /dev/null
diff --git a/desktop-themes/Menta/gtk-3.0/assets/switch-on-ins.svg b/desktop-themes/Menta/gtk-3.0/assets/switch-on-ins.svg
new file mode 100644
index 00000000..5965e5c3
--- /dev/null
+++ b/desktop-themes/Menta/gtk-3.0/assets/switch-on-ins.svg
@@ -0,0 +1,655 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48"
+   height="26"
+   id="svg3482"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="switch-on-ins.svg">
+  <defs
+     id="defs3484">
+    <linearGradient
+       id="linearGradient4125">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0.48627451;"
+         offset="0"
+         id="stop4127" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop4129" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4133">
+      <stop
+         style="stop-color:#000000;stop-opacity:0.1254902;"
+         offset="0"
+         id="stop4135" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0.0627451;"
+         offset="1"
+         id="stop4137" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4064">
+      <stop
+         id="stop4066"
+         offset="0"
+         style="stop-color:#4a79a5;stop-opacity:0.50980395;" />
+      <stop
+         id="stop4068"
+         offset="1"
+         style="stop-color:#4a79a5;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3965">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0.39285713;"
+         offset="0"
+         id="stop3967" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop3969" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3459">
+      <stop
+         id="stop3461"
+         offset="0"
+         style="stop-color:#4a79a5;stop-opacity:0.50980395;" />
+      <stop
+         id="stop3463"
+         offset="1"
+         style="stop-color:#4a79a5;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3466">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0.39285713;"
+         offset="0"
+         id="stop3468" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop3470" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3986">
+      <stop
+         style="stop-color:#878787;stop-opacity:1;"
+         offset="0"
+         id="stop3988" />
+      <stop
+         style="stop-color:#4b4b4b;stop-opacity:1;"
+         offset="1"
+         id="stop3990" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3953">
+      <stop
+         style="stop-color:#828282;stop-opacity:0.68627453;"
+         offset="0"
+         id="stop3955" />
+      <stop
+         style="stop-color:#828282;stop-opacity:0;"
+         offset="1"
+         id="stop3957" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3965-6">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0.39285713;"
+         offset="0"
+         id="stop3967-3" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop3969-2" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3668">
+      <stop
+         style="stop-color:#828282;stop-opacity:0.68627453;"
+         offset="0"
+         id="stop3670" />
+      <stop
+         style="stop-color:#828282;stop-opacity:0;"
+         offset="1"
+         id="stop3672" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3675">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0.39285713;"
+         offset="0"
+         id="stop3677" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop3679" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4133-1">
+      <stop
+         style="stop-color:#000000;stop-opacity:0.1254902;"
+         offset="0"
+         id="stop4135-3" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0.0627451;"
+         offset="1"
+         id="stop4137-6" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4198">
+      <stop
+         style="stop-color:#c0c0c0;stop-opacity:1;"
+         offset="0"
+         id="stop4200" />
+      <stop
+         style="stop-color:#d1d1d1;stop-opacity:1;"
+         offset="1"
+         id="stop4202" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3942">
+      <stop
+         id="stop3944"
+         offset="0"
+         style="stop-color:#878787;stop-opacity:1;" />
+      <stop
+         id="stop3946"
+         offset="1"
+         style="stop-color:#828282;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4125-9"
+       id="linearGradient3245"
+       gradientUnits="userSpaceOnUse"
+       x1="428.21423"
+       y1="548.57648"
+       x2="428.21423"
+       y2="541.57648"
+       gradientTransform="matrix(1.958336,0,0,1.2500004,-360.37115,-69.099883)" />
+    <linearGradient
+       id="linearGradient4125-9">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0.48627451;"
+         offset="0"
+         id="stop4127-6" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop4129-9" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4125-4"
+       id="linearGradient3403"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.958336,0,0,1.2500004,-360.37115,-97.099883)"
+       x1="428.21423"
+       y1="548.57648"
+       x2="428.21423"
+       y2="541.57648" />
+    <linearGradient
+       id="linearGradient4125-4">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0.48627451;"
+         offset="0"
+         id="stop4127-1" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop4129-5" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3972"
+       id="linearGradient3405"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.8750093,0,0,1.150008,-324.3978,-1194.288)"
+       x1="428.21423"
+       y1="548.57648"
+       x2="428.21423"
+       y2="541.57648" />
+    <linearGradient
+       id="linearGradient3972">
+      <stop
+         id="stop3974"
+         offset="0"
+         style="stop-color:#a0a0a0;stop-opacity:1;" />
+      <stop
+         id="stop3976"
+         offset="1"
+         style="stop-color:#bebebe;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4306"
+       id="linearGradient3409"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7916673,0,0,1.049997,-288.41783,-1140.4744)"
+       x1="428.21423"
+       y1="548.57648"
+       x2="428.21423"
+       y2="541.57648" />
+    <linearGradient
+       id="linearGradient4306">
+      <stop
+         id="stop4308"
+         offset="0"
+         style="stop-color:#000000;stop-opacity:0.03137255;" />
+      <stop
+         id="stop4310"
+         offset="1"
+         style="stop-color:#000000;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4284"
+       id="radialGradient3411"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.2051902,0,0,1.2051887,394.57522,598.34706)"
+       cx="66"
+       cy="-19"
+       fx="66"
+       fy="-19"
+       r="7" />
+    <linearGradient
+       id="linearGradient4284">
+      <stop
+         id="stop4286"
+         offset="0"
+         style="stop-color:#828282;stop-opacity:0.39215687;" />
+      <stop
+         id="stop4288"
+         offset="1"
+         style="stop-color:#828282;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3965-4"
+       id="radialGradient3413"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.2051902,0,0,1.2051887,394.57522,598.34706)"
+       cx="66"
+       cy="-19"
+       fx="66"
+       fy="-19"
+       r="7" />
+    <linearGradient
+       id="linearGradient3965-4">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0.39285713;"
+         offset="0"
+         id="stop3967-1" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop3969-7" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4284"
+       id="radialGradient3415"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1.0358675,0.32475847,0.33853201,1.2979227,548.91702,578.67523)"
+       cx="66"
+       cy="-19"
+       fx="66"
+       fy="-19"
+       r="7" />
+    <linearGradient
+       id="linearGradient3955">
+      <stop
+         id="stop3957-1"
+         offset="0"
+         style="stop-color:#828282;stop-opacity:0.39215687;" />
+      <stop
+         id="stop3959"
+         offset="1"
+         style="stop-color:#828282;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3965-4"
+       id="radialGradient3417"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.077388,0,0,1.0773891,-20.634277,27.513995)"
+       cx="459.21423"
+       cy="508.57648"
+       fx="459.21423"
+       fy="508.57648"
+       r="7.8299899" />
+    <linearGradient
+       id="linearGradient3962">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0.39285713;"
+         offset="0"
+         id="stop3964" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop3966" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4270"
+       id="linearGradient3419"
+       gradientUnits="userSpaceOnUse"
+       x1="67.50013"
+       y1="-13.499995"
+       x2="67.50013"
+       y2="-29.500275" />
+    <linearGradient
+       id="linearGradient4270">
+      <stop
+         id="stop4272"
+         offset="0"
+         style="stop-color:#bebebe;stop-opacity:1;" />
+      <stop
+         id="stop4274"
+         offset="1"
+         style="stop-color:#a0a0a0;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       y2="-29.500275"
+       x2="67.50013"
+       y1="-13.499995"
+       x1="67.50013"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3982"
+       xlink:href="#linearGradient4270"
+       inkscape:collect="always" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4284"
+       id="radialGradient4097"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1.0358675,0.32475847,0.33853201,1.2979227,460.83876,535.54569)"
+       cx="66"
+       cy="-19"
+       fx="66"
+       fy="-19"
+       r="7" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3965-4"
+       id="radialGradient4099"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.077388,0,0,1.0773891,-108.71254,-15.615547)"
+       cx="459.21423"
+       cy="508.57648"
+       fx="459.21423"
+       fy="508.57648"
+       r="7.8299899" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4284"
+       id="radialGradient4102"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.2051902,0,0,1.2051887,306.49696,555.21752)"
+       cx="66"
+       cy="-19"
+       fx="66"
+       fy="-19"
+       r="7" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3965-4"
+       id="radialGradient4104"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.2051902,0,0,1.2051887,306.49696,555.21752)"
+       cx="66"
+       cy="-19"
+       fx="66"
+       fy="-19"
+       r="7" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4306"
+       id="linearGradient4108"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7916673,0,0,1.049997,-398.49609,-1097.3449)"
+       x1="428.21423"
+       y1="548.57648"
+       x2="428.21423"
+       y2="541.57648" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3972"
+       id="linearGradient4112"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.8750093,0,0,1.150008,-434.47606,-1151.1585)"
+       x1="428.21423"
+       y1="548.57648"
+       x2="428.21423"
+       y2="541.57648" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4125-4"
+       id="linearGradient4115"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.958336,0,0,1.2500004,-470.44941,-140.22942)"
+       x1="428.21423"
+       y1="548.57648"
+       x2="428.21423"
+       y2="541.57648" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4270"
+       id="linearGradient4117"
+       gradientUnits="userSpaceOnUse"
+       x1="67.50013"
+       y1="-13.499995"
+       x2="67.50013"
+       y2="-29.500275" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4284"
+       id="radialGradient3082"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1.0358675,0.32475847,0.33853201,1.2979227,460.83876,535.54569)"
+       cx="66"
+       cy="-19"
+       fx="66"
+       fy="-19"
+       r="7" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3965-4"
+       id="radialGradient3084"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.077388,0,0,1.0773891,-108.71254,-15.615547)"
+       cx="459.21423"
+       cy="508.57648"
+       fx="459.21423"
+       fy="508.57648"
+       r="7.8299899" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4284"
+       id="radialGradient3087"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.2051902,0,0,1.2051887,306.49696,555.21752)"
+       cx="66"
+       cy="-19"
+       fx="66"
+       fy="-19"
+       r="7" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3965-4"
+       id="radialGradient3089"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.2051902,0,0,1.2051887,306.49696,555.21752)"
+       cx="66"
+       cy="-19"
+       fx="66"
+       fy="-19"
+       r="7" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4306"
+       id="linearGradient3093"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7916673,0,0,1.049997,-398.49609,-1097.3449)"
+       x1="428.21423"
+       y1="548.57648"
+       x2="428.21423"
+       y2="541.57648" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3972"
+       id="linearGradient3097"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.8750093,0,0,1.150008,-434.47606,-1151.1585)"
+       x1="428.21423"
+       y1="548.57648"
+       x2="428.21423"
+       y2="541.57648" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4125-4"
+       id="linearGradient3100"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.958336,0,0,1.2500004,-470.44941,-140.22942)"
+       x1="428.21423"
+       y1="548.57648"
+       x2="428.21423"
+       y2="541.57648" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="11.2"
+     inkscape:cx="26.786527"
+     inkscape:cy="15.691391"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="764"
+     inkscape:window-height="525"
+     inkscape:window-x="0"
+     inkscape:window-y="22"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata3487">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-350.99212,-519.36632)">
+    <g
+       id="g3870">
+      <rect
+         style="fill:none;stroke:url(#linearGradient3100);stroke-width:1.00010014;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="rect3385"
+         width="46.999901"
+         height="24.999901"
+         x="351.49219"
+         y="519.86639"
+         rx="13.35611"
+         ry="12.499951" />
+      <rect
+         transform="scale(1,-1)"
+         ry="11.50003"
+         rx="12.356178"
+         y="-543.86639"
+         x="352.4921"
+         height="23.000061"
+         width="45.000061"
+         id="rect3387"
+         style="fill:none;stroke:url(#linearGradient3097);stroke-width:1.5;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <rect
+         style="fill:#cccccc;fill-opacity:1;stroke:none"
+         id="rect3389"
+         width="44"
+         height="22"
+         x="352.99213"
+         y="521.36633"
+         rx="11.856148"
+         ry="11" />
+      <rect
+         style="fill:none;stroke:url(#linearGradient3093);stroke-width:1.5;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="rect3391"
+         width="42.999847"
+         height="20.999849"
+         x="353.49219"
+         y="-542.86627"
+         rx="11.356056"
+         ry="10.499925"
+         transform="scale(1,-1)" />
+      <path
+         transform="matrix(1.5,0,0,1.3846154,287.03945,559.319)"
+         d="m 72,-19.5 a 6,6.5 0 1 1 -12,0 6,6.5 0 1 1 12,0 z"
+         sodipodi:ry="6.5"
+         sodipodi:rx="6"
+         sodipodi:cy="-19.5"
+         sodipodi:cx="66"
+         id="path3393"
+         style="fill:#ececec;fill-opacity:1;stroke:none"
+         sodipodi:type="arc" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3395"
+         d="m 386.03947,532.31901 -8.43634,4.21817 6.02596,4.21815 4.82076,-16.87265 6.02594,4.21815 -8.43632,4.21818 z"
+         style="fill:url(#radialGradient3087);fill-opacity:1;stroke:url(#radialGradient3089);stroke-width:1.12735164px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         style="fill:url(#radialGradient3082);fill-opacity:1;stroke:url(#radialGradient3084);stroke-width:1.12810218"
+         d="m 386.03946,532.319 8.43595,2.26944 -3.99451,6.16651 -8.88292,-16.8719 -3.99448,6.1665 8.43596,2.26945 z"
+         id="path3397"
+         inkscape:connector-curvature="0" />
+      <path
+         sodipodi:type="arc"
+         style="fill:none;stroke:#ffffff;stroke-width:0.88239956;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:0.54901961;stroke-dasharray:none"
+         id="path3399"
+         sodipodi:cx="67.5"
+         sodipodi:cy="-21.5"
+         sodipodi:rx="7.5"
+         sodipodi:ry="7.5"
+         d="m 75,-21.5 a 7.5,7.5 0 1 1 -15,0 7.5,7.5 0 1 1 15,0 z"
+         transform="matrix(1.13333,0,0,-1.13333,309.53967,507.95241)" />
+      <path
+         transform="matrix(1.2666816,0,0,-1.2666816,300.4911,505.13269)"
+         d="m 75,-21.5 a 7.5,7.5 0 1 1 -15,0 7.5,7.5 0 1 1 15,0 z"
+         sodipodi:ry="7.5"
+         sodipodi:rx="7.5"
+         sodipodi:cy="-21.5"
+         sodipodi:cx="67.5"
+         id="path3401"
+         style="fill:none;stroke:url(#linearGradient4117);stroke-width:0.78928715;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         sodipodi:type="arc" />
+    </g>
+  </g>
+</svg>
diff --git a/desktop-themes/Menta/gtk-3.0/assets/switch-on.png b/desktop-themes/Menta/gtk-3.0/assets/switch-on.png
index f1ecf35f..16fe80b8 100644
--- a/desktop-themes/Menta/gtk-3.0/assets/switch-on.png
+++ b/desktop-themes/Menta/gtk-3.0/assets/switch-on.png
diff --git a/desktop-themes/Menta/gtk-3.0/assets/switch-on.svg b/desktop-themes/Menta/gtk-3.0/assets/switch-on.svg
new file mode 100644
index 00000000..964f9b78
--- /dev/null
+++ b/desktop-themes/Menta/gtk-3.0/assets/switch-on.svg
@@ -0,0 +1,397 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48"
+   height="26"
+   id="svg3482"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="switch-on.svg">
+  <defs
+     id="defs3484">
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4125"
+       id="linearGradient4207"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.958336,0,0,1.2500004,-360.37115,-41.099883)"
+       x1="428.21423"
+       y1="548.57648"
+       x2="428.21423"
+       y2="541.57648" />
+    <linearGradient
+       id="linearGradient4125">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0.48627451;"
+         offset="0"
+         id="stop4127" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop4129" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4133"
+       id="linearGradient4214"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7916673,0,0,1.049997,-288.41783,-1196.4744)"
+       x1="428.21423"
+       y1="548.57648"
+       x2="428.21423"
+       y2="541.57648" />
+    <linearGradient
+       id="linearGradient4133">
+      <stop
+         style="stop-color:#000000;stop-opacity:0.1254902;"
+         offset="0"
+         id="stop4135" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0.0627451;"
+         offset="1"
+         id="stop4137" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4064"
+       id="radialGradient4216"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.2051902,0,0,1.2051887,416.57522,654.34706)"
+       cx="66"
+       cy="-19"
+       fx="66"
+       fy="-19"
+       r="7" />
+    <linearGradient
+       id="linearGradient4064">
+      <stop
+         id="stop4066"
+         offset="0"
+         style="stop-color:#4a79a5;stop-opacity:0.50980395;" />
+      <stop
+         id="stop4068"
+         offset="1"
+         style="stop-color:#4a79a5;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3965"
+       id="radialGradient4218"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.2051902,0,0,1.2051887,416.57522,654.34706)"
+       cx="66"
+       cy="-19"
+       fx="66"
+       fy="-19"
+       r="7" />
+    <linearGradient
+       id="linearGradient3965">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0.39285713;"
+         offset="0"
+         id="stop3967" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop3969" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4064"
+       id="radialGradient4220"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1.0358675,0.32475847,0.33853201,1.2979227,570.91702,634.67523)"
+       cx="66"
+       cy="-19"
+       fx="66"
+       fy="-19"
+       r="7" />
+    <linearGradient
+       id="linearGradient3459">
+      <stop
+         id="stop3461"
+         offset="0"
+         style="stop-color:#4a79a5;stop-opacity:0.50980395;" />
+      <stop
+         id="stop3463"
+         offset="1"
+         style="stop-color:#4a79a5;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3965"
+       id="radialGradient4222"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.077388,0,0,1.0773891,1.365723,83.513995)"
+       cx="459.21423"
+       cy="508.57648"
+       fx="459.21423"
+       fy="508.57648"
+       r="7.8299899" />
+    <linearGradient
+       id="linearGradient3466">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0.39285713;"
+         offset="0"
+         id="stop3468" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop3470" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4064"
+       id="radialGradient3787"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1.0358675,0.32475847,0.33853201,1.2979227,460.83876,535.54569)"
+       cx="66"
+       cy="-19"
+       fx="66"
+       fy="-19"
+       r="7" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3965"
+       id="radialGradient3789"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.077388,0,0,1.0773891,-108.71254,-15.615547)"
+       cx="459.21423"
+       cy="508.57648"
+       fx="459.21423"
+       fy="508.57648"
+       r="7.8299899" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4064"
+       id="radialGradient3792"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.2051902,0,0,1.2051887,306.49696,555.21752)"
+       cx="66"
+       cy="-19"
+       fx="66"
+       fy="-19"
+       r="7" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3965"
+       id="radialGradient3794"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.2051902,0,0,1.2051887,306.49696,555.21752)"
+       cx="66"
+       cy="-19"
+       fx="66"
+       fy="-19"
+       r="7" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4133"
+       id="linearGradient3798"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7916673,0,0,1.049997,-398.49609,-1097.3449)"
+       x1="428.21423"
+       y1="548.57648"
+       x2="428.21423"
+       y2="541.57648" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4125"
+       id="linearGradient3803"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.958336,0,0,1.2500004,-470.44941,-140.22942)"
+       x1="428.21423"
+       y1="548.57648"
+       x2="428.21423"
+       y2="541.57648" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4064"
+       id="radialGradient3033"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1.0358675,0.32475847,0.33853201,1.2979227,460.83876,535.54569)"
+       cx="66"
+       cy="-19"
+       fx="66"
+       fy="-19"
+       r="7" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3965"
+       id="radialGradient3035"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.077388,0,0,1.0773891,-108.71254,-15.615547)"
+       cx="459.21423"
+       cy="508.57648"
+       fx="459.21423"
+       fy="508.57648"
+       r="7.8299899" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4064"
+       id="radialGradient3038"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.2051902,0,0,1.2051887,306.49696,555.21752)"
+       cx="66"
+       cy="-19"
+       fx="66"
+       fy="-19"
+       r="7" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3965"
+       id="radialGradient3040"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.2051902,0,0,1.2051887,306.49696,555.21752)"
+       cx="66"
+       cy="-19"
+       fx="66"
+       fy="-19"
+       r="7" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4133"
+       id="linearGradient3044"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7916673,0,0,1.049997,-398.49609,-1097.3449)"
+       x1="428.21423"
+       y1="548.57648"
+       x2="428.21423"
+       y2="541.57648" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4125"
+       id="linearGradient3049"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.958336,0,0,1.2500004,-470.44941,-140.22942)"
+       x1="428.21423"
+       y1="548.57648"
+       x2="428.21423"
+       y2="541.57648" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="11.2"
+     inkscape:cx="24.004861"
+     inkscape:cy="21.560858"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1166"
+     inkscape:window-height="707"
+     inkscape:window-x="0"
+     inkscape:window-y="22"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata3487">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-350.99212,-519.36632)">
+    <rect
+       ry="12.499951"
+       rx="13.35611"
+       y="519.86639"
+       x="351.49219"
+       height="24.999901"
+       width="46.999901"
+       id="rect4189"
+       style="fill:none;stroke:url(#linearGradient3049);stroke-width:1.00010014;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    <rect
+       style="fill:none;stroke:#336699;stroke-width:1.50000000000000000;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="rect4191"
+       width="45.000061"
+       height="23.000061"
+       x="352.4921"
+       y="520.86633"
+       rx="12.356178"
+       ry="11.50003" />
+    <rect
+       ry="11"
+       rx="11.856148"
+       y="521.36633"
+       x="352.99213"
+       height="22"
+       width="44"
+       id="rect4193"
+       style="fill:#6699cc;fill-opacity:1;stroke:none" />
+    <rect
+       transform="scale(1,-1)"
+       ry="10.499925"
+       rx="11.356056"
+       y="-542.86627"
+       x="353.49219"
+       height="20.999849"
+       width="42.999847"
+       id="rect4195"
+       style="fill:none;stroke:url(#linearGradient3044);stroke-width:1;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#ececec;fill-opacity:1;stroke:none"
+       id="path4197"
+       sodipodi:cx="66"
+       sodipodi:cy="-19.5"
+       sodipodi:rx="6"
+       sodipodi:ry="6.5"
+       d="m 72,-19.5 a 6,6.5 0 1 1 -12,0 6,6.5 0 1 1 12,0 z"
+       transform="matrix(1.5,0,0,1.3846154,287.03945,559.319)" />
+    <path
+       style="fill:url(#radialGradient3038);fill-opacity:1;stroke:url(#radialGradient3040);stroke-width:1.12735164px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 386.03947,532.31901 -8.43634,4.21817 6.02596,4.21815 4.82076,-16.87265 6.02594,4.21815 -8.43632,4.21818 z"
+       id="path4199"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4201"
+       d="m 386.03946,532.319 8.43595,2.26944 -3.99451,6.16651 -8.88292,-16.8719 -3.99448,6.1665 8.43596,2.26945 z"
+       style="fill:url(#radialGradient3033);fill-opacity:1;stroke:url(#radialGradient3035);stroke-width:1.12810218" />
+    <path
+       transform="matrix(1.13333,0,0,-1.13333,309.53967,507.95241)"
+       d="m 75,-21.5 a 7.5,7.5 0 1 1 -15,0 7.5,7.5 0 1 1 15,0 z"
+       sodipodi:ry="7.5"
+       sodipodi:rx="7.5"
+       sodipodi:cy="-21.5"
+       sodipodi:cx="67.5"
+       id="path4203"
+       style="fill:none;stroke:#ffffff;stroke-width:0.88239956;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:0.54901961;stroke-dasharray:none"
+       sodipodi:type="arc" />
+    <path
+       sodipodi:type="arc"
+       style="fill:none;stroke:#336699;stroke-width:0.78928715000000005;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="path4205"
+       sodipodi:cx="67.5"
+       sodipodi:cy="-21.5"
+       sodipodi:rx="7.5"
+       sodipodi:ry="7.5"
+       d="m 75,-21.5 a 7.5,7.5 0 1 1 -15,0 7.5,7.5 0 1 1 15,0 z"
+       transform="matrix(1.2666816,0,0,-1.2666816,300.4911,505.13269)" />
+  </g>
+</svg>
diff --git a/desktop-themes/Menta/gtk-3.0/assets/thumbnail-frame.png b/desktop-themes/Menta/gtk-3.0/assets/thumbnail-frame.png
new file mode 100644
index 00000000..ba5d7212
--- /dev/null
+++ b/desktop-themes/Menta/gtk-3.0/assets/thumbnail-frame.png
diff --git a/desktop-themes/Menta/gtk-3.0/borders/Makefile.am b/desktop-themes/Menta/gtk-3.0/borders/Makefile.am
index 71f267d6..e0719942 100644
--- a/desktop-themes/Menta/gtk-3.0/borders/Makefile.am
+++ b/desktop-themes/Menta/gtk-3.0/borders/Makefile.am
@@ -5,7 +5,9 @@ theme_DATA = \
 	button.png \
 	button-active.png \
 	button-active-focus.png \
+	button-active-ins.png \
 	button-focus.png \
-	button-ins.png
+	button-ins.png \
+	nohl-generic-border.png
 
 EXTRA_DIST = $(theme_DATA)
diff --git a/desktop-themes/Menta/gtk-3.0/borders/button-active-focus.png b/desktop-themes/Menta/gtk-3.0/borders/button-active-focus.png
index 048b548e..c087f2af 100644
--- a/desktop-themes/Menta/gtk-3.0/borders/button-active-focus.png
+++ b/desktop-themes/Menta/gtk-3.0/borders/button-active-focus.png
diff --git a/desktop-themes/Menta/gtk-3.0/borders/button-active-ins.png b/desktop-themes/Menta/gtk-3.0/borders/button-active-ins.png
new file mode 100644
index 00000000..2c474fb7
--- /dev/null
+++ b/desktop-themes/Menta/gtk-3.0/borders/button-active-ins.png
diff --git a/desktop-themes/Menta/gtk-3.0/borders/button-active.png b/desktop-themes/Menta/gtk-3.0/borders/button-active.png
index 4713bc9e..ec2a6716 100644
--- a/desktop-themes/Menta/gtk-3.0/borders/button-active.png
+++ b/desktop-themes/Menta/gtk-3.0/borders/button-active.png
diff --git a/desktop-themes/Menta/gtk-3.0/borders/button-focus.png b/desktop-themes/Menta/gtk-3.0/borders/button-focus.png
index 9a64979c..2d936ec0 100644
--- a/desktop-themes/Menta/gtk-3.0/borders/button-focus.png
+++ b/desktop-themes/Menta/gtk-3.0/borders/button-focus.png
diff --git a/desktop-themes/Menta/gtk-3.0/borders/button-ins.png b/desktop-themes/Menta/gtk-3.0/borders/button-ins.png
index f3ac07de..ca1f9031 100644
--- a/desktop-themes/Menta/gtk-3.0/borders/button-ins.png
+++ b/desktop-themes/Menta/gtk-3.0/borders/button-ins.png
diff --git a/desktop-themes/Menta/gtk-3.0/borders/button.png b/desktop-themes/Menta/gtk-3.0/borders/button.png
index a53b2592..f0abc6af 100644
--- a/desktop-themes/Menta/gtk-3.0/borders/button.png
+++ b/desktop-themes/Menta/gtk-3.0/borders/button.png
diff --git a/desktop-themes/Menta/gtk-3.0/borders/nohl-generic-border.png b/desktop-themes/Menta/gtk-3.0/borders/nohl-generic-border.png
new file mode 100644
index 00000000..bcf97afc
--- /dev/null
+++ b/desktop-themes/Menta/gtk-3.0/borders/nohl-generic-border.png
diff --git a/desktop-themes/Menta/gtk-3.0/gnome-applications.css b/desktop-themes/Menta/gtk-3.0/gnome-applications.css
new file mode 100644
index 00000000..07471b63
--- /dev/null
+++ b/desktop-themes/Menta/gtk-3.0/gnome-applications.css
@@ -0,0 +1,716 @@
+@define-color documents_emblem_bg @theme_selected_bg_color;
+@define-color documents_collection_bg @theme_bg_color;
+
+/****************
+ * Applications *
+ ****************/
+/* used by gnome-font-viewer and sushi */
+SushiFontWidget {
+	padding: 6px 12px;
+}
+
+/* gnome-terminal */
+TerminalScreen {
+	background-color: @theme_base_color;
+	color: @theme_fg_color;
+	-TerminalScreen-background-darkness: 0.95;
+}
+
+TerminalWindow GtkNotebook.notebook {
+	border-bottom-width: 0;
+	border-right-width: 0;
+	border-left-width: 0;
+}
+
+/* nautilus */
+.nautilus-canvas-item {
+	border-radius: 5px;
+}
+
+.nautilus-desktop.nautilus-canvas-item {
+	color: @theme_selected_fg_color;
+	text-shadow: 1px 1px black;
+}
+
+.nautilus-desktop.nautilus-canvas-item:active {
+	color: @theme_text_color;
+}
+
+.nautilus-desktop.nautilus-canvas-item:selected {
+	color: @theme_selected_fg_color;
+}
+
+.nautilus-desktop.nautilus-canvas-item:active,
+.nautilus-desktop.nautilus-canvas-item:prelight,
+.nautilus-desktop.nautilus-canvas-item:selected {
+	text-shadow: none;
+}
+
+NautilusWindow .sidebar .frame {
+	border-width: 1px 0 0 0;
+	border-style: solid;
+	border-color: @borders;
+	border-radius: 0;
+}
+
+NautilusWindow * {
+	-GtkPaned-handle-size: 1;
+}
+
+NautilusWindow .pane-separator {
+	background-image: url("assets/null.png");
+}
+
+NautilusWindow > GtkGrid > .pane-separator,
+NautilusWindow > 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);
+}
+
+NautilusView.frame,
+NautilusNotebook.notebook {
+	border-right-width: 0;
+	border-left-width: 0;
+	border-bottom-width: 0;
+}
+
+NautilusNotebook.notebook tab.top,
+NautilusNotebook.notebook tab.bottom {
+	border-right-width: 1px;
+	border-left-width: 1px;
+	padding-top: 0;
+	padding-bottom: 0;
+}
+
+NautilusNotebook.notebook tab.top:active {
+	padding-top: 2px;
+}
+NautilusNotebook.notebook tab.bottom:active {
+	padding-bottom: 2px;
+}
+
+NautilusNotebook .frame {
+	border-width: 1px 0 0 0;
+}
+
+NautilusToolbar .button {
+	icon-shadow: 0 1px @button_text_shadow;
+}
+
+NautilusToolbar .toolbar {
+	background-image: linear-gradient(to bottom,
+		@theme_bg_color,
+		shade (@theme_bg_color, 0.94));
+}
+
+NautilusToolbar .button *:active {
+	icon-shadow: 0 1px @button_active_text_shadow;
+}
+
+NautilusToolbar .button *:insensitive,
+NautilusToolbar .button *:active:insensitive {
+	text-shadow: none;
+}
+
+NautilusQueryEditor .primary-toolbar.toolbar {
+	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;
+}
+
+NautilusNotebook.notebook NautilusQueryEditor .primary-toolbar.toolbar {
+	border-top-width: 0;
+}
+
+NautilusNotebook.notebook NautilusQueryEditor .toolbar:last-child,
+NautilusNotebook.notebook NautilusQueryEditor .primary-toolbar.toolbar:only-child {
+	border-bottom-width: 1px;
+	border-bottom-color: @borders;
+}
+
+/* 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;
+}
+
+GeditPanel.title GtkLabel {
+	padding: 7px 0 6px 0;
+}
+
+GeditPanel .toolbar {
+	border-style: none;
+	background-color: transparent;
+}
+
+GeditDocumentsPanel .view {
+	background-color: @sidebar_bg;
+}
+
+GeditPanel .notebook {
+	padding: 0px;
+	border-width: 1px 0;
+}
+
+GeditWindow .notebook {
+	border-width: 1px 0;
+}
+
+GeditPanel .notebook tab,
+GeditWindow .notebook tab {
+	border-width: 1px 1px 0 1px;
+}
+
+GeditStatusComboBox .button {
+	text-shadow: none;
+}
+
+GeditStatusComboBox .button,
+GeditStatusComboBox .button:hover,
+GeditStatusComboBox .button:active,
+GeditStatusComboBox .button:active:hover {
+	border-image: none;
+	border-style: solid;
+	border-width: 0 1px;
+	border-radius: 0;
+	padding: 1px 8px 2px 4px;
+}
+
+GeditStatusComboBox .button:hover,
+GeditStatusComboBox .button:active,
+GeditStatusComboBox .button:active:hover {
+	border-color: @borders;
+}
+
+GeditViewFrame .gedit-search-slider {
+	background-color: @theme_base_color;
+	padding: 6px;
+	border-color: shade (@notebook_tab_gradient_b, 0.80);
+	border-radius: 0 0 3px 3px;
+	border-width: 0 1px 1px 1px;
+	border-style: solid;
+}
+
+GeditViewFrame .gedit-search-slider .not-found {
+	color: @error_fg_color;
+	background-image: none;
+	background-color: @error_bg_color;
+}
+
+GeditViewFrame .gedit-search-slider .not-found:selected {
+	background-color: @theme_selected_bg_color;
+	color: @theme_selected_fg_color;
+}
+
+/* gnome-documents */
+.documents-dropdown,
+.documents-dropdown .view {
+	background-color: shade (@theme_bg_color, 1.02);
+}
+
+.documents-dropdown.frame {
+	padding: 6px;
+	border-width: 0 1px 1px 1px;
+	border-style: solid;
+	border-radius: 0 0 5px 5px;
+}
+
+.documents-dropdown .view.radio,
+.documents-dropdown .view.radio:focused,
+.documents-dropdown .view.radio:selected {
+	background-image: none;
+	background-color: alpha(@theme_base_color, 0.0);
+}
+
+.documents-dropdown .view.radio:active,
+.documents-dropdown .view.radio:active:focused,
+.documents-dropdown .view.radio:active:prelight {
+	background-image: url("assets/sidebar-radio-checked.svg");
+}
+
+.documents-dropdown .view.radio:prelight {
+	background-image: url("assets/sidebar-radio-prelight.svg");
+}
+
+.documents-dropdown .view.radio:active:selected,
+.documents-dropdown .view.radio:active:selected:focused {
+	background-image: url("assets/sidebar-radio-selected.svg");
+}
+
+.documents-dropdown .view.radio:selected:prelight,
+.documents-dropdown .view.radio:selected:focused {
+	background-image: url("assets/sidebar-radio-selected-prelight.svg");
+}
+
+.documents-load-more.button {
+	border-image: none;
+	border-color: @borders;
+	border-width: 1px 0 0;
+	border-radius: 0;
+}
+
+.documents-scrolledwin.frame {
+	border-width: 1px 0 0;
+	border-radius: 0;
+}
+
+.documents-icon-bg {
+	background-color: @documents_emblem_bg;
+	border-radius: 4px;
+
+	color: @theme_base_color;
+}
+
+.documents-collection-icon {
+	background-color: @documents_collection_bg;
+	border-radius: 8px;
+}
+
+.documents-counter {
+	background-image: url('assets/dnd-counter.svg');
+	background-size: contain;
+	background-color: transparent;
+	color: @theme_base_color;
+	font: bold;
+}
+
+.documents-favorite.button *:active,
+.documents-favorite.button *:active:hover {
+	color: shade(@theme_selected_bg_color, 1.20);
+}
+
+.documents-entry-tag {
+	background-color: @entry_tag_bg;
+	color: @entry_tag_fg;
+
+	border-radius: 4px;
+	border-width: 0;
+
+	margin: 2px;
+	padding: 4px;
+}
+
+.documents-entry-tag:hover {
+	background-color: shade(@entry_tag_bg, 1.10);
+	color: @entry_tag_fg;
+}
+
+.documents-entry-tag.button,
+.documents-entry-tag.button:hover,
+.documents-entry-tag.button:active,
+.documents-entry-tag.button:active:hover {
+	background-color: transparent;
+	background-image: none;
+	border-image: none;
+	border-width: 0;
+}
+
+.documents-entry-tag.button:hover {
+	color: shade(@entry_tag_bg, 2.10);
+}
+
+/* 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,
+.cell.baobab-level-cell:selected:hover {
+	border-color: darker(@borders);
+	border-width: 1px;
+	border-radius: 3px;
+	border-style: solid;
+	background-color: white;
+}
+
+.cell.baobab-level-cell.fill-block,
+.cell.baobab-level-cell.fill-block:selected,
+.cell.baobab-level-cell.fill-block:selected:hover {
+	background-color: #edd400;
+}
+
+.cell.baobab-level-cell.fill-block.level-low,
+.cell.baobab-level-cell.fill-block.level-low:hover {
+	background-color: #73d216;
+}
+
+.cell.baobab-level-cell.fill-block.level-high,
+.cell.baobab-level-cell.fill-block.level-high:hover {
+	background-color: #cc0000;
+}
+
+.cell.baobab-cell-error {
+	color: @error_color;
+}
+
+.cell.baobab-cell-warning {
+	color: @warning_color;
+}
+
+.cell.baobab-cell-warning:selected,
+.cell.baobab-cell-error:selected {
+	color: @theme_selected_fg_color;
+}
+
+BaobabWindow.background GdStack > GtkGrid > GtkScrolledWindow.frame {
+	border-radius: 0;
+	border-width: 0 1px 0 0;
+}
+
+BaobabWindow GtkInfoBar.warning,
+BaobabWindow GtkInfoBar.error { 
+	border-bottom-width: 1px;
+	border-bottom-style: solid;
+	border-bottom-color: @borders;
+}
+
+/* epiphany */
+
+EphyToolbar .entry:first-child,
+EphyToolbar .entry:focus:first-child {
+	border-image-width: 3px 0 4px 3px;
+	border-right-width: 0;
+	border-bottom-right-radius: 0;
+	border-top-right-radius: 0;
+	padding-left: 4px;
+	padding-right: 4px;
+}
+
+EphyToolbar .entry:last-child,
+EphyToolbar .entry:focus:last-child {
+	border-image-width: 3px 3px 4px 0;
+	border-left-width: 0;
+	border-bottom-left-radius: 0;
+	border-top-left-radius: 0;
+	padding-left: 4px;
+	padding-right: 4px;
+}
+
+EphyToolbar .entry:focus {
+	box-shadow: inset 1px 2px alpha(@theme_selected_bg_color, 0.1),
+		inset 1px 1px alpha(@theme_selected_bg_color, 0.1),
+		inset 0 -1px alpha(@theme_selected_bg_color, 0.2);
+}
+
+EphyToolbar .entry:focus:last-child {
+	box-shadow: inset 0 2px alpha(@theme_selected_bg_color, 0.1),
+		inset 0 1px alpha(@theme_selected_bg_color, 0.1),
+		inset -1px -1px alpha(@theme_selected_bg_color, 0.2);
+}
+
+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-repeat: stretch;
+	border-width: 2px;
+	border-radius: 3px;
+	padding-left: 4px;
+	padding-right: 4px;
+	box-shadow: inset 1px 0 @inset_dark_color,
+		inset 0 1px @entry_inset,
+		inset 0 2px alpha(@entry_inset, 0.4);
+}
+
+EphyToolbar .location-entry .button:last-child {
+	border-image-width: 3px 3px 4px 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-right-width: 0;
+	border-bottom-right-radius: 0;
+	border-top-right-radius: 0;
+	/* flip the box-shadow division*/
+	box-shadow: inset -1px 0 @inset_dark_color,
+		inset 0 1px @entry_inset,
+		inset 0 2px alpha(@entry_inset, 0.4);
+}
+
+EphyToolbar .location-entry .button,
+EphyToolbar .location-entry .button:hover {
+	icon-shadow: none;
+	background-image: -gtk-gradient(linear,
+		left top, left bottom,
+		from(@entry_background_a),
+		to(@entry_background_b));
+}
+
+EphyToolbar .location-entry .button:active,
+EphyToolbar .location-entry .button:active:hover {
+	background-image: -gtk-gradient(linear,
+		left top, left bottom,
+		from(shade(@entry_background_a, 0.9)),
+		to(@entry_background_b));
+}
+
+EphyToolbar .location-entry .button:hover,
+EphyToolbar .location-entry .button:active,
+EphyToolbar .location-entry .button *:active {
+	color: @theme_text_color;
+}
+
+EphyNotebook.notebook {
+	border-width: 1px 0 1px 0;
+}
+
+EphyNotebook.notebook tab {
+	border-width: 0;
+}
+
+EphyToolbar.toolbar .button {
+	padding-left: 4px;
+	padding-right: 4px;
+}
+
+#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;
+}
+
+EphyOverview GtkScrolledWindow {
+	background-color: @theme_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 {
+	border-color: @borders;
+	border-width: 1px 0;
+	border-radius: 0;
+}
+
+/* removes any border from the overview scrolled window, since it's overlaid */
+EphyWindow.background EphyEmbed.vertical EphyOverview .documents-scrolledwin {
+	border-style: none;
+}
+
+/* remove top and bottom borders from the main scrolled window when inside a notebook tab */
+EphyWindow.background EphyNotebook.notebook EphyEmbed.vertical GtkScrolledWindow {
+	border-top-width: 0;
+	border-bottom-width: 0;
+}
+
+/* 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 {
+	border-bottom-width: 0;
+}
+
+/* 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;
+}
+
+/* Background color in contacts pane, similar to .documents-main-view.view */
+.contacts-main-view.view {
+ background-color: #f1f2f1;
+}
+
+.contacts-suggestion {
+ 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;
+}
+
+/* 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-avatar-frame.frame {
+	border-width: 1px 1px 0 1px;
+	border-style: solid;
+	border-color: @borders;
+	border-image: none;
+	border-radius: 0;
+	padding: 0;
+}
+
+/* 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;
+}
+
+.contacts-entry {
+	box-shadow: none;
+	border-image: none;
+	border-width: 1px;
+	border-radius: 4px;
+	border-style: solid;
+	border-color: #bbbeb7;
+	background-image: none;
+	background-color: #ffffff;
+}
+
+.contacts-entry:selected,
+.contacts-entry:selected:focus {
+	background-color: @theme_selected_bg_color;
+	color: @theme_selected_fg_color;
+}
+
+.contacts-entry.contacts-postal-entry {
+	border-radius: 0 0 0 0;
+	border-width: 1px 1px 0 1px;
+}
+
+.contacts-entry.contacts-postal-entry:nth-child(first) {
+	border-radius: 4px 4px 0 0;
+}
+
+.contacts-entry.contacts-postal-entry:nth-child(last) {
+	border-radius: 0 0 4px 4px;
+	border-width: 1px;
+}
+
+.button.contacts-square {
+	padding: 0px;
+}
+
+.contacts-combo .button {
+	border-image: none;
+	border-width: 1px;
+	border-style: solid;
+	border-color: #bbbeb7;
+	background-image: none;
+	background-color: #ffffff;
+}
+
+.toolbar.contacts-edit-toolbar {
+	padding: 6px;
+	background-color: #E2E4E2;
+	border-width: 1px 0 0 0;
+	border-style: solid;
+	border-color: @borders;
+	border-image: none;
+}
+
+.toolbar.contacts-edit-toolbar .button {
+	padding-left: 6px;
+	padding-right: 6px;
+}
+
+.toolbar.contacts-selection-toolbar {
+	border-width: 1px 0 0 0;
+	border-style: solid;
+	border-color: @borders;
+	border-image: none;
+}
+
+/* Gucharmap */
+GucharmapChartable:active,
+GucharmapChartable:focus,
+GucharmapChartable:selected {
+	background-color: @theme_selected_bg_color;
+	color: @theme_selected_fg_color;
+}
+
+/* evince */
+EvWindow.background > GtkBox.vertical > GtkPaned.horizontal > GtkBox.vertical > GtkScrolledWindow.frame {
+	border-width: 0;
+	border-radius: 0;
+}
+
+EvWindow.background EvSidebar.vertical .frame {
+	border-width: 1px 0 0;
+	border-radius: 0;
+}
+
+EvWindow.background EvSidebar.vertical .notebook {
+	border-width: 1px 0 0;
+}
+
+EvWindow.background EvSidebarAnnotations.vertical GtkToolPalette > GtkToolItemGroup > .button { 
+	border-image: none;
+	border-radius: 0;
+	border-style: solid;
+	border-width: 0 0 1px;
+	border-color: @borders;
+}
+
+EvWindow.background EvSidebar.vertical .notebook .frame {
+	border-width: 0;
+}
+
+EvWindow .pane-separator, 
+EvWindow .pane-separator:hover {
+	border-width: 0 1px;
+	border-style: solid;
+	border-color: @borders;
+	background-color: shade(@theme_bg_color, 0.95);
+	color: @borders;
+}
+
+EvWindow.background EggFindBar.toolbar {
+	border-width: 1px 0 0;
+	border-style: solid;
+	border-color: @borders;
+}
+
+/* gcalctool */
+
+MathWindow.background > GtkBox.vertical > GtkBox.vertical > GtkScrolledWindow {
+	padding: 4px;
+	background-color: @theme_base_color;
+	border-radius: 3px;
+}
diff --git a/desktop-themes/Menta/gtk-3.0/gtk-fallback.css b/desktop-themes/Menta/gtk-3.0/gtk-fallback.css
new file mode 100644
index 00000000..f96d1b3a
--- /dev/null
+++ b/desktop-themes/Menta/gtk-3.0/gtk-fallback.css
@@ -0,0 +1,15 @@
+.menu {
+	border-image: linear-gradient(to top,
+		alpha(@borders, 0.80),
+		alpha(@borders, 0.60) 33%,
+		alpha(@borders, 0.50) 66%,
+		alpha(@borders, 0.15)) 1 1 1 1/ 1px 1px 1px 1px;
+}
+
+.menubar .menu {
+	border-image: linear-gradient(to top,
+		alpha(@borders, 0.80),
+		alpha(@borders, 0.60) 33%,
+		alpha(@borders, 0.50) 66%,
+		transparent 99%) 1 1 1 1/ 1px 1px 1px 1px;
+}
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 058ea653..b2950463 100644
--- a/desktop-themes/Menta/gtk-3.0/gtk-main-common.css
+++ b/desktop-themes/Menta/gtk-3.0/gtk-main-common.css
@@ -1,14 +1,16 @@
+/* common color definitions to the light and dark variations */
+
 /*******
  * OSD *
  *******/
 @define-color osd_highlight #ffffff;
 @define-color osd_lowlight #525252;
-@define-color osd_base #212526;
+@define-color osd_base #252621;
+@define-color osd_base_backdrop shade(@osd_base, 1.40);
 
 @define-color osd_fg #ededed;
 @define-color osd_bg alpha(@osd_base, 0.80);
-
-@define-color osd_bg_backdrop alpha(shade(@osd_base, 1.40), 0.90);
+@define-color osd_bg_backdrop alpha(@osd_base_backdrop, 0.90);
 
 @define-color osd_text_shadow alpha(black, 0.75);
 
@@ -27,9 +29,9 @@
 @define-color osd_button_bg_hover_b alpha(@osd_lowlight, 0.14);
 @define-color osd_button_bg_hover_c alpha(@osd_highlight, 0.14);
 
-@define-color osd_button_bg_active_a alpha(@osd_lowlight, 0.18);
-@define-color osd_button_bg_active_b alpha(@osd_highlight, 0.23);
-@define-color osd_button_bg_active_c alpha(@osd_lowlight, 0.17);
+@define-color osd_button_bg_active_a alpha(black, .9);
+@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);
@@ -45,15 +47,32 @@
 @define-color osd_button_fg_insensitive shade(@osd_fg, 0.70);
 
 @define-color osd_button_border alpha(@osd_highlight, 0.40);
+@define-color osd_button_border_active alpha(@osd_highlight, 0.8);
 @define-color osd_button_inset shade(@osd_fg, 0.67);
 @define-color osd_button_shadow alpha(black, 0.35);
 
 @define-color osd_trough_bg alpha(@osd_button_fg, 0.10);
 
+@define-color osd_view_bg alpha(@osd_bg, 0.60);
+@define-color osd_view_bg_backdrop alpha(@osd_bg_backdrop, 0.60);
+
+@define-color osd_scrollbar_trough shade(@osd_base, 1.70);
+@define-color osd_scrollbar_trough_backdrop shade(@osd_base_backdrop, 1.40);
+
+@define-color osd_scrollbar_slider shade(@osd_scrollbar_trough, 1.50);
+@define-color osd_scrollbar_slider_prelight shade(@osd_scrollbar_trough, 1.80);
+@define-color osd_scrollbar_slider_active shade(@osd_scrollbar_trough, 2.10);
+@define-color osd_scrollbar_slider_backdrop shade(@osd_scrollbar_trough_backdrop, 1.50);
+
+/***********
+ * Popover *
+ ***********/
+@define-color osd_popover_bg alpha(@osd_base, 0.90);
+
 /*********************
  * Error/Warning/... *
  *********************/
-@define-color link_color #4a90d9;
+@define-color link_color #8FD94A;
 @define-color warning_color #f57900;
 @define-color error_color #cc0000;
 @define-color success_color #4e9a06;
@@ -70,3 +89,17 @@
 @define-color error_fg_color white;
 @define-color error_text_shadow alpha(black, 0.5);
 @define-color error_bg_color rgb (237, 54, 54);
+
+/*****************
+ * Fallback Mode *
+ *****************/
+@define-color os_chrome_bg_color black;
+@define-color os_chrome_fg_color #ccc;
+@define-color os_chrome_selected_bg_color #333;
+@define-color os_chrome_selected_fg_color white;
+
+/************
+ * Tooltips *
+ ************/
+@define-color theme_tooltip_bg_color #F5F5B5;
+@define-color theme_tooltip_fg_color #2c2c2c;
diff --git a/desktop-themes/Menta/gtk-3.0/gtk-main.css b/desktop-themes/Menta/gtk-3.0/gtk-main.css
index 4322d7a5..9e30fac6 100644
--- a/desktop-themes/Menta/gtk-3.0/gtk-main.css
+++ b/desktop-themes/Menta/gtk-3.0/gtk-main.css
@@ -1,58 +1,211 @@
 /* Default color scheme */
-@define-color bg_color #d2d2d2;
-@define-color fg_color #2c2c2c;
-@define-color base_color #f7f7f7;
-@define-color text_color #2c2c2c;
-@define-color selected_bg_color #99BD73;
-@define-color selected_fg_color #ffffff;
-@define-color tooltip_bg_color #F5F5B5;
-@define-color tooltip_fg_color #2c2c2c;
-
-/* other color schemes could simply override these */
-@define-color theme_bg_color @bg_color;
-@define-color theme_fg_color @fg_color;
-@define-color theme_base_color @base_color;
-@define-color theme_text_color @text_color;
-@define-color theme_selected_bg_color @selected_bg_color;
-@define-color theme_selected_fg_color @selected_fg_color;
-@define-color theme_tooltip_bg_color @tooltip_bg_color;
-@define-color theme_tooltip_fg_color @tooltip_fg_color;
-
-/* theme common colors */
-@define-color button_bg_color shade (@theme_bg_color, 1.06);
-@define-color button_insensitive_bg_color shade (@theme_bg_color, 0.95);
-@define-color dark_bg_color #3f3f3f;
-@define-color dark_fg_color #e0e0e0;
-@define-color transparent rgba (0, 0, 0, 0);
-
-@define-color backdrop_selected_bg_color shade (@bg_color, 0.9);
-@define-color backdrop_selected_fg_color @fg_color;
-
-/* Zukitwo colors */
-@define-color toolbar_gradient_base @bg_color;
-@define-color toolbar_gradient_final shade (@bg_color, 0.96);
-@define-color toolbar_border shade (@bg_color, 0.92);
+@define-color theme_base_color #f7f7f7;
+@define-color theme_bg_color #dcdcdc;
+@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 placeholder_text_color shade(@text_color, 3.5);
+
+@define-color theme_unfocused_base_color shade(@insensitive_bg_color, 1.015); /* I don't want the same color, hope not to hurt usability to much here */
+@define-color theme_unfocused_text_color mix(@theme_unfocused_fg_color, @theme_text_color, 0.5); /* Need something darker here to have stuff nicelly readable*/
+@define-color theme_unfocused_fg_color shade(@theme_bg_color, 0.6);
+@define-color theme_unfocused_bg_color @theme_bg_color;
+@define-color theme_unfocused_selected_bg_color shade(@theme_unfocused_bg_color, 0.95);
+@define-color theme_unfocused_selected_fg_color @theme_fg_color;
+@define-color unfocused_button_background @theme_unfocused_bg_color;
+@define-color unfocused_borders @borders;
+@define-color unfocused_insensitive_borders mix(@theme_unfocused_bg_color, @unfocused_borders, 0.5);
+@define-color unfocused_insensitive_fg_color mix(@theme_unfocused_bg_color, @theme_unfocused_fg_color, 0.5);
+@define-color unfocused_insensitive_bg_color mix(@theme_unfocused_bg_color, @theme_unfocused_base_color, 0.5);
+@define-color unfocused_dark_bg mix(@theme_unfocused_bg_color, @unfocused_borders, 0.3);
+
+@define-color menu_bg_color shade (@theme_bg_color, 1.1);
+@define-color menu_fg_color @theme_fg_color;
+
+@define-color menu_controls_color shade (@theme_fg_color, 0.9);
+
+@define-color menu_combobox_border @theme_selected_bg_color;
+@define-color menu_separator shade (@menu_bg_color, 0.96);
+
+@define-color inactive_frame_color #ccc;
+
+@define-color sidebar_bg shade (@theme_bg_color, 1.025);
+@define-color sidebar_bg_unfocused mix(@sidebar_bg, @theme_unfocused_base_color, 0.5);
+
+@define-color sidebar_scrollbar_trough shade(@sidebar_bg, 0.8);
+@define-color sidebar_scrollbar_trough_backdrop shade(@sidebar_bg_unfocused, 0.8);
+
+@define-color button_gradient_color_a shade(@theme_bg_color, 1.14);
+@define-color button_gradient_color_b shade(@theme_bg_color, 1.04);
+@define-color button_gradient_color_c shade(@theme_bg_color, 1.06);
+@define-color borders shade(@theme_bg_color, 0.82);
+
+@define-color button_active_gradient_color_a shade(@theme_bg_color, 0.8);
+@define-color button_active_gradient_color_b shade(@theme_bg_color, 0.9);
+@define-color button_active_text @theme_fg_color;
+@define-color button_active_text_shadow alpha(white, 0.4);
+@define-color button_text_shadow alpha(white, 0.4);
+
+@define-color button_hover_gradient_color_a shade(@button_gradient_color_a, 1.11);
+@define-color button_hover_gradient_color_b shade(@button_gradient_color_b, 1.06);
+
+@define-color insensitive_bg_color shade(@theme_bg_color, 0.95);
+@define-color insensitive_fg_color shade(@theme_bg_color, 0.6);
+@define-color insensitive_borders shade(@internal_element_color, 1.37);
+@define-color insensitive_scale_borders @insensitive_borders;
+
+@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 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);
+@define-color scrollbar_slider @theme_bg_color;
+@define-color scrollbar_slider_prelight mix(@scrollbar_trough, @theme_fg_color, 0.5);
+@define-color scrollbar_slider_active @theme_selected_bg_color;
+@define-color scrollbar_slider_insensitive alpha(black, 0); /* FIXME should be transparent */
+@define-color scrollbar_slider_unfocused @theme_unfocused_bg_color;
+
+@define-color switch_slider_color #eee;
+@define-color switch_trough_active_color @theme_base_color;
+@define-color switch_trough_active_bg_a shade(@theme_selected_bg_color, 0.96);
+@define-color switch_trough_active_bg_b shade(@theme_selected_bg_color, 0.89);
+
+@define-color progressbar_background_a shade(@theme_selected_bg_color, 0.95);
+@define-color progressbar_background_b shade(@theme_selected_bg_color, 1.1);
+@define-color progressbar_pattern shade(@theme_selected_bg_color, 0.8);
+@define-color progressbar_border @progressbar_pattern;
+@define-color progressbar_unfocused_background @unfocused_dark_bg;
+@define-color progressbar_unfocused_border @unfocused_borders;
+@define-color progressbar_unfocused_trough @theme_unfocused_bg_color;
+
+@define-color entry_text_color @theme_text_color;
+@define-color entry_background_a shade(@theme_base_color, 0.94);
+@define-color entry_background_b @theme_base_color;
+
+@define-color entry_inset alpha(black, 0.1);
+
+@define-color internal_element_color @borders;
+@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_highlight_shadow alpha(white, 0.50);
+
+@define-color notebook_active_tab_border shade(@theme_selected_bg_color, 0.89);
+@define-color notebook_selected_tab_color shade(@theme_selected_bg_color, 0.96);
+
+@define-color notebook_tab_gradient_a shade(@theme_bg_color, 1.06);
+@define-color notebook_tab_gradient_b shade(@theme_bg_color, 1.0);
+@define-color notebook_tab_hilight shade(@theme_bg_color, 1.02);
+
+@define-color toolbar_gradient_a shade(@borders, 1.15);
+@define-color toolbar_gradient_b shade(@borders, 1.25);
+@define-color toolbar_gradient_c shade(@borders, 1.3);
+
+@define-color toolbar_border_top shade(@borders, 0.9);
+@define-color toolbar_border_bottom shade(@borders, 1.1);
+
+@define-color toolbar_active_button_color shade(@theme_bg_color, 0.8);
+@define-color toolbar_button_prelight alpha(white, 0.4);
+@define-color toolbar_separator @borders;
+
+@define-color primary_toolbar_button_text_shadow alpha(black, 0.1);
+
+@define-color content_view_bg #f1f1f1;
+@define-color list_box_bg #fafafa;
+
+@define-color app_notification_a shade(@theme_bg_color, 0.92);
+@define-color app_notification_b shade(@theme_bg_color, 1.0);
+@define-color app_notification_c shade(@theme_bg_color, 1.05);
+
+@define-color app_notification_border @borders;
+
+@define-color treeview_focus_border #78CB2A;
+
+@define-color view_separators shade(@borders, 1.30);
+@define-color view_symbolic_color shade(@internal_element_color, 0.80);
+
+@define-color expander_row_selected_color shade(@theme_selected_bg_color, 1.2);
+
+@define-color inset_light_color alpha(white, 0.45);
+@define-color inset_dark_color alpha(black, 0.07);
+
+@define-color suggested_action_button_a shade(@theme_selected_bg_color, 0.96);
+@define-color suggested_action_button_b shade(@theme_selected_bg_color, 0.89);
+@define-color suggested_action_button_border shade(@theme_selected_bg_color, 0.82);
+@define-color suggested_action_button_fg @theme_base_color;
+@define-color suggested_action_button_shadow shade(@suggested_action_button_border, 1.15);
+
+/**************************
+ * Selection Mode classes *
+ **************************/
+@define-color selection_toolbar_bg_a shade(@theme_selected_bg_color, 0.96);
+@define-color selection_toolbar_bg_b shade(@theme_selected_bg_color, 0.89);
+@define-color selection_toolbar_bg_backdrop @selection_toolbar_bg_a;
+@define-color selection_toolbar_fg @theme_fg_color;
+@define-color selection_toolbar_shadow alpha(white, 0.40);
+@define-color selection_toolbar_border shade(@selection_toolbar_bg_b, 0.75);
+
+@define-color selection_toolbar_button_a shade(@theme_selected_bg_color, 1.2);
+@define-color selection_toolbar_button_b shade(@theme_selected_bg_color, 1.0);
+@define-color selection_toolbar_button_fg @theme_base_color;
+@define-color selection_toolbar_button_border @selection_toolbar_fg;
+@define-color selection_toolbar_button_border_backdrop alpha(@selection_toolbar_button_border, 0.30);
+@define-color selection_toolbar_button_shadow alpha(white, 0.15);
+
+@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_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;
+
+@define-color selection_menu_fg @selection_toolbar_fg;
+@define-color selection_menu_hover shade(@selection_menu_fg, 0.80);
+@define-color selection_menu_active shade(@selection_menu_fg, 0.60);
+
+/**************
+ * GNOME Apps *
+ **************/
+@define-color entry_tag_bg shade(@theme_selected_bg_color, 0.89);
+@define-color entry_tag_fg @theme_base_color;
 
 /******
  * WM *
  ******/
-@define-color wm_title @fg_color;
-@define-color wm_unfocused_title @fg_color;
+@define-color wm_title @theme_fg_color;
+@define-color wm_unfocused_title @theme_unfocused_fg_color;
 @define-color wm_highlight #ffffff;
 @define-color wm_title_highlight_dark alpha(#ffffff, 0.0);
 @define-color wm_title_highlight #ffffff;
 
-@define-color wm_bg_a shade (@bg_color, 1.07);
-@define-color wm_bg_b @bg_color;
+@define-color wm_bg_a shade (@theme_bg_color, 1.1);
+@define-color wm_bg_b @theme_bg_color;
+
+@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);
+@define-color wm_button_bg_d shade (@theme_bg_color, 0.9);
+
+@define-color wm_button_bg_hover_a shade (@wm_button_bg_a, 1.1);
+@define-color wm_button_bg_hover_b shade (@wm_button_bg_b, 1.1);
+@define-color wm_button_bg_hover_c shade (@wm_button_bg_c, 1.1);
+@define-color wm_button_bg_hover_d shade (@wm_button_bg_d, 1.1);
+
+@define-color wm_button_bg_active_a shade (@theme_bg_color, 0.7);
+@define-color wm_button_bg_active_b shade (@theme_bg_color, 0.9);
+@define-color wm_button_bg_active_c shade (@theme_bg_color, 0.9);
 
 @import url("gtk-main-common.css");
-@import url("gtk-widgets.css");
+@import url("gtk-widgets-backgrounds.css");
 @import url("gtk-widgets-borders.css");
 @import url("gtk-widgets-assets.css");
-@import url("apps/gedit.css");
-@import url("apps/gnome-panel.css");
-@import url("apps/gnome-terminal.css");
-@import url("apps/nautilus.css");
-@import url("apps/nemo.css");
-@import url("apps/unity.css");
-@import url("apps/popover.css");
+@import url("gtk-widgets.css");
+@import url("gnome-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 0b8f5412..d8a8f64a 100644
--- a/desktop-themes/Menta/gtk-3.0/gtk-widgets-assets.css
+++ b/desktop-themes/Menta/gtk-3.0/gtk-widgets-assets.css
@@ -4,7 +4,7 @@
 
 .grip {
 	background-color: transparent;
-	/*background-image: url("assets/resize-grip.svg");*/
+	background-image: url("assets/resize-grip.svg");
 }
 
 /*************************
@@ -12,31 +12,18 @@
  *************************/
 
 /* draw regular check and radio items using our SVG assets */
-.radio,
-.check {
-	/*background-clip: border-box;*/
-}
-
-.check {
-	background-image: url("assets/check-normal.png");
-}
-
-.check:hover {
+.check,
+.view.cell.check {
 	background-image: url("assets/check-normal.png");
+	background-repeat: no-repeat;
+	background-position: center;
 }
 
-.check row,
 .check row:selected,
 .check row:selected:focus {
 	background-image: url("assets/check-normal.png");
 }
 
-.check row:hover,
-.check row:selected:hover,
-.check row:selected:focus:hover {
-	background-image: url("assets/check-normal.png");
-}
-
 .check:insensitive {
 	background-image: url("assets/check-normal-ins.png");
 }
@@ -45,38 +32,26 @@
 	background-color: transparent;
 }
 
-.check row:insensitive,
 .check row:selected:insensitive,
 .check row:selected:focus:insensitive {
 	background-color: transparent;
 	background-image: url("assets/check-normal-ins.png");
 }
 
-.check:active {
+.check:active,
+.view.cell.check:active {
 	background-image: url("assets/check-active.png");
 }
 
-.check:active:hover {
-	background-image: url("assets/check-active.png");
-}
-
-.check row:active,
 .check row:selected:active,
 .check row:selected:focus:active {
 	background-image: url("assets/check-active.png");
 }
 
-.check row:active:hover,
-.check row:selected:active:hover,
-.check row:selected:active:focus:hover {
-	background-image: url("assets/check-active.png");
-}
-
 .check:active:insensitive {
 	background-image: url("assets/check-active-ins.png");
 }
 
-.check row:active:insensitive,
 .check row:selected:active:insensitive,
 .check row:selected:focus:active:insensitive {
 	background-image: url("assets/check-active-ins.png");
@@ -86,52 +61,32 @@
 	background-image: url("assets/check-mixed-active.png");
 }
 
-.check:inconsistent:hover {
-	background-image: url("assets/check-mixed-active.png");
-}
-
-.check row:inconsistent,
 .check row:selected:inconsistent,
 .check row:selected:focus:inconsistent {
 	background-image: url("assets/check-mixed-active.png");
 }
 
-.check row:inconsistent:hover,
-.check row:selected:inconsistent:hover,
-.check row:selected:focus:inconsistent:hover {
-	background-image: url("assets/check-mixed-active.png");
-}
-
 .check:inconsistent:insensitive {
 	background-image: url("assets/check-mixed-active-ins.png");
 }
 
-.check row:inconsistent:insensitive,
 .check row:selected:inconsistent:insensitive,
 .check row:selected:focus:inconsistent:insensitive {
 	background-image: url("assets/check-mixed-active-ins.png");
 }
 
-.radio {
-	background-image: url("assets/radio-normal.png");
-}
-
-.radio:hover {
+.radio,
+.view.cell.radio {
 	background-image: url("assets/radio-normal.png");
+	background-repeat: no-repeat;
+	background-position: center;
 }
 
-.radio row,
 .radio row:selected,
 .radio row:selected:focus {
 	background-image: url("assets/radio-normal.png");
 }
 
-.radio row:hover,
-.radio row:selected:hover,
-.radio row:selected:focus:hover {
-	background-image: url("assets/radio-normal.png");
-}
-
 .radio:insensitive {
 	background-image: url("assets/radio-normal-ins.png");
 }
@@ -140,37 +95,25 @@
 	background-color: transparent;
 }
 
-.radio row:insensitive,
 .radio row:selected:insensitive,
 .radio row:selected:focus:insensitive {
 	background-image: url("assets/radio-normal-ins.png");
 }
 
-.radio:active {
+.radio:active,
+.view.cell.radio:active {
 	background-image: url("assets/radio-active.png");
 }
 
-.radio:active:hover {
-	background-image: url("assets/radio-active.png");
-}
-
-.radio row:active,
 .radio row:selected:active,
 .radio row:selected:focus:active {
 	background-image: url("assets/radio-active.png");
 }
 
-.radio row:active:hover,
-.radio row:selected:active:hover,
-.radio row:selected:focus:active:hover {
-	background-image: url("assets/radio-active.png");
-}
-
 .radio:active:insensitive {
 	background-image: url("assets/radio-active-ins.png");
 }
 
-.radio row:insensitive,
 .radio row:selected:active:insensitive,
 .radio row:selected:focus:active:insensitive {
 	background-image: url("assets/radio-active-ins.png");
@@ -180,116 +123,172 @@
 	background-image: url("assets/radio-mixed-active.png");
 }
 
-.radio:inconsistent:hover {
-	background-image: url("assets/radio-mixed-active.png");
-}
-
-.radio row:inconsistent,
 .radio row:selected:inconsistent,
 .radio row:selected:focus:inconsistent {
 	background-image: url("assets/radio-mixed-active.png");
 }
 
-.radio row:inconsistent:hover,
-.radio row:selected:inconsistent:hover,
-.radio row:selected:focus:inconsistent:hover {
-	background-image: url("assets/radio-mixed-active.png");
-}
-
 .radio:inconsistent:insensitive {
 	background-image: url("assets/radio-mixed-active-ins.png");
 }
 
-.radio row:inconsistent:insensitive,
 .radio row:selected:inconsistent:insensitive,
 .radio row:selected:focus:inconsistent:insensitive {
 	background-image: url("assets/radio-mixed-active-ins.png");
 }
 
-.primary-toolbar .menu .check,
-.menu .check {
-	background-image: url("assets/check-menuitem-unselected.png");
+.sidebar .view.radio:active,
+.sidebar .view.radio:active:focus,
+.sidebar .view.radio:active:hover {
+	background-image: url("assets/sidebar-radio-checked.svg");
 }
 
-.primary-toolbar .menu .radio,
-.menu .radio {
-	background-image: url("assets/check-menuitem-unselected.png");
+.sidebar .view.radio:hover {
+	background-image: url("assets/sidebar-radio-prelight.svg");
 }
 
-.primary-toolbar .menu .check:active,
-.menu .check:active {
-	background-image: url("assets/check-menuitem-dark.png");
+.sidebar .view.radio:active:selected,
+.sidebar .view.radio:active:selected:focus {
+	background-image: url("assets/sidebar-radio-selected.svg");
 }
 
-.toolbar .menu .check:active:hover,
-.menu .check:active:hover {
-	background-image: url("assets/check-menuitem.png");
+.sidebar .view.radio:selected:hover,
+.sidebar .view.radio:selected:focus {
+	background-image: url("assets/sidebar-radio-selected-prelight.svg");	
 }
 
-.primary-toolbar .menu .check:active:insensitive,
-.toolbar .menu .check:active:hover:insensitive,
-.menu .check:active:insensitive,
-.menu .check:active:hover:insensitive {
-	background-image: url("assets/check-menuitem-insensitive-dark.png");
+/*************
+ * GtkSwitch *
+ *************/
+GtkSwitch.trough {
+ 	background-image: url("assets/switch-off.svg");
 }
 
-.primary-toolbar .menu .radio:active,
-.menu .radio:active {
-	background-image: url("assets/radio-menuitem-dark.png");
+GtkSwitch.trough:active {
+	background-image: url("assets/switch-on.svg");
 }
 
-.toolbar .menu .radio:active:hover,
-.menu .radio:active:hover {
-	background-image: url("assets/radio-menuitem.png");
+GtkSwitch.trough:insensitive {
+	background-image: url("assets/switch-off-ins.svg");
 }
 
-.primary-toolbar .menu .radio:active:insensitive,
-.toolbar .menu .radio:active:hover:insensitive,
-.menu .radio:active:insensitive,
-.menu .radio:active:hover:insensitive {
-	background-image: url("assets/radio-menuitem-insensitive-dark.png");
+GtkSwitch.trough:active:insensitive {
+	background-image: url("assets/switch-on-ins.svg");
 }
 
-.toolbar .menu .check {
-	background-image: url("assets/check-menuitem-unselected.png");
+/*********************
+ * GtkScale's slider *
+ *********************/
+.scale.slider,
+.scale.slider.horizontal {
+	background-image: url("assets/slider.png");
 }
 
-.toolbar .menu .radio {
-	background-image: url("assets/check-menuitem-unselected.png");
+.scale.slider:hover,
+.scale.slider.horizontal:hover {
+	background-image: url("assets/slider-hover.png");
 }
 
-.toolbar .menu .check:active {
-	background-image: url("assets/check-menuitem-dark.png");
+.scale.slider:active,
+.scale.slider:active:hover,
+.scale.slider.horizontal:active,
+.scale.slider.horizontal:active:hover {
+	background-image: url("assets/slider-hover.png");
 }
 
-.toolbar .menu .check:active:insensitive {
-	background-image: url("assets/check-menuitem-insensitive-dark.png");
+.scale.slider:insensitive,
+.scale.slider:insensitive:hover,
+.scale.slider.horizontal:insensitive,
+.scale.slider.horizontal:insensitive:hover {
+	background-image: url("assets/slider-ins.png");
 }
 
-.toolbar .menu .radio:active {
-	background-image: url("assets/radio-menuitem-dark.png");
+.scale.scale-has-marks-above.slider.horizontal {
+	background-image: url("assets/slider.png");
 }
 
-.toolbar .menu .radio:active:insensitive {
-	background-image: url("assets/radio-menuitem-insensitive-dark.png");
+.scale.scale-has-marks-above.slider.horizontal:hover {
+	background-image: url("assets/slider-hover.png");
 }
 
-/**********
- * switch *
- **********/
+.scale.scale-has-marks-above.slider.horizontal:active,
+.scale.scale-has-marks-above.slider.horizontal:active:hover {
+	background-image: url("assets/slider-hover.png");
+}
 
-GtkSwitch.trough {
- 	background-image: url("assets/switch-off.png");
+.scale.scale-has-marks-above.slider.horizontal:insensitive,
+.scale.scale-has-marks-above.slider.horizontal:insensitive:hover {
+	background-image: url("assets/slider-ins.png");
 }
 
-GtkSwitch.trough:active {
-	background-image: url("assets/switch-on.png");
+.scale.scale-has-marks-above.slider.vertical {
+	background-image: url("assets/slider.png");
 }
 
-GtkSwitch.trough:insensitive {
-	background-image: url("assets/switch-off-ins.png");
+.scale.scale-has-marks-above.slider.vertical:hover {
+	background-image: url("assets/slider-hover.png");
 }
 
-GtkSwitch.trough:active:insensitive {
-	background-image: url("assets/switch-on-ins.png");
+.scale.scale-has-marks-above.slider.vertical:active,
+.scale.scale-has-marks-above.slider.vertical:active:hover {
+	background-image: url("assets/slider-hover.png");
+}
+
+.scale.scale-has-marks-above.slider.vertical:insensitive,
+.scale.scale-has-marks-above.slider.vertical:insensitive:hover {
+	background-image: url("assets/slider-ins.png");
+}
+
+.scale.scale-has-marks-below.slider.horizontal {
+	background-image: url("assets/slider.png");
+}
+
+.scale.scale-has-marks-below.slider.horizontal:hover {
+	background-image: url("assets/slider-hover.png");
+}
+
+.scale.scale-has-marks-below.slider.horizontal:active,
+.scale.scale-has-marks-below.slider.horizontal:active:hover {
+	background-image: url("assets/slider-hover.png");
+}
+
+.scale.scale-has-marks-below.slider.horizontal:insensitive,
+.scale.scale-has-marks-below.slider.horizontal:insensitive:hover {
+	background-image: url("assets/slider-ins.png");
+}
+
+.scale.scale-has-marks-below.slider.vertical {
+	background-image: url("assets/slider.png");
+}
+
+.scale.scale-has-marks-below.slider.vertical:hover {
+	background-image: url("assets/slider-hover.png");
+}
+
+.scale.scale-has-marks-below.slider.vertical:active,
+.scale.scale-has-marks-below.slider.vertical:active:hover {
+	background-image: url("assets/slider-hover.png");
+}
+
+.scale.scale-has-marks-below.slider.vertical:insensitive,
+.scale.scale-has-marks-below.slider.vertical:insensitive:hover {
+	background-image: url("assets/slider-ins.png");
+}
+
+/********************************
+ * Touch text selection handles *
+ ********************************/
+.cursor-handle.bottom {
+	background-image: url("assets/slider.png");
+}
+
+.cursor-handle.top {
+	background-image: url("assets/slider.png");
+}
+
+/****************
+ * Content view *
+ ****************/
+.content-view.view {
+	/*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
new file mode 100644
index 00000000..5c40e20c
--- /dev/null
+++ b/desktop-themes/Menta/gtk-3.0/gtk-widgets-backgrounds.css
@@ -0,0 +1,249 @@
+/* Button background */
+.button,
+.toolbar .button.raised,
+.toolbar .raised .button,
+.toolbar GtkComboBox .button,
+.spinbutton.vertical .button {
+	background-image: linear-gradient(to bottom, 
+		@button_gradient_color_a,
+		@button_gradient_color_b);
+	background-color: transparent;
+}
+
+/* Pushed button and progressbar through background */
+.button:active, 
+.spinbutton.vertical .button:active,
+.toolbar .button:active,
+.toolbar .button.raised:active,
+.toolbar .raised .button:active {
+	background-image: linear-gradient(to bottom,
+		@button_active_gradient_color_a,
+		@button_active_gradient_color_b);
+	background-color: transparent; 
+}
+
+.trough,
+.trough.highlight,
+.trough row {
+	background-image: linear-gradient(to bottom,
+		@trough_bg_color_a,
+		@trough_bg_color_b);
+	background-color: transparent; 
+}
+
+.button:active:hover,
+.spinbutton.vertical .button:active:hover,
+.toolbar .button:active:hover,
+.toolbar .button.raised:active:hover,
+.toolbar .raised .button:active:hover,
+.trough row:hover {
+	background-image: linear-gradient(to bottom,
+		shade (@button_active_gradient_color_a, 1.05),
+		shade (@button_active_gradient_color_b, 1.05));
+	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 {
+	background-image: linear-gradient(to bottom,
+		@button_active_gradient_color_a,
+		@button_active_gradient_color_b);
+	background-color: transparent;
+}
+
+.primary-toolbar .button:active:hover,
+.inline-toolbar .button:active:hover {
+	background-image: linear-gradient(to bottom,
+		shade (@button_active_gradient_color_a, 1.05),
+		shade (@button_active_gradient_color_b, 1.05));
+	background-color: transparent;
+}	
+
+/* Prelit button background */
+.button:hover,
+.toolbar .button:hover,
+.toolbar .button.raised:hover,
+.toolbar .raised .button:hover,
+.toolbar GtkComboBox .button:hover,
+.spinbutton.vertical .button:hover {
+	background-color: transparent;
+	background-image: linear-gradient(to bottom,
+		@button_hover_gradient_color_a,
+		@button_hover_gradient_color_b);
+}
+
+/* Prelit button on primary toolbar background */
+.primary-toolbar .button:hover {
+	background-color: transparent;
+	background-image: linear-gradient(to bottom,
+		@button_gradient_color_a,
+		@button_gradient_color_b);
+}
+
+/* Insensitive button background */
+.button:insensitive,
+.spinbutton.vertical .button:insensitive,
+.toolbar GtkComboBox .button:insensitive,
+.toolbar .button.raised:insensitive,
+.toolbar .raised .button:insensitive {
+	background-image: none;
+	background-color: @insensitive_bg_color;
+}
+
+/* Pushed + Insensitive button background */
+.button:active:insensitive,
+.toolbar .button:active:insensitive,
+.toolbar GtkComboBox .button:active:insensitive {
+	background-image: linear-gradient(to bottom,
+		shade(@insensitive_bg_color, 0.95),
+		@insensitive_bg_color 40%,
+		@insensitive_bg_color);
+	background-color: transparent;
+}
+
+/* Entry background */
+.entry,
+GtkComboBox.combobox-entry .button,
+GtkComboBox.combobox-entry .button:hover,
+.primary-toolbar GtkComboBox.combobox-entry .button,
+.primary-toolbar GtkComboBox.combobox-entry .button:hover,
+.level-bar.trough {
+	background-image: linear-gradient(to bottom,
+		@entry_background_a,
+		@entry_background_b);
+	box-shadow: inset 0 1px @entry_inset, 
+		inset 0 2px alpha(@entry_inset, 0.4);
+}
+
+/* Entry pushed button background */
+.primary-toolbar GtkComboBox.combobox-entry .button:active,
+/* .primary-toolbar GtkComboBox.combobox-entry .button:hover:active,*/
+GtkComboBox.combobox-entry .button:active,
+.spinbutton .button:active,
+.spinbutton .button:active:hover {
+	background-image: linear-gradient(to bottom,
+		shade(@entry_background_a, 0.9),
+		@entry_background_b);
+	background-color: transparent;
+	box-shadow: inset 0 1px @entry_inset, 
+		inset 0 2px alpha(@entry_inset, 0.4);
+}
+
+column-header.button,
+column-header .button {
+	background-image: linear-gradient(to bottom,
+		shade(@entry_background_a, 0.94),
+		@entry_background_b);
+	box-shadow: inset 0 1px @entry_inset, 
+		inset 0 2px alpha(@entry_inset, 0.4);
+}
+
+column-header.button:hover,
+column-header .button:hover {
+	background-image: linear-gradient(to bottom,
+		shade(@entry_background_a, 1.0),
+		@entry_background_b);
+	box-shadow: inset 0 1px @entry_inset, 
+		inset 0 2px alpha(@entry_inset, 0.4);
+}
+
+column-header.button:active,
+column-header .button:active,
+column-header.button:active:hover,
+column-header .button:active:hover {
+	background-image: linear-gradient(to bottom,
+		shade(@entry_background_a, 0.9),
+		@entry_background_b);
+	background-color: transparent;
+	box-shadow: inset 0 1px @entry_inset, 
+		inset 0 2px alpha(@entry_inset, 0.4);
+}
+
+/* Insensitive entry background */
+.entry:insensitive,
+GtkComboBox.combobox-entry .button:insensitive,
+.level-bar.trough:insensitive {
+	background-color: @insensitive_bg_color;
+	background-image: none;
+	box-shadow: none;
+}
+
+/* Primary and inline toolbars background */
+.primary-toolbar .toolbar,
+.primary-toolbar.toolbar,
+.inline-toolbar.toolbar  {
+	background-image: linear-gradient(to bottom,
+		shade (@theme_bg_color, 1.0),
+		shade (@theme_bg_color, 0.96));
+	background-color: transparent;
+}
+
+.primary-toolbar .toolbar.vertical,
+.primary-toolbar.toolbar.vertical,
+.inline-toolbar.toolbar.vertical {
+	background-image: linear-gradient(to right,
+		shade (@theme_bg_color, 1.0),
+		shade (@theme_bg_color, 0.96));
+	background-color: transparent;
+}
+
+/* Active switch background*/
+.scale.progressbar {
+	background-image: linear-gradient(to bottom,
+		@switch_trough_active_bg_a,
+		@switch_trough_active_bg_b);
+	background-color: transparent;
+}
+
+.scale.progressbar.vertical {
+	background-image: linear-gradient(to right,
+		@switch_trough_active_bg_a,
+		@switch_trough_active_bg_b);
+	background-color: transparent;
+}
+
+/* Progressbar backgrounds */
+
+.progressbar,
+.progressbar row,
+.progressbar row:hover,
+.progressbar row:selected,
+.progressbar row:selected:focus {
+	background-image: linear-gradient(to left top,
+		alpha (@progressbar_pattern, 0.25),
+		alpha (@progressbar_pattern, 0.25) 25%,
+		transparent 25%,
+		transparent 50%,
+		alpha (@progressbar_pattern, 0.25) 50%,
+		alpha (@progressbar_pattern, 0.25) 75%,
+		transparent 75%,
+		transparent),
+		linear-gradient(to bottom,
+		@progressbar_background_a,
+		@progressbar_background_b);
+	background-size: 40px 40px, auto;
+	box-shadow: inset 1px 1px alpha(white, 0.2), inset -1px -1px alpha(white, 0.1);
+}
+
+.progressbar.vertical {
+	background-image: linear-gradient(to right top,
+		alpha (@progressbar_pattern, 0.25),
+		alpha (@progressbar_pattern, 0.25) 25%,
+		transparent 25%,
+		transparent 50%,
+		alpha (@progressbar_pattern, 0.25) 50%,
+		alpha (@progressbar_pattern, 0.25) 75%,
+		transparent 75%,
+		transparent),
+		linear-gradient(to right,
+		@progressbar_background_a,
+		@progressbar_background_b);
+}
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 13eaf34e..21ffee6a 100644
--- a/desktop-themes/Menta/gtk-3.0/gtk-widgets-borders.css
+++ b/desktop-themes/Menta/gtk-3.0/gtk-widgets-borders.css
@@ -1,36 +1,265 @@
-/******************
- * Borders *
- ******************/
-/* borders */
-.button {
-	border-image: url("borders/button.png") 10 12 10 12 / 10px 12px 10px 12px stretch; /* 10 12 10 12 / 10px 12px 10px 12px stretch; */
+/* 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 {
+	border-image: url("borders/button-active.png") 3 4 4 4 / 3px 4px 4px 4px stretch;
+	border-radius: 4px;
+	border-width: 2px;
+	border-style: solid;
+	border-color: transparent;
 }
 
-.button.default,
-.button:focus {
-	border-image: url("borders/button-focus.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
-	outline-color: transparent;
+.entry:insensitive,
+GtkComboBox.combobox-entry .entry:insensitive,
+GtkComboBox.combobox-entry .button:insensitive,
+.button:active:insensitive,
+.spinbutton.vertical .button:insensitive,
+.inline-toolbar.toolbar.vertical .button:insensitive,
+.inline-toolbar.toolbar.vertical .button.default:insensitive {
+	border-image: url("borders/button-active-ins.png") 3 4 4 4 / 3px 4px 4px 4px stretch;
+	border-radius: 4px;
+	border-width: 2px;
+	border-style: solid;
+	border-color: transparent;
 }
 
-.button:insensitive {
-	border-image: url("borders/button.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
+.trough row {
+	border-image: url("borders/nohl-generic-border.png") 3 / 3px stretch; /* Zuki note: figure out the heck it does */
+	border-radius: 4px;
+	border-width: 1px;
+	border-style: solid;
+	border-color: transparent;
 }
 
-.primary-toolbar .button:active,
-.primary-toolbar .button:active:hover,
-.button:active {
-	border-image: url("borders/button-active.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
+GtkProgressBar.trough {
+	box-shadow: inset 0 0 0 1px @borders;
+}
+
+/* focused element borders */
+.entry:focus,
+GtkComboBox.combobox-entry .entry:focus,
+.button.default:active,
+.inline-toolbar.toolbar.vertical .button.default:active {
+	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;
+}
+
+/* generic button borders */
+.button
+/*.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;
+	border-width: 2px;
+	border-style: solid;
+	border-color: transparent;
+}
+
+.spinbutton.vertical .button,
+.inline-toolbar.toolbar.vertical .button {
+	border-image: url("borders/button.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
+	border-radius: 4px;
+	border-width: 2px;
+	border-style: solid;
+	border-color: transparent;
+}
+
+/* focused button borders */
+.button.default,
+.button:focus { 
+	border-image: url("borders/button-focus.png") 3 4 4 4 / 3px 4px 4px 4px stretch;
+	border-radius: 4px;
+	border-width: 2px;
+	border-style: solid;
+	border-color: transparent;
 }
 
-.button:active:focus {
-	border-image: url("borders/button-active-focus.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
+.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;
 }
 
-.button:active:insensitive {
-	border-image: url("borders/button.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
+/* 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") 10 12 10 12 / 10px 12px 10px 12px stretch;
+	border-image: url("borders/button.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
 	background-color: transparent;
 }
+
+.primary-toolbar .button:active {
+	border-image: url("borders/button-active.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
+	background-color: transparent;
+}
+
+/* tooltip elements borders */
+.tooltip .entry {
+	border-image: url("borders/button-active.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
+	border-width: 1px;
+	border-style: solid;
+	border-color: transparent;
+}
+
+.tooltip .button {
+	border-image: url("borders/button.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
+	border-width: 1px;
+	border-style: solid;
+	border-color: transparent;
+}
+
+/* tooltip focused elements borders */
+.tooltip .entry:focus {
+	border-image: url("borders/button-focus.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
+	border-width: 1px;
+	border-style: solid;
+	border-color: transparent;
+}
+
+/* primary toolbar - generic element borders */
+.primary-toolbar .entry,
+.primary-toolbar GtkComboBox.combobox-entry .entry,
+.primary-toolbar GtkComboBox.combobox-entry .button,
+.primary-toolbar .button:active,
+.primary-toolbar .button.raised:active,
+.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;
+	border-style: solid;
+	border-color: transparent;
+}
+
+.primary-toolbar .button.raised:insensitive,
+.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 GtkComboBox .button:insensitive {
+	border-image: url("borders/button-active-ins.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
+	border-radius: 4px;
+	border-width: 2px;
+	border-style: solid;
+	border-color: transparent;
+}
+
+/* primary toolbar - focused element borders */
+.primary-toolbar .button:active:focus,
+.primary-toolbar .entry:focus,
+.primary-toolbar 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-width: 2px;
+	border-style: solid;
+	border-color: transparent;
+}
+
+/* primary toolbar - generic button borders */
+.primary-toolbar .button.raised,
+.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;
+	border-style: solid;
+	border-color: transparent;
+}
+
+/* primary toolbar - focused button borders */
+.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;
+	border-color: transparent;
+}
+
+/* column-headers borders */
+column-header.button,
+column-header .button,
+column-header.button:active,
+column-header .button:active,
+column-header.button:active:hover,
+column-header .button:active:hover,
+column-header.button:insensitive,
+column-header .button:insensitive {
+	border-width: 0 1px 1px 0;
+	border-radius: 0;
+	border-style: solid;
+	border-color: transparent;
+}
+
+column-header.button,
+column-header .button,
+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: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;
+}
+
+column-header.button:last-child,
+column-header:last-child .button,
+column-header.button:last-child:active,
+column-header:last-child .button:active,
+column-header.button:last-child:active:hover,
+column-header:last-child .button:active:hover {
+	border-right-width: 0;
+}
+
+/* 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-radius: 4px;
+	border-width: 0px 0px 1px 0px;
+	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 73d1634a..f499a834 100644
--- a/desktop-themes/Menta/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/Menta/gtk-3.0/gtk-widgets.css
@@ -1,807 +1,965 @@
-/* default */
 * {
-	-GtkArrow-arrow-scaling: 0.5;
+	engine: adwaita;
+	padding: 0;
+
+	background-clip: padding-box;
+
 	-GtkButton-child-displacement-x: 1;
 	-GtkButton-child-displacement-y: 1;
-	-GtkButton-default-border: 0;
-	-GtkButton-image-spacing: 0;
-	-GtkButton-interior-focus: true;
-	-GtkButton-inner-border: 3;
 	-GtkButtonBox-child-min-height: 26;
-	-GtkCheckButton-indicator-size: 15;
-	-GtkCheckMenuItem-indicator-size: 14;
-	-GtkComboBox-arrow-scaling: 0.75;
-	-GtkExpander-expander-size: 10;
-	-GtkHTML-link-color: @link_color;
-	-GtkIMHtml-hyperlink-color: @link_color;
-	-GtkMenu-horizontal-padding: 0;
-	-GtkMenu-vertical-padding: 0;  
-	-GtkMenuBar-internal-padding: 0;
-	-GtkMenuItem-arrow-scaling: 0.5;
-	-GtkPaned-handle-size: 6;
-	-GtkProgressBar-min-horizontal-bar-height: 10;
-	-GtkProgressBar-min-vertical-bar-width: 10;
-	-GtkRange-trough-border: 1;
-	-GtkRange-slider-width: 11;
-	-GtkRange-stepper-size: 13;
-	-GtkRange-trough-under-steppers: 1;
-	-GtkRange-stepper-spacing: 0;
-	-GtkScale-trough-border: 0;
-	-GtkScrollbar-activate-slider: 1;
-	-GtkScrollbar-trough-border: 0;
-	-GtkScrollbar-slider-width: 11;
-	-GtkScrollbar-min-slider-length: 31;
+
+	-GtkToolButton-icon-spacing: 4;
+
+	-GtkTextView-error-underline-color: @error_color;
+
+	-GtkPaned-handle-size: 5;
+
+	-GtkCheckButton-indicator-size: 16;
+	-GtkCheckMenuItem-indicator-size: 12;
+
+	/* The size for scrollbars. The slider is 2px smaller, but we keep it
+	 * up so that the whole area is sensitive to button presses for the
+	 * slider. The stepper button is larger in both directions, the slider
+	 * only in the width
+	 */
+
 	-GtkScrolledWindow-scrollbar-spacing: 0;
 	-GtkScrolledWindow-scrollbars-within-bevel: 1;
-	-GtkSeparatorMenuItem-horizontal-padding: 0;
-	-GtkStatusbar-shadow-type: none;
-	-GtkTextView-error-underline-color: @error_color;
-	-GtkToolButton-icon-spacing: 4;
+
 	-GtkToolItemGroup-expander-size: 11;
-	-GtkToolbar-internal-padding: 0;
-	-GtkTreeView-expander-size: 6;
-	-GtkTreeView-vertical-separator: 1;
-	-GtkWidget-wide-separators: true;
-	-GtkWidget-separator-width: 2px;
-	-GtkWidget-separator-height: 2;
-	-GtkWidget-focus-padding: 0;
-	-GtkWidget-focus-line-width: 1;
+	-GtkExpander-expander-size: 11;
+	-GtkTreeView-expander-size: 11;
+
+	-GtkTreeView-horizontal-separator: 4;
+
+	-GtkMenu-horizontal-padding: 0;
+	-GtkMenu-vertical-padding: 0;
+
 	-GtkWidget-link-color: @link_color;
 	-GtkWidget-visited-link-color: @link_color;
-	-GtkWindow-resize-grip-default: false;
-	-GtkWindow-resize-grip-width: 0;
-	-GtkWindow-resize-grip-height: 0;
-	-WnckTasklist-fade-overlay-rect: 0;
+	-GtkIMHtml-hyperlink-color: @link_color;
+	-GtkHTML-link-color: @link_color;
 
-	border-width: 1px;
-	padding: 0;
+	-WnckTasklist-fade-overlay-rect: 0;
 
-	engine: adwaita;
+	-GtkWidget-focus-padding: 2;
+	-GtkWidget-focus-line-width: 1;
+	-GtkWindow-resize-grip-width: 0;
+	-GtkWindow-resize-grip-height: 0;
 
-	outline-color: alpha(@text_color, 0.3);
+	/* 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;
 }
 
-GtkWindow {
-	color: @fg_color;
-}
-
-* {
-	/* inherit the color from parent by default */
-	color: inherit;
-	background-color: @bg_color;
-}
-
-/**********
- * states *
- **********/
-*:insensitive {
-	color: shade (@bg_color, 0.6);
-	text-shadow: 0 1px alpha (shade (@bg_color, 1.25), 0.5);
-}
-
-*:active {
-}
-
-*:active:hover:insensitive {
-}
-
-*:active:insensitive {
-}
+/***************
+ * Base States *
+ ***************/
 
-*:hover {
+.background {
+	color: @theme_fg_color;
+	background-color: @theme_bg_color;
 }
 
-*:hover:insensitive {
+/* FIXME: why do we still need this? */
+GtkClutterOffscreen {
+	background-color: @theme_bg_color;
+	color: @theme_fg_color;
 }
 
 *:selected,
 *:selected:focus {
-	background-color: @selected_bg_color;
-	color: @selected_fg_color;
+	background-color: @theme_selected_bg_color;
+	color: @theme_selected_fg_color;
 }
 
 *:selected:backdrop,
 *:selected:focus:backdrop {
-	background-color: @backdrop_selected_bg_color;
-	color: @backdrop_selected_fg_color;
+	background-color: @theme_unfocused_selected_bg_color;
+	color: @theme_unfocused_selected_fg_color;
+}
+
+*:insensitive {
+	background-color: @insensitive_bg_color;
+	color: @insensitive_fg_color;
+	border-color: @insensitive_borders;
 }
 
 .gtkstyle-fallback {
-	background-color: @bg_color;
-	color: @fg_color;
+	background-color: @theme_bg_color;
+	color: @theme_fg_color;
 }
 
 .gtkstyle-fallback:prelight {
-	background-color: shade(@bg_color, 1.10);
-	color: @fg_color;
+	background-color: shade(@theme_bg_color, 1.10);
+	color: @theme_fg_color;
 }
 
 .gtkstyle-fallback:active {
-	background-color: shade(@bg_color, 0.90);
-	color: @fg_color;
+	background-color: shade(@theme_bg_color, 0.90);
+	color: @theme_fg_color;
 }
 
 .gtkstyle-fallback:insensitive {
-	background-color: @bg_color;
-	color: @fg_color;
+	background-color: @insensitive_bg_color;
+	color: @insensitive_fg_color;
 }
 
 .gtkstyle-fallback:selected {
-	background-color: @selected_bg_color;
-	color: @selected_fg_color;
+	background-color: @theme_selected_bg_color;
+	color: @theme_selected_fg_color;
 }
 
-/*************
- * assistant *
- *************/
-GtkAssistant .sidebar .highlight {
-	color: @fg_color;
-	font: bold;
+GtkImage,
+GtkImage:insensitive,
+GtkLabel,
+GtkLabel:insensitive {
+	background-color: transparent;
 }
 
-GtkAssistant .sidebar {
-	background-color: shade (@bg_color, 0.97);
-	border-right-color: shade (@bg_color, 0.8);
-	border-radius: 0;
+/************
+ * Tooltips *
+ ************/
+.tooltip {
+	padding: 4px;
 	border-style: solid;
-	border-width: 0 1px 0 0;
-	padding: 12px;
-	color: mix (@fg_color, @bg_color, 0.40);
-	text-shadow: 0 1px shade (@bg_color, 1.04);
+	border-width: 1px;
+	border-color: shade(@theme_tooltip_bg_color, 0.50);
+	border-radius: 0px;
+
+	background-color: @theme_tooltip_bg_color;
+	color: @theme_tooltip_fg_color;
+
+	text-shadow: none;
 }
 
-/**************
- * background *
- **************/
-.background {
-	background-color: @bg_color;
-	border-width: 0;
+.tooltip * {
+	background-color: transparent;
 }
 
-/**********
- * button *
- **********/
-.button {
-	padding: 3px;
+/*****************
+ * Miscellaneous *
+ *****************/
+@keyframes spinner {
+	0.00% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
+		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)),
+		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)),
+		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)),
+		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)),
+		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)),
+		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)),
+		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)); }
+
+	12.5% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)),
+		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)),
+		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)),
+		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)),
+		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)),
+		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)),
+		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)),
+		-gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)); }
+
+	25.0% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)),
+		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)),
+		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)),
+		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)),
+		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)),
+		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)),
+		-gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
+		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)); }
+
+	37.5% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)),
+		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)),
+		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)),
+		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)),
+		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)),
+		-gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
+		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)),
+		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)); }
+
+	50.0% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)),
+		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)),
+		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)),
+		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)),
+		-gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
+		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)),
+		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)),
+		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)); }
+
+	62.5% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)),
+		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)),
+		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)),
+		-gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
+		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)),
+		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)),
+		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)),
+		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)); }
+
+	75.0% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)),
+		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)),
+		-gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
+		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)),
+		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)),
+		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)),
+		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)),
+		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)); }
+
+	87.5% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)),
+		-gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
+		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)),
+		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)),
+		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)),
+		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)),
+		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)),
+		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)); }
+
+	100%  { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
+		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)),
+		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)),
+		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)),
+		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)),
+		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)),
+		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)),
+		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)); }
 }
 
-GtkComboBox,
-.button {
-	background-image: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@button_bg_color, 1.1)),
-		to (shade (@button_bg_color, 0.95)));
-	border-radius: 6px;
-	border-style: solid;
-	border-color: transparent;
-	color: @fg_color;
-	text-shadow: 0 1px alpha (shade (@button_bg_color, 1.25), 0.4);
+.spinner {
 	background-color: transparent;
+	background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
+		-gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
+		-gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
+		-gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
+		-gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
+		-gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
+		-gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
+		-gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent));
+	background-position: 14% 14%, 0% 50%, 14% 86%, 50% 100%, 86% 86%, 100% 50%, 86% 14%, 50% 0%;
+	background-size: 20% 20%;
+	background-repeat: no-repeat;
+}
+
+.spinner:active {
+	background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)),
+		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)),
+		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)),
+		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)),
+		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)),
+		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)),
+		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)),
+		-gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent));
+	animation: spinner 1s infinite linear;
 }
 
-.button:hover {
-	background-image: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@button_bg_color, 1.2)),
-		to (shade (@button_bg_color, 1.04)));
+.button .spinner:active {
+	color: @theme_fg_color;
 }
 
-.button:active {
-	background-image: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@bg_color, 0.8)),
-		to (shade (@bg_color, 0.9)));
+.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;
 }
 
-.button:active:hover {
-	background-image: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@bg_color, 0.85)),
-		to (shade (@bg_color, 0.95)));
+.floating-bar.top {
+	border-top-width: 0;
+	border-top-right-radius: 0;
+	border-top-left-radius: 0;
 }
 
-.button:insensitive {
-	background-image: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@button_insensitive_bg_color, 1.04)),
-		to (shade (@button_insensitive_bg_color, 0.98)));
+.floating-bar.right {
+	border-right-width: 0;
+	border-top-right-radius: 0;
+	border-bottom-right-radius: 0;
+}
 
-	text-shadow: 0 1px alpha (shade (@button_bg_color, 1.25), 0.4);
+.floating-bar.bottom {
+	border-bottom-width: 0;
+	border-bottom-right-radius: 0;
+	border-bottom-left-radius: 0;
 }
 
-.button:insensitive:active {
-	background-image: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@button_insensitive_bg_color, 1.0)),
-		to (shade (@button_insensitive_bg_color, 0.97)));
+.floating-bar.left {
+	border-left-width: 0;
+	border-top-left-radius: 0;
+	border-bottom-left-radius: 0;
 }
 
-/* Comboboxes etc */
+.floating-bar.bottom.right {
+	box-shadow: inset 1px 1px @inset_light_color;
+}
 
-GtkComboBox.combobox-entry .button,
-GtkScale.slider,
-GtkScale.slider.vertical,
-.notebook .button,
-.inline-toolbar.toolbar .button {
-	background-image: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@button_bg_color, 1.1)),
-		to (shade (@button_bg_color, 0.95)));
-	border-top-color: shade (@bg_color, 0.82);
-	border-right-color: shade (@bg_color, 0.78);
-	border-bottom-color: shade (@bg_color, 0.64);
-	border-left-color: shade (@bg_color, 0.78);
-	padding: 1px;
-	text-shadow: 0 1px alpha (shade (@bg_color, 1.26), 0.5);
-}
-
-GtkComboBox.combobox-entry .button:hover,
-GtkScale.slider:hover,
-GtkScale.slider.vertical:hover,
-.notebook .button:hover,
-.inline-toolbar.toolbar .button:hover {
-	background-image: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@button_bg_color, 1.2)),
-		to (shade (@button_bg_color, 1.04)));
-	border-top-color: shade (@bg_color, 0.85);
-	border-right-color: shade (@bg_color, 0.82);
-	border-bottom-color: shade (@bg_color, 0.67);
-	border-left-color: shade (@bg_color, 0.82);
-}
-
-GtkComboBox.combobox-entry .button:active,
-.notebook .button:active,
-.inline-toolbar.toolbar .button:active {
-	background-image: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@bg_color, 0.8)),
-		to (shade (@bg_color, 0.9)));
-	border-top-color: shade (@bg_color, 0.62);
-	border-right-color: shade (@bg_color, 0.72);
-	border-bottom-color: shade (@bg_color, 0.76);
-	border-left-color: shade (@bg_color, 0.72);
-}
-
-GtkComboBox.combobox-entry .button:active:hover,
-.notebook .button:active:hover,
-.inline-toolbar.toolbar .button:active:hover {
-	background-image: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@bg_color, 0.85)),
-		to (shade (@bg_color, 0.95)));
-	border-top-color: shade (@bg_color, 0.64);
-	border-right-color: shade (@bg_color, 0.74);
-	border-bottom-color: shade (@bg_color, 0.79);
-	border-left-color: shade (@bg_color, 0.74);
-}
-
-GtkComboBox.combobox-entry .button:insensitive,
-.notebook .button:insensitive,
-.inline-toolbar.toolbar .button:insensitive {
-	background-image: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@button_insensitive_bg_color, 1.04)),
-		to (shade (@button_insensitive_bg_color, 0.98)));
-	border-top-color: shade (@bg_color, 0.86);
-	border-right-color: shade (@bg_color, 0.86);
-	border-bottom-color: shade (@bg_color, 0.86);
-	border-left-color: shade (@bg_color, 0.9);
+.floating-bar.bottom.left {
+	box-shadow: inset -1px 1px @inset_light_color;
 }
 
-/* Middle button */
-.primary-toolbar .linked .entry,
-.primary-toolbar .linked .button,
-.primary-toolbar .linked .button:active,
-.primary-toolbar .linked .button:active:hover,
-.primary-toolbar .linked .button:insensitive {
+.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;
+}
+
+.view.rubberband,
+.rubberband {
+	background-color: alpha (@theme_selected_bg_color, 0.35);
+
+	border-color: @theme_selected_bg_color;
+	border-style: solid;
 	border-width: 1px;
-	border-right-width: 0;
+	border-radius: 2px;
+}
+
+GtkStatusbar {
+	padding: 5px;
+	color: @theme_fg_color;
+	-GtkStatusbar-shadow-type: none;
+}
+
+.dnd {
+	border-width: 1px;
+	border-style: solid;
+	border-color: @theme_selected_bg_color;
 	border-radius: 0;
 }
 
-/* Set up shadows and hilights for button visual separation */
-.linked .button,
-.toolbar .button.raised.linked,
-.toolbar .raised.linked .button,
-.inline-toolbar.toolbar .button,
-.inline-toolbar.toolbar GtkToolButton .button {
-	box-shadow: inset -1px 0 shade (@bg_color, 0.84);
+GtkTreeView.view.separator,
+GtkTreeView.separator,
+.separator,
+.separator:hover {
+	color: @view_separators;
+	background-color: transparent;
 }
 
-.linked .button:first-child,
-.toolbar .button.raised.linked:first-child,
-.toolbar .raised.linked .button:first-child,
-.inline-toolbar.toolbar .button:first-child,
-.inline-toolbar.toolbar GtkToolButton:first-child .button {
-	box-shadow: inset -1px 0 shade (@bg_color, 0.84);
+.toolbar .separator {
+	color: transparent;
 }
 
-.linked .button:last-child,
-.toolbar .button.raised.linked:last-child,
-.toolbar .raised.linked .button:last-child,
-.inline-toolbar.toolbar .button:last-child,
-.inline-toolbar.toolbar GtkToolButton:last-child .button {
+.pane-separator {
+	color: shade (@inactive_frame_color, 0.80);
+}
+
+.pane-separator:hover,
+.pane-separator:selected {
+	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;
+}
+
+/****************
+ * Text Entries *
+ ****************/
+.entry {
+	border-style: solid;
+	padding: 4px;
+
+	/* border-image defined in the -assets variants */
+
+	color: @entry_text_color;
+	background-color: @theme_base_color;
+	box-shadow: inset 0px 2px 3px 0px alpha(@theme_fg_color, 0.15);
+}
+
+.entry:focus {
+	box-shadow: inset 1px 2px alpha(@theme_selected_bg_color, 0.1),
+		inset 1px 1px alpha(@theme_selected_bg_color, 0.1),
+		inset -1px -1px alpha(@theme_selected_bg_color, 0.2);
+}
+
+.entry.progressbar,
+.entry.progressbar:focus {
+	margin-left: 2px;
+	margin-right: 2px;
+	border-image: none;
+	border-style: none;
+	background-color: transparent;
+	background-image: linear-gradient(to top, 
+		transparent 2px,
+		white 2px,
+		white 3px,
+		shade(@theme_selected_bg_color, 0.9) 3px,
+		shade(@theme_selected_bg_color, 0.9) 5px,
+		transparent 5px);
+	background-size: auto;
 	box-shadow: none;
 }
 
-/* active button shadows */
-.linked .button:active,
-.toolbar .button:active.raised.linked,
-.toolbar .raised.linked .button:active,
-.inline-toolbar.toolbar .button:active,
-.inline-toolbar.toolbar GtkToolButton .button:active {
-	box-shadow: inset 0 0 1px 1px alpha (@dark_bg_color, 0.66);
+.entry.progressbar.pulse,
+.entry.progressbar.pulse:focus {
+	background-image: linear-gradient(to top, 
+		transparent 2px,
+		white 2px,
+		white 3px,
+		@borders 3px,
+		@borders 5px,
+		transparent 5px);
 }
 
-.linked .button:active:first-child,
-.toolbar .button:active.raised.linked:first-child,
-.toolbar .raised.linked .button:active:first-child,
-.inline-toolbar.toolbar .button:active:first-child,
-.inline-toolbar.toolbar GtkToolButton:first-child .button:active {
-	box-shadow: inset -1px 0 1px 0 alpha (@dark_bg_color, 0.66);
+.entry:selected {
+	color: @theme_selected_fg_color;
+	background-color: @theme_selected_bg_color;
 }
 
-.linked .button:active:last-child,
-.toolbar .button:active.raised.linked:last-child,
-.toolbar .raised.linked .button:active:last-child,
-.inline-toolbar.toolbar .button:active:last-child,
-.inline-toolbar.toolbar GtkToolButton:last-child .button:active {
-	box-shadow: inset 1px 0 1px 0 alpha (@dark_bg_color, 0.66);
+.entry:insensitive {
+	color: @insensitive_fg_color;
 }
 
-.linked .button:active:only-child,
-.toolbar .button:active.raised.linked:only-child,
-.toolbar .raised.linked .button:active:only-child,
-.inline-toolbar.toolbar .button:active:only-child,
-.inline-toolbar.toolbar GtkToolButton:only-child .button:active {
+/* needed for webkit/GtkStyle compatibility */
+.entry:active {
+	color: @theme_unfocused_selected_fg_color;
+	background-color: @theme_unfocused_selected_bg_color;
+}
+
+.cursor-handle.top,
+.cursor-handle.bottom {
+	background-color: transparent;
 	box-shadow: none;
+	border-style: none;
+	border-image: none;
+	border-radius: 0px;
+	border-width: 0px;
+
+	/* background-image in assets */
 }
 
-.linked .button:active,
-.toolbar .button.raised.linked:active,
-.toolbar .raised.linked .button:active,
-.inline-toolbar.toolbar .button:active,
-.inline-toolbar.toolbar GtkToolButton .button:active {
-	/*box-shadow: inset 1px 0 shade (@bg_color, 0.76);*/
+/*******************
+ * Symbolic images *
+ *******************/
+.image {
+	color: @internal_element_color;
 }
 
-.linked .button:insensitive,
-.toolbar .button.raised.linked:insensitive,
-.toolbar .raised.linked .button:insensitive,
-.inline-toolbar.toolbar .button:insensitive,
-.inline-toolbar.toolbar GtkToolButton .button:insensitive {
-	box-shadow: inset -1px 0 shade (@bg_color, 0.84);
+.image:hover {
+	color: @internal_element_prelight;
 }
 
+.image:selected,
+.image:selected:hover {
+	color: @theme_selected_fg_color;
+}
 
-/* Middle button */
-.linked .entry,
-.linked .button,
-.linked .button:active,
-.linked .button:active:hover,
-.linked .button:focus,
-.linked .button:focus:active,
-.linked .button:insensitive {
-	border-right-width: 0;
-	border-left-width: 0;
-	border-image-width: 10px 0 10px 0;
+.view.image,
+.view.image:hover {
+	color: @view_symbolic_color;
+}
+
+.view.image:selected,
+.view.image:selected:hover {
+	color: @theme_selected_fg_color;
+}
+
+/*****************
+ * GtkSpinButton *
+ *****************/
+.spinbutton .button {
+	color: @theme_fg_color;
+	padding: 2px 6px;
+	border-width: 0;
 	border-radius: 0;
+	border-style: none;
+	border-image: none;
+	box-shadow: inset 1px 0 @inset_dark_color;
 }
 
-/* Leftmost button */
-.linked .entry:first-child,
-.linked .button:first-child,
-.linked .button:active:first-child,
-.linked .button:active:hover:first-child,
-.linked .button:focus:first-child,
-.linked .button:focus:active:first-child,
-.linked .button:insensitive:first-child {
-	border-width: 1px;
-	border-right-width: 0;
-	border-image-width: 10px 0 10px 12px;
-	border-radius: 6px;
-	border-bottom-right-radius: 0;
-	border-top-right-radius: 0;
+.spinbutton .button {
+	background-color: transparent;
+	background-image: none;
 }
 
-.linked .button:hover:first-child,
-.linked .button:hover:focus:first-child {
-	border-image-width: 10px 0 10px 12px;
+.spinbutton .button:insensitive {
+	color: @insensitive_fg_color;
 }
 
-/* Rightmost button */
-.linked .entry:last-child,
-.linked .button:last-child,
-.linked .button:active:last-child,
-.linked .button:active:hover:last-child,
-.linked .button:focus:last-child,
-.linked .button:focus:active:last-child,
-.linked .button:insensitive:last-child {
-	border-width: 1px;
-	border-left-width: 0;
-	border-image-width: 10px 12px 10px 0;
-	border-radius: 6px;
-	border-bottom-left-radius: 0;
-	border-top-left-radius: 0;
+.spinbutton .button:active,
+.spinbutton .button:hover {
+	color: @internal_element_color;
 }
 
-.linked .button:hover:last-child,
-.linked .button:hover:focus:last-child {
-	border-image-width: 10px 12px 10px 0;
+.spinbutton .button:first-child {
+	border-radius: 4px 0 0 4px;
+	box-shadow: none;
 }
 
-/* Linked single button */
-.linked .entry:only-child,
-.linked .button:only-child,
-.linked .button:active:only-child,
-.linked .button:active:hover:only-child,
-.linked .button:focus:only-child,
-.linked .button:focus:active:only-child,
-.linked .button:insensitive:only-child {
-	border-right-width: 1px;
-	border-left-width: 1px;
-	border-image-width: 10px 12px 10px 12px;
-	border-radius: 6px;
+.spinbutton .button:last-child {
+	border-radius: 0 4px 4px 0;
 }
 
-/* Set up shadows and hilights for button visual separation */
-.primary-toolbar .linked .button,
-.primary-toolbar .button.raised.linked,
-.primary-toolbar .raised.linked .button {
-	/* box-shadow: inset 1px 0 shade (@dark_bg_color, 1.4),
-		inset -1px 0 shade (@dark_bg_color, 0.9); */
+/* FIXME: GtkWarning, bad pseudo-class */
+/*.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 {
+	box-shadow: inset 1px 0 @inset_dark_color,
+		inset 0 1px alpha(@theme_selected_bg_color, 0.2),
+		inset 0 -1px alpha(@theme_selected_bg_color, 0.2);
 }
 
-.primary-toolbar .linked .button:first-child,
-.primary-toolbar .button.raised.linked:first-child,
-.primary-toolbar .raised.linked .button:first-child {
-	/* box-shadow: inset -1px 0 shade (@dark_bg_color, 0.9); */
+.spinbutton .button:first-child:active {
+	box-shadow: inset 1px 1px alpha(@theme_selected_bg_color, 0.2),
+		inset 0 -1px alpha(@theme_selected_bg_color, 0.2);
 }
 
-.primary-toolbar .linked .button:last-child,
-.primary-toolbar .button.raised.linked:last-child,
-.primary-toolbar .raised.linked .button:last-child {
-	/* box-shadow: inset 1px 0 shade (@dark_bg_color, 1.4); */
+.spinbutton .button:last-child:active {
+	box-shadow: inset 1px 0 @inset_dark_color,
+		inset 0 1px alpha(@theme_selected_bg_color, 0.2),
+		inset -1px -1px alpha(@theme_selected_bg_color, 0.2);
 }
 
-.primary-toolbar .linked .button:active,
-.primary-toolbar .button.raised.linked:active,
-.primary-toolbar .raised.linked .button:active {
-	/* box-shadow: inset 1px 0 shade (@dark_bg_color, 0.9); */
+
+.spinbutton.vertical .button {
+	padding: 4px;
+	icon-shadow: 0 1px @button_text_shadow;
 }
 
-.primary-toolbar .linked .button:insensitive,
-.primary-toolbar .button.raised.linked:insensitive,
-.primary-toolbar .raised.linked .button:insensitive {
-	box-shadow: inset -1px 0 shade (@dark_bg_color, 0.9);
+.spinbutton.vertical .button,
+.spinbutton.vertical .button:hover {
+	color: @theme_fg_color;
 }
 
-/* Linked single button */
-.primary-toolbar .linked .entry:only-child,
-.primary-toolbar .linked .button:only-child,
-.primary-toolbar .linked .button:active:only-child,
-.primary-toolbar .linked .button:active:hover:only-child,
-.primary-toolbar .linked .button:insensitive:only-child {
-	border-radius: 6px;
+.spinbutton.vertical .button:insensitive {
+	color: @insensitive_fg_color;
+}
+
+.spinbutton.vertical .button:active {
+	color: @button_active_text;
+	icon-shadow: 0 1px @button_active_text_shadow;
+}
+
+/* :insensitive:insensitive to override the dark overriden style for
+   normal spinbutton buttons, yeah we lack !important */
+.spinbutton.vertical .button:insensitive:insensitive {
+	icon-shadow: none;
+}
+
+.spinbutton.vertical .button,
+/* :active:active to override the dark overriden style for
+   normal spinbutton buttons, yeah we lack !important */
+.spinbutton.vertical .button:active:active {
 	box-shadow: none;
 }
 
-/****************
- * cell and row *
- ****************/
-.cell {
-	background-color: @base_color;
-	border-radius: 0;
-	border-width: 0;
+.spinbutton.vertical .button:first-child {
+	border-image-width: 3px 3px 0 3px;
+	border-width: 1px 1px 0 1px;
+	border-radius: 4px 4px 0 0;
 }
 
-row:selected,
-row:selected:focused {
-	border-width: 1px 0 0 0;
-	border-style: solid;
-	border-color: shade (@selected_bg_color, 0.85);
-	background-image: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@selected_bg_color, 1.0)),
-		to (shade (@selected_bg_color, 0.85)));
+.spinbutton.vertical .button:last-child {
+	border-image-width: 0 3px 4px 3px;
+	border-width: 0 1px 2px 1px;
+	border-radius: 0 0 4px 4px;
 }
 
-row:selected:backdrop,
-row:selected:focused:backdrop {
-	border-width: 1px 0 0 0;
+.spinbutton.vertical.entry {
+	/*border-image: none;*/
+	border-image-width: 0px 3px 0 3px;
+	border-color: @borders;
+	border-width: 0 1px;
 	border-style: solid;
-	border-color: @backdrop_selected_bg_color;
-	background-image: -gtk-gradient (linear,left top, left bottom,
-		from (shade (@backdrop_selected_bg_color, 1.08)),
-		to (shade (@backdrop_selected_bg_color, 0.98)));
-}
+	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;
 
-/*******************
- * check and radio *
- *******************/
-.check,
-.radio,
-.check:insensitive,
-.radio:insensitive {
-	background-color: transparent;
-	border-style: none;
-	margin: 1px 0;
+	/* I'm using box-shadow as borders, so I need to compensate
+	   with padding. Those two values need to be entry padding +1 */
+	padding-top: 5px;
+	padding-bottom: 5px;
 }
 
-GtkCheckButton:hover,
-GtkCheckButton:active:hover,
-GtkCheckButton:selected,
-GtkCheckButton:selected:focus {
-	background-color: transparent;
+.spinbutton.vertical.entry:insensitive {
+	border-color: @insensitive_borders;
+	box-shadow: inset 0 1px @entry_inset, 
+		inset 0 -1px @entry_inset;
 }
 
-.menu .radio * {
-	box-shadow: none;
+.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;
 }
 
 /*****************
- * column-header *
+ * Color Chooser *
  *****************/
-column-header .button,
-column-header .button:hover,
-column-header .button:active,
-column-header .button:active:hover,
-column-header .button:focused,
-column-header .button:hover:focused,
-column-header .button:active:focused,
-column-header .button:active:hover:focused {
-	-GtkButton-inner-border: 0;
-	background-image: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@base_color,0.9)),
-		to (shade (@base_color,1.0)));
-	text-shadow: 0 1px alpha (shade (@bg_color, 1.25), 0.4);
-	box-shadow: inset 0 1px 0 0 shade (@base_color, 0.96);
-	border-radius: 0;
-	border-width: 0;
-	border-right-width: 1px;
-	border-image: -gtk-gradient (linear, left top, left bottom,
-		from (alpha (shade (@bg_color, 0.94), 1.0)),
-		to (alpha (shade (@base_color, 1.02), 1.0))) 1;
-}
+GtkColorSwatch,
+GtkColorSwatch:selected {
+	border-width: 1px;
+	border-style: solid;
+	border-radius: 1px;
+	border-color: alpha(black, 0.3);
+	box-shadow: inset 0 2px alpha(black, 0.07),
+		inset 1px 1px alpha(black, 0.07);
 
-column-header .button:hover {
-	background-image: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@base_color,0.98)),
-		to (shade (@base_color,1.0)));
+	background-color: transparent;
+	background-clip: border-box;
 }
 
-column-header .button:focused,
-column-header .button:hover:focused,
-column-header .button:active:focused,
-column-header .button:active:hover:focused {
-	box-shadow: inset 0 1px 0 0 shade (@selected_bg_color, 1.0);
-	outline-color: transparent;
+GtkColorSwatch:hover,
+GtkColorSwatch:selected:hover {
+	border-color: alpha(black, 0.45);
 }
 
-column-header:nth-child(last) .button {
-	border-right-width: 0;
+GtkColorSwatch.color-dark:hover {
+	background-image: linear-gradient(to bottom,
+		alpha(white, 0) 40%,
+		alpha(white, 0.3));
 }
 
-/******************
- * combobox entry *
- ******************/
-.primary-toolbar GtkComboBox.combobox-entry .entry,
-.primary-toolbar GtkComboBox.combobox-entry .entry:active,
-.primary-toolbar GtkComboBox.combobox-entry .entry:focused,
-GtkComboBox.combobox-entry .entry,
-GtkComboBox.combobox-entry .entry:active,
-GtkComboBox.combobox-entry .entry:focused {
-	border-top-right-radius: 0;
-	border-bottom-right-radius: 0;
-	border-width: 1px 0 1px 1px;
-	box-shadow: inset 0 0 1px 1px alpha (@dark_bg_color, 0.26);
-	background-image: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@base_color, 0.96)),
-		to (@base_color));
+GtkColorSwatch.color-light:hover {
+	background-image: linear-gradient(to top,
+		alpha(black, 0) 40%,
+		alpha(black, 0.1));
 }
 
-.primary-toolbar GtkComboBox.combobox-entry .entry:insensitive,
-GtkComboBox.combobox-entry .entry:insensitive {
-	background-color: shade (@bg_color, 0.96);
+GtkColorSwatch.color-light:selected:hover,
+GtkColorSwatch.color-dark:selected:hover {
 	background-image: none;
-	color: mix (@text_color, @base_color, 0.4);
-	box-shadow: inset 0 0 1px 1px alpha (@dark_bg_color, 0.16);
 }
 
-GtkComboBox.combobox-entry .entry:focused {
-	box-shadow: inset 0 0 1px 1px alpha (@selected_bg_color, 0.66);
+GtkColorSwatch.left,
+GtkColorSwatch:first-child {
+	border-top-left-radius: 6px;
+	border-bottom-left-radius: 6px;
 }
 
-.primary-toolbar GtkComboBox.combobox-entry .button,
-.primary-toolbar GtkComboBox.combobox-entry .button:hover,
-.primary-toolbar GtkComboBox.combobox-entry .button:active,
-.primary-toolbar GtkComboBox.combobox-entry .button:insensitive,
-GtkComboBox.combobox-entry .button,
-GtkComboBox.combobox-entry .button:hover,
-GtkComboBox.combobox-entry .button:active,
-GtkComboBox.combobox-entry .button:focus,
-GtkComboBox.combobox-entry .button:insensitive {
-	border-top-left-radius: 0;
-	border-bottom-left-radius: 0;
-	border-width: 1px 1px 1px 1px;
-	border-image: none;
-	border-top-right-radius: 2px;
-	border-bottom-right-radius: 2px;
-	outline-color: transparent;
-	background-image: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@button_bg_color, 1.1)),
-		to (shade (@button_bg_color, 0.95)));
+GtkColorSwatch.right,
+GtkColorSwatch:last-child {
+	border-top-right-radius: 6px;
+	border-bottom-right-radius: 6px;
 }
 
-GtkComboBox.combobox-entry .button,
-GtkComboBox.combobox-entry .button:insensitive {
-	border-color: shade (@bg_color, 0.66);
-	background-image: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@button_bg_color, 1.1)),
-		to (shade (@button_bg_color, 0.95)));
+GtkColorSwatch:only-child {
+	border-radius: 6px;
 }
 
-GtkComboBox.combobox-entry .button:hover {
-	background-image: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@button_bg_color, 1.2)),
-		to (shade (@button_bg_color, 1.04)));
+GtkColorSwatch.top {
+	border-top-left-radius: 6px;
+	border-top-right-radius: 6px;
 }
 
-GtkComboBox.combobox-entry .button:active {
-	background-image: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@bg_color, 0.8)),
-		to (shade (@bg_color, 0.9)));
-	box-shadow: inset 0 0 1px 1px alpha (@dark_bg_color, 0.26);
+GtkColorSwatch.bottom {
+	border-bottom-left-radius: 6px;
+	border-bottom-right-radius: 6px;
 }
 
-GtkComboBox {
-	padding: 1px 1px 0;
+GtkColorChooserWidget #add-color-button {
+	background-clip: padding-box;
+	border-color: mix(@borders, @theme_bg_color, 0.3);
+	background-color: mix(@borders, @theme_bg_color, 0.3);
+	color: @theme_base_color;
+	box-shadow: none;
 }
 
-GtkComboBox .button {
-	padding: 2px;
+GtkColorChooserWidget #add-color-button:hover {
+	border-color: @borders;
+	background-color: @borders;
+	color: @theme_base_color;
 }
 
-GtkComboBox .separator {
-	border-width: 0;
+.color-active-badge,
+.color-active-badge:selected {
+	border-style: solid;
+	border-width: 2px;
+	background-color: transparent;
+}
+
+.color-active-badge.color-light,
+.color-active-badge.color-light:hover {
+	border-color: #444444;
+	color: #444444;
+}
+
+.color-active-badge.color-dark,
+.color-active-badge.color-dark:hover {
+	border-color: #cccccc;
+	color: #cccccc;
+}
+
+GtkColorEditor GtkColorSwatch {
+	border-radius: 6px;
+}
+
+GtkColorEditor GtkColorSwatch.color-dark:hover,
+GtkColorEditor GtkColorSwatch.color-light:hover {
+	background-image: none;
+	border-color: alpha(black, 0.3);
+}
+
+GtkColorButton.button {
+	padding: 1px 20px;
 }
 
 /****************
- * Content view *
+ * Progress bar *
  ****************/
-.content-view.view {
-	background-color: @base_color;
+
+/* FIXME: this should really be a margin... */
+GtkProgressBar {
+	-GtkProgressBar-min-horizontal-bar-height: 16;
+	-GtkProgressBar-min-vertical-bar-width: 16;
+	border-radius: 16px;
+	padding: 0 0 1px 0;
 }
 
-.content-view.view:prelight {
-	background-color: shade (@bg_color, 1.03);
+/* progress component */
+.progressbar,
+.progressbar row,
+.progressbar row:hover,
+.progressbar row:selected,
+.progressbar row:selected:focus {
+	border-radius: 16px;
+	border-width: 1px;
+	border-style: solid;
+	border-color: @progressbar_border;
 }
 
-.content-view.view:selected,
-.content-view.view:active {
-	/*background-color: @selected_bg_color;*/
+.progressbar row:selected,
+.progressbar row:selected:focus {
+	border-color: shade(@progressbar_border, 0.85);
 }
 
-.content-view.view:insensitive {
-	background-color: @bg_color;
+/* for progressbars in cell renderers */
+.trough row {
+	padding: 0;
 }
 
-.content-view.view:backdrop {
-	background-color: @bg_color;
+.trough row:selected,
+.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));
 }
 
-.content-view.view:selected:backdrop {
-	background-color: @backdrop_selected_bg_color;
+/* level bars as used for password quality or remaining power */
+GtkLevelBar {
+	-GtkLevelBar-min-block-width: 34;
+	-GtkLevelBar-min-block-height: 3;
 }
 
-GdMainIconView.content-view {
-	-GdMainIconView-icon-size: 40;
+GtkLevelBar.vertical {
+	-GtkLevelBar-min-block-width: 3;
+	-GtkLevelBar-min-block-height: 34;
 }
 
-GtkIconView.content-view.check {
+.level-bar.trough {
+	padding: 2px;
+	border-radius: 8px;
+	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;
 }
 
-GtkIconView.content-view.check:active {
-	background-color: transparent;
+
+.level-bar.fill-block {
+	border-width: 1px;
+	border-style: solid;
+
+	border-color: @progressbar_border;
+	background-image: linear-gradient(to bottom,
+		@progressbar_background_a,
+		@progressbar_background_b);
 }
 
-.content-view.view.check,
-.content-view.view.check:active {
-	background-color: transparent;
+.level-bar.indicator-continuous.fill-block {
+	padding: 2px;
+	border-radius: 8px;
 }
 
-GtkIconView.content-view.check:prelight,
-GtkIconView.content-view.check:insensitive,
-GtkIconView.content-view.check:backdrop,
-GtkIconView.content-view.check:selected {
+.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,
+   uncomment when :nth-child will be working
+   on the widget
+
+.level-bar.indicator-discrete.fill-block.horizontal:first-child {
+	border-radius: 2px 0 0 2px;
+}
+
+.level-bar.indicator-discrete.fill-block.horizontal:last-child {
+	border-radius: 0 2px 2px 0;
+}
+
+.level-bar.indicator-discrete.fill-block.vertical:first-child {
+	border-radius: 2px 2px 0 0;
+}
+
+.level-bar.indicator-discrete.fill-block.vertical:last-child {
+	border-radius: 0 0 2px 2px;
+}
+
+*/
+
+.level-bar.fill-block.level-high {
+	border-color: shade(@success_color, 0.85);
+	background-image: linear-gradient(to bottom,
+		shade(@success_color, 1.2),
+		@success_color 75%,
+		shade(@success_color, 0.95));
+}
+
+.level-bar.fill-block.level-low {
+	border-color: shade(@warning_bg_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));
+}
+
+.level-bar.fill-block.empty-fill-block {
 	background-color: transparent;
+	background-image: none;
+	border-color: alpha(@theme_fg_color, 0.1);
 }
 
-/****************
- * drawing area *
- ****************/
-GtkDrawingArea {
+/************
+ * GtkScale *
+ ************/
+
+.scale {
+	-GtkScale-slider-length: 16;
+	-GtkRange-slider-width: 16;
+	-GtkRange-trough-border: 0;
+}
+
+.scale.slider,
+.scale.slider:hover,
+.scale.slider:insensitive {
+	border-radius: 0;
+	border-style: none;
+
 	background-color: transparent;
+
+	/* background-image in -assets variant */
 }
 
-/*********
- * entry *
- *********/
-.entry {
-	background-image: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@base_color, 0.96)),
-		to (@base_color));
-	background-color: @base_color; /* Fix for Opera */
-	border-color: shade (@bg_color, 0.66);
-	border-radius: 2px;
+.scale.trough {
+	margin: 7px 0;
+	border-radius: 6px;
+}
+
+.scale.trough.vertical {
+	margin: 0 7px;
+}
+
+.scale.trough,
+.scale.trough.highlight,
+.scale.trough.vertical {
+	border-width: 1px;
+	border-image: none;
 	border-style: solid;
-	padding: 4px 5px 4px 5px;
-	box-shadow: inset 0 0 1px 1px alpha (@dark_bg_color, 0.26);
-	color: @text_color;
 }
 
-.entry:selected,
-.entry:selected:focused {
-	background-color: @selected_bg_color;
-	color: @selected_fg_color;
-	box-shadow: inset 0 0 1px 1px alpha (@selected_bg_color, 0.66);
+.scale.trough,
+.scale.trough.vertical {
+	border-color: @borders;
 }
 
-.entry:focused {
-	box-shadow: inset 0 0 1px 1px alpha (@selected_bg_color, 0.66);
-	border-color: shade (@selected_bg_color, 0.66);
+.scale.trough.highlight,
+.scale.trough.highlight.vertical {
+	border-color: @scale_highlight_border;
 }
 
-.entry:insensitive {
-	background-color: shade (@bg_color, 0.96);
+.scale.trough:insensitive,
+.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);
+	box-shadow: none;
 	background-image: none;
-	color: mix (@text_color, @base_color, 0.4);
-	box-shadow: inset 0 0 1px 1px alpha (@dark_bg_color, 0.16);
 }
 
-.primary-toolbar .entry.progressbar,
-.primary-toolbar .entry.progressbar,
-.entry.progressbar {
-	background-image: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@selected_bg_color, 0.8)),
-		color-stop (0.1, shade (@selected_bg_color, 0.9)),
-		to (shade (@selected_bg_color, 1.1)));
-	border-radius: 2px;
-	border-width: 0;
-	color: @selected_fg_color;
+.scale.trough.highlight,
+.scale.trough.vertical.highlight {
+	background-image: none;
+	background-color: @scale_highlight_bg;
 }
 
-/* needed for webkit/GtkStyle compatibility */
-.entry:active {
-	color: @backdrop_selected_fg_color;
-	background-color: @backdrop_selected_bg_color;
+.scale.progressbar {
+	background-color: @scale_progress_fill;
 }
 
-.cursor-handle.top,
-.cursor-handle.bottom {
-	background-color: transparent;
-	box-shadow: none;
-	border-style: none;
-	border-image: none;
-	border-radius: 0px;
-	border-width: 0px;
+.scale.mark.separator {
+	/* defines the color of the actuall marks on the scale */
+	color: alpha(@theme_fg_color, 0.3);
+}
 
-	/* background-image in assets */
+.scale.trough {
+	box-shadow: inset 0 -1px @theme_bg_color;
 }
 
-/************
- * expander *
- ************/
-.expander {
-	color: @fg_color;
+.scale.trough.vertical {
+	box-shadow: inset -1px 0 @theme_bg_color;
 }
 
-/*********
- * frame *
- *********/
+.scale.trough.highlight {
+	box-shadow: inset 0 -1px @scale_highlight_shadow;
+}
+
+.scale.trough.vertical.highlight {
+	box-shadow: inset -1px 0 @scale_highlight_shadow;
+}
+
+/**********
+ * Frames *
+ **********/
 .frame {
 	border-width: 1px;
+	border-color: @borders;
 	border-style: solid;
-	border-color: shade (@bg_color, 0.9);
-	border-image: none;
 	padding: 0;
 }
 
 GtkScrolledWindow.frame {
 	border-style: solid;
-	border-color: shade (@bg_color, 0.9);
+	border-color: @borders;
 	border-width: 1px;
 	border-radius: 2px;
 	padding: 0;
@@ -813,618 +971,799 @@ GtkScrolledWindow GtkViewport.frame {
 	border-style: none;
 }
 
-/************
- * iconview *
- ************/
-GtkIconView.view.cell:selected,
-GtkIconView.view.cell:selected:focused {
-	background-image: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@selected_bg_color, 1.0)),
-		to (shade (@selected_bg_color, 0.9)));
-	border-radius: 2px;
-	border-style: solid;
-	border-width: 1px;
-	color: @selected_fg_color;
+/* FIXME: May have to remove this. */
+GtkViewport.frame {
+	border-width: 0;
 }
 
-.rubberband {
-	background-color: alpha (@selected_bg_color, 0.35);
-	border-color: @selected_bg_color;
-	border-radius: 0;
+/* GtkViewport, FIXME: Same as above. */
+GtkViewport,
+GtkIconView {
+	background-color: @theme_base_color;	
+}
+
+/***********
+ * Buttons *
+ ***********/
+.button,
+.button.menuitem.menubar,
+GtkColorButton.button,
+GtkComboBox.combobox-entry .button {
+	padding: 1px 4px;
+}
+
+.button.image-button {
+	padding: 3px 4px 4px;
+}
+
+.button {
+	-GtkButton-image-spacing: 4;
+	-GtkButton-interior-focus: true;
+	-GtkButton-default-border: 0;
+	-GtkButton-inner-border: 3;
+
+	color: @theme_text_color;
+
 	border-style: solid;
-	border-width: 1px;
+	border-color: transparent;
+
+	text-shadow: 0 1px @button_text_shadow;
 }
 
-/*********
- * image *
- *********/
-GtkImage,
-GtkImage:insensitive,
-GtkLabel,
-GtkLabel:insensitive {
+/* We may want a background for focused buttons, but in the meantime let's remove it too */
+.primary-toolbar .button,
+.primary-toolbar .button:insensitive {
+	background-image: none;
 	background-color: transparent;
 }
 
-/**************
- * GtkInfoBar *
- **************/
-GtkInfoBar {
-	border-width: 0;
-	border-style: none;
+/* Remove borders from primary toolbar buttons*/
+.primary-toolbar .button {
+	border-image: none;
+
+	/* setting border-style: none; here would override the border-width values 
+	 * we set in gtk-widget-borders.css to zero.
+	 */
+	border-style: solid;
+	border-width: 2px;
+	border-color: transparent;
+
+	text-shadow: 0 1px @button_text_shadow;
 }
 
-.info {
-	text-shadow: 0 1px @info_text_shadow;
+.primary-toolbar.toolbar .button.image-button {
+	padding: 3px 4px 4px;
 }
 
-.warning {
-	text-shadow: 0 1px @warning_text_shadow;
+.primary-toolbar .button *:active,
+.inline-toolbar .button *:active,
+.button *:active {
+	color: @button_active_text;
+	text-shadow: 0 1px @button_active_text_shadow;
 }
 
-.question {
-	text-shadow: 0 1px @question_text_shadow;
+.button *:insensitive,
+.button *:active:insensitive {
+	color: @insensitive_fg_color;
+	text-shadow: none;
 }
 
-.error {
-	text-shadow: 0 1px @error_text_shadow;
+.toolbar .button.raised *,
+.toolbar .raised .button *,
+.inline-toolbar .button * {
+	icon-shadow: 0 1px @button_text_shadow;
+	text-shadow: 0 1px @button_text_shadow;
 }
 
-.info .entry,
-.info .entry:focus,
-.info .button,
-.info .button:insensitive,
-.info .button:active,
-.warning .entry,
-.warning .entry:focus,
-.warning .button,
-.warning .button:insensitive,
-.warning .button:active,
-.error .entry,
-.error .entry:focus,
-.error .button,
-.error .button:insensitive,
-.error .button:active {
-	border-image: none;
+.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;
+}
 
-	border-color: shade(@borders, 0.9);
-	border-style: solid;
-	border-width: 1px;
+.toolbar .button.raised *:insensitive,
+.toolbar .raised .button *:insensitive,
+.inline-toolbar .button *:insensitive {
+	icon-shadow: none;
+	text-shadow: none;
 }
 
-.question .entry,
-.question .entry:focus,
-.question .button,
-.question .button:insensitive,
-.question .button:active {
-	border-image: none;
+/* linked entries/buttons */
 
-	border-color: darker(@question_bg_color);
-	border-style: solid;
-	border-width: 1px;
+/* Set up shadows and hilights for button visual separation */
+.linked .entry {
+	box-shadow: inset -1px 0 @inset_dark_color;
 }
 
-.info {
-	background-color: @info_bg_color;
-	color: @info_fg_color;
+.linked .entry:focus {
+	box-shadow: inset 1px 0 @inset_dark_color,
+		inset -1px 0 @inset_dark_color,
+		inset 1px 2px alpha(@theme_selected_bg_color, 0.1),
+		inset 1px 1px alpha(@theme_selected_bg_color, 0.1),
+		inset -1px -1px alpha(@theme_selected_bg_color, 0.2);
 
-	border-color: darker(@info_bg_color);
 }
 
-.warning {
-	background-color: @warning_bg_color;
-	color: @warning_fg_color;
+.linked .entry:focus:first-child {
+	box-shadow: inset -1px 0 @inset_dark_color,
+		inset 1px 2px alpha(@theme_selected_bg_color, 0.1),
+		inset 1px 1px alpha(@theme_selected_bg_color, 0.1),
+		inset -1px -1px alpha(@theme_selected_bg_color, 0.2);
 
-	border-color: darker(@warning_bg_color);
 }
 
-.question {
-	background-color: @question_bg_color;
-	color: @question_fg_color;
+.linked .entry:focus:last-child {
+	box-shadow: inset 1px 0 @inset_dark_color,
+		inset 1px 2px alpha(@theme_selected_bg_color, 0.1),
+		inset 1px 1px alpha(@theme_selected_bg_color, 0.1),
+		inset -1px -1px alpha(@theme_selected_bg_color, 0.2);
 
-	border-color: darker(@question_bg_color);
 }
 
-.error {
-	background-color: @error_bg_color;
-	color: @error_fg_color;
-
-	border-color: darker(@error_bg_color);
+/* Set up shadows and hilights for button visual separation */
+.linked .button,
+.toolbar .button.raised.linked,
+.toolbar .raised.linked .button,
+.inline-toolbar.toolbar .button,
+.inline-toolbar.toolbar GtkToolButton > .button {
+	box-shadow: inset 1px 0 @inset_light_color, inset -1px 0 @inset_dark_color;
 }
 
-/**************
- * Dim labels *
- **************/
-.view.dim-label,
-.dim-label,
-.dim-label:hover,
-.dim-label:focus {
-	color: mix (@fg_color, @bg_color, 0.50);
-	text-shadow: none;
+.linked .button:first-child,
+.toolbar .button.raised.linked:first-child,
+.toolbar .raised.linked .button:first-child,
+.inline-toolbar.toolbar .button:first-child,
+.inline-toolbar.toolbar GtkToolButton:first-child > .button {
+	box-shadow: inset -1px 0 @inset_dark_color;
+	border-left-width: 2px;
 }
 
-.dim-label:selected,
-.dim-label:selected:focus {
-	color: mix (@selected_fg_color, @base_color, 0.50);
-	text-shadow: none;
+.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;
 }
 
-/********
- * menu *
- ********/
-GtkTreeMenu.menu,
-.toolbar .primary-toolbar .menu,
-GtkMenuToolButton.menu,
-.primary-toolbar .button .menu,
-.menu {
-	background-image: none;
-	background-color: @base_color;
-	padding: 0;
-	border-width: 1px;
-	border-style: solid;
-	border-color: shade (@bg_color, 0.8);
-	border-radius: 0;
-	color: @fg_color;
-	box-shadow: none;
+.linked .button:last-child,
+.toolbar .button.raised.linked:last-child,
+.toolbar .raised.linked .button:last-child,
+.inline-toolbar.toolbar .button:last-child,
+.inline-toolbar.toolbar GtkToolButton:last-child > .button {
+	box-shadow: inset 1px 0 @inset_light_color;
+	border-right-width: 2px;
 }
 
-.toolbar .menu,
-GtkComboBox .menu {
-	background-image: none;
-	background-color: @base_color;
-	border-style: solid;
-	padding: 0;
+.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;
+}
 
-	color: @fg_color;
+.linked .button:active,
+.toolbar .button.raised.linked:active,
+.toolbar .raised.linked .button:active,
+.inline-toolbar.toolbar .button:active,
+.inline-toolbar.toolbar GtkToolButton > .button:active {
+	box-shadow: inset 1px 0 @inset_dark_color;
+}
 
-	box-shadow: none;
+.linked .button:insensitive,
+.toolbar .button.raised.linked:insensitive,
+.toolbar .raised.linked .button:insensitive,
+.inline-toolbar.toolbar .button:insensitive,
+.inline-toolbar.toolbar GtkToolButton > .button:insensitive {
+	box-shadow: inset -1px 0 @inset_dark_color;
 }
 
-.menu:selected {
-	background-color: @selected_bg_color;
+/* remove box shadow from last-child and only-child */
+.linked .button:insensitive:last-child,
+.linked .button:only-child,
+.toolbar .button.raised.linked:insensitive:last-child,
+.toolbar .raised.linked .button:insensitive:last-child,
+.inline-toolbar.toolbar .button:insensitive:last-child,
+.inline-toolbar.toolbar .button:only-child,
+.inline-toolbar.toolbar GtkToolButton:last-child > .button:insensitive,
+.inline-toolbar.toolbar GtkToolButton:only-child > .button {
+	box-shadow: none; 
 }
 
-.menu.button:hover,
-.menu.button:active,
-.menu.button:active:insensitive,
-.menu.button:insensitive,
-.menu.button {
-	background-color: shade (@bg_color, 1.08);
-	background-image: none;
+/* Middle button */
+.linked .entry,
+.linked .button,
+.linked .button:active,
+.linked .button:active:hover,
+.linked .button:insensitive {
+	border-right-width: 0;
+	border-left-width: 0;
+	border-image-width: 3px 0 4px 0;
 	border-radius: 0;
-	border-style: none;
-	border-width: 1px;
 }
 
-/***********
- * menubar *
- ***********/
-.menubar {
-	-GtkWidget-window-dragging: true;
+/* Leftmost button */
+.linked .entry:first-child,
+.linked .button:first-child,
+.linked .button:active:first-child,
+.linked .button:active:hover:first-child,
+.linked .button:insensitive:first-child {
+	border-right-width: 0;
+	border-image-width: 3px 0 4px 4px;
+	border-bottom-right-radius: 0;
+	border-top-right-radius: 0;
+}
 
-	background-image: -gtk-gradient (linear,left top,left bottom,
-		from (@toolbar_gradient_base),
-		to (@toolbar_gradient_final));
-	border-width: 0 0 1px 0;
-	border-style: solid;
-	border-color: alpha (@base_color, 0.2);
+/* Rightmost button */
+.linked .entry:last-child,
+.linked .button:last-child,
+.linked .button:active:last-child,
+.linked .button:active:hover:last-child,
+.linked .button:insensitive:last-child {
+	border-left-width: 0;
+	border-image-width: 3px 4px 4px 0;
+	border-bottom-left-radius: 0;
+	border-top-left-radius: 0;
+}
 
-	color: @fg_color;
-	text-shadow: alpha (shade (@button_bg_color, 1.25), 0.4);
-	box-shadow: inset 0px -1px @toolbar_border;
+/* Linked single button */
+.linked .entry:only-child,
+.linked .button:only-child,
+.linked .button:active:only-child,
+.linked .button:active:hover:only-child,
+.linked .button:insensitive:only-child {
+	border-right-width: 1px;
+	border-left-width: 1px;
+	border-image-width: 3px 4px 4px 4px;
+	border-radius: 4px;
 }
 
-/***************
- * menubaritem *
- ***************/
-.menubar.menuitem,
-.menubar .menuitem {
-	text-shadow: 0 1px alpha (shade (@button_bg_color, 1.25), 0.4);
+/* Middle button (vertical) */
+.linked.vertical .entry,
+.linked.vertical .button,
+.linked.vertical .button:active,
+.linked.vertical .button:active:hover,
+.linked.vertical .button:insensitive {
+	border-top-width: 0;
+	border-bottom-width: 0;
+	border-image-width: 0 4px;
+	border-radius: 0;
 }
 
-.menubar.menuitem:hover,
-.menubar .menuitem:hover {
-	color: @fg_color;
-	text-shadow: none;
-	border-width: 0px;
-	border-style: none;
-	background-image: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@bg_color, 1.0)),
-		to (shade (@bg_color, 0.85)));
-	/*box-shadow: inset 0 -1px shade (@dark_bg_color, 0.95);*/
-	box-shadow: none;
+/* Top button (vertical) */
+.linked.vertical .entry:first-child,
+.linked.vertical .button:first-child,
+.linked.vertical .button:active:first-child,
+.linked.vertical .button:active:hover:first-child,
+.linked.vertical .button:insensitive:first-child {
+	border-bottom-width: 0;
+	border-image-width: 3px 4px 0 4px;
+	border-radius: 4px 4px 0 0;
 }
 
-/************
- * menuitem *
- ************/
-.menuitem {
-	border-radius: 0;
-	border-style: none;
-	border-width: 0px;
-	padding: 3px 2px 3px 2px;
-	box-shadow: none;
+/* Bottom button (vertical) */
+.linked.vertical .entry:last-child,
+.linked.vertical .button:last-child,
+.linked.vertical .button:active:last-child,
+.linked.vertical .button:active:hover:last-child,
+.linked.vertical .button:insensitive:last-child {
+	border-top-width: 0;
+	border-image-width: 0 4px 4px 4px;
+	border-radius: 0 0 4px 4px;
 }
 
-/* Workaround for lp:949368 */
-GtkComboBox .menuitem * {
-	color: @fg_color;
+/* Linked single button (vertical) */
+.linked.vertical .entry:only-child,
+.linked.vertical .button:only-child,
+.linked.vertical .button:active:only-child,
+.linked.vertical .button:active:hover:only-child,
+.linked.vertical .button:insensitive:only-child {
+	border-top-width: 1px;
+	border-bottom-width: 1px;
+	border-image-width: 3px 4px 4px 4px;
+	border-radius: 4px;
 }
 
-GtkComboBox .menuitem *:hover {
-	color: @selected_fg_color;
+/* Linked button shadows (vertical) */
+.linked.vertical .button,
+.inline-toolbar.toolbar.vertical .button,
+.inline-toolbar.toolbar.vertical GtkToolButton > .button {
+	box-shadow: inset 0 1px @inset_light_color, inset 0 -1px @inset_dark_color;
 }
 
-.menuitem:hover,
-.menu .menuitem:hover,
-.toolbar .primary-toolbar .menu .menuitem:hover,
-.primary-toolbar .button .menu .menuitem:hover,
-.toolbar .primary-toolbar .menu .menuitem *:hover,
-.primary-toolbar .button .menu .menuitem *:hover {
-	border-radius: 0;
-	border-width: 0;
-	border-style: none;
-	background-image: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@selected_bg_color, 1.0)),
-		to (shade (@selected_bg_color, 0.85)));
-	box-shadow: none;
-	color: @selected_fg_color;
-	text-shadow: none;
+.linked.vertical .button:first-child,
+.inline-toolbar.toolbar.vertical .button:first-child,
+.inline-toolbar.toolbar.vertical GtkToolButton:first-child > .button {
+	box-shadow: inset 0 -1px @inset_dark_color;
 }
 
-.menuitem.check:active,
-.menuitem.radio:active {
-	color: @fg_color;
+.linked.vertical .button:last-child,
+.inline-toolbar.toolbar.vertical .button:last-child,
+.inline-toolbar.toolbar.vertical GtkToolButton:last-child > .button {
+	box-shadow: inset 0 -1px @inset_light_color;
 }
 
-.menu .menuitem.check:hover,
-.menu .menuitem.radio:hover {
+.linked.vertical .button:active,
+.inline-toolbar.toolbar.vertical .button:active,
+.inline-toolbar.toolbar.vertical GtkToolButton > .button:active {
+	box-shadow: inset 0 1px @inset_dark_color, inset 0 -1px @inset_dark_color;
+}
+
+.linked.vertical .button:insensitive,
+.inline-toolbar.toolbar.vertical .button:insensitive,
+.inline-toolbar.toolbar.vertical GtkToolButton > .button:insensitive {
+	box-shadow: inset 0 -1px @inset_dark_color;
+}
+
+.linked.vertical .button:only-child,
+.linked.vertical .button:insensitive:last-child,
+.inline-toolbar.toolbar.vertical .button:insensitive:last-child,
+.inline-toolbar.toolbar.vertical .button:only-child,
+.inline-toolbar.toolbar.vertical GtkToolButton:last-child > .button:insensitive,
+.inline-toolbar.toolbar.vertical GtkToolButton:only-child > .button {
 	box-shadow: none;
 }
 
-GtkTreeMenu.menu .menuitem:insensitive,
-GtkTreeMenu.menu .menuitem *:insensitive,
-.toolbar .primary-toolbar .menu .menuitem:insensitive,
-.toolbar .primary-toolbar .menu .menuitem *:insensitive,
-GtkMenuToolButton.menu .menuitem:insensitive,
-GtkMenuToolButton.menu .menuitem *:insensitive,
-.primary-toolbar .button .menu .menuitem:insensitive,
-.primary-toolbar .button .menu .menuitem *:insensitive,
-.menuitem:insensitive,
-.menuitem *:insensitive {
-	color: mix (@fg_color, @bg_color, 0.5);
+/* Linked buttons on primary toolbars */
+
+/* Middle button */
+.primary-toolbar .button.raised.linked,
+.primary-toolbar .button.raised.linked:active,
+.primary-toolbar .button.raised.linked:insensitive,
+.primary-toolbar .linked .entry,
+.primary-toolbar .linked .button,
+.primary-toolbar .linked .button:active,
+.primary-toolbar .linked .button:insensitive,
+.inline-toolbar.toolbar .button,
+.inline-toolbar.toolbar .button:active,
+.inline-toolbar.toolbar .button:insensitive,
+.inline-toolbar.toolbar GtkToolButton > .button,
+.inline-toolbar.toolbar GtkToolButton > .button:active,
+.inline-toolbar.toolbar GtkToolButton > .button:insensitive {
+	border-right-width: 0;
+	border-left-width: 0;
+	border-image-width: 3px 0 4px 0;
+	border-radius: 0;
+}
+
+/* Leftmost button */
+.primary-toolbar .button.raised.linked:first-child,
+.primary-toolbar .button.raised.linked:active:first-child,
+.primary-toolbar .button.raised.linked:insensitive:first-child,
+.primary-toolbar .linked .entry:first-child,
+.primary-toolbar .linked .button:first-child,
+.primary-toolbar .linked .button:active:first-child,
+.primary-toolbar .linked .button:insensitive:first-child,
+.inline-toolbar.toolbar .button:first-child,
+.inline-toolbar.toolbar .button:active:first-child,
+.inline-toolbar.toolbar .button:insensitive:first-child,
+.inline-toolbar.toolbar GtkToolButton:first-child > .button,
+.inline-toolbar.toolbar GtkToolButton:first-child > .button:active,
+.inline-toolbar.toolbar GtkToolButton:first-child > .button:insensitive {
+	border-left-width: 2px;
+	border-right-width: 0;
+	border-image-width: 3px 0 4px 3px;
+	border-bottom-right-radius: 0;
+	border-top-right-radius: 0;
 }
 
-.toolbar .menu .menuitem:insensitive,
-.toolbar .menu .menuitem *:insensitive,
-GtkComboBox .menu .menuitem:insensitive,
-GtkComboBox .menu .menuitem *:insensitive {
-	color: mix (@fg_color, @bg_color, 0.5);
+/* Rightmost button */
+.primary-toolbar .button.raised.linked:last-child,
+.primary-toolbar .button.raised.linked:active:last-child,
+.primary-toolbar .button.raised.linked:insensitive:last-child,
+.primary-toolbar .linked .entry:last-child,
+.primary-toolbar .linked .button:last-child,
+.primary-toolbar .linked .button:active:last-child,
+.primary-toolbar .linked .button:insensitive:last-child,
+.inline-toolbar.toolbar .button:last-child,
+.inline-toolbar.toolbar .button:active:last-child,
+.inline-toolbar.toolbar .button:insensitive:last-child,
+.inline-toolbar.toolbar GtkToolButton:last-child > .button,
+.inline-toolbar.toolbar GtkToolButton:last-child > .button:active,
+.inline-toolbar.toolbar GtkToolButton:last-child > .button:insensitive {
+	border-left-width: 0;
+	border-right-width: 2px;
+	border-image-width: 3px 3px 4px 0;
+	border-bottom-left-radius: 0;
+	border-top-left-radius: 0;
+	box-shadow: none;
 }
 
-.menuitem GtkCalendar,
-.menuitem GtkCalendar.button,
-.menuitem GtkCalendar.header,
-.menuitem GtkCalendar.view {
-	background-color: @bg_color;
-	background-image: none;
+/* Single button */
+.inline-toolbar.toolbar .button:only-child,
+.inline-toolbar.toolbar .button:active:only-child,
+.inline-toolbar.toolbar .button:insensitive:only-child,
+.inline-toolbar.toolbar GtkToolButton:only-child > .button,
+.inline-toolbar.toolbar GtkToolButton:only-child > .button:active,
+.inline-toolbar.toolbar GtkToolButton:only-child > .button:insensitive {
+	border-right-width: 2px;
+	border-left-width: 2px;
+	border-image-width: 3px 3px 4px 3px;
+	border-radius: 4px;
+}
+
+/* Special-case GtkMenuToolButton, since it's a GtkToolButton, but it
+ * has a box inside to pack the button and the actual menu */
+.inline-toolbar.toolbar GtkMenuToolButton .button:first-child,
+.inline-toolbar.toolbar GtkMenuToolButton .button:active:first-child,
+.inline-toolbar.toolbar GtkMenuToolButton .button:insensitive:first-child,
+.inline-toolbar.toolbar GtkMenuToolButton .button:last-child,
+.inline-toolbar.toolbar GtkMenuToolButton .button:active:last-child,
+.inline-toolbar.toolbar GtkMenuToolButton .button:insensitive:last-child {
+	border-right-width: 0;
+	border-left-width: 0;
+	border-image-width: 3px 0 4px 0;
 	border-radius: 0;
-	border-style: solid;
-	border-width: 0;
-	padding: 0;
+}
 
-	color: @fg_color;
+.inline-toolbar.toolbar GtkMenuToolButton:first-child .button:first-child,
+.inline-toolbar.toolbar GtkMenuToolButton:first-child .button:active:first-child,
+.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-bottom-right-radius: 0;
+	border-top-right-radius: 0;
 }
 
-.menuitem GtkCalendar {
-	background-color: shade (@bg_color, 1.3);
-	background-image: none;
+.inline-toolbar.toolbar GtkMenuToolButton:last-child .button:last-child,
+.inline-toolbar.toolbar GtkMenuToolButton:last-child .button:active:last-child,
+.inline-toolbar.toolbar GtkMenuToolButton:last-child .button:insensitive:last-child {
+	border-left-width: 0;
+	border-right-width: 2px;
+	border-image-width: 3px 3px 4px 0;
+	border-bottom-left-radius: 0;
+	border-top-left-radius: 0;
 }
 
-.menuitem .entry {
-	background-color: shade (@bg_color, 1.3);
-	background-image: none;
+/* Vertical inline toolbars */
 
-	color: @dark_fg_color;
+/* Middle button */
+.inline-toolbar.toolbar.vertical .button,
+.inline-toolbar.toolbar.vertical .button:active,
+.inline-toolbar.toolbar.vertical .button:insensitive,
+.inline-toolbar.toolbar.vertical GtkToolButton > .button,
+.inline-toolbar.toolbar.vertical GtkToolButton > .button:active,
+.inline-toolbar.toolbar.vertical GtkToolButton > .button:insensitive {
+	border-bottom-width: 0;
+	border-top-width: 0;
+	border-image-width: 0 3px 0 3px;
+	border-radius: 0;
+}
 
-	border-image: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@bg_color, 0.75)),
-		to (shade (@bg_color, 0.9))) 1;
-	border-image-width: 1px;
+/* Topmost button */
+.inline-toolbar.toolbar.vertical .button:first-child,
+.inline-toolbar.toolbar.vertical .button:active:first-child,
+.inline-toolbar.toolbar.vertical .button:insensitive:first-child,
+.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-image-width: 3px 3px 0 3px;
+	border-bottom-left-radius: 0;
+	border-bottom-right-radius: 0;
 }
 
-.primary-toolbar GtkScale.trough,
-.primary-toolbar GtkScale.trough:backdrop,
-.menuitem GtkScale.trough {
-	background-color: @bg_color;
-	background-image: none;
-	border-image: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@bg_color, 0.75)),
-		to (shade (@bg_color, 1.15))) 1;
-	border-image-width: 1px;
+/* Bottommost button */
+.inline-toolbar.toolbar.vertical .button:last-child,
+.inline-toolbar.toolbar.vertical .button:active:last-child,
+.inline-toolbar.toolbar.vertical .button:insensitive:last-child,
+.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-image-width: 0 3px 4px 3px;
+	border-top-left-radius: 0;
+	border-top-right-radius: 0;
 }
 
-.menuitem .accelerator {
-	color: alpha (@fg_color, 0.5);
+/* Single button */
+.inline-toolbar.toolbar.vertical .button:only-child,
+.inline-toolbar.toolbar.vertical .button:active:only-child,
+.inline-toolbar.toolbar.vertical .button:insensitive:only-child,
+.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-bottom-width: 2px;
+	border-image-width: 3px 3px 3px 4px;
+	border-radius: 4px;
 }
 
-.menuitem .accelerator:hover {
-	color: alpha (@selected_fg_color, 0.8);
+GtkLinkButton.button,
+GtkLinkButton.button *:active {
+	text-shadow: none;
 }
 
-.menuitem .accelerator:insensitive {
-	color: alpha (mix (@fg_color, @bg_color, 0.5), 0.5);
+.button .separator { 
+	color: shade(@internal_element_color, 1.30);
 }
 
-/************
- * notebook *
- ************/
+/*****************
+ * Notebooks and *
+ * tabs		*
+ *****************/
 .notebook {
 	/* To get rid of the horrible adwaita tabs we need the notebook to use no engine */
 	engine: none;
-	background-color: shade (@bg_color, 1.1);
-	background-image: none;
-	border-radius: 2px;
 	padding: 0;
-	box-shadow: none;
-	border-color: shade (@bg_color, 0.82);
-	border-width: 1px;
+
+	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;
 }
 
 .notebook GtkViewport {
-	background-color: @base_color;
+	background-color: @theme_base_color;
 }
 
 .notebook tab {
-	background-image: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@bg_color, 1.04)),
-		to (shade (@bg_color, 0.96)));
-	background-color: @bg_color;
+	padding: 2px;
 	border-style: solid;
-	border-color: shade (@bg_color, 0.82);
-	border-bottom-width: 0;
-	border-width: 1px;
-	box-shadow: inset 0 1px alpha (shade (@bg_color, 1.26), 0.3);
-	border-radius: 3px 3px 0 0;
+	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_bg_color, 1.26), 0.3);
+}
+
+.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_bg_color, 1.26), 0.3);
 }
 
 .notebook tab:active {
-	border-color: shade (@bg_color, 0.82);
-	border-style: solid;
-	border-width: 1px;
-	border-bottom-width: 0;
-	background-color: shade (@bg_color, 1.02);
-	background-image: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@bg_color, 1.18)),
-		to (shade (@bg_color, 1.1)));
-	color: @fg_color;
+	background-image: linear-gradient(to bottom,
+		shade (@theme_bg_color, 1.18),
+		shade (@theme_bg_color, 1.1));
+	border-width: 1px 1px 0px 1px;
 }
 
-.notebook tab GtkLabel:active {
-	color: @fg_color;
-	padding: 1px 1px 2px 1px;
+.notebook tab.bottom:active {
+	background-image: linear-gradient(to bottom,
+		shade (@theme_bg_color, 1.1),
+		shade (@theme_bg_color, 1.18));
+	border-width: 0px 1px 1px 1px;
 }
 
-.notebook tab GtkLabel {
-	color: @fg_color;
+.notebook tab.top {
+	padding: 4px 2px 0;
 }
 
 .notebook tab.top:active {
-	padding: 7px 7px 1px 7px;
+	padding: 6px 2px 0;
 }
 
-.notebook tab.top {
-	padding: 6px 5px 0 5px;
+.notebook tab.bottom {
+	padding: 0 2px 4px;
 }
 
-.notebook tab.right:active {
-	padding: 4px 6px 4px 1px;
-	background-image: -gtk-gradient (linear, left top, right top,
-		from (shade (@bg_color, 1.1)),
-		to (shade (@bg_color, 1.18)));
+.notebook tab.bottom:active {
+	padding: 0 2px 6px;
 }
 
+.notebook tab.left,
 .notebook tab.right {
-	padding: 3px 4px 3px 0;
-	border-left-width: 0;
-	border-bottom-width: 1px;
-	border-radius: 3px;
-	background-image: -gtk-gradient (linear, left top, right top,
-		from (shade (@bg_color, 0.96)),
-		to (shade (@bg_color, 1.04)));
+	background-image: none;
+	background-color: @theme_bg_color;
+	padding: 3px;
 }
 
-.notebook tab.bottom:active {
-	padding: 1px 7px 6px 7px;
-	background-image: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@bg_color, 1.1)),
-		to (shade (@bg_color, 1.18)));
+.notebook tab.left {
+	border-width: 1px 0 1px 1px;
+	border-radius: 4px 0 0 4px;
 }
 
-.notebook tab.bottom {
-	background-image: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@bg_color, 0.96)),
-		to (shade (@bg_color, 1.04)));
-	padding: 0 5px 5px 5px;
-	border-top-width: 0;
-	border-bottom-width: 1px;
-	border-radius: 3px;
-	box-shadow: inset 0 -1px alpha (shade (@bg_color, 1.26), 0.3);
+.notebook tab.right {
+	border-width: 1px 1px 1px 0;
+	border-radius: 0 4px 4px 0;
+}
+
+.notebook tab.left:active,
+.notebook tab.right:active {
+	background-image: none;
+	background-color: shade (@theme_bg_color, 1.1);
 }
 
 .notebook tab.left:active {
-	padding: 4px 1px 4px 6px;
-	background-image: -gtk-gradient (linear, left top, right top,
-		from (shade (@bg_color, 1.18)),
-		to (shade (@bg_color, 1.1)));
+	padding: 3px 3px 3px 5px;
+	border-radius: 4px 0 0 4px;
 }
 
-.notebook tab.left {
-	padding: 3px 0 3px 4px;
-	border-right-width: 0;
-	border-bottom-width: 1px;
-	border-radius: 3px;
-	background-image: -gtk-gradient (linear, left top, right top,
-		from (shade (@bg_color, 1.04)),
-		to (shade (@bg_color, 0.96)));
+.notebook tab.right:active {
+	padding: 3px 5px 3px 3px;
+	border-radius: 0 4px 4px 0;
 }
 
-.notebook tab .button {
-	padding: 0;
+/* close button styling */
+.notebook tab .button,
+.notebook tab .button:active,
+.notebook tab .button:hover {
+	border-image: none;
+	border-style: none;
+	background-image: none;
+	background-color: transparent;
 }
 
-.notebook GtkDrawingArea {
-	background-color: shade (@bg_color, 1.02);
+.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 .button {
-	padding: 3px;
+.notebook tab .button GtkImage:hover {
+	color: @theme_fg_color;
+	border-color: alpha(black, 0.1);
 }
 
-/******************
- * pane separator *
- ******************/
-.sidebar .pane-separator,
-.pane-separator {
-	background-color: transparent;
-	border-color: shade (@bg_color, 0.84);
-	text-shadow: none;
+.notebook tab .button GtkImage:active,
+.notebook tab .button GtkImage:active:hover {
+	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) 
+		alpha(black, 0.13) 
+		alpha(black, 0.13) 
+		alpha(black, 0.13);
 }
 
-/*************************
- * progressbar and scale *
- *************************/
-GtkScale,
-GtkProgressBar {
-	border-radius: 0;
-	border-width: 1px;
+/**************
+ * ComboBoxes *
+ **************/
+GtkComboBox {
 	padding: 0;
+
+	-GtkComboBox-arrow-scaling: 0.5;
+	-GtkComboBox-shadow-type: none;
+
+	text-shadow: 0 1px @button_text_shadow;
 }
 
-.menubar .menuitem .scale.highlight.left,
-.scale.highlight.left,
-.progressbar,
-.progressbar row,
-.progressbar row:hover,
-.progressbar row:selected,
-.progressbar row:selected:focused {
-	background-image: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@selected_bg_color, 0.96)),
-		to (shade (@selected_bg_color, 1.1)));
-	border-width: 1px;
-	border-style: solid;
-	border-color: shade (@selected_bg_color, 0.8);
-	box-shadow: inset 0 1px alpha (shade (@bg_color, 1.26), 0.3);
+GtkComboBox *:insensitive {
+	text-shadow: none;
+	color: @insensitive_fg_color;
 }
 
-.scale.highlight.bottom,
-.progressbar.vertical {
-	background-image: -gtk-gradient (linear, left top, right top,
-		from (shade (@selected_bg_color, 0.96)),
-		to (shade (@selected_bg_color, 1.1)));
-	border-width: 1px;
-	border-style: solid;
-	border-color: shade (@selected_bg_color, 0.8);
-	box-shadow: inset 1px 1px alpha (shade (@bg_color, 1.26), 0.3);
+GtkComboBox .separator {
+	/* always disable separators */
+	-GtkWidget-wide-separators: true;
+	-GtkWidget-horizontal-separator: 0;
+	-GtkWidget-vertical-separator: 0;
 }
 
-.scale.highlight.left:insensitive {
-	background-image: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@bg_color, 0.95)),
-		to (shade (@bg_color, 0.85)));
+GtkComboBox.combobox-entry .entry:first-child,
+GtkComboBox.combobox-entry .button:first-child {
+	border-image-width: 3px 0 4px 3px;
+	border-radius: 3px 0 0 3px;
+	border-right-width: 0;
 }
 
-.scale.highlight.bottom:insensitive {
-	background-image: -gtk-gradient (linear, left top, right top,
-		from (shade (@bg_color, 0.95)),
-		to (shade (@bg_color, 0.85)));
+GtkComboBox.combobox-entry .entry:last-child,
+GtkComboBox.combobox-entry .button:last-child {
+	border-image-width: 3px 3px 4px 0;
+	border-radius: 0 3px 3px 0;
+	border-left-width: 0;
 }
 
-.trough,
-.trough row,
-.trough row:hover,
-.trough row:selected,
-.trough row:selected:focused {
-	background-image: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@bg_color, 0.9)),
-		to (shade (@bg_color, 0.98)));
-	border-width: 1px;
-	border-style: solid;
-	border-radius: 0;
-	border-color: shade (@bg_color, 0.8);
+.primary-toolbar GtkComboBox.combobox-entry .entry:first-child,
+.primary-toolbar GtkComboBox.combobox-entry .button:first-child {
+	border-image-width: 4px 0 4px 4px;
+	border-radius: 3px 0 0 3px;
+	border-right-width: 0;
 }
 
-.trough.vertical {
-	background-image: -gtk-gradient (linear, left top, right top,
-		from (shade (@bg_color, 0.9)),
-		to (shade (@bg_color, 0.98)));
+.primary-toolbar GtkComboBox.combobox-entry .entry:last-child,
+.primary-toolbar GtkComboBox.combobox-entry .button:last-child {
+	border-image-width: 4px 4px 4px 0;
+	border-radius: 0 3px 3px 0;
+	border-left-width: 0;
+}
 
-	border-width: 1px;
-	border-style: solid;
-	border-radius: 0;
-	border-color: shade (@bg_color, 0.8);
+GtkComboBox.combobox-entry .entry:focus:first-child {
+	box-shadow: inset 1px 2px alpha(@theme_selected_bg_color, 0.1),
+		inset 1px 1px alpha(@theme_selected_bg_color, 0.1),
+		inset 0 -1px alpha(@theme_selected_bg_color, 0.2);
 }
 
-.scale.trough.horizontal {
-	margin: 6px 0 5px 0;
-	border-radius: 8px;
-	background-image: none;
-	background-color: shade (@bg_color, 0.9);
-	border-width: 1px;
+GtkComboBox.combobox-entry .entry:focus:last-child {
+	box-shadow: inset -1px 2px alpha(@theme_selected_bg_color, 0.1),
+		inset -1px 1px alpha(@theme_selected_bg_color, 0.1),
+		inset 0 -1px alpha(@theme_selected_bg_color, 0.2);
 }
 
-.scale.trough.vertical {
-	margin: 0 6px 0 5px;
-	border-radius: 8px;
-	background-image: none;
-	background-color: shade (@bg_color, 0.9);
-	border-width: 1px;
+GtkComboBox.combobox-entry .button:last-child,
+GtkComboBox.combobox-entry .button:hover:last-child,
+GtkComboBox.combobox-entry .button:active:last-child,
+GtkComboBox.combobox-entry .button:hover:active:last-child {
+	box-shadow: inset 1px 0 @inset_dark_color, 
+		inset 0 1px @entry_inset,
+		inset 0 2px alpha(@entry_inset, 0.4);
 }
 
-.scale.trough.vertical.highlight.bottom,
-.scale.trough.horizontal.highlight.left {
-	background-color: alpha (@selected_bg_color, 0.6);
+GtkComboBox.combobox-entry .button:first-child,
+GtkComboBox.combobox-entry .button:hover:first-child,
+GtkComboBox.combobox-entry .button:active:first-child,
+GtkComboBox.combobox-entry .button:hover:active:first-child {
+	box-shadow: inset -1px 0 @inset_dark_color, 
+		inset 0 1px @entry_inset,
+		inset 0 2px alpha(@entry_inset, 0.4);
 }
 
-GtkScale {
-	-GtkRange-slider-width: 14;
-	-GtkRange-trough-border: 1;
-	-GtkScale-slider-length: 14;
+GtkComboBox.combobox-entry .button:insensitive:first-child {
+	box-shadow: inset -1px 0 @inset_dark_color;
+}
 
-	border-style: solid;
-	border-width: 1px;
-	border-radius: 8px;
+GtkComboBox.combobox-entry .button:insensitive:last-child {
+	box-shadow: inset 1px 0 @inset_dark_color;
 }
 
-GtkScale.vertical {
-	-GtkScale-slider-length: 14;
+GtkComboBox.combobox-entry .button *:active,
+GtkComboBox.combobox-entry .button *:active:hover {
+	color: @theme_text_color;
 }
 
-GtkScale.mark {
-	border-color: shade (@bg_color, 0.8);
+GtkComboBox .button {
+	color: @theme_text_color;
 }
 
-/*************
- * scrollbar *
- *************/
+GtkComboBox .button *:hover {
+	color: @internal_element_color;
+}
+
+/**************
+ * Scrollbars *
+ **************/
+
 .scrollbar {
 	background-image: none;
 	border-style: solid;
 	-GtkRange-trough-border: 0;
-	-GtkRange-arrow-scaling: 0.444;
+	-GtkScrollbar-has-backward-stepper: true;
+	-GtkScrollbar-has-forward-stepper: true;
 	-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;
-	-GtkScrollbar-min-slider-length: 30;
 	-GtkRange-stepper-spacing: 0;
 	-GtkRange-trough-under-steppers: 1;
 }
 
 .scrollbars-junction { /* the small square between scrollbars!!! */
 	background-image: none;
-	background-color: @bg_color;
+	background-color: @theme_bg_color;
 	border-width: 0;
 	border-radius: 0;
 	border-image: none;
@@ -1432,678 +1771,552 @@ GtkScale.mark {
 
 .scrollbar.trough,
 .scrollbar.trough.vertical {
-	background-image: -gtk-gradient (linear, left top, right top,
-		from (shade (@bg_color, 0.98)),
-		to (shade (@bg_color, 1.06)));
-	border-radius: 0;
-	border-width: 0 0 0 1px;
+	background-image: linear-gradient(to right,
+		@scrollbar_trough,
+		shade (@scrollbar_trough, 1.08));
+	border-left-width: 1px;
 	border-style: solid;
-	border-color: shade (@bg_color, 0.94);
+	border-color: shade (@theme_bg_color, 0.94);
+	border-radius: 0;
+	border-image: none;
 }
 
 .scrollbar.trough.horizontal {
-	background-image: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@bg_color, 0.98)),
-		to (shade (@bg_color, 1.06)));
-	border-radius: 0;
-	border-width: 1px 0 0 0;
+	background-image: linear-gradient(to bottom,
+		@scrollbar_trough,
+		shade (@scrollbar_trough, 1.08));
+	border-top-width: 1px;
 	border-style: solid;
-	border-color: shade (@bg_color, 0.94);
+	border-color: shade (@theme_bg_color, 0.94);
+	border-radius: 0;
+	border-image: none;
 }
 
-/* Sliders and buttons */
-.scrollbar.slider.vertical {
-	background-image: -gtk-gradient (linear, left top, right top,
-		from (shade (@bg_color, 0.95)),
-		to (shade (@bg_color, 0.8)));
-	border-color: shade (@bg_color, 0.65);
-	border-radius: 10px;
-	border-width: 1px;
+.scrollbar.button,
+.scrollbar.button:active,
+.scrollbar.button:active:hover,
+.scrollbar.button:insensitive {
+	border-style: none;
+	border-image: none;
+	border-radius: 0;
+	background-image: none;
+	background-color: transparent;
 }
 
-.scrollbar.slider.vertical:hover,
-.scrollbar.slider.vertical:hover:active {
-	background-image: -gtk-gradient (linear, left top, right top,
-		from (shade (@bg_color, 0.85)),
-		to (shade (@bg_color, 0.7)));
-	border-color: shade (@bg_color, 0.6);
+.scrollbar.button:active,
+.scrollbar.button:active:hover {
+	background-color: alpha(shade(@scrollbar_trough, 0.8), 0.5);
 }
 
-.scrollbar.slider.horizontal {
-	background-image: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@bg_color, 0.95)),
-		to (shade (@bg_color, 0.8)));
-	border-color: shade (@bg_color, 0.65);
-	border-radius: 10px;
-	border-width: 1px;
+.scrollbar.button.top:hover {
+	box-shadow: inset 0 -1px mix(@scrollbar_slider, @scrollbar_trough, 0.8);
 }
 
-.scrollbar.slider.horizontal:hover,
-.scrollbar.slider.horizontal:hover:active {
-	background-image: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@bg_color, 0.85)),
-		to (shade (@bg_color, 0.7)));
-	border-color: shade (@bg_color, 0.6);
+.scrollbar.button.bottom:hover {
+	box-shadow: inset 0 1px mix(@scrollbar_slider, @scrollbar_trough, 0.8);
 }
 
-.scrollbar.slider:insensitive {
-	background-color: shade (@bg_color, 0.9);
+.scrollbar.button.right:hover {
+	box-shadow: inset 1px 0 mix(@scrollbar_slider, @scrollbar_trough, 0.8);
 }
 
-.scrollbar.trough:insensitive {
-	background-color: shade (@bg_color, 1.06);
+.scrollbar.button.left:hover {
+	box-shadow: inset -1px 0 mix(@scrollbar_slider, @scrollbar_trough, 0.8);
 }
 
-/* Fixes a bug in Opera */
 .scrollbar.button {
-	background-image: -gtk-gradient (linear, left top, left bottom,
-		from (transparent),
-		to (transparent));
-	background-color: transparent;
+	color: @theme_fg_color;
 }
 
-/* overlay scrollbar */
-OsThumb {
-	color: shade (@fg_color, 1.6);
+.scrollbar.button:hover {
+	color: @theme_fg_color;
 }
 
-OsThumb:selected,
-OsScrollbar:selected {
-	background-color: @selected_bg_color;
+.scrollbar.button:insensitive {
+	color: @insensitive_fg_color;
 }
 
-OsThumb:active,
-OsScrollbar:active {
-	background-color: shade (@bg_color, 0.6);
+.scrollbar.button:active {
+	color: @theme_fg_color;
 }
 
-OsThumb:insensitive,
-OsScrollbar:insensitive {
-	background-color: shade (@bg_color, 0.85);
+.scrollbar.slider.vertical {
+	background-image: linear-gradient(to right,
+		shade(@scrollbar_slider, 0.95),
+		shade(@scrollbar_slider, 0.8));
+	border-radius: 20px;
+	border-style: solid;
+	border-image: none;
+	border-color: shade(@scrollbar_slider, 0.65);
+	border-width: 1px;
 }
 
-/*******************
- * scrolled window *
- *******************/
-.ubuntu-online-accounts.frame,
-GtkScrolledWindow.frame {
-	border-top-color: shade (@bg_color, 0.84);
-	border-right-color: shade (@bg_color, 0.76);
-	border-bottom-color: shade (@bg_color, 0.86);
-	border-left-color: shade (@bg_color, 0.76);
-	border-radius: 0;
+.scrollbar.slider.vertical:hover,
+.scrollbar.slider.vertical:hover:active {
+	background-image: linear-gradient(to right,
+		shade(@scrollbar_slider, 0.85),
+		shade(@scrollbar_slider, 0.7));
 	border-style: solid;
+	border-image: none;
+	border-color: shade(@scrollbar_slider, 0.65);
+	border-width: 1px;
 }
 
-.ubuntu-online-accounts.frame {
-	border-top-width: 0;
+.scrollbar.slider.horizontal {
+	background-image: linear-gradient(to bottom,
+		shade(@scrollbar_slider, 0.95),
+		shade(@scrollbar_slider, 0.8));
+	border-radius: 20px;
+	border-style: solid;
+	border-image: none;
+	border-color: shade(@scrollbar_slider, 0.65);
+	border-width: 1px;
 }
 
-/*************
- * separator *
- *************/
-.separator {
-	border-left-color: shade (@bg_color, 0.96);
-	border-right-color: alpha (@base_color, 0.4);
-	border-top-color: shade (@bg_color, 0.96);
-	border-bottom-color: alpha (@base_color, 0.4);
+.scrollbar.slider.horizontal:hover,
+.scrollbar.slider.horizontal:hover:active {
+	background-image: linear-gradient(to bottom,
+		shade(@scrollbar_slider, 0.85),
+		shade(@scrollbar_slider, 0.7));
 	border-style: solid;
 	border-image: none;
+	border-color: shade(@scrollbar_slider, 0.65);
 	border-width: 1px;
 }
 
-.button .separator,
-.button.separator {
-	border-color: shade (@button_bg_color, 0.84);
+.scrollbar.slider:insensitive {
+	background-color: shade(@scrollbar_slider, 0.85);
+	border-style: solid;
+	border-image: none;
+	border-color: shade(@scrollbar_slider, 0.75);
+	border-width: 1px;
 }
 
-.notebook .button .separator,
-.notebook .button.separator {
-	border-color: shade (@bg_color, 0.9);
+/*********
+ * Menus *
+ *********/
+/* combobox menus */
+GtkTreeMenu.menu {
+	background-color: @menu_bg_color;
 }
 
-.button .separator:insensitive,
-.button.separator:insensitive {
-	border-color: shade (@button_insensitive_bg_color, 0.9);
-}
+GtkTreeMenu .menuitem {
+	padding: 2px;
 
-.notebook .button .separator,
-.notebook .button.separator {
-	border-color: shade (@bg_color, 0.84);
+	border-style: none;
 }
 
-.menuitem.separator {
-	-GtkMenuItem-horizontal-padding: 0;
-	-GtkWidget-separator-height: 1;
-
-	border-color: shade (@bg_color, 0.96);
+GtkTreeMenu .menuitem * {
+	color: @theme_text_color;
 }
 
-Genericmenuitem .menuitem.separator,
-DbusmenuGtkMenu .menuitem.separator,
-.menubar .menuitem.separator,
-.primary-toolbar .menuitem.separator {
-	border-color: shade (@base_color, 0.94);
+GtkTreeMenu .menuitem,
+.button .menuitem,
+.toolbar .button .menuitem * {
+	text-shadow: none;
 }
 
-/***********
- * sidebar *
- ***********/
-.sidebar,
-.sidebar .view {
+.menu {
+	background-color: @menu_bg_color;
+	color: @menu_fg_color;
+	padding: 0;
+	border-style: none;
 }
 
-.sidebar row:selected {
-	text-shadow: 0 1px shade (@selected_bg_color, 0.7);
-}
+.menu.button {
+	background-image: none;
+	background-color: @theme_base_color;
+	color: @internal_element_color;
 
-.sidebar row:hover {
-	background-color: alpha (@bg_color, 0.0);
+	border-image: none;
+	border-style: none;
 }
 
-.sidebar .frame {
-	border-width: 0;
-}
+.menu.button:hover {
+	background-image: none;
+	background-color: @theme_base_color;
+	color: @theme_text_color;
 
-/**************
- * spinbutton *
- **************/
-.spinbutton.button:active,
-.spinbutton.button:insensitive,
-.notebook .spinbutton.button:active,
-.notebook .spinbutton.button:insensitive,
-.spinbutton.button,
-.notebook .spinbutton.button {
-	border-radius: 0;
-	border-width: 1px 0 1px 1px;
-	background-color: transparent;
 	border-image: none;
-	border-color: transparent;
-	border-left-color: alpha (@dark_bg_color, 0.3);
+	border-style: none;
 }
 
-.spinbutton.button:insensitive:nth-child(last),
-.notebook .spinbutton.button:insensitive:nth-child(last),
-.spinbutton.button:nth-child(last),
-.notebook .spinbutton.button:nth-child(last) {
-	border-radius: 0 2px 2px 0;
-	border-width: 1px;
-	background-color: transparent;
+.menu.button:insensitive {
+	background-color: @theme_base_color;
+	color: lighter(@internal_element_color);
+
 	border-image: none;
-	border-color: transparent;
-	border-left-color: alpha (@dark_bg_color, 0.3);
+	border-style: none;
 }
 
-.spinbutton.button,
-.notebook .spinbutton.button {
-	background-image: none;
-	background-color: transparent;
-	border-image: none;
-	border-color: transparent;
-	border-left-color: alpha (@dark_bg_color, 0.3);
+/* this controls the general appearance of the menubar */
+.menubar {
+	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);
+	-GtkWidget-window-dragging: true;
 }
 
-.spinbutton.button:hover,
-.notebook .spinbutton.button:hover {
-	background-color: alpha (shade (@base_color, 1.1), 0.5);
+.menubar .menuitem {
+	border-style: none;
+	padding: 2px 6px;
+	text-shadow: 0 1px @button_text_shadow;
 }
 
-.spinbutton.button:active,
-.notebook .spinbutton.button:active,
-.spinbutton.button:active:hover,
-.notebook .spinbutton.button:active:hover {
-	background-color: alpha (shade (@selected_bg_color, 1.0), 0.3);
+.menubar .menuitem:hover {
+	background-image: linear-gradient(to bottom,
+		shade (@theme_bg_color, 1.0),
+		shade (@theme_bg_color, 0.82));
 }
 
-.spinbutton.button:insensitive,
-.notebook .spinbutton.button:insensitive {
-	border-left-color: alpha (@dark_bg_color, 0.3);
-	color: shade (@bg_color, 0.66);
+.menubar .menuitem *:hover {
+	color: @menu_fg_color;
 }
 
-.spinbutton,
-.spinbutton:hover {
-	color: @fg_color;
+.menu .menuitem {
+	-GtkMenuItem-arrow-scaling: 0.4;
+	padding: 4px;
 }
 
-.spinbutton.button:focus,
-.spinbutton:focus {
-	outline-color: transparent;
+.menu .menuitem:hover {
+	border-radius: 0;
 }
 
-/*************
- * statusbar *
- *************/
-GtkStatusbar {
+.menu .menuitem:active,
+.menu .menuitem:hover {
+	background-color: @theme_selected_bg_color;
+	background-image: linear-gradient(to bottom,
+		shade (@theme_selected_bg_color, 1.0),
+		shade (@theme_selected_bg_color, 0.85));
+	text-shadow: none;
 }
 
-/**********
- * switch *
- **********/
-GtkSwitch {
-	border-radius: 8px;
-	padding: 0;
-	background-color: transparent;
+.menu .menuitem:insensitive {
+	background-color: @menu_bg_color;
 }
 
-GtkSwitch.trough {
-	border: none;
-	border-image: none;
-	background: none;
-	color: transparent;
-	box-shadow: none;
-	background-color: transparent;
-	background-size: 48px 24px;
-	background-position: center center;
-	background-repeat: no-repeat;
-	text-shadow: none;
+.menu .menuitem:active,
+.menu .menuitem *:active,
+.menu .menuitem:hover,
+.menu .menuitem *:hover {
+	color: @theme_selected_fg_color;
 }
 
-/************
- * textview *
- ************/
-GtkTextView {
-	background-color: @base_color;
+.menu .menuitem:insensitive,
+.menu .menuitem *:insensitive {
+	color: mix (@menu_fg_color, @menu_bg_color, 0.6);
 }
 
-/********************
- * Menubar Toolbars *
- ********************/
-.toolbar.menubar {
-	-GtkToolbar-button-relief: normal;
-	
-	padding: 4px 4px 2px 4px; /* weird padding to compensate border-images 
-				 and eventual top border presence, 
-				 see selection mode toolbars */
+.menu .menuitem .accelerator:insensitive {
+	color: mix (@menu_fg_color, @menu_bg_color, 0.7);
+}
 
+.menuitem .accelerator {
+	color: alpha (@menu_fg_color, 0.4);
 }
 
-/***********
- * toolbar *
- ***********/
-.toolbar {
-	border-style: none;
+.menuitem .accelerator:hover,
+.menuitem .accelerator:active {
+	color: alpha (@theme_selected_fg_color, 0.7);
 }
 
-/* primary-toolbar */
-.primary-toolbar,
-.primary-toolbar .toolbar,
-.primary-toolbar.toolbar {
-	-GtkWidget-window-dragging: true;
+.menuitem.arrow {
+	color: @menu_controls_color;
+}
 
-	background-image: -gtk-gradient (linear, left top, left bottom,
-		from (@toolbar_gradient_base),
-		to (@toolbar_gradient_final));
-	border-color: shade (@toolbar_border, 1.0);
-	border-style: solid;
-	border-width: 0 0 1px 0;
-	padding: 2px;
+.menuitem.separator {
+	color: @menu_separator;
 
-	color: @fg_color;
-	text-shadow: 0 1px alpha (shade (@button_bg_color, 1.25), 0.4);
+	-GtkMenuItem-horizontal-padding: 0px;
 }
 
-.primary-toolbar :insensitive {
-	text-shadow: 0 1px alpha (shade (@button_bg_color, 1.25), 0.4);
+.menuitem.check,
+.menuitem.radio,
+.menuitem.check:hover,
+.menuitem.radio:hover,
+.menuitem.check:insensitive,
+.menuitem.radio:insensitive {
+	background-image: none;
+	background-color: transparent;
 }
 
-.primary-toolbar GtkComboBox,
-.primary-toolbar .button *,
-.primary-toolbar .button {
+.menuitem.check:active,
+.menuitem.radio:active {
 	background-color: transparent;
-	background-image: none;
-	border-radius: 6px;
-	border-width: 1px;
-	border-color: transparent;
-	/* border-image: none; */
-	color: @fg_color;
-	text-shadow: 0 1px alpha (shade (@button_bg_color, 1.25), 0.4);
 }
 
-.primary-toolbar .raised .button,
-.primary-toolbar .raised.button,
-.primary-toolbar .button:hover,
-.primary-toolbar .button:active,
-.primary-toolbar .button:insensitive {
-	border-width: 1px;
-	color: @fg_color;
+.menuitem.check:active {
+	background-image: url("assets/menuitem-checkbox-checked.svg");
 }
 
-.primary-toolbar .raised .button:hover,
-.primary-toolbar .raised.button:hover {
-	background-image: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@button_bg_color, 1.2)),
-		to (shade (@button_bg_color, 1.04)));
+.menuitem.check:active:hover {
+	background-image: url("assets/menuitem-checkbox-checked-selected.svg");
 }
 
-.primary-toolbar .raised .button:focus,
-.primary-toolbar .raised.button:focus,
-.primary-toolbar .button:hover:focus,
-.primary-toolbar .button:active:focus,
-.primary-toolbar .button:insensitive:focus {
-	color: @fg_color;
+.menuitem.check:active:insensitive {
+	background-image: url("assets/menuitem-checkbox-checked-insensitive.svg");
 }
 
-.primary-toolbar GtkComboBox.combobox-entry .button,
-.primary-toolbar .raised .button,
-.primary-toolbar .raised.button,
-.primary-toolbar .button:hover {
-	background-image: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@button_bg_color, 1.1)),
-		to (shade (@button_bg_color, 0.95)));
-	border-style: solid;
-	text-shadow: 0 1px alpha (shade (@button_bg_color, 1.25), 0.4);
-	color: @fg_color;
+.menuitem.check:inconsistent,
+.menuitem.radio:inconsistent {
+	background-image: url("assets/menuitem-checkbox-mixed.svg");
 }
 
-.primary-toolbar .button:active {
-	background-image: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@bg_color, 0.8)),
-		to (shade (@bg_color, 0.9)));
-	color: @fg_color;
+.menuitem.check:inconsistent:insensitive,
+.menuitem.radio:inconsistent:insensitive {
+	background-image: url("assets/menuitem-checkbox-mixed-insensitive.svg");
 }
 
-.primary-toolbar .button:active:hover {
-	background-image: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@bg_color, 0.85)),
-		to (shade (@bg_color, 0.95)));
-	color: @fg_color;
+.menuitem.check:inconsistent:hover,
+.menuitem.radio:inconsistent:hover {
+	background-image: url("assets/menuitem-checkbox-mixed-selected.svg");
 }
 
-.primary-toolbar .button:active:insensitive,
-.primary-toolbar .button:insensitive {
-	background-image: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@button_insensitive_bg_color, 1.04)),
-		to (shade (@button_insensitive_bg_color, 0.96)));
-
-	text-shadow: 0 1px alpha (shade (@button_bg_color, 1.25), 0.4);
+.menuitem.radio:active {
+	background-image: url("assets/menuitem-radio-checked.svg");
 }
 
-.primary-toolbar .button:insensitive {
-	background-image: -gtk-gradient (linear, left top, left bottom,
-		from (alpha (@button_insensitive_bg_color, 0.0)),
-		to (alpha (@button_insensitive_bg_color, 0.0)));
-
-	text-shadow: 0 1px alpha (shade (@button_bg_color, 1.25), 0.4);
+.menuitem.radio:active:hover {
+	background-image: url("assets/menuitem-radio-checked-selected.svg");
+}
 
-	border-width: 1px;
+.menuitem.radio:active:insensitive {
+	background-image: url("assets/menuitem-radio-checked-insensitive.svg");
 }
 
-.primary-toolbar .button *:insensitive {
-	color: mix (@fg_color, @bg_color, 0.5);
+/***************
+ * 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 {
+/*	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;*/
 }
 
-.primary-toolbar .button:active:insensitive {
-	background-image: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@button_insensitive_bg_color, 1.0)),
-		to (shade (@button_insensitive_bg_color, 0.97)));
-	border-width: 1px;
+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;
 }
 
-.primary-toolbar .entry,
-.primary-toolbar .entry:active,
-.primary-toolbar .entry:focused {
-	border-radius: 2px;
-	color: @text_color;
+.linked GtkMenuButton.button:active:last-child,
+.toolbar .linked.raised GtkMenuButton.button:active:last-child,
+.toolbar GtkMenuButton.button.linked.raised:active:last-child {
+	border-top-left-radius: 0;
 }
 
-.primary-toolbar GtkSeparatorToolItem,
-.primary-toolbar .separator,
-.primary-toolbar .separator:insensitive {
-	border-color: alpha (shade (@bg_color, 0.94), 0.0);
-	border-style: solid;
+.linked GtkMenuButton.button:active:first-child,
+.toolbar .linked.raised GtkMenuButton.button:active:first-child,
+.toolbar GtkMenuButton.button.linked.raised:active:first-child {
+	border-top-right-radius: 0;
 }
 
-/* inline-toolbar */
-.inline-toolbar.toolbar {
-	-GtkToolbar-button-relief: normal;
+.button.menuitem.menubar:active {
+	background-image: none;
+	background-color: @menu_bg_color;
 
-	background-image: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@base_color, 0.93)),
-		to (shade (@base_color, 0.93)));
-	border-radius: 0;
+	border-radius: 4px 4px 0 0;
+	border-image: none;
+	border-width: 1px 1px 0 1px;
+	border-color: @menu_bg_color;
 	border-style: solid;
-	border-width: 1px;
-	padding: 3px 4px 4px 4px;
 }
 
-.inline-toolbar.toolbar:nth-child(last) {
-	border-bottom-color: shade (@bg_color, 0.76);
-	border-color: shade (@bg_color, 0.8);
-	border-radius: 0;
-	border-width: 0 1px 1px 1px;
+.button.menuitem.menubar *:active,
+GtkMenuButton.button *:active,
+.toolbar GtkMenuButton.button *:active {
+	color: @theme_text_color;
 }
 
-.inline-toolbar.toolbar .button {
-	background-image: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@button_bg_color, 1.1)),
-		to (shade (@button_bg_color, 0.95)));
-	icon-shadow: 0 1px shade (@bg_color, 1.16);
-}
-
-.inline-toolbar.toolbar .button *:insensitive,
-.inline-toolbar.toolbar GtkToolButton .button:insensitive {
-	background-image: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@bg_color, 1.02)),
-		to (shade (@bg_color, 0.98)));
+GtkMenuButton .menu {
+	text-shadow: none;
 }
 
-/***********
- * tooltip *
- ***********/
-.tooltip {
-	background-color: @tooltip_bg_color;
-	border-color: shade (@tooltip_bg_color, 0.7);
-	border-radius: 0px;
-	border-style: solid;
-	border-width: 1px;
+/****************
+ * Radiobuttons *
+ ****************/
 
-	color: @tooltip_fg_color;
+.check,
+.radio,
+.check:insensitive,
+.radio:insensitive {
+	background-color: transparent;
+	border-style: none;
 }
 
-.tooltip * {
+GtkCheckButton:hover,
+GtkCheckButton:active:hover,
+GtkCheckButton:selected,
+GtkCheckButton:selected:focus {
 	background-color: transparent;
 }
 
 /************
- * treeview *
+ * Toolbars *
  ************/
-GtkTreeView {
-	-GtkTreeView-vertical-separator: 0;
-	-GtkTreeView-expander-size: 10;
+.toolbar {
+	border-style: none;
+	border-color: darker (@theme_bg_color);
+	padding: 6px;
+	background-color: @theme_bg_color;
 }
 
-GtkTreeView.dnd {
-	border-color: shade (@selected_bg_color, 1.12);
-	border-radius: 0;
-	border-width: 0;
-	border-style: solid;
+.toolbar .button {
+	padding: 1px;
 }
 
-GtkTreeView .entry {
-	background-image: none;
-	border-radius: 0;
+.toolbar .button.text-button {
+	padding: 2px 16px;
 }
 
-GtkTreeView row:nth-child(even),
-GtkTreeView row:nth-child(even):hover {
-	background-color: shade (@base_color, 0.97);
+.toolbar .button.image-button {
+	padding: 5px 4px 4px 5px;
 }
 
-GtkTreeView row:nth-child(odd),
-GtkTreeView row:nth-child(odd):hover {
-	background-color: shade (@base_color, 1.0);
+.toolbar:insensitive {
+	color: alpha (@theme_fg_color, 0.6);
+	background-color: @insensitive_bg_color;
 }
 
-/************
- * viewport *
- ************/
-GtkViewport.frame {
-	border-width: 0;
-}
+/********************
+ * Menubar Toolbars *
+ ********************/
+.toolbar.menubar {
+	-GtkToolbar-button-relief: normal;
+	
+	padding: 6px 6px 5px 6px; /* weird padding to compensate border-images
+				and eventual top border presence, 
+				see selection mode toolbars */
 
-GtkViewport,
-GtkIconView {
-	background-color: @base_color;	
 }
 
-/***********
- * spinner *
- ***********/
-@keyframes spinner {
-	0.00% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)); }
+/***************
+ * Header bars *
+ ***************/
+.header-bar {
+	border-width: 0 0 1px;
+	border-style: solid;
+	border-color: shade(@borders, 0.90);
+	padding: 0 1px;
 
-	12.5% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)); }
+	box-shadow: inset 0 -1px shade(@borders, 1.30);
+	background-color: @theme_bg_color;
+}
 
-	25.0% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)); }
+.header-bar .button.text-button {
+	padding: 2px 16px;
+}
 
-	37.5% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)); }
+.header-bar .button.image-button {
+	padding: 5px 4px 4px 5px;
+}
 
-	50.0% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)); }
+/********************
+ * Primary Toolbars *
+ ********************/
 
-	62.5% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)); }
+/* applications using EggEditableToolbar usually set the primary-toolbar
+ * 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;
 
-	75.0% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)); }
+	-GtkWidget-window-dragging: true;
+	-GtkToolbar-button-relief: normal;
+	text-shadow: 0 1px @button_text_shadow;
+	padding-top: 1px;
+	padding-bottom: 1px;
+}
 
-	87.5% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)); }
+.primary-toolbar .toolbar:insensitive,
+.primary-toolbar.toolbar:insensitive {
+	background-image: none;
+	background-color: shade (@theme_bg_color, 0.97);
 
-	100%  { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)); }
+	border-color: shade (@theme_bg_color, 0.91);
+	text-shadow: none;
 }
 
-.spinner {
-	background-color: transparent;
-	background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent));
-	background-position: 14% 14%, 0% 50%, 14% 86%, 50% 100%, 86% 86%, 100% 50%, 86% 14%, 50% 0%;
-	background-size: 20% 20%;
-	background-repeat: no-repeat;
-}
+/* progressbars on primary toolbar entries are special */
+.primary-toolbar .toolbar .entry.progressbar,
+.primary-toolbar.toolbar .entry.progressbar {
+	background-image: linear-gradient(to bottom,
+		@trough_bg_color_a,
+		@trough_bg_color_b);
+	border-width: 1px;
+	border-radius: 2px;
+	border-style: solid;
+	border-color: shade(@internal_element_color, 1.10);
+	border-image: none;
 
-.spinner:active {
-	animation: spinner 1s infinite linear;
+	color: @theme_text_color;
 }
 
-/*****************
- * Miscellaneous *
- *****************/
-.floating-bar {
-	background-color: @base_color;
-}
+/*******************
+ * Inline toolbars *
+ *******************/
 
-.floating-bar.top {
-	border-top-width: 0;
-	border-top-right-radius: 0;
-	border-top-left-radius: 0;
-}
+.inline-toolbar.toolbar {
+	border-width: 1px;
+	border-style: solid;
+	border-color: @borders;
 
-.floating-bar.right {
-	border-right-width: 0;
-	border-top-right-radius: 0;
-	border-bottom-right-radius: 0;
+	-GtkToolbar-button-relief: normal;
+	/*box-shadow: inset 0 3px alpha(black, 0.02), inset 0 2px alpha(black, 0.02), inset 0 1px alpha(black, 0.02);*/
+	padding: 2px;
 }
 
-.floating-bar.bottom {
-	border-bottom-width: 0;
-	border-bottom-right-radius: 0;
-	border-bottom-left-radius: 0;
+.inline-toolbar.toolbar:last-child {
+	border-top-width: 0;
+	/*padding-top: 4px; FIXME: why a specific padding here? */
+
+	border-radius: 0 0 3px 3px;
 }
 
-.floating-bar.left {
+.inline-toolbar.toolbar.vertical:last-child {
 	border-left-width: 0;
-	border-top-left-radius: 0;
-	border-bottom-left-radius: 0;
-}
+	/*padding-left: 4px; FIXME: why a specific padding here? */
 
-.floating-bar.bottom.right {
-	box-shadow: inset 1px 1px @base_color;
+	border-radius: 0;
 }
 
-.floating-bar.bottom.left {
-	box-shadow: inset -1px 1px @base_color;
+/***********
+ * Sidebar *
+ ***********/
+.sidebar,
+.sidebar .view,
+.sidebar GtkScrolledWindow {
+	background-color: @sidebar_bg;
 }
 
-.floating-bar .button {
-	background-color: transparent;
+.sidebar .radio,
+.sidebar .radio:focus,
+.sidebar .radio:selected {
 	background-image: none;
-	border-style: none;
-	border-image: none;
-	-GtkButton-image-spacing: 0;
-	-GtkButton-inner-border: 0;
+	background-color: transparent;
 }
 
 /*******
  * OSD *
  *******/
-GtkWindow.osd {
+.background.osd {
 	color: @osd_fg;
 	background-color: @osd_bg;
 }
@@ -2112,23 +2325,37 @@ GtkOverlay.osd {
 	background-color: transparent;
 }
 
+.osd.frame {
+	background-clip: border-box;
+	background-origin: border-box;
+}
+
+.osd.button,
+.osd.button:active,
 .osd .button,
 .osd .button:active {
 	border-width: 1px;
 	border-style: solid;
 	border-image: none;
-	border-color: @osd_button_border;
 	border-radius: 5px;
 }
 
 .osd .button {
+	border-color: @osd_button_border;
+}
+
+.osd .button:active {
+	border-color: @osd_button_border_active;
+}
+
+.osd.button,
+.osd .button {
 	padding: 4px;
 
 	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;
 
@@ -2136,52 +2363,77 @@ GtkOverlay.osd {
 	icon-shadow: 0 -1px @osd_button_shadow;
 }
 
+.osd.button {
+	padding: 8px;
+}
+
+.osd.button,
+.osd.button:active {
+	border-color: transparent;
+}
+
+.osd.button,
+.osd.button:prelight,
+.osd.button:active {
+	background-color: shade(@osd_bg, 1.10);
+}
+
 .osd .button,
 .osd .button:prelight,
 .osd .button:active {
 	background-color: transparent;
 }
 
+.osd.button:insensitive,
 .osd .button:insensitive {
 	background-image: none;
 	background-color: @osd_button_bg_insensitive;
 }
 
+.osd.button:active:insensitive,
 .osd .button:active:insensitive {
 	background-image: none;
 	background-color: @osd_button_bg_insensitive_active;
 }
 
+.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 {
 	color: @osd_button_fg_active;
 }
 
+.osd.button *:insensitive,
+.osd.button *:insensitive:active,
 .osd .button *:insensitive,
 .osd .button *:insensitive:active {
 	color: @osd_button_fg_insensitive;
+	text-shadow: none;
+	icon-shadow: none;
 }
 
+.osd.button:hover,
 .osd .button:hover {
 	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,
+.osd.button:active:hover,
 .osd .button:active,
 .osd .button:active:hover,
 .osd GtkMenuButton.button:active {
 	background-image: linear-gradient(to bottom,
 		@osd_button_bg_active_a,
-		@osd_button_bg_active_b 68%,
-		@osd_button_bg_active_c
-		);
+		@osd_button_bg_active_b 20%,
+		@osd_button_bg_active_c);
 }
 
 .osd GtkMenuButton.button:active {
@@ -2204,8 +2456,7 @@ 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;
@@ -2259,19 +2510,34 @@ 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;
 }
 
-.osd GtkProgressBar {
+.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));
+}
+
+.osd .scale.trough:insensitive,
+.osd .scale.trough.highlight:insensitive {
+	border-color: shade(@osd_button_border, 0.60);
+	background-image: none;
+	background-color: transparent;
+}
+
+.osd GtkProgressBar,
+GtkProgressBar.osd {
 	padding: 0;
 	-GtkProgressBar-xspacing: 0;
 	-GtkProgressBar-yspacing: 3px;
 	-GtkProgressBar-min-horizontal-bar-height: 3px;
 }
 
-.osd GtkProgressBar.trough {
+.osd GtkProgressBar.trough,
+GtkProgressBar.osd.trough {
 	padding: 0;
 	border-image: none;
 	border-style: none;
@@ -2281,9 +2547,901 @@ GtkOverlay.osd {
 	border-radius: 0;
 }
 
-.osd GtkProgressBar.progressbar {
+.osd GtkProgressBar.progressbar,
+GtkProgressBar.osd.progressbar {
 	border-style: none;
-	background-color: @selected_bg_color;
+	background-color: @theme_selected_bg_color;
 	background-image: none;
 	border-radius: 0;	
 }
+
+.osd .view,
+.osd.view {
+	background-color: @osd_view_bg;
+}
+
+.osd .scrollbar.trough {
+	background-color: @osd_scrollbar_trough;
+}
+
+.osd .scrollbar.slider {
+	background-color: @osd_scrollbar_slider;
+}
+
+.osd .scrollbar.slider:hover {
+	background-color: @osd_scrollbar_slider_prelight;
+}
+
+.osd .scrollbar.slider:active {
+	background-color: @osd_scrollbar_slider_active;
+}
+
+.osd GtkIconView.cell:selected,
+.osd GtkIconView.cell:selected:focus {
+	background-color: transparent;
+
+	border-style: solid;
+	border-radius: 15px;
+	border-width: 3px;
+	border-color: @osd_button_fg;
+
+	outline-color: transparent;
+}
+
+/* used by Documents */
+.osd .page-thumbnail {
+	border-style: solid;
+	border-width: 1px;
+	border-color: @osd_lowlight;
+
+	/* when there's no pixbuf yet */
+	background-color: @osd_bg;
+}
+
+/****************************
+ * Suggested action buttons *
+ ****************************/
+.toolbar .suggested-action.button,
+.suggested-action.button {
+	background-image: linear-gradient(to bottom,
+		@suggested_action_button_a,
+		@suggested_action_button_b);
+	border-image: none;
+	border-color: @suggested_action_button_border;
+	border-width: 1px;
+
+	color: @suggested_action_button_fg;
+}
+
+.toolbar .suggested-action.button:hover,
+.suggested-action.button:hover {
+	background-image: linear-gradient(to bottom,
+		shade(@suggested_action_button_a, 1.10),
+		shade(@suggested_action_button_b, 1.05));
+}
+
+.toolbar .suggested-action.button:active,
+.toolbar .suggested-action.button:hover:active,
+.suggested-action.button:active,
+.suggested-action.button:hover:active {
+	background-image: linear-gradient(to bottom,
+		@suggested_action_button_b,
+		@suggested_action_button_a);
+
+	color: @suggested_action_button_fg;
+}
+
+.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 {
+	text-shadow: 0 1px shade(@suggested_action_button_shadow, 1.15);
+	icon-shadow: 0 1px shade(@suggested_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;
+	background-image: linear-gradient(to bottom,
+		@selection_toolbar_bg_a,
+		@selection_toolbar_bg_b);
+	background-color: transparent;
+
+	border-color: @borders;
+	border-style: solid;
+	border-image: none;
+
+	text-shadow: 0 1px @selection_toolbar_shadow;
+}
+
+.selection-mode.header-bar {
+	border-top-color: @selection_toolbar_bg_a;
+	border-bottom-color: @selection_toolbar_border;
+
+	box-shadow: inset 0 -1px shade(@selection_toolbar_border, 1.20);
+}
+
+.selection-mode.toolbar {
+	padding: 6px;
+}
+
+/* regular button */
+.selection-mode.header-bar .button,
+.selection-mode.toolbar .button,
+.selection-mode.toolbar GtkToolButton .button {
+	background-image: linear-gradient(to bottom,
+		@selection_toolbar_button_a,
+		@selection_toolbar_button_b);
+
+	border-image: none;
+	border-color: @selection_toolbar_button_border;
+	border-width: 1px;
+
+	box-shadow: inset 0 1px alpha(white, 0.1);
+
+	color: @selection_toolbar_button_fg;
+}
+
+.selection-mode.header-bar .button:hover,
+.selection-mode.toolbar .button:hover,
+.selection-mode.toolbar GtkToolButton .button:hover {
+	background-image: linear-gradient(to bottom,
+		shade(@selection_toolbar_button_a, 1.05),
+		shade(@selection_toolbar_button_b, 1.02));
+}
+
+.selection-mode.header-bar .button:active,
+.selection-mode.header-bar .button:hover:active,
+.selection-mode.toolbar .button:active,
+.selection-mode.toolbar .button:hover:active,
+.selection-mode.toolbar GtkToolButton .button:active,
+.selection-mode.toolbar GtkToolButton .button:hover:active {
+	background-image: linear-gradient(to bottom,
+		shade(@selection_toolbar_button_b, 0.95),
+		shade(@selection_toolbar_button_a, 0.88));
+	box-shadow: none;
+}
+
+.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 {
+	text-shadow: 0 1px @selection_toolbar_button_shadow;
+	icon-shadow: 0 1px @selection_toolbar_button_shadow;
+}
+
+/* suggested button */
+.selection-mode.header-bar .suggested-action.button,
+.selection-mode.toolbar .suggested-action.button,
+.selection-mode.toolbar GtkToolButton.suggested-action .button {
+	background-image: linear-gradient(to bottom,
+		@selection_toolbar_suggested_button_a,
+		@selection_toolbar_suggested_button_b 40%,
+		@selection_toolbar_suggested_button_c);
+
+	border-image: none;
+	border-color: @selection_toolbar_suggested_button_border;
+	border-width: 1px;
+
+	box-shadow: inset 0 2px alpha(@selection_toolbar_suggested_button_b, 0.2),
+		inset 0 1px @selection_toolbar_suggested_button_a;
+	color: @theme_text_color;
+}
+
+.selection-mode.header-bar .suggested-action.button:hover,
+.selection-mode.toolbar .suggested-action.button:hover,
+.selection-mode.toolbar GtkToolButton.suggested-action .button:hover {
+	background-image: linear-gradient(to bottom,
+		shade(@selection_toolbar_suggested_button_a, 1.15),
+		shade(@selection_toolbar_suggested_button_b, 1.15) 40%,
+		@selection_toolbar_suggested_button_c);
+}
+
+.selection-mode.header-bar .suggested-action.button:active,
+.selection-mode.header-bar .suggested-action.button:hover:active,
+.selection-mode.toolbar .suggested-action.button:active,
+.selection-mode.toolbar .suggested-action.button:hover:active,
+.selection-mode.toolbar GtkToolButton.suggested-action .button:active,
+.selection-mode.toolbar GtkToolButton.suggested-action .button:hover:active {
+	background-image: linear-gradient(to bottom,
+		shade(@selection_toolbar_suggested_button_c, 0.92),
+		@selection_toolbar_suggested_button_b 40%,
+		shade(@selection_toolbar_suggested_button_a, 0.92));
+	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 {
+	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 {
+	text-shadow: 0 1px @button_text_shadow;
+	icon-shadow: 0 1px @button_text_shadow;
+}
+
+/* menu button */
+.selection-mode.header-bar .selection-menu.button,
+.selection-mode.toolbar .selection-menu.button {
+	background-image: none;
+	border-image: none;
+	border-color: transparent;
+	border: 0px;
+	box-shadow: none;
+
+	color: @selection_menu_fg;
+}
+
+.selection-mode.toolbar .dim-label,
+.selection-mode.toolbar .selection-menu.button .dim-label {
+	color: @selection_menu_fg;
+}
+
+.selection-mode.header-bar .selection-menu.button:hover,
+.selection-mode.toolbar .dim-label:hover,
+.selection-mode.toolbar .selection-menu.button:hover,
+.selection-mode.toolbar .selection-menu.button .dim-label:hover {
+	background-color: transparent;
+	color: @selection_menu_hover;
+}
+
+.selection-mode.header-bar .selection-menu.button:active,
+.selection-mode.toolbar .selection-menu.button:active {
+	border-color: transparent;
+	border-radius: 3px;
+	border-width: 1px;
+
+	background-color: transparent;
+}
+
+.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 * {
+	text-shadow: 0 1px @selection_toolbar_shadow;
+}
+
+.selection-mode.header-bar .selection-menu.button .menuitem *,
+.selection-mode.toolbar .selection-menu.button .menuitem * {
+	text-shadow: none;
+}
+
+/****************
+ * GtkAssistant *
+ ****************/
+GtkAssistant .sidebar .highlight {
+	background-color: transparent;
+	color: @theme_fg_color;
+	font: bold;
+}
+
+GtkAssistant .sidebar {
+	padding: 12px;
+
+	border-width: 1px;
+	border-radius: 2px;
+	border-style: solid;
+	border-color: @inactive_frame_color;
+
+	color: mix (@theme_fg_color, @theme_bg_color, 0.40);
+
+	background-color: shade (@theme_bg_color, 0.97);
+	/* shall we make it like sidebars in general? */
+
+}
+
+/*************
+ * GtkSwitch *
+ *************/
+
+GtkSwitch {
+	border-radius: 8px;
+	padding: 2px;
+	background-color: transparent;
+}
+
+GtkSwitch.trough,
+GtkSwitch.trough:insensitive {
+	border: none;
+	border-image: none;
+	color: transparent;
+	box-shadow: none;
+	background-color: transparent;
+	background-size: 48px 26px;
+	background-position: center center;
+	background-repeat: no-repeat;
+	text-shadow: none;
+}
+
+GtkSwitch.slider {
+	background-color: transparent;
+	border: none;
+	border-image: none;
+}
+
+/***********************
+ * Tree and Icon views *
+ ***********************/
+GtkTreeView {
+	-GtkTreeView-vertical-separator: 0;
+
+	-GtkWidget-focus-line-width: 1;
+	-GtkWidget-focus-padding: 1;
+
+	outline-color: alpha(@theme_text_color, 0.6);
+}
+
+GtkTreeView.dnd {
+	border-color: @internal_element_color;
+	border-radius: 2px;
+	border-width: 1px;
+	border-style: solid;
+}
+
+GtkTreeView:selected:focus {
+	outline-color: mix(@theme_selected_fg_color, @theme_selected_bg_color, 0.30);
+}
+
+GtkIconView.cell:selected,
+GtkIconView.cell:selected:focus {
+	border-radius: 4px;
+
+	/* FIXME: this probably needs to be better;
+	 * see https://bugzilla.gnome.org/show_bug.cgi?id=644157
+	 */
+	outline-color: @treeview_focus_border;
+	outline-style: solid;
+	outline-offset: 3px;
+}
+
+.view {
+	background-color: @theme_base_color;
+	color: @theme_text_color;
+}
+
+.view:insensitive {
+	background-color: @insensitive_bg_color;
+	color: @insensitive_fg_color;
+}
+
+.view:selected {
+	background-color: @theme_selected_bg_color;
+	color: @theme_selected_fg_color;
+}
+
+.view:selected:backdrop {
+	background-color: shade(@theme_unfocused_bg_color, 0.94);
+	color: @theme_fg_color;
+}
+
+.cell {
+	color: @theme_text_color;
+	padding: 2px;
+}
+
+.cell:selected,
+.cell:selected:focus {
+	background-color: @theme_selected_bg_color;
+	color: @theme_selected_fg_color;
+}
+
+.cell:selected:backdrop,
+.cell:selected:focus:backdrop {
+	background-color: shade(@theme_unfocused_bg_color, 0.94);
+	color: @theme_fg_color;
+}
+
+row:selected,
+row:selected:focus {
+	border-width: 1px 0 0 0;
+	border-style: solid;
+	border-color: shade (@theme_selected_bg_color, 0.85);
+	background-image: linear-gradient(to bottom,
+		shade (@theme_selected_bg_color, 1.0),
+		shade (@theme_selected_bg_color, 0.85));
+	box-shadow: none;
+}
+
+row:selected:backdrop,
+row:selected:focus:backdrop {
+	border-width: 1px 0 1px 0;
+	border-style: solid;
+	border-color: shade (@theme_bg_color, 0.85);
+	background-image: linear-gradient(to bottom,
+		shade (@theme_bg_color, 1.0),
+		shade (@theme_bg_color, 0.85));
+	color: @theme_fg_color;
+	text-shadow: none;
+	box-shadow: none;
+}
+
+GtkTreeView row:nth-child(even),
+GtkTreeView row:nth-child(odd) {
+	background-color: shade (@theme_base_color, 1.0);
+	box-shadow: inset 0 -1px 0 0 alpha (@theme_bg_color, 0.4);
+}
+
+GtkTreeView row:nth-child(odd):hover,
+GtkTreeView row:nth-child(even):hover {
+	background-color: shade (@theme_selected_bg_color, 1.55);
+}
+
+GtkTreeView row:nth-child(odd):backdrop:hover,
+GtkTreeView row:nth-child(even):backdrop:hover {
+	background-color: shade (@theme_base_color, 0.96);
+}
+
+column-header.button,
+column-header .button {
+	color: @theme_text_color;
+}
+
+column-header.button,
+column-header .button,
+column-header.button:insensitive,
+column-header .button:insensitive,
+column-header.button:hover,
+column-header .button:hover {
+	padding: 0 4px;
+	text-shadow: none;
+	icon-shadow: none;
+	border-radius: 0;
+}
+
+column-header.button:insensitive,
+column-header .button:insensitive {
+	background-color: @insensitive_bg_color;
+}
+
+column-header.button:hover,
+column-header .button:hover,
+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;
+	text-shadow: none;
+	icon-shadow: none;
+	border-radius: 0;
+}
+
+column-header .button.dnd {
+	background-color: transparent;
+	background-image: linear-gradient(to bottom,
+		shade(@theme_base_color, 0.97),
+		@theme_base_color);
+	border-width: 0 1px;
+	border-image-slice: 0 1;
+}
+
+.expander {
+	color: @theme_fg_color;
+	border-color: @theme_fg_color;
+}
+
+.expander:active {
+	color: @theme_fg_color;
+	border-color: @theme_fg_color;
+}
+
+.expander:hover {
+	color: @internal_element_color;
+	border-color: @internal_element_color;
+}
+
+.expander row:selected,
+.expander row:selected:focus {
+	color: @expander_row_selected_color;
+	border-color: @expander_row_selected_color;
+	border-width: 0;
+	background-color: transparent;
+	background-image: none;
+	border-image: none;
+	box-shadow: none;
+}
+
+.expander row:selected:hover,
+.expander row:selected:focus:hover {
+	color: @theme_selected_fg_color;
+	border-color: @theme_selected_fg_color;
+}
+
+/**************
+ * List boxes *
+ **************/
+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.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;
+}
+
+.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;
+}
+
+/* Calendars */
+GtkCalendar {
+	padding: 2px;
+}
+
+GtkCalendar.view {
+	border-radius: 3px;
+	border-style: solid;
+	border-width: 1px;
+	padding: 2px;
+}
+
+GtkCalendar.header {
+	border-radius: 0;
+	background-image: linear-gradient(to bottom,
+		shade(@theme_bg_color, 1.04),
+		shade(@theme_bg_color, 0.89));
+	border-width: 0;
+}
+
+GtkCalendar.button,
+GtkCalendar.button:insensitive {
+	background-image: none;
+	background-color: transparent;
+}
+
+.highlight,
+GtkCalendar.highlight {
+	background-color: @theme_selected_bg_color;
+	color: @theme_selected_fg_color;
+	border-radius: 0;
+	padding: 0;
+	border-width: 0;
+}
+
+/**************
+ * GtkInfoBar *
+ **************/
+GtkInfoBar {
+	border-width: 0;
+	border-style: none;
+}
+
+.info {
+	text-shadow: 0 1px @info_text_shadow;
+}
+
+.warning {
+	text-shadow: 0 1px @warning_text_shadow;
+}
+
+.question {
+	text-shadow: 0 1px @question_text_shadow;
+}
+
+.error {
+	text-shadow: 0 1px @error_text_shadow;
+}
+
+.info .entry,
+.info .entry:focus,
+.info .button,
+.info .button:insensitive,
+.info .button:active,
+.warning .entry,
+.warning .entry:focus,
+.warning .button,
+.warning .button:insensitive,
+.warning .button:active,
+.error .entry,
+.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;
+}
+
+.question .entry,
+.question .entry:focus,
+.question .button,
+.question .button:insensitive,
+.question .button:active {
+	border-image: none;
+
+	border-color: darker(@question_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);
+	text-shadow: none;
+}
+
+/*************************
+ * Touch text selections *
+ *************************/
+GtkBubbleWindow {
+	border-radius: 5px;
+	background-clip: border-box;
+}
+
+GtkBubbleWindow.osd.background {
+	background-color: @osd_popover_bg;
+}
+
+GtkBubbleWindow .toolbar {
+	background-color: transparent;
+}
+
+/**********************
+ * 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;
+}
+
diff --git a/desktop-themes/Menta/gtk-3.0/other-applications.css b/desktop-themes/Menta/gtk-3.0/other-applications.css
new file mode 100644
index 00000000..813b2c89
--- /dev/null
+++ b/desktop-themes/Menta/gtk-3.0/other-applications.css
@@ -0,0 +1,206 @@
+/*********************
+ * NEMO File manager *
+ *********************/
+@define-color cluebar_color shade (@theme_base_color, 0.9);
+
+NemoWindow * {
+	-GtkPaned-handle-size: 1;
+}
+
+NemoWindow .view {
+	background-color: @theme_base_color;
+}
+
+NemoWindow .rubberband,
+NemoWindow .view.rubberband {
+	background-color: alpha (@theme_selected_bg_color, 0.35);
+}
+
+/* sidebar */
+
+NemoWindow .sidebar .view {
+	background-color: @theme_bg_color;
+	color: @theme_fg_color;
+	text-shadow: 0 1px shade (shade (@theme_bg_color, 0.95), 1.04);  
+}
+
+NemoWindow .sidebar .frame {
+	border-right-width: 1px;
+	border-style: solid;
+	border-color: shade (@theme_bg_color, 0.82);
+}
+
+NemoWindow .sidebar row:selected {
+	color: @theme_selected_fg_color;
+	text-shadow: 0 -1px shade (@theme_selected_bg_color, 0.8); 
+}
+
+NemoWindow .sidebar row:backdrop:selected {
+	color: @theme_fg_color;
+	text-shadow: none; 
+}
+
+/* desktop mode */
+.nemo-desktop.nemo-canvas-item {
+	color: @theme_bg_color;
+	text-shadow: 1px 1px alpha (#000000, 0.8);
+}
+
+.nemo-desktop.nemo-canvas-item:active {
+	background-image: none;
+	background-color: alpha (@theme_bg_color, 0.84);
+	color: @theme_fg_color;
+}
+
+.nemo-desktop.nemo-canvas-item:selected {
+	background-image: none;
+	background-color: alpha (@theme_selected_bg_color, 0.84);
+	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;
+}
+
+/* inactive pane */
+
+.nemo-inactive-pane .view {
+	background-color: shade(@theme_base_color, 0.9);
+}
+
+/* Toolbar */
+NemoWindow .toolbar .button {
+	border-image: none;
+}
+
+/* Misc */
+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;
+}
+
+NemoNotebook .frame {
+	border-width: 1px 0 0 0;
+}
+
+.nemo-cluebar-label {
+	font: normal;
+	text-shadow: 0 1px shade (@cluebar_color, 1.06);
+}
+
+NemoTrashBar.info,
+NemoXContentBar.info,
+NemoSearchBar.info,
+NemoQueryEditor.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;
+}
+
+NemoTrashBar .button,
+NemoXContentBar .button,
+NemoSearchBar .button,
+NemoQueryEditor .button {
+	border-radius: 0;
+}
+
+/****************
+ * PopOver menu *
+ ****************/
+GraniteWidgetsPopOver {
+	-GraniteWidgetsPopOver-arrow-width: 24;
+	-GraniteWidgetsPopOver-arrow-height: 12;
+	-GraniteWidgetsPopOver-border-radius: 6;
+	-GraniteWidgetsPopOver-border-width: 1;
+	-GraniteWidgetsPopOver-shadow-size: 18;
+	
+	border-style: solid;
+	border-color: shade (@theme_bg_color, 0.50);
+	background-color: @theme_bg_color;
+	margin: 0;
+}
+
+GraniteWidgetsPopOver * {
+	background-color: @theme_bg_color;
+}
+
+GraniteWidgetsPopOver .sidebar.view {
+	background-color: @theme_bg_color;
+}
+
+GraniteWidgetsPopOver .button {
+	background-image: none;
+	background-color: alpha (#fff, 0.0);
+}
+
+GraniteWidgetsPopOver .button:active,
+GraniteWidgetsPopOver .button:hover:active {
+	background-image: none;
+	background-color: alpha (#000, 0.05);
+}
+
+GraniteWidgetsPopOver .entry {
+	background-image: linear-gradient(to bottom,
+		shade (@theme_base_color, 0.88),
+		shade (@theme_base_color, 0.94) 20px,
+		shade (@theme_base_color, 0.96));
+}
+
+.button.app {
+	border-width: 0;
+	border-radius: 5px;
+}
+
+.app:hover,
+.app:focus {
+	background-color: alpha (#000, 0.15);
+}
+
+/*****************
+ * Ubuntu styles *
+ *****************/
+/* overlay scrollbar */
+OsThumb {
+	color: shade (@theme_fg_color, 1.6);
+}
+
+OsThumb:selected,
+OsScrollbar:selected {
+	background-color: @theme_selected_bg_color;
+}
+
+OsThumb:active,
+OsScrollbar:active {
+	background-color: shade (@theme_bg_color, 0.6);
+}
+
+OsThumb:insensitive,
+OsScrollbar:insensitive {
+	background-color: shade (@theme_bg_color, 0.85);
+}
+
+/* scrolled window */
+.ubuntu-online-accounts.frame {
+	border-style: solid;
+	border-color: @borders;
+	border-width: 1px;
+	border-radius: 2px;
+	padding: 0;
+}
+
+.ubuntu-online-accounts.frame {
+	border-top-width: 0;
+}
diff --git a/desktop-themes/Menta/gtk-3.0/settings.ini b/desktop-themes/Menta/gtk-3.0/settings.ini
new file mode 100644
index 00000000..2ef35157
--- /dev/null
+++ b/desktop-themes/Menta/gtk-3.0/settings.ini
@@ -0,0 +1,4 @@
+[Settings]
+gtk-color-scheme = "base_color:#f7f7f7\nbg_color:#dcdcdc\ntooltip_bg_color:#F5F5B5\nselected_bg_color:#accd8a\ntext_color:#2c2c2c\nfg_color:#2c2c2c;\ntooltip_fg_color:#000000\nselected_fg_color:#f5f5f5"
+gtk-auto-mnemonics = 1
+gtk-visible-focus = automatic
diff --git a/desktop-themes/Menta/gtk-3.0/unity.css b/desktop-themes/Menta/gtk-3.0/unity.css
new file mode 100644
index 00000000..b3bd5f68
--- /dev/null
+++ b/desktop-themes/Menta/gtk-3.0/unity.css
@@ -0,0 +1,29 @@
+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;
+	border-width: 0;
+}
+
+.unity-panel.menubar,
+.unity-panel .menubar {
+	color: @theme_fg_color;
+	text-shadow: 0 1px @button_text_shadow;
+}
+
+.unity-panel.menuitem,
+.unity-panel .menuitem {
+	border-width: 1px 1px 0 1px;
+	text-shadow: 0 1px @button_text_shadow;
+}
+
+.unity-panel.menubar.menuitem:hover,
+.unity-panel.menubar .menuitem *:hover {
+	background-image: linear-gradient(to bottom,
+		shade (@theme_selected_bg_color, 0.96),
+		shade (@theme_selected_bg_color, 1.15));
+	color: @selected_fg_color;
+}