GTK3 Green-Submarine: re-work of the theme, follow 3.16 branch

author: raveit65 <[email protected]> 2015-08-18 20:22:05 +0200
committer: raveit65 <[email protected]> 2015-08-18 20:22:05 +0200
commit: 81515074f71950e0b6707a876b77467291a5f12d (patch)
tree: ffdc900ccdf3d3878781f2481441b562b43116be
parent: 3ef0c282b0fa27bcc6a37df704a0420a1abbcb77 (diff)
download: mate-themes-81515074f71950e0b6707a876b77467291a5f12d.tar.bz2
mate-themes-81515074f71950e0b6707a876b77467291a5f12d.tar.xz
85 files changed, 15012 insertions, 6853 deletions
diff --git a/desktop-themes/Green-Submarine/gtk-2.0/apps/panel.rc b/desktop-themes/Green-Submarine/gtk-2.0/apps/panel.rc
index 91477358..c040ffc5 100644
--- a/desktop-themes/Green-Submarine/gtk-2.0/apps/panel.rc
+++ b/desktop-themes/Green-Submarine/gtk-2.0/apps/panel.rc
@@ -6,22 +6,22 @@ style "theme-panel"
 # Disable for normal backgrounds and transparancy panel with dark DE backgrounds.
 #	bg_pixmap[NORMAL] = "/Panel/panel-bg.png" 
 
-	base[NORMAL]		= @bg_color
-	base[PRELIGHT]		= shade (1.06, @bg_color)
-	base[INSENSITIVE]	= @bg_color
-	bg[NORMAL]			= @bg_color_dark
-	bg[PRELIGHT]		= shade (2.60, @bg_color_dark)
-#	bg[SELECTED]		= shade (0.90, @selected_bg_color)
-	bg[INSENSITIVE]		= @bg_color
-#	bg[ACTIVE]			= shade (0.8, @bg_color_dark)
-	fg[NORMAL]			= "#f5f5f5"
-	fg[PRELIGHT]		= "#ffffff"
-	fg[INSENSITIVE]		= shade (0.75, @text_color_dark)
-	fg[ACTIVE]			= "#f5f5f5"
-	text[NORMAL]		= "#CFCFCF"
-	text[PRELIGHT]		= "#ffffff"
-	text[INSENSITIVE]	= shade (0.75, @text_color_dark)
-	text[ACTIVE]		= "#f5f5f5"
+	base[NORMAL]        = @bg_color
+	base[PRELIGHT]      = shade (1.06, @bg_color)
+	base[INSENSITIVE]   = @bg_color
+	bg[NORMAL]          = @bg_color_dark
+	bg[PRELIGHT]        = shade (2.60, @bg_color_dark)
+#	bg[SELECTED]        = shade (0.90, @selected_bg_color)
+	bg[INSENSITIVE]     = @bg_color
+#	bg[ACTIVE]          = shade (0.8, @bg_color_dark)
+	fg[NORMAL]          = "#f5f5f5"
+	fg[PRELIGHT]        = shade (1.20, @selected_bg_color)
+	fg[INSENSITIVE]     = shade (0.75, @text_color_dark)
+	fg[ACTIVE]          = "#f5f5f5"
+	text[NORMAL]        = "#CFCFCF"
+	text[PRELIGHT]      = shade (1.20, @selected_bg_color)
+	text[INSENSITIVE]   = shade (0.75, @text_color_dark)
+	text[ACTIVE]        = "#f5f5f5"
 
 	engine "murrine" {
 
@@ -88,28 +88,28 @@ style "theme-panel-buttons"
 
 style "theme-panel-text"
 {
-	bg[NORMAL]			= @menu_color
-	fg[NORMAL]			= "#f5f5f5"
-	fg[PRELIGHT]		= "#ffffff"
-	fg[INSENSITIVE]		= shade (0.75, @text_color_dark)
-	fg[ACTIVE]			= "#f5f5f5"
-	text[NORMAL]		= "#f5f5f5"
-	text[PRELIGHT]		= "#ffffff"
-	text[INSENSITIVE]	= shade (0.75, @text_color_dark)
-	text[ACTIVE]		= "#f5f5f5"
+	bg[NORMAL]          = @bg_color_dark
+	fg[NORMAL]          = "#f5f5f5"
+	fg[PRELIGHT]        = shade (1.20, @selected_bg_color)
+	fg[INSENSITIVE]     = shade (0.75, @text_color_dark)
+	fg[ACTIVE]          = "#f5f5f5"
+	text[NORMAL]        = "#f5f5f5"
+	text[PRELIGHT]      = "#ffffff"
+	text[INSENSITIVE]   = shade (0.75, @text_color_dark)
+	text[ACTIVE]        = "#f5f5f5"
 }
 
 style "theme-main-menu-text" = "theme-panel-text"
 {
-	bg[NORMAL]			= @menu_color
-	fg[NORMAL]			= "#f5f5f5"
-	fg[PRELIGHT]		= "#ffffff"
-	fg[INSENSITIVE]		= shade (0.75, @text_color_dark)
-	fg[ACTIVE]			= "#f5f5f5"
-	text[NORMAL]		= "#f5f5f5"
-	text[PRELIGHT]		= "#ffffff"
-	text[INSENSITIVE] 	= shade (0.75, @text_color_dark)
-	text[ACTIVE]		= "#f5f5f5"
+	bg[NORMAL]          = @bg_color_dark
+	fg[NORMAL]          = "#f5f5f5"
+	fg[PRELIGHT]        = "#ffffff"
+	fg[INSENSITIVE]     = shade (0.75, @text_color_dark)
+	fg[ACTIVE]          = "#f5f5f5"
+	text[NORMAL]        = "#f5f5f5"
+	text[PRELIGHT]      = "#ffffff"
+	text[INSENSITIVE]   = shade (0.75, @text_color_dark)
+	text[ACTIVE]        = "#f5f5f5"
 }
 
 style "theme-panel-handle" 
diff --git a/desktop-themes/Green-Submarine/gtk-2.0/gtkrc b/desktop-themes/Green-Submarine/gtk-2.0/gtkrc
index 7a8b33a4..814d9714 100644
--- a/desktop-themes/Green-Submarine/gtk-2.0/gtkrc
+++ b/desktop-themes/Green-Submarine/gtk-2.0/gtkrc
@@ -9,7 +9,7 @@
 
 # NOTE: Uncommenting means to delete the "#" at the beginning of a line. Commenting means to add a "#" at the beginning of a line. The "#" tells the theme wether to ignore the specified line or not.
 
-# These are the defined colors for the theme, you can change them in MATE's appearance preferences.
+# These are the defined colors for the theme, you can change them in GNOME's appearance preferences.
 gtk_color_scheme = "bg_color:#CBD9D4\nselected_bg_color:#72B49D\nbase_color:#FFF" # Background, base.
 gtk_color_scheme = "fg_color:#101010\nselected_fg_color:#FFF\ntext_color:#1A1A1A" # Foreground, text.
 gtk_color_scheme = "tooltip_bg_color:#DBFFF3\ntooltip_fg_color:#000000" # Tooltips.
@@ -60,7 +60,7 @@ style "murrine-default" {
 	GtkScrollbar	::activate-slider			= 1
 
 	GtkScrolledWindow ::scrollbar-spacing		= 0
-	GtkScrolledWindow ::scrollbars-within-bevel	= 1
+	GtkScrolledWindow ::scrollbars-within-bevel	= 0
 
 	GtkPaned	::handle-size			= 2
 
@@ -491,34 +491,38 @@ style "murrine-menubar" = "murrine-wider-dark" {
 style "murrine-menu" = "murrine-wider-dark" {
 	GtkMenuItem::arrow-scaling	= 0.5
 
-	bg[NORMAL]			= shade (0.88, @bg_color_dark)
+	bg[NORMAL]		= shade(0.88, @bg_color_dark)
+    bg[PRELIGHT] 	= shade(0.91, @bg_color_dark)
+	bg[SELECTED] 	= shade(1.00, @bg_color_dark)
+	fg[PRELIGHT]    = shade (1.20, @selected_bg_color)		# menu item selected
 
 	engine "murrine" {
-		border_shades 	= { 1.2, 1.0 }
-		roundness		= 1 # 0 = squared
-		textstyle 		= 0
+        gradient_shades = {2.63,1.17,1.17,1.17}
+		border_shades   = { 6.60, 6.50 }
+		roundness       = 4 # 0 = squared
+		textstyle       = 0
 	}
 }
 
 style "murrine-menu-item" = "murrine-wider-dark" {
-	fg[NORMAL] 			= shade (0.95, @fg_color_dark)        # menu item normal
-    fg[INSENSITIVE] 	= mix(0.20, @fg_color_dark, @bg_color_dark) # menu item activated
-	fg[PRELIGHT]		= @selected_fg_color						# menu item selected
+	fg[NORMAL]          = shade (0.95, @fg_color_dark)      # menu item normal
+	fg[INSENSITIVE]     = mix(0.20, @fg_color_dark, @bg_color_dark) # menu item activated
+	fg[PRELIGHT]        = shade (1.20, @selected_bg_color)  # menu item selected
 
-	text[NORMAL]        = shade (0.94, @fg_color_dark)		# Color check/radio menu
-	text[INSENSITIVE] 	= mix(0.20, @text_color_dark, @bg_color_dark)	    
-	text[PRELIGHT]      = @selected_fg_color            			# Color check/radio menu
+	text[NORMAL]        = shade (0.94, @fg_color_dark)      # Color check/radio menu
+	text[INSENSITIVE]   = mix(0.20, @text_color_dark, @bg_color_dark)
+	text[PRELIGHT]      = @selected_fg_color                # Color check/radio menu
 
-    bg[PRELIGHT]      	= shade (1.00, @selected_bg_color)
-    bg[SELECTED]      	= shade (1.00, @selected_bg_color)
+	bg[PRELIGHT]        = shade (0.91, @bg_color_dark)
+	bg[SELECTED]        = shade (1.00, @bg_color_dark)
 
-	engine "murrine" {
-        gradient_shades		= {0.90, 0.95, 0.95, 1.00}
-		border_shades 		= {1.40, 1.0}
-        roundness           = 1
-        contrast            = 0.8           # contrast separators
-		#textstyle           = 1
-		#text_shade			= 0.7
+    engine "murrine" {
+        gradient_shades = {2.63,1.17,1.17,1.17}
+        border_shades   = { 6.60, 6.50 }
+        roundness       = 4
+        contrast        = 0.8           # contrast separators
+        textstyle       = 0
+        #text_shade     = 0.7
 	}
 }
 
@@ -598,17 +602,19 @@ style "murrine-progressbar" = "murrine-thin" {
 }
 
 style "murrine-statusbar" = "murrine-wide" {
-	xthickness = 2
-
-	engine "pixmap" {
-		image
-		{
-		function        = RESIZE_GRIP
-		recolorable     = TRUE
-		state           = NORMAL
-		detail          = "statusbar"
-		file            = "assets/resize-grip.png"
-		}
+	xthickness = 0
+	engine "pixmap"
+	{
+	    image
+	    {
+		function		= RESIZE_GRIP
+		recolorable		= TRUE
+		state			= NORMAL
+		detail			= "statusbar"
+		overlay_file	= "assets/resize-grip.png"
+		overlay_border	= {0,0,0,0 }
+		overlay_stretch	= FALSE
+	    }
 	}
 }
 
@@ -680,25 +686,31 @@ style "murrine-toolbar-button" {
     ythickness	= 2
 
 	bg[NORMAL]		= shade(0.80, @bg_color_dark)
-    bg[PRELIGHT] 	= shade(1.50, @bg_color_dark)
-    bg[ACTIVE] 		= shade(1.10, @bg_color_dark)
+    bg[PRELIGHT] 	= shade(0.91, @bg_color_dark)
+    bg[ACTIVE] 		= shade(0.76, @bg_color_dark)
 	bg[SELECTED] 	= shade(0.80, @selected_bg_color)
 	bg[INSENSITIVE] = shade(0.83, @bg_color_dark)
 
     fg[NORMAL]          = @fg_color_dark
-	fg[PRELIGHT]	    = @selected_fg_color
-	fg[ACTIVE]	        = @fg_color_dark
-	fg[SELECTED]	    = @fg_color_dark
+	fg[PRELIGHT]	    = shade (1.20, @selected_bg_color)
+	fg[ACTIVE]	        = shade (1.20, @selected_bg_color)
+	fg[SELECTED]	    = shade (1.20, @selected_bg_color)
+
+    text[NORMAL]        = @fg_color_dark
+	text[PRELIGHT]	    = shade (1.20, @selected_bg_color)
+	text[ACTIVE]	    = shade (1.20, @selected_bg_color)
+	text[SELECTED]	    = shade (1.20, @selected_bg_color)
 
 	engine "murrine" {
-		gradient_shades     	= {1.00,0.96,0.96,0.90}
-		border_shades           = {4.10, 4.00}
-		contrast                = 0.80
-		lightborderstyle		= 1
-		lightborder_shade       = 1.1
-        glow_shade              = 1.0
-		textstyle               = 1
-		text_shade			    = 1.15
+		gradient_shades    = {2.63,1.17,1.17,1.17}
+		border_shades      = {5.10, 5.00}
+		contrast           = 0.80
+		roundness          = 5 # 0 = squared
+		lightborderstyle   = 1
+		lightborder_shade  = 1.1
+		glow_shade         = 1.0
+		textstyle          = 1
+		text_shade         = 1.15
 	}
 }
 
diff --git a/desktop-themes/Green-Submarine/gtk-3.0/Makefile.am b/desktop-themes/Green-Submarine/gtk-3.0/Makefile.am
index f324a8e4..be09ee05 100644
--- a/desktop-themes/Green-Submarine/gtk-3.0/Makefile.am
+++ b/desktop-themes/Green-Submarine/gtk-3.0/Makefile.am
@@ -1,15 +1,19 @@
 themedir = $(datadir)/themes/Green-Submarine/gtk-3.0
 
 theme_DATA = \
-	settings.ini \
+	gnome-applications.css \
 	gtk.css \
+	gtk-widgets-assets.css \
 	gtk-widgets.css \
-	gtk-dark.css
+	mate-applications.css \
+	menu.css \
+	other-applications.css \
+	scrollbar.css \
+	settings.ini \
+	sidebar.css
 
 EXTRA_DIST = $(theme_DATA)
 
-SUBDIRS = apps \
-	assets
+SUBDIRS = assets
 
-DIST_SUBDIRS = apps \
-	assets
+DIST_SUBDIRS = assets
diff --git a/desktop-themes/Green-Submarine/gtk-3.0/apps/Makefile.am b/desktop-themes/Green-Submarine/gtk-3.0/apps/Makefile.am
deleted file mode 100644
index d0e48a4c..00000000
--- a/desktop-themes/Green-Submarine/gtk-3.0/apps/Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-themedir = $(datadir)/themes/Green-Submarine/gtk-3.0/apps
-
-theme_DATA = \
-	epiphany.css \
-	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/Green-Submarine/gtk-3.0/apps/epiphany.css b/desktop-themes/Green-Submarine/gtk-3.0/apps/epiphany.css
deleted file mode 100644
index b8a209b3..00000000
--- a/desktop-themes/Green-Submarine/gtk-3.0/apps/epiphany.css
+++ /dev/null
@@ -1,172 +0,0 @@
-/* epiphany */
-
-EphyToolbar.toolbar {
-	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;
-
-	color: @theme_fg_color;
-	text-shadow: 0px 1px alpha (shade (@button_bg_color, 1.25), 0.4);
-
-	-unico-border-gradient: none;
-	-unico-inner-stroke-width: 0;
-
-	padding-top: 4px;
-	padding-bottom: 4px;
-	padding-left: 6px;
-	padding-right: 6px;
-}
-
-EphyToolbar .entry,
-EphyToolbar .entry:focus,
-EphyToolbar .entry:backdrop {
-	border-width: 1px;
-	padding-top: 5px;
-	padding-bottom: 5px;
-	padding-left: 4px;
-	padding-right: 4px;
-}
-
-EphyToolbar .entry:focus {
-
-}
-
-EphyToolbar .location-entry .button {
-	color: @theme_text_color;
-	-GtkButton-child-displacement-y: 0;
-}
-
-/* EphyToolbar .location-entry .button:last-child {
-	background-image: none;
-	background-color: @transparent;
-	border-width: 0px;
-	padding-left: 4px;
-	padding-right: 2px;
-	-unico-inner-stroke-width: 0px;
-	-unico-outer-stroke-width: 0px;
-}
-
-EphyToolbar .location-entry .button,
-EphyToolbar .location-entry .button:hover,
-EphyToolbar .location-entry .button:focus {
-	background-image: none;
-	background-color: @transparent;
-	icon-shadow: none;
-	color: shade (@theme_text_color, 1.4);
-	border-width: 0px;
-	-unico-inner-stroke-width: 0px;
-	-unico-outer-stroke-width: 0px;
-}
-
-EphyToolbar .location-entry .button:active,
-EphyToolbar .location-entry .button:active:hover {
-	background-image: none;
-	background-color: @transparent;
-	color: shade (@theme_text_color, 1.4);
-	border-width: 0px;
-	-unico-inner-stroke-width: 0px;
-	-unico-outer-stroke-width: 0px;
-} */
-
-/* EphyToolbar .location-entry .button:hover,
-EphyToolbar .location-entry .button:focus,
-EphyToolbar .location-entry .button:active,
-EphyToolbar .location-entry .button *:active {
-	background-image: none;
-	background-color: @transparent;
-	color: shade (@theme_text_color, 1.4);
-	border-width: 0px;
-	-unico-inner-stroke-width: 0px;
-	-unico-outer-stroke-width: 0px;
-} */
-
-EphyNotebook.notebook {
-	border-width: 1px 0 1px 0;
-}
-
-EphyNotebook.notebook tab {
-	border-width: 1px;
-	-unico-border-gradient: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@theme_bg_color, 0.89)),
-		to (shade (@theme_bg_color, 0.80)));
-	-unico-inner-stroke-color: alpha (shade (@theme_bg_color, 1.15), 0.34);
-	-unico-inner-stroke-gradient: none;
-	-unico-inner-stroke-width: 1px;
-	-unico-outer-stroke-color: @transparent;
-	-unico-outer-stroke-gradient: none;
-	-unico-outer-stroke-width: 1px;
-}
-
-EphyToolbar.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)));
-	padding-left: 4px;
-	padding-right: 4px;
-	border-width: 1px;
-	-unico-border-gradient: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@theme_bg_color, 0.7)),
-		to (shade (@theme_bg_color, 0.6)));
-	-unico-glow-color: shade (@button_bg_color, 1.14);
-	-unico-glow-radius: 0;
-	-unico-inner-stroke-color: shade (@theme_bg_color, 1.9);
-	-unico-inner-stroke-width: 1px 1px 0 1px;
-	-unico-outer-stroke-gradient: -gtk-gradient (linear, left top, left bottom,
-		from (alpha (shade (@theme_bg_color, 0.05), 0.05)),
-		to (alpha (shade (@theme_bg_color, 0.05), 0.09)));
-	-unico-outer-stroke-width: 1px;
-	color: @theme_text_color;
-}
-
-EphyToolbar.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)));
-}
-
-EphyToolbar.toolbar .button:active {
-	background-image: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@theme_bg_color, 0.9)),
-		to (shade (@theme_bg_color, 0.85)));
-
-	-unico-focus-outer-stroke-color: @transparent;
-	-unico-border-gradient: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@theme_bg_color, 0.6)),
-		to (shade (@theme_bg_color, 0.6)));
-	-unico-glow-radius: 0;
-	-unico-inner-stroke-color: shade (@theme_bg_color, 0.8);
-	-unico-inner-stroke-width: 1px 1px 0 1px;
-}
-
-EphyToolbar.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)));
-
-	text-shadow: 0px 1px alpha (shade (@button_bg_color, 1.25), 0.4);
-
-	-unico-border-gradient: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@button_insensitive_bg_color, 0.7)),
-		to (shade (@button_insensitive_bg_color, 0.8)));
-	-unico-inner-stroke-gradient: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@button_insensitive_bg_color, 1.1)),
-		to (shade (@button_insensitive_bg_color, 1.1)));
-	-unico-inner-stroke-width: 1px 1px 0 1px;
-}
-
-#ephy-page-menu-button.active-menu {
-	background-image: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@theme_bg_color, 0.9)),
-		to (shade (@theme_bg_color, 0.85)));
-
-	-unico-focus-outer-stroke-color: @transparent;
-	-unico-border-gradient: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@theme_bg_color, 0.6)),
-		to (shade (@theme_bg_color, 0.6)));
-	-unico-glow-radius: 0;
-	-unico-inner-stroke-color: shade (@theme_bg_color, 0.8);
-	-unico-inner-stroke-width: 1px 1px 0 1px;
-}
diff --git a/desktop-themes/Green-Submarine/gtk-3.0/apps/gedit.css b/desktop-themes/Green-Submarine/gtk-3.0/apps/gedit.css
deleted file mode 100644
index 7bd7b8d2..00000000
--- a/desktop-themes/Green-Submarine/gtk-3.0/apps/gedit.css
+++ /dev/null
@@ -1,34 +0,0 @@
-@define-color notebook_tab_gradient_b shade (@theme_bg_color, 0.98);
-
-GeditWindow .pane-separator,
-GeditWindow .pane-separator:hover {
-}
-
-GeditPanel.title GtkLabel {
-}
-
-GeditPanel .toolbar {
-	border-style: none;
-	background-color: transparent;
-}
-
-GeditDocumentsPanel .view {
-}
-
-GeditDocumentsPanel .view:backdrop {
-}
-
-GeditWindow .notebook {
-	padding: 1px;
-	border-radius: 1px;
-}
-
-GeditPanel .notebook {
-	padding: 3px;
-	border-radius: 1px;
-}
-
-GeditPanel .notebook tab,
-GeditWindow .notebook tab {
-	border-radius: 3px;
-}
diff --git a/desktop-themes/Green-Submarine/gtk-3.0/apps/gnome-panel.css b/desktop-themes/Green-Submarine/gtk-3.0/apps/gnome-panel.css
deleted file mode 100644
index e4b37340..00000000
--- a/desktop-themes/Green-Submarine/gtk-3.0/apps/gnome-panel.css
+++ /dev/null
@@ -1,152 +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;
-	-unico-inner-stroke-width: 0;
-	-unico-outer-stroke-width: 0;
-	color: @dark_fg_color;
-	text-shadow: none;
-}
-
-PanelApplet {
-	border-width: 0;
-}
-
-PanelSeparator {
-	border-width: 0;
-	background-image: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@dark_bg_color, 1.5)),
-		to (shade (@dark_bg_color, 1.05)));
-	-unico-inner-stroke-width: 0;
-	-unico-outer-stroke-width: 0;
-	color: @dark_fg_color;
-	text-shadow: 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)));
-	-unico-inner-stroke-width: 0;
-	-unico-outer-stroke-width: 0;
-	text-shadow: 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;
-	-unico-inner-stroke-width: 0;
-	-unico-outer-stroke-width: 0;
-	text-shadow: none;
-}
-
-PanelApplet .button,
-.desktop-panel .button {
-	-GtkButton-inner-border: 2;
-
-	background-image: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@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;
-
-	-unico-border-gradient: none;
-	-unico-glow-radius: 0;
-	-unico-inner-stroke-width: 0;
-	-unico-outer-stroke-width: 0;
-}
-
-PanelApplet .button:prelight:active,
-PanelApplet .button:active,
-.desktop-panel .button:prelight:active,
-.desktop-panel .button:active {
-	background-image: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@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;
-
-	-unico-border-gradient: none;
-	-unico-glow-radius: 0;
-	-unico-inner-stroke-width: 0;
-	-unico-outer-stroke-width: 0;
-	text-shadow: none;
-}
-
-PanelApplet .button:prelight,
-.desktop-panel .button:prelight {
-	background-image: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@dark_bg_color, 1.7)),
-		to (shade (@dark_bg_color, 1.25)));
-	border-color: @transparent;
-	border-radius: 0;
-	border-width: 0 1px 0 1px;
-
-	-unico-border-gradient: none;
-	-unico-glow-radius: 0;
-	-unico-inner-stroke-width: 0;
-	-unico-outer-stroke-width: 0;
-	text-shadow: none;
-}
-
-ClockBox {
-	text-shadow: none;
-}
-
-WnckPager, WnckTasklist {
-	background-color: @dark_bg_color;
-	text-shadow: none;
-}
-
-/* Classic icon style */
-.gnome-panel-menu-bar {
-	-PanelMenuBar-icon-visible: true;
-}
-
-/* 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 (@theme_selected_bg_color, 1.0)),
-		to (shade (@theme_selected_bg_color, 0.85)));
-	border-width: 0;
-	color: @dark_fg_color;
-	text-shadow: none;
-	-unico-inner-stroke-width: 0;
-	-unico-outer-stroke-width: 0;	
-}
-
-.gnome-panel-menu-bar .menu.menuitem:hover,
-.gnome-panel-menu-bar .menu .menuitem:hover {
-	color: @theme_selected_fg_color;
-}
-
-/* FIXME - Need to figure out what id or class the indicator applet use */
-/* IndicatorSession {
-	color: @dark_fg_color;
-	text-shadow: none;
-} */
diff --git a/desktop-themes/Green-Submarine/gtk-3.0/apps/gnome-terminal.css b/desktop-themes/Green-Submarine/gtk-3.0/apps/gnome-terminal.css
deleted file mode 100644
index 249be730..00000000
--- a/desktop-themes/Green-Submarine/gtk-3.0/apps/gnome-terminal.css
+++ /dev/null
@@ -1,20 +0,0 @@
-/* gnome-terminal */
-TerminalScreen {
-	-TerminalScreen-background-darkness: 0.95;
-	background-color: shade (@dark_bg_color, 1.8);
-	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;
-	border-radius: 2px 2px 0 0;
-}
diff --git a/desktop-themes/Green-Submarine/gtk-3.0/apps/nautilus.css b/desktop-themes/Green-Submarine/gtk-3.0/apps/nautilus.css
deleted file mode 100644
index b5f9b627..00000000
--- a/desktop-themes/Green-Submarine/gtk-3.0/apps/nautilus.css
+++ /dev/null
@@ -1,153 +0,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;
-}
-
-/* sidebar */
-NautilusWindow .sidebar,
-NautilusWindow .sidebar .view {
-	background-color: @theme_bg_color;
-
-	color: @theme_fg_color;
-	text-shadow: 0px 1px shade (shade (@theme_bg_color, 0.95), 1.04);  
-}
-
-NautilusWindow .sidebar row:selected {
-	color: @theme_selected_fg_color;
-	text-shadow: 0px -1px shade (@theme_selected_bg_color, 0.8); 
-}
-
-NautilusWindow .sidebar row:backdrop:selected {
-	color: @backdrop_selected_fg_color;
-	text-shadow: none; 
-}
-
-NautilusWindow .sidebar .frame {
-}
-
-NautilusWindow * {
-	-GtkPaned-handle-size: 1;
-}
-
-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;
-}
-
-/* disable for black menu bar */
-/*
-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;
-}
-
-/* FIXME - Something I don't understand. Why this theme gets a gray bg without this, and Ambiance which it's based on does not. */
-NautilusWindow .view {
-	background-color: @theme_base_color;
-}
-
-NautilusWindow .view:selected {
-	background-color: @theme_selected_bg_color;
-}
-
-NautilusWindow .view:selected:backdrop {
-	background-color: @backdrop_selected_bg_color;
-}
-
-NautilusWindow .view.rubberband {
-	background-color: alpha (@theme_selected_bg_color, 0.35);
-}
-/* FIXME end */
diff --git a/desktop-themes/Green-Submarine/gtk-3.0/apps/nemo.css b/desktop-themes/Green-Submarine/gtk-3.0/apps/nemo.css
deleted file mode 100644
index 4642ad14..00000000
--- a/desktop-themes/Green-Submarine/gtk-3.0/apps/nemo.css
+++ /dev/null
@@ -1,168 +0,0 @@
-@define-color cluebar_color shade (@theme_base_color, 0.9);
-
-NemoWindow * {
-	-GtkPaned-handle-size: 1;
-}
-
-/* FIXME - Something I don't understand. Why this theme gets a gray bg without this, and Ambiance which it's based on does not. */
-NemoWindow .view {
-	background-color: @theme_base_color;
-}
-
-NemoWindow .view:selected {
-	background-color: @theme_selected_bg_color;
-}
-
-NemoWindow .view:selected:backdrop {
-	background-color: @backdrop_selected_bg_color;
-}
-
-NemoWindow .view.rubberband {
-	background-color: alpha (@theme_selected_bg_color, 0.35);
-}
-/* FIXME end */
-
-.nemo-inactive-pane .view {
-	background-color: shade (@theme_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: @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;
-}
-
-/* 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;
-
-	-unico-border-gradient: none;
-	-unico-inner-stroke-width: 0;
-	-unico-inner-stroke-gradient: none;
-	color: @theme_fg_color;
-}
-
-NemoSearchBar .entry {
-}
-
-.nemo-cluebar-label {
-	font: normal;
-	text-shadow: 0px 1px shade (@cluebar_color, 1.06);
-}
-
-.nemo-cluebar-label:backdrop {
-	color: mix (@theme_fg_color, @cluebar_color, 0.2);
-	text-shadow: 0px 1px shade (@cluebar_color, 1.02);
-}
-
-#nemo-search-button *:active,
-#nemo-search-button *:active:prelight {
-	color: @theme_fg_color;
-}
-
-NemoFloatingBar {
-	background-color: @info_bg_color;
-	border-radius: 2px 2px 0 0;
-	border-style: solid;
-	border-width: 1px;
-	border-color: darker (@info_bg_color);
-
-	-unico-border-gradient: none;
-}
-
-NemoFloatingBar .button {
-	-GtkButton-image-spacing: 0;
-	-GtkButton-inner-border: 0;
-}
-
-/* sidebar */
-NemoWindow .sidebar,
-NemoWindow .sidebar .view {
-	background-color: @theme_bg_color;
-
-	color: @theme_fg_color;
-	text-shadow: 0px 1px shade (shade (@theme_bg_color, 0.95), 1.04);  
-}
-
-NemoWindow .sidebar row:selected {
-	color: @theme_selected_fg_color;
-	text-shadow: 0px -1px shade (@theme_selected_bg_color, 0.8); 
-}
-
-NemoWindow .sidebar row:backdrop:selected {
-	color: @backdrop_selected_fg_color;
-	text-shadow: none; 
-}
-
-NemoWindow .sidebar .frame {
-}
-
-NemoWindow .pane-separator {
-	background-color: shade (shade (@theme_bg_color, 0.95), 0.94);
-	border-color: @dark_bg_color;
-	border-style: solid;
-	border-width: 0;
-
-	-unico-border-gradient: none;
-	-unico-inner-stroke-width: 0;
-}
-
-NemoWindow .pane-separator:backdrop {
-	background-color: shade (shade (@theme_bg_color, 0.95), 0.96);
-}
-
-/* FIXME - Just a workaround atm. */
-NemoWindow .primary-toolbar .button {
-	-unico-border-gradient: none;
-}
-
-NemoWindow .primary-toolbar .button:hover {
-	-unico-border-gradient: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@theme_bg_color, 0.7)),
-		to (shade (@theme_bg_color, 0.6)));
-}
-
diff --git a/desktop-themes/Green-Submarine/gtk-3.0/apps/popover.css b/desktop-themes/Green-Submarine/gtk-3.0/apps/popover.css
deleted file mode 100644
index 52cd06ba..00000000
--- a/desktop-themes/Green-Submarine/gtk-3.0/apps/popover.css
+++ /dev/null
@@ -1,109 +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 (@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);	
-
-	-unico-outer-stroke-gradient: -gtk-gradient (linear,
-		left top, left bottom,
-		from (alpha (#fff, 0.00)),
-		color-stop (0.80, alpha (#fff, 0.00)),
-		to (alpha (#fff, 0.40)));
-
-	-unico-border-gradient: -gtk-gradient (linear,
-		left top, left bottom,
-		from (shade (@theme_base_color, 0.80)),
-		to (shade (@theme_base_color, 0.74)));
-}
-
-GraniteWidgetsPopOver .button:active,
-GraniteWidgetsPopOver .button:hover:active {
-	background-image: none;
-
-	background-color: alpha (#000, 0.05);
-
-	-unico-border-gradient: -gtk-gradient (linear,
-		left top, left bottom,
-		from (shade (@theme_base_color, 0.74)),
-		to (shade (@theme_base_color, 0.74)));
-
-	-unico-inner-stroke-gradient: -gtk-gradient (linear,
-		left top, left bottom,
-		from (alpha (#000, 0.07)),
-		to (alpha (#000, 0.03)));
-}
-
-GraniteWidgetsPopOver .entry {
-	background-image: -gtk-gradient (linear,
-		left top,
-		left bottom,
-		from (shade (@theme_base_color, 0.88)),
-		color-stop (0.20, shade (@theme_base_color, 0.94)),
-		to (shade (@theme_base_color, 0.96)));
-
-	-unico-border-gradient: -gtk-gradient (linear,
-		left top, left bottom,
-		from (shade (@theme_base_color, 0.74)),
-		to (shade (@theme_base_color, 0.76)));
-
-	-unico-inner-stroke-gradient: -gtk-gradient (linear,
-		left top, left bottom,
-		from (alpha (#000, 0.07)),
-		to (alpha (#000, 0.03)));
-}
-
-.button.app {
-	border-width: 0;
-	border-radius: 5px;
-
-	-unico-inner-stroke-gradient: -gtk-gradient (linear,
-		left top, left bottom,
-		from (alpha (#fff, 0.00)),
-		to (alpha (#fff, 0.00)));
-
-	-unico-outer-stroke-gradient: -gtk-gradient (linear,
-		left top, left bottom,
-		from (alpha (#000, 0.00)),
-		to (alpha (#000, 0.00)));
-}
-
-.app:hover,
-.app:focus {
-	background-color: alpha (#000, 0.15);
-}
-
-/*.app:hover, .app:focus {
-	border-width: 3;
-
-	-unico-outer-stroke-gradient: -gtk-gradient (linear,
-		left top, left bottom,
-		from (shade (@theme_selected_bg_color, 1.05)),
-		to (shade (@theme_selected_bg_color, 0.88)));
-
-	-unico-border-gradient: -gtk-gradient (linear,
-		left top,
-		left bottom,
-		from (shade (@theme_selected_bg_color, 1.30)),
-		to (shade (@theme_selected_bg_color, 0.98)));
-}*/
-
diff --git a/desktop-themes/Green-Submarine/gtk-3.0/apps/unity.css b/desktop-themes/Green-Submarine/gtk-3.0/apps/unity.css
deleted file mode 100644
index 5a705e4a..00000000
--- a/desktop-themes/Green-Submarine/gtk-3.0/apps/unity.css
+++ /dev/null
@@ -1,40 +0,0 @@
-UnityPanelWidget,
-.unity-panel {
-	background-image: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@dark_bg_color, 1.5)),
-		to (shade (@dark_bg_color, 1.04)));
-	border-top-color: shade (@dark_bg_color, 1.6);
-	border-style: solid;
-	border-width: 0;
-
-	-unico-border-gradient: none;
-	-unico-inner-stroke-width: 0;
-	-unico-inner-stroke-color: @transparent;
-}
-
-.unity-panel.menubar,
-.unity-panel .menubar {
-	color: #fff;
-}
-
-.unity-panel.menuitem,
-.unity-panel .menuitem {
-	border-width: 1px 1px 0 1px;
-	icon-shadow: 0px -1px shade (@dark_bg_color, 0.7);
-}
-
-.unity-panel.menubar.menuitem:hover,
-.unity-panel.menubar .menuitem *:hover {
-	background-image: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@dark_bg_color, 1.7)),
-		to (shade (@dark_bg_color, 1.12)));
-
-	color: #fff;
-
-	-unico-border-gradient: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@dark_bg_color, 1.08)),
-		to (shade (@dark_bg_color, 0.98)));
-	-unico-inner-stroke-gradient: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@dark_bg_color, 1.8)),
-		to (shade (@dark_bg_color, 1.2)));
-}
diff --git a/desktop-themes/Green-Submarine/gtk-3.0/assets/Makefile.am b/desktop-themes/Green-Submarine/gtk-3.0/assets/Makefile.am
index a3e9fab9..99784231 100644
--- a/desktop-themes/Green-Submarine/gtk-3.0/assets/Makefile.am
+++ b/desktop-themes/Green-Submarine/gtk-3.0/assets/Makefile.am
@@ -1,33 +1,42 @@
 themedir = $(datadir)/themes/Green-Submarine/gtk-3.0/assets
 
 theme_DATA = \
-	check-active-ins.png \
-	check-active.png \
-	check-mixed-active-ins.png \
-	check-mixed-active.png \
-	check-normal-ins.png \
-	check-normal.png \
+	checkbox-checked-insensitive.png \
+	checkbox-checked.png \
+	checkbox-checked.svg \
+	checkbox-menuitem-checked-insensitive.svg \
+	checkbox-menuitem-checked-prelight.svg \
+	checkbox-menuitem-checked.svg \
+	checkbox-menuitem-mixed-insensitive.svg \
+	checkbox-menuitem-mixed-prelight.svg \
+	checkbox-menuitem-mixed.svg \
+	checkbox-menuitem-unchecked.svg \
+	checkbox-mixed-insensitive.png \
+	checkbox-mixed.png \
+	checkbox-mixed.svg \
+	checkbox-unchecked-insensitive.png \
+	checkbox-unchecked.png \
+	checkbox-unchecked.svg \
 	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-mixed-active-ins.png \
-	radio-mixed-active.png \
-	radio-normal-ins.png \
-	radio-normal.png \
+	panel-grid.svg \
+	radio-menuitem-checked-insensitive.svg \
+	radio-menuitem-checked-prelight.svg \
+	radio-menuitem-checked.svg \
+	radio-menuitem-mixed-insensitive.svg \
+	radio-menuitem-mixed-prelight.svg \
+	radio-menuitem-mixed.svg \
+	radio-menuitem-unselected.svg \
+	radio-mixed-insensitive.png \
+	radio-mixed.png \
+	radio-mixed.svg \
+	radio-selected-insensitive.png \
+	radio-selected.png \
+	radio-selected.svg \
+	radio-unselected-insensitive.png \
+	radio-unselected.png \
+	radio-unselected.svg \
 	resize-grip.svg \
 	scale-slider-hor-dark.svg \
 	scale-slider-horizontal-insensitive.svg \
@@ -51,14 +60,17 @@ theme_DATA = \
 	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 \
+	slider_fine_horizontal.svg \
+	slider_fine_vertical.svg \
+	slider-horizontal.png \
+	slider-vertical.png \
+	switch-dark-off-disabled.svg \
+	switch-dark-off.svg \
+	switch-dark-on-disabled.svg \
+	switch-dark-on.svg \
+	switch-off-disabled.svg \
 	switch-off.svg \
-	switch-on-ins.svg \
-	switch-on.png \
-	switch-on.svg \
-	thumbnail-frame.png
+	switch-on-disabled.svg \
+	switch-on.svg
 
 EXTRA_DIST = $(theme_DATA)
diff --git a/desktop-themes/Green-Submarine/gtk-3.0/assets/check-active-ins.png b/desktop-themes/Green-Submarine/gtk-3.0/assets/checkbox-checked-insensitive.png
index 3ae980fe..3ae980fe 100644
--- a/desktop-themes/Green-Submarine/gtk-3.0/assets/check-active-ins.png
+++ b/desktop-themes/Green-Submarine/gtk-3.0/assets/checkbox-checked-insensitive.png
diff --git a/desktop-themes/Green-Submarine/gtk-3.0/assets/check-active.png b/desktop-themes/Green-Submarine/gtk-3.0/assets/checkbox-checked.png
index 4829fc82..4829fc82 100644
--- a/desktop-themes/Green-Submarine/gtk-3.0/assets/check-active.png
+++ b/desktop-themes/Green-Submarine/gtk-3.0/assets/checkbox-checked.png
diff --git a/desktop-themes/Green-Submarine/gtk-3.0/assets/checkbox-checked.svg b/desktop-themes/Green-Submarine/gtk-3.0/assets/checkbox-checked.svg
new file mode 100644
index 00000000..21c80468
--- /dev/null
+++ b/desktop-themes/Green-Submarine/gtk-3.0/assets/checkbox-checked.svg
@@ -0,0 +1,444 @@
+<?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"
+   id="svg814"
+   height="16"
+   width="16"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="checkbox-checked.svg"
+   inkscape:export-filename="/usr/share/themes/MediterraneanNightDarkest/gtk-3.0/assets/checkbox-checked.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1323"
+     inkscape:window-height="956"
+     id="namedview21"
+     showgrid="true"
+     inkscape:zoom="29.5"
+     inkscape:cx="-2.6101695"
+     inkscape:cy="11.388133"
+     inkscape:window-x="18"
+     inkscape:window-y="53"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg814">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3004"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <defs
+     id="defs816">
+    <linearGradient
+       id="linearGradient3783">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0.32156864;"
+         offset="0"
+         id="stop3785" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0.15686275;"
+         offset="1"
+         id="stop3787" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3877">
+      <stop
+         style="stop-color:#192d4a;stop-opacity:1;"
+         offset="0"
+         id="stop3879" />
+      <stop
+         style="stop-color:#7c96bc;stop-opacity:1;"
+         offset="1"
+         id="stop3881" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3869">
+      <stop
+         style="stop-color:#ff0000;stop-opacity:1;"
+         offset="0"
+         id="stop3871" />
+      <stop
+         style="stop-color:#ff0000;stop-opacity:1;"
+         offset="1"
+         id="stop3873" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient8394"
+       y2="197.99"
+       gradientUnits="userSpaceOnUse"
+       x2="1580.5"
+       y1="201.99"
+       x1="1582.1">
+      <stop
+         id="stop24135"
+         style="stop-color:#0e4460;stop-opacity:1;"
+         offset="0" />
+      <stop
+         id="stop24137"
+         style="stop-color:#135479;stop-opacity:1;"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3951"
+       y2="-202.35"
+       gradientUnits="userSpaceOnUse"
+       y1="-186.45"
+       gradientTransform="translate(-1610,-78.958)"
+       x2="1205.6"
+       x1="1205.6">
+      <stop
+         id="stop10356-2"
+         style="stop-color:#f2f2f2;stop-opacity:1;"
+         offset="0" />
+      <stop
+         id="stop10358-2"
+         style="stop-color:#e0e0e0;stop-opacity:1;"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3953"
+       y2="248.98"
+       gradientUnits="userSpaceOnUse"
+       y1="233.78"
+       gradientTransform="matrix(0.84941,0,0,0.84794,-623.98,-483.16)"
+       x2="260.93"
+       x1="260.93">
+      <stop
+         id="stop10334-5"
+         style="stop-color:#878787;stop-opacity:1;"
+         offset="0" />
+      <stop
+         id="stop10336-29"
+         style="stop-color:#b4b4b4;stop-opacity:1;"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8394"
+       id="linearGradient3009"
+       gradientUnits="userSpaceOnUse"
+       x1="1582.1"
+       y1="201.99"
+       x2="1580.5"
+       y2="197.99"
+       gradientTransform="translate(-1569,-195.4)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3951"
+       id="linearGradient3780"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.3285885,0,0,1.3308786,-1594.292,258.69534)"
+       x1="1205.1505"
+       y1="-195.23808"
+       x2="1205.1505"
+       y2="-205.54277" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3953"
+       id="linearGradient3782"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.1285162,0,0,1.128505,-284.27745,-279.24832)"
+       x1="260.93"
+       y1="233.78"
+       x2="260.76492"
+       y2="246.11308" />
+    <linearGradient
+       y2="1037.3622"
+       x2="7"
+       y1="1052.3622"
+       x1="7"
+       gradientTransform="matrix(0.9375,0,0,0.86666668,0.49999996,140.31529)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3870"
+       xlink:href="#linearGradient3810"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3810">
+      <stop
+         id="stop3812"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:0.09803922;" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0.04313726;"
+         offset="0.26666188"
+         id="stop3814" />
+      <stop
+         id="stop3816"
+         offset="1"
+         style="stop-color:#000000;stop-opacity:0.04313726;" />
+    </linearGradient>
+    <linearGradient
+       y2="1037.3622"
+       x2="7"
+       y1="1052.3622"
+       x1="7"
+       gradientTransform="matrix(0.8125,0,0,0.86666668,1.5,-896.04689)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3032"
+       xlink:href="#linearGradient3810"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3877"
+       id="linearGradient3883"
+       x1="11"
+       y1="11"
+       x2="5"
+       y2="4.46557"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(15.399111,-4.0328352)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3783"
+       id="linearGradient3789"
+       x1="5"
+       y1="-1.404128"
+       x2="5"
+       y2="-14.590569"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3951-8"
+       id="linearGradient3780-5"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.356545,0,0,1.3588837,-1628.0079,280.30722)"
+       x1="1205.1505"
+       y1="-195.23808"
+       x2="1205.1505"
+       y2="-205.54277" />
+    <linearGradient
+       id="linearGradient3951-8"
+       y2="-202.35001"
+       gradientUnits="userSpaceOnUse"
+       y1="-186.45"
+       gradientTransform="translate(-1610,-78.958)"
+       x2="1205.6"
+       x1="1205.6">
+      <stop
+         id="stop10356-2-5"
+         style="stop-color:#e0e0e0;stop-opacity:1;"
+         offset="0" />
+      <stop
+         id="stop10358-2-2"
+         style="stop-color:#f2f2f2;stop-opacity:1;"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3953-9"
+       id="linearGradient3782-8"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.1522627,0,0,1.1522509,-290.42761,-268.95599)"
+       x1="260.92999"
+       y1="233.78"
+       x2="260.92999"
+       y2="248.98" />
+    <linearGradient
+       id="linearGradient3953-9"
+       y2="248.98"
+       gradientUnits="userSpaceOnUse"
+       y1="233.78"
+       gradientTransform="matrix(0.84941,0,0,0.84794,-623.98,-483.16)"
+       x2="260.92999"
+       x1="260.92999">
+      <stop
+         id="stop10334-5-4"
+         style="stop-color:#b4b4b4;stop-opacity:1;"
+         offset="0" />
+      <stop
+         id="stop10336-29-8"
+         style="stop-color:#878787;stop-opacity:1;"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       y2="-205.54277"
+       x2="1205.1505"
+       y1="-195.23808"
+       x1="1205.1505"
+       gradientTransform="matrix(1.356545,0,0,1.3588837,-1628.0079,280.30722)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3794"
+       xlink:href="#linearGradient3951-8"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="248.98"
+       x2="260.92999"
+       y1="233.78"
+       x1="260.92999"
+       gradientTransform="matrix(1.1522627,0,0,1.1522509,-290.42761,-268.95599)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3796"
+       xlink:href="#linearGradient3953-9"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3780-1"
+       id="linearGradient3004"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.3565004,0,0,1.3588501,-1627.9482,1316.6653)"
+       x1="1205.1462"
+       y1="-194.38103"
+       x2="1205.1462"
+       y2="-206.40338" />
+    <linearGradient
+       id="linearGradient3780-1">
+      <stop
+         style="stop-color:#c2c2c2;stop-opacity:1;"
+         offset="0"
+         id="stop3782" />
+      <stop
+         id="stop3784"
+         offset="0.49999991"
+         style="stop-color:#cfcfcf;stop-opacity:1;" />
+      <stop
+         id="stop3786"
+         offset="0.57142842"
+         style="stop-color:#dadada;stop-opacity:1;" />
+      <stop
+         style="stop-color:#e2e2e2;stop-opacity:1;"
+         offset="1"
+         id="stop3788" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient10332-5"
+       id="linearGradient3006"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.1522277,0,0,1.1522273,-290.4273,767.41065)"
+       x1="260.92538"
+       y1="233.77748"
+       x2="260.92538"
+       y2="248.97633" />
+    <linearGradient
+       id="linearGradient10332-5">
+      <stop
+         style="stop-color:#a0a0a0;stop-opacity:1;"
+         offset="0"
+         id="stop10334-5-1" />
+      <stop
+         style="stop-color:#8c8c8c;stop-opacity:1;"
+         offset="1"
+         id="stop10336-29-0" />
+    </linearGradient>
+    <linearGradient
+       y2="-206.40338"
+       x2="1205.1462"
+       y1="-194.38103"
+       x1="1205.1462"
+       gradientTransform="matrix(1.3565004,0,0,1.3588501,-1627.9482,280.30302)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3818"
+       xlink:href="#linearGradient3780-1"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="248.97633"
+       x2="260.92538"
+       y1="233.77748"
+       x1="260.92538"
+       gradientTransform="matrix(1.1522277,0,0,1.1522273,-290.4273,-268.95163)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3820"
+       xlink:href="#linearGradient10332-5"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="-14.590569"
+       x2="5"
+       y1="-1.404128"
+       x1="5"
+       gradientTransform="matrix(1.0478093,0,0,1.0522523,-0.40395452,-1036.0005)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3022"
+       xlink:href="#linearGradient3783-7"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3783-7">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0.19607843;"
+         offset="0"
+         id="stop3785-9" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0.10196079;"
+         offset="1"
+         id="stop3787-2" />
+    </linearGradient>
+    <linearGradient
+       y2="-14.590569"
+       x2="5"
+       y1="-1.404128"
+       x1="5"
+       gradientTransform="matrix(1.0478093,0,0,1.0522523,-0.40395454,0.3616641)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3837"
+       xlink:href="#linearGradient3783-7"
+       inkscape:collect="always" />
+  </defs>
+  <metadata
+     id="metadata819">
+    <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>
+  <rect
+     ry="2.1885514"
+     rx="2.184767"
+     y="0.5105195"
+     x="0.5105195"
+     height="14.978961"
+     width="14.978961"
+     id="rect6506"
+     style="color:#000000;fill:url(#linearGradient3818);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient3820);stroke-width:1.02103901;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+  <rect
+     style="fill:none;stroke:url(#linearGradient3837);stroke-width:1.09566748;stroke-linecap:square;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+     id="rect3867"
+     width="12.904332"
+     height="12.904332"
+     x="1.5478337"
+     y="-14.452167"
+     rx="1.8447696"
+     ry="1.9251661"
+     transform="scale(1,-1)" />
+  <path
+     style="fill:none;stroke:url(#linearGradient3883);stroke-width:2.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+     d="M 26.559433,1.168 22,8 18.000111,5.268"
+     id="path3809"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="ccc" />
+  <path
+     style="fill:none;stroke:#fafafa;stroke-width:2.34100008;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:3;stroke-opacity:1;stroke-dasharray:none"
+     d="m 4.3205,9.80967 c 0,0 0.8511726,0.245811 1.7796611,0.79661 1,0.59322 2,1.59322 2,1.59322 0,0 0.5733896,-2.6237682 1.5932203,-4.38983 C 10.646844,6.1585395 11.100161,5.2 11.100161,5.2"
+     id="path3916"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cscsc" />
+  <path
+     sodipodi:nodetypes="cscsc"
+     inkscape:connector-curvature="0"
+     id="path3783"
+     d="m 4.0205,8.60967 c 0,0 0.8511726,0.2458114 1.7796611,0.79661 1,0.59322 2,1.59322 2,1.59322 0,0 0.5733896,-2.6237682 1.5932203,-4.38983 C 10.346844,4.9585395 11,4 11,4"
+     style="fill:none;stroke:#48612f;stroke-width:2.34100008000000015;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:3;stroke-opacity:1;stroke-dasharray:none" />
+</svg>
diff --git a/desktop-themes/Green-Submarine/gtk-3.0/assets/menuitem-checkbox-checked-insensitive.svg b/desktop-themes/Green-Submarine/gtk-3.0/assets/checkbox-menuitem-checked-insensitive.svg
index 049a09ff..7517df28 100644
--- a/desktop-themes/Green-Submarine/gtk-3.0/assets/menuitem-checkbox-checked-insensitive.svg
+++ b/desktop-themes/Green-Submarine/gtk-3.0/assets/checkbox-menuitem-checked-insensitive.svg
@@ -9,14 +9,14 @@
    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"
+   width="12"
+   height="12"
+   id="svg26761"
    version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="menuitem-checkbox-checked-selected.svg">
+   inkscape:version="0.48.1 r9760"
+   sodipodi:docname="checkbox-menuitem-checked-prelight.svg">
   <defs
-     id="defs4961" />
+     id="defs26763" />
   <sodipodi:namedview
      id="base"
      pagecolor="#ffffff"
@@ -24,23 +24,28 @@
      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:zoom="22.197802"
+     inkscape:cx="-7.3168318"
+     inkscape:cy="8"
      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"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1920"
+     inkscape:window-height="1025"
      inkscape:window-x="0"
-     inkscape:window-y="49"
-     inkscape:window-maximized="0" />
+     inkscape:window-y="24"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       type="xygrid"
+       id="grid2983" />
+  </sodipodi:namedview>
   <metadata
-     id="metadata4964">
+     id="metadata26766">
     <rdf:RDF>
       <cc:Work
          rdf:about="">
@@ -52,14 +57,14 @@
     </rdf:RDF>
   </metadata>
   <g
+     id="layer1"
      inkscape:label="Layer 1"
      inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-398.2133,-533.50504)">
+     transform="translate(0,-4)">
     <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"
+       d="M 1,10.285715 3.9948567,13.5 11,6"
+       style="fill:none;stroke:#a2a2a2;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline;enable-background:new;opacity:0.5"
        id="path6301-5"
        inkscape:connector-curvature="0" />
   </g>
diff --git a/desktop-themes/Green-Submarine/gtk-3.0/assets/menuitem-checkbox-checked-selected.svg b/desktop-themes/Green-Submarine/gtk-3.0/assets/checkbox-menuitem-checked-prelight.svg
index fc75bfba..91b8c7ad 100644
--- a/desktop-themes/Green-Submarine/gtk-3.0/assets/menuitem-checkbox-checked-selected.svg
+++ b/desktop-themes/Green-Submarine/gtk-3.0/assets/checkbox-menuitem-checked-prelight.svg
@@ -9,14 +9,14 @@
    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"
+   width="12"
+   height="12"
+   id="svg26761"
    version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="menuitem-checkbox-checked.svg">
+   inkscape:version="0.48.1 r9760"
+   sodipodi:docname="checkbox-menuitem-checked.svg">
   <defs
-     id="defs4961" />
+     id="defs26763" />
   <sodipodi:namedview
      id="base"
      pagecolor="#ffffff"
@@ -24,23 +24,28 @@
      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:zoom="22.197802"
+     inkscape:cx="-7.3168318"
+     inkscape:cy="8"
      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"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1920"
+     inkscape:window-height="1025"
      inkscape:window-x="0"
-     inkscape:window-y="49"
-     inkscape:window-maximized="0" />
+     inkscape:window-y="24"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       type="xygrid"
+       id="grid2983" />
+  </sodipodi:namedview>
   <metadata
-     id="metadata4964">
+     id="metadata26766">
     <rdf:RDF>
       <cc:Work
          rdf:about="">
@@ -52,14 +57,14 @@
     </rdf:RDF>
   </metadata>
   <g
+     id="layer1"
      inkscape:label="Layer 1"
      inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-398.2133,-533.50504)">
+     transform="translate(0,-4)">
     <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"
+       d="M 1,10.285715 3.9948567,13.5 11,6"
+       style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline;enable-background:new"
        id="path6301-5"
        inkscape:connector-curvature="0" />
   </g>
diff --git a/desktop-themes/Green-Submarine/gtk-3.0/assets/menuitem-checkbox-checked.svg b/desktop-themes/Green-Submarine/gtk-3.0/assets/checkbox-menuitem-checked.svg
index edb00edc..ccfbd9ab 100644
--- a/desktop-themes/Green-Submarine/gtk-3.0/assets/menuitem-checkbox-checked.svg
+++ b/desktop-themes/Green-Submarine/gtk-3.0/assets/checkbox-menuitem-checked.svg
@@ -9,14 +9,14 @@
    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"
+   width="12"
+   height="12"
+   id="svg26761"
    version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="menuitem-checkbox-checked.svg">
+   inkscape:version="0.48.1 r9760"
+   sodipodi:docname="checkbox-menuitem-checked.svg">
   <defs
-     id="defs4961" />
+     id="defs26763" />
   <sodipodi:namedview
      id="base"
      pagecolor="#ffffff"
@@ -24,42 +24,47 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="7.9195959"
-     inkscape:cx="19.507651"
-     inkscape:cy="10.941332"
-     inkscape:document-units="px"
+     inkscape:zoom="22.197802"
+     inkscape:cx="-7.3168318"
+     inkscape:cy="8"
      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="433"
-     inkscape:window-x="976"
-     inkscape:window-y="200"
-     inkscape:window-maximized="0" />
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1920"
+     inkscape:window-height="1025"
+     inkscape:window-x="0"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       type="xygrid"
+       id="grid2983" />
+  </sodipodi:namedview>
   <metadata
-     id="metadata4964">
+     id="metadata26766">
     <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></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
   <g
+     id="layer1"
      inkscape:label="Layer 1"
      inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-398.2133,-533.50504)">
+     transform="translate(0,-4)">
     <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"
+       d="M 1,10.285715 3.9948567,13.5 11,6"
+       style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline;enable-background:new"
        id="path6301-5"
        inkscape:connector-curvature="0" />
   </g>
diff --git a/desktop-themes/Green-Submarine/gtk-3.0/assets/checkbox-menuitem-mixed-insensitive.svg b/desktop-themes/Green-Submarine/gtk-3.0/assets/checkbox-menuitem-mixed-insensitive.svg
new file mode 100644
index 00000000..45c64597
--- /dev/null
+++ b/desktop-themes/Green-Submarine/gtk-3.0/assets/checkbox-menuitem-mixed-insensitive.svg
@@ -0,0 +1,74 @@
+<?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"
+   height="12"
+   id="svg26761"
+   version="1.1"
+   inkscape:version="0.48.1 r9760"
+   sodipodi:docname="checkbox-menuitem-mixed.svg">
+  <defs
+     id="defs26763" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.197802"
+     inkscape:cx="-4.9680489"
+     inkscape:cy="8"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1920"
+     inkscape:window-height="1025"
+     inkscape:window-x="0"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2983"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata26766">
+    <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,-4)">
+    <rect
+       style="color:#000000;fill:#a2a2a2;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;opacity:0.5"
+       id="rect5494"
+       width="12"
+       height="2"
+       x="8.8817842e-16"
+       y="9"
+       rx="2.034965"
+       ry="1" />
+  </g>
+</svg>
diff --git a/desktop-themes/Green-Submarine/gtk-3.0/assets/checkbox-menuitem-mixed-prelight.svg b/desktop-themes/Green-Submarine/gtk-3.0/assets/checkbox-menuitem-mixed-prelight.svg
new file mode 100644
index 00000000..063024cd
--- /dev/null
+++ b/desktop-themes/Green-Submarine/gtk-3.0/assets/checkbox-menuitem-mixed-prelight.svg
@@ -0,0 +1,74 @@
+<?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"
+   height="12"
+   id="svg26761"
+   version="1.1"
+   inkscape:version="0.48.1 r9760"
+   sodipodi:docname="checkbox-menuitem-mixed-insensitive.svg">
+  <defs
+     id="defs26763" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.197802"
+     inkscape:cx="-4.9680489"
+     inkscape:cy="8"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1920"
+     inkscape:window-height="1025"
+     inkscape:window-x="0"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2983"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata26766">
+    <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,-4)">
+    <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;opacity:1"
+       id="rect5494"
+       width="12"
+       height="2"
+       x="8.8817842e-16"
+       y="9"
+       rx="2.034965"
+       ry="1" />
+  </g>
+</svg>
diff --git a/desktop-themes/Green-Submarine/gtk-3.0/assets/menuitem-checkbox-mixed.svg b/desktop-themes/Green-Submarine/gtk-3.0/assets/checkbox-menuitem-mixed.svg
index 2cba55cf..90cd6e3b 100644
--- a/desktop-themes/Green-Submarine/gtk-3.0/assets/menuitem-checkbox-mixed.svg
+++ b/desktop-themes/Green-Submarine/gtk-3.0/assets/checkbox-menuitem-mixed.svg
@@ -9,14 +9,14 @@
    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"
+   width="12"
+   height="12"
+   id="svg26761"
    version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="menuitem-checkbox-mixed.svg">
+   inkscape:version="0.48.1 r9760"
+   sodipodi:docname="checkbox-menuitem-mixed.svg">
   <defs
-     id="defs4961" />
+     id="defs26763" />
   <sodipodi:namedview
      id="base"
      pagecolor="#ffffff"
@@ -24,23 +24,28 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="7.9195959"
-     inkscape:cx="-2.3368977"
-     inkscape:cy="11.077361"
-     inkscape:document-units="px"
+     inkscape:zoom="22.197802"
+     inkscape:cx="-4.9680489"
+     inkscape:cy="8"
      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="693"
-     inkscape:window-y="233"
-     inkscape:window-maximized="0" />
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1920"
+     inkscape:window-height="1025"
+     inkscape:window-x="0"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2983"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
-     id="metadata4964">
+     id="metadata26766">
     <rdf:RDF>
       <cc:Work
          rdf:about="">
@@ -52,18 +57,18 @@
     </rdf:RDF>
   </metadata>
   <g
+     id="layer1"
      inkscape:label="Layer 1"
      inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-398.2133,-533.50504)">
+     transform="translate(0,-4)">
     <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"
+       id="rect5494"
+       width="12"
        height="2"
-       x="399.21329"
-       y="539.51373"
-       rx="1.8653847"
+       x="8.8817842e-16"
+       y="9"
+       rx="2.034965"
        ry="1" />
   </g>
 </svg>
diff --git a/desktop-themes/Green-Submarine/gtk-3.0/assets/checkbox-menuitem-unchecked.svg b/desktop-themes/Green-Submarine/gtk-3.0/assets/checkbox-menuitem-unchecked.svg
new file mode 100644
index 00000000..52bd33c5
--- /dev/null
+++ b/desktop-themes/Green-Submarine/gtk-3.0/assets/checkbox-menuitem-unchecked.svg
@@ -0,0 +1,486 @@
+<?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="16px"
+   height="16px"
+   id="svg33222"
+   version="1.1"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="checkbox-menuitem-unchecked.svg">
+  <defs
+     id="defs33224">
+    <linearGradient
+       id="linearGradient3833">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0.06;"
+         offset="0"
+         id="stop3835" />
+      <stop
+         id="stop3842"
+         offset="0.40000001"
+         style="stop-color:#000000;stop-opacity:0.08;" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop3837" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3786">
+      <stop
+         style="stop-color:#222222;stop-opacity:1;"
+         offset="0"
+         id="stop3788" />
+      <stop
+         id="stop3771"
+         offset="0.40000001"
+         style="stop-color:#1f1f1f;stop-opacity:1;" />
+      <stop
+         style="stop-color:#1c1c1c;stop-opacity:1;"
+         offset="1"
+         id="stop3790" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3764">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop3766" />
+      <stop
+         style="stop-color:#006aa8;stop-opacity:1;"
+         offset="1"
+         id="stop3768" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3845">
+      <stop
+         style="stop-color:#121212;stop-opacity:1;"
+         offset="0"
+         id="stop3847" />
+      <stop
+         id="stop3818"
+         offset="0.69999999"
+         style="stop-color:#101010;stop-opacity:1;" />
+      <stop
+         style="stop-color:#080808;stop-opacity:1;"
+         offset="1"
+         id="stop3849" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3837">
+      <stop
+         style="stop-color:#f2f3f5;stop-opacity:1;"
+         offset="0"
+         id="stop3839" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop3841" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3845"
+       id="linearGradient3851"
+       x1="7.8765793"
+       y1="1.2683721"
+       x2="7.8765793"
+       y2="14.07719"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.74804615,0,0,0.81102357,-14.316455,0.11559541)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3786"
+       id="linearGradient3792"
+       x1="6.8922429"
+       y1="2.1706364"
+       x2="6.8922429"
+       y2="14.152619"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.85678531,0,0,0.86698952,-14.329582,-0.73764399)" />
+    <linearGradient
+       gradientTransform="translate(-0.30025841,1.7674453e-4)"
+       y2="4.0926723"
+       x2="11.308908"
+       y1="6.7147994"
+       x1="13.50862"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3018"
+       xlink:href="#linearGradient3764-9"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3764-9">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop3766-6" />
+      <stop
+         style="stop-color:#008de0;stop-opacity:1;"
+         offset="1"
+         id="stop3768-0" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3837-9">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop3839-0" />
+      <stop
+         id="stop4140"
+         offset="0.16"
+         style="stop-color:#ffffff;stop-opacity:0.20625;" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0.175;"
+         offset="1"
+         id="stop3841-0" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3845-6">
+      <stop
+         style="stop-color:#1d1d1d;stop-opacity:1;"
+         offset="0"
+         id="stop3847-4" />
+      <stop
+         style="stop-color:#1d1d1d;stop-opacity:1;"
+         offset="1"
+         id="stop3849-5" />
+    </linearGradient>
+    <linearGradient
+       y2="15.009266"
+       x2="7.8456097"
+       y1="0.096163601"
+       x1="7.8456097"
+       gradientTransform="matrix(1.1225376,0,0,1.2027189,0.0196969,-2.0203897)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4121"
+       xlink:href="#linearGradient3845-4"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3845-4">
+      <stop
+         style="stop-color:#000000;stop-opacity:0.06;"
+         offset="0"
+         id="stop3847-6" />
+      <stop
+         id="stop4144"
+         offset="0.40000001"
+         style="stop-color:#000000;stop-opacity:0.2;" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0.23999999;"
+         offset="0.74000001"
+         id="stop4146" />
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="1"
+         id="stop3849-8" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3845-4"
+       id="linearGradient3825"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.99781126,0,0,1.073045,-17.366593,0.64186868)"
+       x1="7.8456097"
+       y1="0.096163601"
+       x2="7.8456097"
+       y2="15.009266" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3837-9"
+       id="linearGradient3831"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.88630385,0,0,0.96372049,-14.313509,-0.98347984)"
+       x1="7.999999"
+       y1="1.92503"
+       x2="7.999999"
+       y2="14.003025" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3833-4"
+       id="linearGradient3839-9"
+       x1="2.131603"
+       y1="1.9009107"
+       x2="13.968019"
+       y2="13.737327"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient3833-4">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0.26282051;"
+         offset="0"
+         id="stop3835-1" />
+      <stop
+         id="stop3842-3"
+         offset="0.40000001"
+         style="stop-color:#000000;stop-opacity:0.12179487;" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop3837-2" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3845-6-2"
+       id="linearGradient3828-7"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.88888894,0,0,0.95166157,0.88984484,0.83385193)"
+       x1="8.0000019"
+       y1="1.5371597"
+       x2="8.000001"
+       y2="13.462841" />
+    <linearGradient
+       id="linearGradient3845-6-2">
+      <stop
+         style="stop-color:#121212;stop-opacity:1;"
+         offset="0"
+         id="stop3847-4-9" />
+      <stop
+         id="stop4142-3"
+         offset="0.14"
+         style="stop-color:#0b0b0b;stop-opacity:1;" />
+      <stop
+         style="stop-color:#080808;stop-opacity:1;"
+         offset="1"
+         id="stop3849-5-9" />
+    </linearGradient>
+    <linearGradient
+       y2="13.462841"
+       x2="8.000001"
+       y1="1.5371597"
+       x1="8.0000019"
+       gradientTransform="matrix(0.88888894,0,0,0.95166157,0.89894606,0.85248156)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3819"
+       xlink:href="#linearGradient3845-6-2"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3845-4-4"
+       id="linearGradient3825-8"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0000002,0,0,1.0791256,-2.4405569e-6,-0.1114016)"
+       x1="7.8456097"
+       y1="0.096163601"
+       x2="7.8456097"
+       y2="15.009266" />
+    <linearGradient
+       id="linearGradient3845-4-4">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop3847-6-0" />
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="1"
+         id="stop3849-8-9" />
+    </linearGradient>
+    <filter
+       id="filter3883"
+       style="color-interpolation-filters:sRGB;"
+       inkscape:label="Drop Shadow">
+      <feFlood
+         id="feFlood3885"
+         flood-opacity="0.22"
+         flood-color="rgb(0,0,0)"
+         result="flood" />
+      <feComposite
+         id="feComposite3887"
+         in2="SourceGraphic"
+         in="flood"
+         operator="in"
+         result="composite1" />
+      <feGaussianBlur
+         id="feGaussianBlur3889"
+         in="composite"
+         stdDeviation="0.5"
+         result="blur" />
+      <feOffset
+         id="feOffset3891"
+         dx="0.5"
+         dy="1.5"
+         result="offset" />
+      <feComposite
+         id="feComposite3893"
+         in2="offset"
+         in="SourceGraphic"
+         operator="over"
+         result="composite2" />
+    </filter>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3845-8"
+       id="linearGradient3851-7"
+       x1="8.0000019"
+       y1="1.5371597"
+       x2="8.000001"
+       y2="13.462841"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,-14.999999)" />
+    <linearGradient
+       id="linearGradient3845-8">
+      <stop
+         style="stop-color:#212121;stop-opacity:1;"
+         offset="0"
+         id="stop3847-3" />
+      <stop
+         style="stop-color:#242424;stop-opacity:1;"
+         offset="1"
+         id="stop3849-51" />
+    </linearGradient>
+    <linearGradient
+       y2="13.462841"
+       x2="8.000001"
+       y1="1.5371597"
+       x1="8.0000019"
+       gradientTransform="translate(0,-14.999999)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3015"
+       xlink:href="#linearGradient3845-8"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3845-8"
+       id="linearGradient3104"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.87477773,0,0,0.8819048,-20.121793,-15.450501)"
+       x1="8.0000019"
+       y1="1.5371597"
+       x2="8.000001"
+       y2="13.462841" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3845-8-6"
+       id="linearGradient3104-4"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.87477773,0,0,0.8819048,0.00177815,-14.226786)"
+       x1="8.0000019"
+       y1="1.5371597"
+       x2="8.000001"
+       y2="13.462841" />
+    <linearGradient
+       id="linearGradient3845-8-6">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="0"
+         id="stop3847-3-7" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="1"
+         id="stop3849-51-4" />
+    </linearGradient>
+    <linearGradient
+       y2="13.462841"
+       x2="8.000001"
+       y1="1.5371597"
+       x1="8.0000019"
+       gradientTransform="matrix(0.74952124,0,0,0.76276264,-19.11974,-14.56222)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3122"
+       xlink:href="#linearGradient3845-8-6"
+       inkscape:collect="always" />
+    <filter
+       color-interpolation-filters="sRGB"
+       id="filter3883-2"
+       inkscape:label="Drop Shadow">
+      <feFlood
+         id="feFlood3885-3"
+         flood-opacity="0.22"
+         flood-color="rgb(0,0,0)"
+         result="flood" />
+      <feComposite
+         id="feComposite3887-7"
+         in2="SourceGraphic"
+         in="flood"
+         operator="in"
+         result="composite1" />
+      <feGaussianBlur
+         id="feGaussianBlur3889-4"
+         stdDeviation="0.5"
+         result="blur" />
+      <feOffset
+         id="feOffset3891-6"
+         dx="0.5"
+         dy="1.5"
+         result="offset" />
+      <feComposite
+         id="feComposite3893-4"
+         in2="offset"
+         in="SourceGraphic"
+         operator="over"
+         result="composite2" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#eaeaea"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="1"
+     inkscape:pageshadow="2"
+     inkscape:zoom="21.16"
+     inkscape:cx="-23.350918"
+     inkscape:cy="7.4060848"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1680"
+     inkscape:window-height="981"
+     inkscape:window-x="0"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1"
+     inkscape:snap-nodes="false"
+     inkscape:snap-bbox="true"
+     inkscape:showpageshadow="true"
+     showborder="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2992"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata33227">
+    <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">
+    <rect
+       style="fill:#1f2427;fill-opacity:0;stroke:none"
+       id="rect3909"
+       width="14"
+       height="14"
+       x="0"
+       y="1"
+       ry="1.9340975"
+       rx="1.9340975" />
+    <rect
+       style="fill:#1f2427;stroke:#969696;stroke-width:0.93333334000000001;stroke-opacity:1;fill-opacity:0"
+       id="rect3909-7"
+       width="13.066667"
+       height="13.066667"
+       x="0.46666673"
+       y="1.4666667"
+       ry="1.513849"
+       rx="1.513849" />
+  </g>
+</svg>
diff --git a/desktop-themes/Green-Submarine/gtk-3.0/assets/check-mixed-active-ins.png b/desktop-themes/Green-Submarine/gtk-3.0/assets/checkbox-mixed-insensitive.png
index a4c2e3ee..a4c2e3ee 100644
--- a/desktop-themes/Green-Submarine/gtk-3.0/assets/check-mixed-active-ins.png
+++ b/desktop-themes/Green-Submarine/gtk-3.0/assets/checkbox-mixed-insensitive.png
diff --git a/desktop-themes/Green-Submarine/gtk-3.0/assets/check-mixed-active.png b/desktop-themes/Green-Submarine/gtk-3.0/assets/checkbox-mixed.png
index 6654de23..6654de23 100644
--- a/desktop-themes/Green-Submarine/gtk-3.0/assets/check-mixed-active.png
+++ b/desktop-themes/Green-Submarine/gtk-3.0/assets/checkbox-mixed.png
diff --git a/desktop-themes/Green-Submarine/gtk-3.0/assets/checkbox-mixed.svg b/desktop-themes/Green-Submarine/gtk-3.0/assets/checkbox-mixed.svg
new file mode 100644
index 00000000..cf8edfdc
--- /dev/null
+++ b/desktop-themes/Green-Submarine/gtk-3.0/assets/checkbox-mixed.svg
@@ -0,0 +1,161 @@
+<?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"
+   id="svg814"
+   height="16"
+   width="16"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="checkbox-mixed.svg">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1055"
+     inkscape:window-height="910"
+     id="namedview21"
+     showgrid="true"
+     inkscape:zoom="29.5"
+     inkscape:cx="3.6971553"
+     inkscape:cy="9.6084721"
+     inkscape:window-x="436"
+     inkscape:window-y="49"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg814">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3004" />
+  </sodipodi:namedview>
+  <defs
+     id="defs816">
+    <linearGradient
+       id="linearGradient8394"
+       y2="197.99"
+       gradientUnits="userSpaceOnUse"
+       x2="1580.5"
+       y1="201.99"
+       x1="1582.1">
+      <stop
+         id="stop24135"
+         style="stop-color:#0e4460;stop-opacity:1;"
+         offset="0" />
+      <stop
+         id="stop24137"
+         style="stop-color:#135479;stop-opacity:1;"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3951"
+       y2="-202.35"
+       gradientUnits="userSpaceOnUse"
+       y1="-186.45"
+       gradientTransform="translate(-1610,-78.958)"
+       x2="1205.6"
+       x1="1205.6">
+      <stop
+         id="stop10356-2"
+         style="stop-color:#8a8f86;stop-opacity:1;"
+         offset="0" />
+      <stop
+         id="stop10358-2"
+         style="stop-color:#e0ecd5;stop-opacity:1;"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3953"
+       y2="248.98"
+       gradientUnits="userSpaceOnUse"
+       y1="233.78"
+       gradientTransform="matrix(0.84941,0,0,0.84794,-623.98,-483.16)"
+       x2="260.93"
+       x1="260.93">
+      <stop
+         id="stop10334-5"
+         style="stop-color:#5e7f3e;stop-opacity:1;"
+         offset="0" />
+      <stop
+         offset="0.78571439"
+         style="stop-color:#537038;stop-opacity:0.94117647;"
+         id="stop3764" />
+      <stop
+         id="stop10336-29"
+         style="stop-color:#787878;stop-opacity:1;"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8394"
+       id="linearGradient3009"
+       gradientUnits="userSpaceOnUse"
+       x1="1582.1"
+       y1="201.99"
+       x2="1580.5"
+       y2="197.99"
+       gradientTransform="translate(-1569,-195.4)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3951"
+       id="linearGradient3780"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.1625149,0,0,1.1645187,-1394.0054,241.3584)"
+       x1="1205.1505"
+       y1="-194.37936"
+       x2="1205.1505"
+       y2="-206.40149" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3953"
+       id="linearGradient3782"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.98745162,0,0,0.98744182,-247.74276,-229.34228)"
+       x1="261.01813"
+       y1="233.27174"
+       x2="261.01813"
+       y2="247.4498" />
+  </defs>
+  <metadata
+     id="metadata819">
+    <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>
+  <path
+     style="fill:none;stroke:#000000;stroke-width:6.69371461999999973;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.14117648;stroke-dasharray:none"
+     d="m 4.4248573,12.579852 7.2501467,0"
+     id="path3769"
+     inkscape:connector-curvature="0" />
+  <rect
+     id="rect6506"
+     ry="2.418247"
+     style="color:#000000;fill:url(#linearGradient3780);stroke:url(#linearGradient3782);stroke-width:1.16351676000000004;enable-background:accumulate"
+     rx="2.418247"
+     height="12.836483"
+     width="12.836483"
+     y="1.581753"
+     x="1.5817577" />
+  <path
+     style="fill:none;stroke:#2a322f;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+     d="m 4,8 8,0"
+     id="path3766"
+     inkscape:connector-curvature="0" />
+</svg>
diff --git a/desktop-themes/Green-Submarine/gtk-3.0/assets/check-normal-ins.png b/desktop-themes/Green-Submarine/gtk-3.0/assets/checkbox-unchecked-insensitive.png
index e27c7f93..e27c7f93 100644
--- a/desktop-themes/Green-Submarine/gtk-3.0/assets/check-normal-ins.png
+++ b/desktop-themes/Green-Submarine/gtk-3.0/assets/checkbox-unchecked-insensitive.png
diff --git a/desktop-themes/Green-Submarine/gtk-3.0/assets/check-normal.png b/desktop-themes/Green-Submarine/gtk-3.0/assets/checkbox-unchecked.png
index d905828d..d905828d 100644
--- a/desktop-themes/Green-Submarine/gtk-3.0/assets/check-normal.png
+++ b/desktop-themes/Green-Submarine/gtk-3.0/assets/checkbox-unchecked.png
diff --git a/desktop-themes/Green-Submarine/gtk-3.0/assets/checkbox-unchecked.svg b/desktop-themes/Green-Submarine/gtk-3.0/assets/checkbox-unchecked.svg
new file mode 100644
index 00000000..437a848a
--- /dev/null
+++ b/desktop-themes/Green-Submarine/gtk-3.0/assets/checkbox-unchecked.svg
@@ -0,0 +1,225 @@
+<?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"
+   id="svg814"
+   height="16"
+   width="16"
+   version="1.1"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="checkbox-unchecked.svg"
+   inkscape:export-filename="/usr/share/themes/MediterraneanLightDarkest/gtk-3.0/assets/checkbox-unchecked.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1083"
+     inkscape:window-height="981"
+     id="namedview21"
+     showgrid="true"
+     inkscape:zoom="29.5"
+     inkscape:cx="6.3670494"
+     inkscape:cy="7.9813535"
+     inkscape:window-x="444"
+     inkscape:window-y="63"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg814">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3004" />
+  </sodipodi:namedview>
+  <defs
+     id="defs816">
+    <linearGradient
+       id="linearGradient8394"
+       y2="197.99"
+       gradientUnits="userSpaceOnUse"
+       x2="1580.5"
+       y1="201.99"
+       x1="1582.1">
+      <stop
+         id="stop24135"
+         style="stop-color:#0e4460;stop-opacity:1;"
+         offset="0" />
+      <stop
+         id="stop24137"
+         style="stop-color:#135479;stop-opacity:1;"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3951"
+       y2="-202.35"
+       gradientUnits="userSpaceOnUse"
+       y1="-186.45"
+       gradientTransform="translate(-1610,-78.958)"
+       x2="1205.6"
+       x1="1205.6">
+      <stop
+         id="stop10356-2"
+         style="stop-color:#e0e0e0;stop-opacity:1;"
+         offset="0" />
+      <stop
+         id="stop10358-2"
+         style="stop-color:#f2f2f2;stop-opacity:1;"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3953"
+       y2="248.98"
+       gradientUnits="userSpaceOnUse"
+       y1="233.78"
+       gradientTransform="matrix(0.84941,0,0,0.84794,-623.98,-483.16)"
+       x2="260.93"
+       x1="260.93">
+      <stop
+         id="stop10334-5"
+         style="stop-color:#b4b4b4;stop-opacity:1;"
+         offset="0" />
+      <stop
+         id="stop10336-29"
+         style="stop-color:#878787;stop-opacity:1;"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8394"
+       id="linearGradient3009"
+       gradientUnits="userSpaceOnUse"
+       x1="1582.1"
+       y1="201.99"
+       x2="1580.5"
+       y2="197.99"
+       gradientTransform="translate(-1569,-195.4)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3951"
+       id="linearGradient3780"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.356545,0,0,1.3588837,-1628.0079,280.30722)"
+       x1="1205.1505"
+       y1="-195.23808"
+       x2="1205.1505"
+       y2="-205.54277" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3953"
+       id="linearGradient3782"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.1522627,0,0,1.1522509,-290.42761,-268.95599)"
+       x1="260.93"
+       y1="233.78"
+       x2="260.93"
+       y2="248.98" />
+    <linearGradient
+       y2="1037.3622"
+       x2="7"
+       y1="1052.3622"
+       x1="7"
+       gradientTransform="matrix(0.8125,0,0,0.86666668,1.5,-896.04689)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3032"
+       xlink:href="#linearGradient3810"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3810">
+      <stop
+         id="stop3812"
+         offset="0"
+         style="stop-color:#000000;stop-opacity:0.09803922;" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0.04313726;"
+         offset="0.26666188"
+         id="stop3814" />
+      <stop
+         id="stop3816"
+         offset="1"
+         style="stop-color:#000000;stop-opacity:0.04313726;" />
+    </linearGradient>
+    <linearGradient
+       y2="1037.3622"
+       x2="7"
+       y1="1052.3622"
+       x1="7"
+       gradientTransform="matrix(0.8125,0,0,0.86666668,1.5,-896.04689)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3846"
+       xlink:href="#linearGradient3810"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3783"
+       id="linearGradient3789"
+       x1="5"
+       y1="-1.404128"
+       x2="5"
+       y2="-14.590569"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient3783">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0.32156864;"
+         offset="0"
+         id="stop3785" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0.15686275;"
+         offset="1"
+         id="stop3787" />
+    </linearGradient>
+    <linearGradient
+       y2="-14.590569"
+       x2="5"
+       y1="-1.404128"
+       x1="5"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3806"
+       xlink:href="#linearGradient3783"
+       inkscape:collect="always"
+       gradientTransform="matrix(1.0478093,0,0,1.0522523,-0.40395446,0.36172366)" />
+  </defs>
+  <metadata
+     id="metadata819">
+    <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>
+  <rect
+     id="rect6506"
+     ry="2.8218648"
+     style="color:#000000;fill:url(#linearGradient3780);stroke:url(#linearGradient3782);stroke-width:1.02104199;stroke-miterlimit:4;stroke-dasharray:none;enable-background:accumulate"
+     rx="2.8218648"
+     height="14.978958"
+     width="14.978958"
+     y="0.51052088"
+     x="0.51052099" />
+  <rect
+     style="fill:none;stroke:url(#linearGradient3806);stroke-width:1.09566748;stroke-linecap:square;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+     id="rect3867"
+     width="12.904332"
+     height="12.904332"
+     x="1.5478338"
+     y="-14.452167"
+     rx="1.8447696"
+     ry="1.9251661"
+     transform="scale(1,-1)" />
+</svg>
diff --git a/desktop-themes/Green-Submarine/gtk-3.0/assets/menuitem-radio-checked-insensitive.svg b/desktop-themes/Green-Submarine/gtk-3.0/assets/menuitem-radio-checked-insensitive.svg
deleted file mode 100644
index 3cd2cb09..00000000
--- a/desktop-themes/Green-Submarine/gtk-3.0/assets/menuitem-radio-checked-insensitive.svg
+++ /dev/null
@@ -1,65 +0,0 @@
-<?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/Green-Submarine/gtk-3.0/assets/menuitem-radio-checked.svg b/desktop-themes/Green-Submarine/gtk-3.0/assets/menuitem-radio-checked.svg
deleted file mode 100644
index 6bee5d3f..00000000
--- a/desktop-themes/Green-Submarine/gtk-3.0/assets/menuitem-radio-checked.svg
+++ /dev/null
@@ -1,65 +0,0 @@
-<?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="-2.3368977"
-     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="807"
-     inkscape:window-y="427"
-     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 />
-      </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/Green-Submarine/gtk-3.0/assets/null.png b/desktop-themes/Green-Submarine/gtk-3.0/assets/null.png
deleted file mode 100644
index 8777a4cb..00000000
--- a/desktop-themes/Green-Submarine/gtk-3.0/assets/null.png
+++ /dev/null
diff --git a/desktop-themes/Green-Submarine/gtk-3.0/assets/pane-separator-grip-vertical.svg b/desktop-themes/Green-Submarine/gtk-3.0/assets/pane-separator-grip-vertical.svg
deleted file mode 100644
index 9d1190c7..00000000
--- a/desktop-themes/Green-Submarine/gtk-3.0/assets/pane-separator-grip-vertical.svg
+++ /dev/null
@@ -1,107 +0,0 @@
-<?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/Green-Submarine/gtk-3.0/assets/pane-separator-grip.svg b/desktop-themes/Green-Submarine/gtk-3.0/assets/pane-separator-grip.svg
deleted file mode 100644
index e2fa9be0..00000000
--- a/desktop-themes/Green-Submarine/gtk-3.0/assets/pane-separator-grip.svg
+++ /dev/null
@@ -1,107 +0,0 @@
-<?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/Green-Submarine/gtk-3.0/assets/panel-grid.svg b/desktop-themes/Green-Submarine/gtk-3.0/assets/panel-grid.svg
new file mode 100644
index 00000000..c057ca53
--- /dev/null
+++ b/desktop-themes/Green-Submarine/gtk-3.0/assets/panel-grid.svg
@@ -0,0 +1,173 @@
+<?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"
+   sodipodi:docname="view-more-symbolic.svg"
+   height="22"
+   id="svg7384"
+   inkscape:version="0.91 r13725"
+   version="1.1"
+   width="12">
+  <metadata
+     id="metadata90">
+    <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>Gnome Symbolic Icon Theme</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     inkscape:bbox-nodes="false"
+     inkscape:bbox-paths="true"
+     bordercolor="#666666"
+     borderopacity="1"
+     inkscape:current-layer="layer12"
+     inkscape:cx="37.386562"
+     inkscape:cy="10"
+     gridtolerance="10"
+     inkscape:guide-bbox="true"
+     guidetolerance="10"
+     id="namedview88"
+     inkscape:object-nodes="false"
+     inkscape:object-paths="false"
+     objecttolerance="10"
+     pagecolor="#3a3b39"
+     inkscape:pageopacity="1"
+     inkscape:pageshadow="2"
+     showborder="true"
+     showgrid="false"
+     showguides="true"
+     inkscape:snap-bbox="true"
+     inkscape:snap-bbox-midpoints="false"
+     inkscape:snap-global="true"
+     inkscape:snap-grids="true"
+     inkscape:snap-nodes="true"
+     inkscape:snap-others="false"
+     inkscape:snap-to-guides="true"
+     inkscape:window-height="444"
+     inkscape:window-maximized="0"
+     inkscape:window-width="534"
+     inkscape:window-x="788"
+     inkscape:window-y="500"
+     inkscape:zoom="2.8284271">
+    <inkscape:grid
+       empspacing="2"
+       enabled="true"
+       id="grid4866"
+       originx="119.9998px"
+       originy="650px"
+       snapvisiblegridlinesonly="true"
+       spacingx="1px"
+       spacingy="1px"
+       type="xygrid"
+       visible="true" />
+    <inkscape:grid
+       color="#000000"
+       empcolor="#000000"
+       empopacity="0"
+       empspacing="4"
+       enabled="true"
+       id="grid5968"
+       opacity="0.1254902"
+       originx="119.9998px"
+       originy="650px"
+       snapvisiblegridlinesonly="true"
+       spacingx="0.5px"
+       spacingy="0.5px"
+       type="xygrid"
+       visible="true" />
+  </sodipodi:namedview>
+  <title
+     id="title9167">Gnome Symbolic Icon Theme</title>
+  <defs
+     id="defs7386" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer9"
+     inkscape:label="status"
+     style="display:inline"
+     transform="translate(-121.0004,-861)" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer10"
+     inkscape:label="devices"
+     transform="translate(-121.0004,-861)" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer11"
+     inkscape:label="apps"
+     transform="translate(-121.0004,-861)" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer13"
+     inkscape:label="places"
+     transform="translate(-121.0004,-861)" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer14"
+     inkscape:label="mimetypes"
+     transform="translate(-121.0004,-861)" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer15"
+     inkscape:label="emblems"
+     style="display:inline"
+     transform="translate(-121.0004,-861)" />
+  <g
+     inkscape:groupmode="layer"
+     id="g71291"
+     inkscape:label="emotes"
+     style="display:inline"
+     transform="translate(-121.0004,-861)" />
+  <g
+     inkscape:groupmode="layer"
+     id="g4953"
+     inkscape:label="categories"
+     style="display:inline"
+     transform="translate(-121.0004,-861)" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer12"
+     inkscape:label="actions"
+     style="display:inline"
+     transform="translate(-121.0004,-861)">
+    <rect
+       height="4"
+       id="rect20592"
+       rx="0.38461545"
+       ry="0.50229359"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#555555;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:new"
+       width="4"
+       x="125.23243"
+       y="864.17157" />
+    <rect
+       height="4"
+       id="rect16730"
+       rx="0.38461545"
+       ry="0.50229359"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#555555;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:new"
+       width="4"
+       x="125.23243"
+       y="870.17157" />
+    <rect
+       height="4"
+       id="rect16732"
+       rx="0.38461545"
+       ry="0.50229359"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#555555;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:new"
+       width="4"
+       x="125.23243"
+       y="876.17157" />
+  </g>
+</svg>
diff --git a/desktop-themes/Green-Submarine/gtk-3.0/assets/radio-menuitem-checked-insensitive.svg b/desktop-themes/Green-Submarine/gtk-3.0/assets/radio-menuitem-checked-insensitive.svg
new file mode 100644
index 00000000..5e1d3c2f
--- /dev/null
+++ b/desktop-themes/Green-Submarine/gtk-3.0/assets/radio-menuitem-checked-insensitive.svg
@@ -0,0 +1,75 @@
+<?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"
+   height="12"
+   id="svg27352"
+   version="1.1"
+   inkscape:version="0.48.1 r9760"
+   sodipodi:docname="radio-menuitem-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="22.197802"
+     inkscape:cx="-14.479703"
+     inkscape:cy="8"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1920"
+     inkscape:window-height="1025"
+     inkscape:window-x="0"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2983"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <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"
+     transform="translate(0,-4)">
+    <path
+       sodipodi:type="arc"
+       style="color:#000000;fill:#a2a2a2;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.27423298000000007;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;opacity:0.5"
+       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 c 0,4.02825 -2.01821,7.29379 -4.5078,7.29379 -2.48959,0 -4.50781,-3.26554 -4.50781,-7.29379 0,-4.02824 2.01822,-7.29378 4.50781,-7.29378 2.48959,0 4.5078,3.26554 4.5078,7.29378 z"
+       transform="matrix(0.77643096,0,0,0.47986074,-507.19608,-112.89654)" />
+  </g>
+</svg>
diff --git a/desktop-themes/Green-Submarine/gtk-3.0/assets/radio-menuitem-checked-prelight.svg b/desktop-themes/Green-Submarine/gtk-3.0/assets/radio-menuitem-checked-prelight.svg
new file mode 100644
index 00000000..bb028c73
--- /dev/null
+++ b/desktop-themes/Green-Submarine/gtk-3.0/assets/radio-menuitem-checked-prelight.svg
@@ -0,0 +1,75 @@
+<?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"
+   height="12"
+   id="svg27352"
+   version="1.1"
+   inkscape:version="0.48.1 r9760"
+   sodipodi:docname="radio-menuitem-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="22.197802"
+     inkscape:cx="-14.479703"
+     inkscape:cy="8"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1920"
+     inkscape:window-height="1025"
+     inkscape:window-x="0"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2983"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <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"
+     transform="translate(0,-4)">
+    <path
+       sodipodi:type="arc"
+       style="color:#000000;fill:#000000;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 c 0,4.02825 -2.01821,7.29379 -4.5078,7.29379 -2.48959,0 -4.50781,-3.26554 -4.50781,-7.29379 0,-4.02824 2.01822,-7.29378 4.50781,-7.29378 2.48959,0 4.5078,3.26554 4.5078,7.29378 z"
+       transform="matrix(0.77643096,0,0,0.47986074,-507.19608,-112.89654)" />
+  </g>
+</svg>
diff --git a/desktop-themes/Green-Submarine/gtk-3.0/assets/menuitem-radio-checked-selected.svg b/desktop-themes/Green-Submarine/gtk-3.0/assets/radio-menuitem-checked.svg
index 15ee80b3..887174e8 100644
--- a/desktop-themes/Green-Submarine/gtk-3.0/assets/menuitem-radio-checked-selected.svg
+++ b/desktop-themes/Green-Submarine/gtk-3.0/assets/radio-menuitem-checked.svg
@@ -9,14 +9,14 @@
    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"
+   width="16"
+   height="16"
+   id="svg27352"
    version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="menuitem-radio-checked.svg">
+   inkscape:version="0.48.1 r9760"
+   sodipodi:docname="sidebar-radio-prelight.svg">
   <defs
-     id="defs4961" />
+     id="defs27354" />
   <sodipodi:namedview
      id="base"
      pagecolor="#ffffff"
@@ -24,23 +24,20 @@
      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:zoom="22.197802"
+     inkscape:cx="-8.3079209"
+     inkscape:cy="8"
      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"
+     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="49"
-     inkscape:window-maximized="0" />
+     inkscape:window-y="26"
+     inkscape:window-maximized="1" />
   <metadata
-     id="metadata4964">
+     id="metadata27357">
     <rdf:RDF>
       <cc:Work
          rdf:about="">
@@ -52,14 +49,18 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
-     transform="translate(-398.2133,-533.50504)">
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
     <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" />
+       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/Green-Submarine/gtk-3.0/assets/radio-menuitem-mixed-insensitive.svg b/desktop-themes/Green-Submarine/gtk-3.0/assets/radio-menuitem-mixed-insensitive.svg
new file mode 100644
index 00000000..c4fc6c0e
--- /dev/null
+++ b/desktop-themes/Green-Submarine/gtk-3.0/assets/radio-menuitem-mixed-insensitive.svg
@@ -0,0 +1,74 @@
+<?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"
+   height="12"
+   id="svg27352"
+   version="1.1"
+   inkscape:version="0.48.1 r9760"
+   sodipodi:docname="radio-menuitem-mixed.svg">
+  <defs
+     id="defs27354" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.197802"
+     inkscape:cx="-13.77401"
+     inkscape:cy="8"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1920"
+     inkscape:window-height="1025"
+     inkscape:window-x="0"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2983"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <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"
+     transform="translate(0,-4)">
+    <rect
+       style="color:#000000;fill:#a2a2a2;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;opacity:0.5"
+       id="rect5494"
+       width="6"
+       height="2"
+       x="3"
+       y="9"
+       rx="1.0174824"
+       ry="1" />
+  </g>
+</svg>
diff --git a/desktop-themes/Green-Submarine/gtk-3.0/assets/menuitem-checkbox-mixed-insensitive.svg b/desktop-themes/Green-Submarine/gtk-3.0/assets/radio-menuitem-mixed-prelight.svg
index e37b20b6..2c2ad1ad 100644
--- a/desktop-themes/Green-Submarine/gtk-3.0/assets/menuitem-checkbox-mixed-insensitive.svg
+++ b/desktop-themes/Green-Submarine/gtk-3.0/assets/radio-menuitem-mixed-prelight.svg
@@ -9,14 +9,14 @@
    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"
+   width="12"
+   height="12"
+   id="svg27352"
    version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="menuitem-checkbox-mixed-selected.svg">
+   inkscape:version="0.48.1 r9760"
+   sodipodi:docname="radio-menuitem-mixed.svg">
   <defs
-     id="defs4961" />
+     id="defs27354" />
   <sodipodi:namedview
      id="base"
      pagecolor="#ffffff"
@@ -24,23 +24,28 @@
      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:zoom="22.197802"
+     inkscape:cx="-20.936881"
+     inkscape:cy="8"
      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"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1920"
+     inkscape:window-height="1025"
      inkscape:window-x="0"
-     inkscape:window-y="49"
-     inkscape:window-maximized="0" />
+     inkscape:window-y="24"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2983"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
-     id="metadata4964">
+     id="metadata27357">
     <rdf:RDF>
       <cc:Work
          rdf:about="">
@@ -52,18 +57,18 @@
     </rdf:RDF>
   </metadata>
   <g
+     id="layer1"
      inkscape:label="Layer 1"
      inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-398.2133,-533.50504)">
+     transform="translate(0,-4)">
     <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"
+       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"
+       width="6"
        height="2"
-       x="399.21329"
-       y="539.51373"
-       rx="1.8653847"
+       x="3"
+       y="9"
+       rx="1.0174824"
        ry="1" />
   </g>
 </svg>
diff --git a/desktop-themes/Green-Submarine/gtk-3.0/assets/menuitem-checkbox-mixed-selected.svg b/desktop-themes/Green-Submarine/gtk-3.0/assets/radio-menuitem-mixed.svg
index 466f05f1..0ffe2190 100644
--- a/desktop-themes/Green-Submarine/gtk-3.0/assets/menuitem-checkbox-mixed-selected.svg
+++ b/desktop-themes/Green-Submarine/gtk-3.0/assets/radio-menuitem-mixed.svg
@@ -9,14 +9,14 @@
    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"
+   width="12"
+   height="12"
+   id="svg27352"
    version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="menuitem-checkbox-mixed.svg">
+   inkscape:version="0.48.1 r9760"
+   sodipodi:docname="radio-menuitem-mixed.svg">
   <defs
-     id="defs4961" />
+     id="defs27354" />
   <sodipodi:namedview
      id="base"
      pagecolor="#ffffff"
@@ -24,46 +24,51 @@
      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:zoom="22.197802"
+     inkscape:cx="-13.77401"
+     inkscape:cy="8"
      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"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1920"
+     inkscape:window-height="1025"
      inkscape:window-x="0"
-     inkscape:window-y="49"
-     inkscape:window-maximized="0" />
+     inkscape:window-y="24"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2983"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
-     id="metadata4964">
+     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>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
   <g
+     id="layer1"
      inkscape:label="Layer 1"
      inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-398.2133,-533.50504)">
+     transform="translate(0,-4)">
     <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"
+       id="rect5494"
+       width="6"
        height="2"
-       x="399.21329"
-       y="539.51373"
-       rx="1.8653847"
+       x="3"
+       y="9"
+       rx="1.0174824"
        ry="1" />
   </g>
 </svg>
diff --git a/desktop-themes/Green-Submarine/gtk-3.0/assets/radio-menuitem-unselected.svg b/desktop-themes/Green-Submarine/gtk-3.0/assets/radio-menuitem-unselected.svg
new file mode 100644
index 00000000..1d5dc080
--- /dev/null
+++ b/desktop-themes/Green-Submarine/gtk-3.0/assets/radio-menuitem-unselected.svg
@@ -0,0 +1,330 @@
+<?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="16px"
+   height="16px"
+   id="svg33222"
+   version="1.1"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="radio-menuitem-un-selected.svg">
+  <defs
+     id="defs33224">
+    <linearGradient
+       id="linearGradient3825">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0.06;"
+         offset="0"
+         id="stop3827" />
+      <stop
+         id="stop3833"
+         offset="1"
+         style="stop-color:#000000;stop-opacity:0.08;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3774">
+      <stop
+         style="stop-color:#222222;stop-opacity:1;"
+         offset="0"
+         id="stop3776" />
+      <stop
+         id="stop4312"
+         offset="0.40000001"
+         style="stop-color:#141414;stop-opacity:1;" />
+      <stop
+         style="stop-color:#1c1c1c;stop-opacity:1;"
+         offset="1"
+         id="stop3778" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3850">
+      <stop
+         style="stop-color:#006aa8;stop-opacity:1;"
+         offset="0"
+         id="stop3852" />
+      <stop
+         id="stop3858"
+         offset="0.60919541"
+         style="stop-color:#21adff;stop-opacity:1;" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="1"
+         id="stop3854" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3764">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0.02;"
+         offset="0"
+         id="stop3766" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0.18000001;"
+         offset="1"
+         id="stop3768" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3845">
+      <stop
+         style="stop-color:#121212;stop-opacity:1;"
+         offset="0"
+         id="stop3847" />
+      <stop
+         style="stop-color:#080808;stop-opacity:1;"
+         offset="1"
+         id="stop3849" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3837">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop3839" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0.17948718;"
+         offset="1"
+         id="stop3841" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3837"
+       id="linearGradient3843"
+       x1="7.999999"
+       y1="1.92503"
+       x2="7.999999"
+       y2="14.003025"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.84855276,0,0,0.91926555,-12.788421,1.105508)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3850"
+       id="linearGradient3856"
+       x1="8.0459757"
+       y1="9.9117441"
+       x2="8.0459757"
+       y2="3.8412359"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.99804585,0,0,1.0126674,-22.064123,0.96698238)" />
+    <linearGradient
+       id="linearGradient3781">
+      <stop
+         style="stop-color:#dbdbdb;stop-opacity:1;"
+         offset="0"
+         id="stop3783" />
+      <stop
+         style="stop-color:#b8b8b8;stop-opacity:1;"
+         offset="1"
+         id="stop3785" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3850-7"
+       id="linearGradient3856-0"
+       x1="8.0459757"
+       y1="9.9117441"
+       x2="8.0459757"
+       y2="3.8412359"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.99804585,0,0,1.0126674,-0.4764796,0.03307433)" />
+    <linearGradient
+       id="linearGradient3850-7">
+      <stop
+         style="stop-color:#006aa8;stop-opacity:1;"
+         offset="0"
+         id="stop3852-3" />
+      <stop
+         style="stop-color:#5dc3ff;stop-opacity:1;"
+         offset="1"
+         id="stop3854-7" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3845-8"
+       id="linearGradient3851-4"
+       x1="8.0000019"
+       y1="1.5371597"
+       x2="8.000001"
+       y2="13.462841"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.93361995,0,0,1.0149618,0.0417955,-0.02050801)" />
+    <linearGradient
+       id="linearGradient3845-8">
+      <stop
+         style="stop-color:#1c1c1c;stop-opacity:1;"
+         offset="0"
+         id="stop3847-5" />
+      <stop
+         style="stop-color:#141414;stop-opacity:1;"
+         offset="1"
+         id="stop3849-5" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3845"
+       id="linearGradient3867"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.86666669,0,0,0.92857149,0.06666681,1.0357142)"
+       x1="8.0000019"
+       y1="1.5371597"
+       x2="8.000001"
+       y2="13.462841" />
+    <filter
+       id="filter4389"
+       style="color-interpolation-filters:sRGB;"
+       inkscape:label="Drop Shadow">
+      <feFlood
+         id="feFlood4391"
+         flood-opacity="0.22"
+         flood-color="rgb(0,0,0)"
+         result="flood" />
+      <feComposite
+         id="feComposite4393"
+         in2="SourceGraphic"
+         in="flood"
+         operator="in"
+         result="composite1" />
+      <feGaussianBlur
+         id="feGaussianBlur4395"
+         in="composite"
+         stdDeviation="0.5"
+         result="blur" />
+      <feOffset
+         id="feOffset4397"
+         dx="0.5"
+         dy="1.5"
+         result="offset" />
+      <feComposite
+         id="feComposite4399"
+         in2="offset"
+         in="SourceGraphic"
+         operator="over"
+         result="composite2" />
+    </filter>
+    <filter
+       color-interpolation-filters="sRGB"
+       id="filter4389-0"
+       inkscape:label="Drop Shadow">
+      <feFlood
+         id="feFlood4391-9"
+         flood-opacity="0.22"
+         flood-color="rgb(0,0,0)"
+         result="flood" />
+      <feComposite
+         id="feComposite4393-5"
+         in2="SourceGraphic"
+         in="flood"
+         operator="in"
+         result="composite1" />
+      <feGaussianBlur
+         id="feGaussianBlur4395-1"
+         stdDeviation="0.5"
+         result="blur" />
+      <feOffset
+         id="feOffset4397-3"
+         dx="0.5"
+         dy="1.5"
+         result="offset" />
+      <feComposite
+         id="feComposite4399-9"
+         in2="offset"
+         in="SourceGraphic"
+         operator="over"
+         result="composite2" />
+    </filter>
+    <filter
+       color-interpolation-filters="sRGB"
+       id="filter4267"
+       inkscape:label="Drop Shadow">
+      <feFlood
+         id="feFlood4269"
+         flood-opacity="0.22"
+         flood-color="rgb(0,0,0)"
+         result="flood" />
+      <feComposite
+         id="feComposite4271"
+         in2="SourceGraphic"
+         in="flood"
+         operator="in"
+         result="composite1" />
+      <feGaussianBlur
+         id="feGaussianBlur4273"
+         stdDeviation="0.5"
+         result="blur" />
+      <feOffset
+         id="feOffset4275"
+         dx="0.5"
+         dy="1.5"
+         result="offset" />
+      <feComposite
+         id="feComposite4277"
+         in2="offset"
+         in="SourceGraphic"
+         operator="over"
+         result="composite2" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#295156"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="1"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.002159"
+     inkscape:cx="-10.154954"
+     inkscape:cy="7.4232754"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1680"
+     inkscape:window-height="981"
+     inkscape:window-x="0"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1"
+     inkscape:snap-nodes="false"
+     inkscape:snap-bbox="true"
+     inkscape:showpageshadow="true"
+     showborder="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3823"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata33227">
+    <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">
+    <rect
+       ry="6.5132794"
+       rx="6.5132794"
+       y="1.4867208"
+       x="0.48672035"
+       height="13.026559"
+       width="13.026559"
+       id="rect17861-2"
+       style="color:#000000;fill:#1f2427;fill-opacity:0;stroke:#969696;stroke-width:0.97344154000000005;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+  </g>
+</svg>
diff --git a/desktop-themes/Green-Submarine/gtk-3.0/assets/radio-mixed-active-ins.png b/desktop-themes/Green-Submarine/gtk-3.0/assets/radio-mixed-insensitive.png
index bc8e1b65..bc8e1b65 100644
--- a/desktop-themes/Green-Submarine/gtk-3.0/assets/radio-mixed-active-ins.png
+++ b/desktop-themes/Green-Submarine/gtk-3.0/assets/radio-mixed-insensitive.png
diff --git a/desktop-themes/Green-Submarine/gtk-3.0/assets/radio-mixed-active.png b/desktop-themes/Green-Submarine/gtk-3.0/assets/radio-mixed.png
index 5f62bdf7..5f62bdf7 100644
--- a/desktop-themes/Green-Submarine/gtk-3.0/assets/radio-mixed-active.png
+++ b/desktop-themes/Green-Submarine/gtk-3.0/assets/radio-mixed.png
diff --git a/desktop-themes/Green-Submarine/gtk-3.0/assets/radio-mixed.svg b/desktop-themes/Green-Submarine/gtk-3.0/assets/radio-mixed.svg
new file mode 100644
index 00000000..217f7ee2
--- /dev/null
+++ b/desktop-themes/Green-Submarine/gtk-3.0/assets/radio-mixed.svg
@@ -0,0 +1,600 @@
+<?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"
+   id="svg814"
+   height="16"
+   width="16"
+   version="1.1"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="radio-selected.svg">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1023"
+     inkscape:window-height="914"
+     id="namedview33"
+     showgrid="true"
+     inkscape:zoom="20.85965"
+     inkscape:cx="4.6265781"
+     inkscape:cy="7.9708196"
+     inkscape:window-x="325"
+     inkscape:window-y="51"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg814">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3050" />
+  </sodipodi:namedview>
+  <defs
+     id="defs816">
+    <linearGradient
+       id="linearGradient3849">
+      <stop
+         style="stop-color:#000000;stop-opacity:0.65189874;"
+         offset="0"
+         id="stop3851" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0.18354431;"
+         offset="1"
+         id="stop3853" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3841">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop3843" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0.34810126;"
+         offset="1"
+         id="stop3845" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3826">
+      <stop
+         style="stop-color:#000000;stop-opacity:0.14901961;"
+         offset="0"
+         id="stop3828" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop3830" />
+    </linearGradient>
+    <linearGradient
+       x1="664.27"
+       y1="261.45"
+       x2="664.27"
+       gradientUnits="userSpaceOnUse"
+       y2="248.05"
+       id="linearGradient3806">
+      <stop
+         offset="0"
+         style="stop-color:#718e9b;stop-opacity:1;"
+         id="stop3808" />
+      <stop
+         id="stop3810"
+         style="stop-color:#526770;stop-opacity:1;"
+         offset="0.75000018" />
+      <stop
+         offset="1"
+         style="stop-color:#6e6e6e;stop-opacity:1;"
+         id="stop3812" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient8358"
+       y2="262.5"
+       gradientUnits="userSpaceOnUse"
+       x2="662.53"
+       y1="249.29"
+       x1="662.53">
+      <stop
+         id="stop11579-5-6-7-4"
+         style="stop-color:#78a1be;stop-opacity:1;"
+         offset="0" />
+      <stop
+         id="stop11581-8-0-0-9"
+         style="stop-color:#ebf1f5;stop-opacity:1;"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient8360"
+       y2="248.05"
+       gradientUnits="userSpaceOnUse"
+       x2="664.27"
+       y1="261.45"
+       x1="664.27">
+      <stop
+         id="stop12417-2-8-0"
+         style="stop-color:#6195ab;stop-opacity:1;"
+         offset="0" />
+      <stop
+         offset="0.5"
+         style="stop-color:#436d7f;stop-opacity:1;"
+         id="stop3804" />
+      <stop
+         id="stop12419-5-0-9"
+         style="stop-color:#767676;stop-opacity:1;"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient8362"
+       y2="258.26"
+       gradientUnits="userSpaceOnUse"
+       x2="661.05"
+       y1="251.69"
+       x1="661.05">
+      <stop
+         id="stop11625-5-6-0"
+         style="stop-color:#277397;stop-opacity:1;"
+         offset="0" />
+      <stop
+         id="stop11627-4-4-9"
+         style="stop-color:#59a4b5;stop-opacity:1;"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient8364"
+       y2="259.78"
+       gradientUnits="userSpaceOnUse"
+       x2="662.26"
+       y1="251.67"
+       x1="662.26">
+      <stop
+         id="stop12389-7-2"
+         style="stop-color:#165c7a;stop-opacity:1;"
+         offset="0" />
+      <stop
+         id="stop12391-1-4"
+         style="stop-color:#0f405f;stop-opacity:1;"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient8366"
+       y2="260.71"
+       gradientUnits="userSpaceOnUse"
+       x2="660.27"
+       y1="246.7"
+       x1="660.16">
+      <stop
+         id="stop11555-5-9-8"
+         style="stop-color:#fff"
+         offset="0" />
+      <stop
+         id="stop11557-1-9-0"
+         style="stop-color:#fff;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <radialGradient
+       id="radialGradient8368"
+       gradientUnits="userSpaceOnUse"
+       cy="251.41"
+       cx="660.87"
+       gradientTransform="matrix(1.4686,0,0,2.2821,-309.65,-324.36)"
+       r="5.0291">
+      <stop
+         id="stop12407-9"
+         offset="0"
+         style="stop-color:#000000;stop-opacity:0.76582277;" />
+      <stop
+         id="stop12409-7"
+         style="stop-opacity:0"
+         offset="1" />
+    </radialGradient>
+    <radialGradient
+       id="radialGradient5029"
+       gradientUnits="userSpaceOnUse"
+       cx="663.02"
+       cy="269.83"
+       r="2.3865"
+       gradientTransform="matrix(2.4144,0,0,1.7214,-937.77,-194.09)">
+      <stop
+         id="stop12694-4-1"
+         style="stop-color:#fff"
+         offset="0" />
+      <stop
+         id="stop12696-5-2"
+         style="stop-color:#fff;stop-opacity:0"
+         offset="1" />
+    </radialGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8358"
+       id="linearGradient3016"
+       gradientUnits="userSpaceOnUse"
+       x1="662.53"
+       y1="249.29"
+       x2="662.53"
+       y2="262.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8360"
+       id="linearGradient3018"
+       gradientUnits="userSpaceOnUse"
+       x1="664.27"
+       y1="261.45"
+       x2="664.27"
+       y2="248.05" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8362"
+       id="linearGradient3020"
+       gradientUnits="userSpaceOnUse"
+       x1="661.05"
+       y1="251.69"
+       x2="661.05"
+       y2="258.26" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8364"
+       id="linearGradient3022"
+       gradientUnits="userSpaceOnUse"
+       x1="662.26"
+       y1="251.67"
+       x2="662.26"
+       y2="259.78" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8366"
+       id="linearGradient3024"
+       gradientUnits="userSpaceOnUse"
+       x1="660.16"
+       y1="246.7"
+       x2="660.27"
+       y2="260.71" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#radialGradient8368"
+       id="radialGradient3026"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.4686,0,0,2.2821,-309.65,-324.36)"
+       cx="660.87"
+       cy="251.41"
+       r="5.0291" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#radialGradient5029"
+       id="radialGradient3028"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.4144,0,0,1.7214,-937.77,-194.09)"
+       cx="663.02"
+       cy="269.83"
+       r="2.3865" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#radialGradient5029"
+       id="radialGradient3031"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(3.0351422,0,0,1.9988897,-2004.4307,-534.93931)"
+       cx="663.02"
+       cy="269.83"
+       r="2.3865" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#radialGradient8368"
+       id="radialGradient3034"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7918389,0,0,1.7208631,-1176.254,-428.96715)"
+       cx="660.87"
+       cy="251.41"
+       r="5.0291" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8366"
+       id="linearGradient3037"
+       gradientUnits="userSpaceOnUse"
+       x1="660.16"
+       y1="246.7"
+       x2="660.27"
+       y2="260.71"
+       gradientTransform="matrix(0.77641,0,0,-0.47985,-505.19,130.35)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8362"
+       id="linearGradient3040"
+       gradientUnits="userSpaceOnUse"
+       x1="661.05"
+       y1="251.69"
+       x2="661.05"
+       y2="258.26"
+       gradientTransform="matrix(0.99826,0,0,0.61696,-651.82,-149.41)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8364"
+       id="linearGradient3042"
+       gradientUnits="userSpaceOnUse"
+       x1="662.26"
+       y1="251.67"
+       x2="662.26"
+       y2="259.78"
+       gradientTransform="matrix(0.99826,0,0,0.61696,-651.82,-149.41)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8358"
+       id="linearGradient3045"
+       gradientUnits="userSpaceOnUse"
+       x1="662.53"
+       y1="249.29"
+       x2="662.53"
+       y2="262.5"
+       gradientTransform="matrix(1.4419,0,0,0.89117,-945.079,-219.348)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8360"
+       id="linearGradient3047"
+       gradientUnits="userSpaceOnUse"
+       x1="664.27"
+       y1="261.45"
+       x2="664.27"
+       y2="248.05"
+       gradientTransform="matrix(1.4419,0,0,0.89117,-945.079,-219.348)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8358"
+       id="linearGradient3028"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.4419,0,0,0.89117,-945.079,-219.348)"
+       x1="662.53"
+       y1="249.29"
+       x2="662.53"
+       y2="262.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8360"
+       id="linearGradient3030"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.4419,0,0,0.89117,-945.079,-219.348)"
+       x1="664.27"
+       y1="261.45"
+       x2="664.27"
+       y2="248.05" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8362"
+       id="linearGradient3032"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.99826,0,0,0.61696,-651.82,-149.41)"
+       x1="661.05"
+       y1="251.69"
+       x2="661.05"
+       y2="258.26" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8364"
+       id="linearGradient3034"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.99826,0,0,0.61696,-651.82,-149.41)"
+       x1="662.26"
+       y1="251.67"
+       x2="662.26"
+       y2="259.78" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8366"
+       id="linearGradient3036"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.77641,0,0,-0.47985,-505.19,130.35)"
+       x1="660.16"
+       y1="246.7"
+       x2="660.27"
+       y2="260.71" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#radialGradient8368"
+       id="radialGradient3038"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7918389,0,0,1.7208631,-1176.254,-428.96715)"
+       cx="660.87"
+       cy="251.41"
+       r="5.0291" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#radialGradient5029"
+       id="radialGradient3040"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(3.0351422,0,0,1.9988897,-2004.4307,-534.93931)"
+       cx="663.02"
+       cy="269.83"
+       r="2.3865" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#radialGradient5029"
+       id="radialGradient3030"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(3.4687287,0,0,2.2844419,-2291.891,-612.45853)"
+       cx="663.02"
+       cy="269.83"
+       r="2.3865" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#radialGradient8368"
+       id="radialGradient3033"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.0478128,0,0,-1.9666977,-1345.4048,507.34768)"
+       cx="660.87"
+       cy="251.41"
+       r="5.0291" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8366"
+       id="linearGradient3038"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.88732436,0,0,0.54839916,-578.47572,-131.87095)"
+       x1="660.16"
+       y1="246.7"
+       x2="660.27"
+       y2="260.71" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8362"
+       id="linearGradient3041"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.1408668,0,0,0.70509607,-746.0526,-171.85428)"
+       x1="661.05"
+       y1="251.69"
+       x2="661.05"
+       y2="258.26" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8364"
+       id="linearGradient3043"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.1408668,0,0,0.70509607,-746.0526,-171.85428)"
+       x1="662.26"
+       y1="251.67"
+       x2="662.26"
+       y2="259.78" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8358"
+       id="linearGradient3046"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.6478832,0,0,-1.0184784,-1081.2052,267.7833)"
+       x1="662.18604"
+       y1="247.21516"
+       x2="662.18604"
+       y2="262.92487" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3806"
+       id="linearGradient3048"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.6478832,0,0,-1.0184784,-1081.2052,267.7833)"
+       x1="664.00653"
+       y1="262.92487"
+       x2="664.00653"
+       y2="247.21516" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8358"
+       id="linearGradient3818"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.6478832,0,0,-1.0184784,-1081.2052,267.7833)"
+       x1="662.18604"
+       y1="247.21516"
+       x2="662.18604"
+       y2="262.92487" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3806"
+       id="linearGradient3820"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.6478832,0,0,-1.0184784,-1081.2052,267.7833)"
+       x1="664.00653"
+       y1="262.92487"
+       x2="664.00653"
+       y2="247.21516" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#radialGradient8368"
+       id="radialGradient3822"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.0478128,0,0,-1.9666977,-1345.4048,507.34768)"
+       cx="660.87"
+       cy="251.41"
+       r="5.0291" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3826"
+       id="linearGradient3832"
+       x1="11.75"
+       y1="15.499999"
+       x2="11.75"
+       y2="8.9375"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3841"
+       id="linearGradient3847"
+       x1="7.1666665"
+       y1="12.833333"
+       x2="7.1666665"
+       y2="1.1666666"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3849"
+       id="linearGradient3855"
+       x1="9.666667"
+       y1="12.833333"
+       x2="9.666667"
+       y2="1.1666666"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#radialGradient8368"
+       id="radialGradient3858"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7918942,0,0,-1.720866,-1176.2673,444.93059)"
+       cx="660.87"
+       cy="251.41"
+       r="5.0291" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8358"
+       id="linearGradient3861"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.4419445,0,0,-0.89117144,-945.0852,235.31108)"
+       x1="662.35919"
+       y1="253.94786"
+       x2="662.35919"
+       y2="264.04694"
+       spreadMethod="reflect" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3806"
+       id="linearGradient3863"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.4419445,0,0,-0.89117144,-945.0852,235.31108)"
+       x1="664.00653"
+       y1="262.92487"
+       x2="664.00653"
+       y2="247.21516" />
+  </defs>
+  <metadata
+     id="metadata819">
+    <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>
+  <path
+     sodipodi:type="arc"
+     style="fill:none;fill-rule:evenodd;stroke:url(#linearGradient3832);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     id="path3824"
+     sodipodi:cx="8"
+     sodipodi:cy="8"
+     sodipodi:rx="7"
+     sodipodi:ry="7"
+     d="M 15,8 A 7,7 0 1 1 1,8 7,7 0 1 1 15,8 z"
+     transform="matrix(1.0666667,0,0,1.0666667,-0.53333333,-0.53333333)" />
+  <path
+     id="path6307"
+     style="color:#000000;fill:url(#linearGradient3861);stroke:url(#linearGradient3863);stroke-width:1.00000525000000007;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:100;enable-background:new;fill-opacity:1"
+     d="M 14.499997,7.9999709 C 14.499997,4.4101543 11.589865,1.499944 8,1.499944 c -3.5898651,0 -6.4999974,2.9101211 -6.4999974,6.5000269 0,3.5898171 2.9101323,6.5000271 6.4999974,6.5000271 3.589865,0 6.499997,-2.910121 6.499997,-6.5000271 z"
+     inkscape:connector-curvature="0" />
+  <path
+     style="fill:none;stroke:#2a2f32;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+     d="m 4,8 8,0"
+     id="path3057"
+     inkscape:connector-curvature="0" />
+</svg>
diff --git a/desktop-themes/Green-Submarine/gtk-3.0/assets/radio-active-ins.png b/desktop-themes/Green-Submarine/gtk-3.0/assets/radio-selected-insensitive.png
index 741b2e57..741b2e57 100644
--- a/desktop-themes/Green-Submarine/gtk-3.0/assets/radio-active-ins.png
+++ b/desktop-themes/Green-Submarine/gtk-3.0/assets/radio-selected-insensitive.png
diff --git a/desktop-themes/Green-Submarine/gtk-3.0/assets/radio-active.png b/desktop-themes/Green-Submarine/gtk-3.0/assets/radio-selected.png
index 3ffe271e..3ffe271e 100644
--- a/desktop-themes/Green-Submarine/gtk-3.0/assets/radio-active.png
+++ b/desktop-themes/Green-Submarine/gtk-3.0/assets/radio-selected.png
diff --git a/desktop-themes/Green-Submarine/gtk-3.0/assets/radio-selected.svg b/desktop-themes/Green-Submarine/gtk-3.0/assets/radio-selected.svg
new file mode 100644
index 00000000..b48941be
--- /dev/null
+++ b/desktop-themes/Green-Submarine/gtk-3.0/assets/radio-selected.svg
@@ -0,0 +1,451 @@
+<?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="16"
+   height="16"
+   id="svg814"
+   version="1.1"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="radio-selected.svg"
+   inkscape:export-filename="/usr/share/themes/MediterraneanGray/gtk-3.0/assets/radio-selected.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs816">
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient10354-2"
+       id="linearGradient8378"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-1609.9926,-78.958432)"
+       x1="1205.5752"
+       y1="-186.45331"
+       x2="1205.5752"
+       y2="-202.34555" />
+    <linearGradient
+       id="linearGradient10354-2"
+       inkscape:collect="always">
+      <stop
+         id="stop10356-2"
+         offset="0"
+         style="stop-color:#bcbfb8;stop-opacity:1" />
+      <stop
+         id="stop10358-2"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient10332-5"
+       id="linearGradient8380"
+       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">
+      <stop
+         style="stop-color:#d3d7cf;stop-opacity:1"
+         offset="0"
+         id="stop10334-5" />
+      <stop
+         style="stop-color:#8f9985;stop-opacity:1"
+         offset="1"
+         id="stop10336-29" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient11577-0-5-0-2"
+       id="linearGradient8358"
+       gradientUnits="userSpaceOnUse"
+       x1="662.53418"
+       y1="249.29141"
+       x2="662.53418"
+       y2="262.49979" />
+    <linearGradient
+       id="linearGradient11577-0-5-0-2">
+      <stop
+         id="stop11579-5-6-7-4"
+         offset="0"
+         style="stop-color:#f0f0f0;stop-opacity:1;" />
+      <stop
+         id="stop11581-8-0-0-9"
+         offset="1"
+         style="stop-color:#e0e0e0;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient12415-4-1-5"
+       id="linearGradient8360"
+       gradientUnits="userSpaceOnUse"
+       x1="664.26984"
+       y1="261.44751"
+       x2="664.26984"
+       y2="248.05356" />
+    <linearGradient
+       id="linearGradient12415-4-1-5">
+      <stop
+         id="stop12417-2-8-0"
+         offset="0"
+         style="stop-color:#8b8b8b;stop-opacity:1;" />
+      <stop
+         id="stop12419-5-0-9"
+         offset="1"
+         style="stop-color:#cacaca;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient11623-4-5-4"
+       id="linearGradient8362"
+       gradientUnits="userSpaceOnUse"
+       x1="661.04559"
+       y1="251.6946"
+       x2="661.04559"
+       y2="258.26358" />
+    <linearGradient
+       id="linearGradient11623-4-5-4"
+       inkscape:collect="always">
+      <stop
+         id="stop11625-5-6-0"
+         offset="0"
+         style="stop-color:#2e87e3;stop-opacity:1" />
+      <stop
+         id="stop11627-4-4-9"
+         offset="1"
+         style="stop-color:#76b0ec;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient12387-1-5"
+       id="linearGradient8364"
+       gradientUnits="userSpaceOnUse"
+       x1="662.26074"
+       y1="251.66537"
+       x2="662.26074"
+       y2="259.77792" />
+    <linearGradient
+       id="linearGradient12387-1-5"
+       inkscape:collect="always">
+      <stop
+         id="stop12389-7-2"
+         offset="0"
+         style="stop-color:#1b6fc5;stop-opacity:1;" />
+      <stop
+         id="stop12391-1-4"
+         offset="1"
+         style="stop-color:#145393;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient11553-0-7-9"
+       id="linearGradient8366"
+       gradientUnits="userSpaceOnUse"
+       x1="660.16144"
+       y1="246.69635"
+       x2="660.27411"
+       y2="260.70532" />
+    <linearGradient
+       id="linearGradient11553-0-7-9">
+      <stop
+         id="stop11555-5-9-8"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop11557-1-9-0"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient12405-7"
+       id="radialGradient8368"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.4685542,0,0,2.2820942,-309.65132,-324.35943)"
+       cx="660.8656"
+       cy="251.41324"
+       fx="660.8656"
+       fy="251.41324"
+       r="5.0290799" />
+    <linearGradient
+       id="linearGradient12405-7">
+      <stop
+         id="stop12407-9"
+         offset="0"
+         style="stop-color:#000000;stop-opacity:0;" />
+      <stop
+         id="stop12409-7"
+         offset="1"
+         style="stop-color:#000000;stop-opacity:0.64313728;" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient12692-5-0"
+       id="radialGradient8370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.4143887,0,0,1.7213698,-937.76662,-194.09437)"
+       cx="663.01904"
+       cy="269.82831"
+       fx="663.01904"
+       fy="269.82831"
+       r="2.3864853" />
+    <linearGradient
+       id="linearGradient12692-5-0"
+       inkscape:collect="always">
+      <stop
+         id="stop12694-4-1"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop12696-5-2"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       r="2.3864853"
+       fy="269.82831"
+       fx="663.01904"
+       cy="269.82831"
+       cx="663.01904"
+       gradientTransform="matrix(2.4143887,0,0,1.7213698,-937.76662,-194.09437)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient5029"
+       xlink:href="#linearGradient12692-5-0"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient11577-0-5-0-2"
+       id="linearGradient3027"
+       gradientUnits="userSpaceOnUse"
+       x1="662.53418"
+       y1="249.29141"
+       x2="662.53418"
+       y2="262.49979" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient12415-4-1-5"
+       id="linearGradient3029"
+       gradientUnits="userSpaceOnUse"
+       x1="664.26984"
+       y1="261.44751"
+       x2="664.26984"
+       y2="248.05356" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient12405-7"
+       id="radialGradient3031"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.4685542,0,0,2.2820942,-309.65132,-324.35943)"
+       cx="660.8656"
+       cy="251.41324"
+       fx="660.8656"
+       fy="251.41324"
+       r="5.0290799" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient12415-4-1-5"
+       id="linearGradient3803"
+       gradientUnits="userSpaceOnUse"
+       x1="664.0022"
+       y1="261.93979"
+       x2="664.0022"
+       y2="248.19382" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient11577-0-5-0-2"
+       id="linearGradient3805"
+       gradientUnits="userSpaceOnUse"
+       x1="662.1817"
+       y1="247.21196"
+       x2="662.1817"
+       y2="260.95795" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient11577-0-5-0-2"
+       id="linearGradient3032"
+       gradientUnits="userSpaceOnUse"
+       x1="662.1817"
+       y1="247.21196"
+       x2="662.1817"
+       y2="260.95795" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient12415-4-1-5"
+       id="linearGradient3034"
+       gradientUnits="userSpaceOnUse"
+       x1="664.0022"
+       y1="261.93979"
+       x2="664.0022"
+       y2="248.19382" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient12405-7"
+       id="radialGradient3036"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.4667349,-1.2515703e-6,8.5691457e-7,2.6369512,-308.51428,-416.33956)"
+       cx="660.9798"
+       cy="252.60332"
+       fx="660.9798"
+       fy="252.60332"
+       r="5.0290799" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient11577-0-5-0-2"
+       id="linearGradient3035"
+       gradientUnits="userSpaceOnUse"
+       x1="660.96808"
+       y1="248.33408"
+       x2="660.96808"
+       y2="261.79953" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3841"
+       id="linearGradient3847"
+       x1="7.1666665"
+       y1="12.833333"
+       x2="7.1666665"
+       y2="1.1666666"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient3841">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop3843" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0.34810126;"
+         offset="1"
+         id="stop3845" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3849"
+       id="linearGradient3855"
+       x1="9.666667"
+       y1="12.833333"
+       x2="9.666667"
+       y2="1.1666666"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient3849">
+      <stop
+         style="stop-color:#000000;stop-opacity:0.65189874;"
+         offset="0"
+         id="stop3851" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0.18354431;"
+         offset="1"
+         id="stop3853" />
+    </linearGradient>
+    <linearGradient
+       y2="1.1666666"
+       x2="7.1666665"
+       y1="12.833333"
+       x1="7.1666665"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3076"
+       xlink:href="#linearGradient3841"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="1.1666666"
+       x2="9.666667"
+       y1="12.833333"
+       x1="9.666667"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3078"
+       xlink:href="#linearGradient3849"
+       inkscape:collect="always" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="31.621594"
+     inkscape:cx="7.9718999"
+     inkscape:cy="6.1099404"
+     inkscape:document-units="px"
+     inkscape:current-layer="g6305"
+     showgrid="true"
+     borderlayer="true"
+     inkscape:showpageshadow="false"
+     inkscape:window-width="1185"
+     inkscape:window-height="911"
+     inkscape:window-x="150"
+     inkscape:window-y="33"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4084"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata819">
+    <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(0,-1036.3622)">
+    <g
+       transform="translate(-1031,770.36221)"
+       id="g6305"
+       style="display:inline;enable-background:new">
+      <path
+         transform="matrix(1.4419432,0,0,-0.89116943,85.921547,501.30773)"
+         d="m 665.47588,255.0668 c 0,4.02825 -2.01821,7.29379 -4.5078,7.29379 -2.48959,0 -4.50781,-3.26554 -4.50781,-7.29379 0,-4.02824 2.01822,-7.29378 4.50781,-7.29378 2.48959,0 4.5078,3.26554 4.5078,7.29378 z"
+         sodipodi:ry="7.2937827"
+         sodipodi:rx="4.5078058"
+         sodipodi:cy="255.0668"
+         sodipodi:cx="660.96808"
+         id="path6307"
+         style="color:#000000;fill:url(#linearGradient3035);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient3034);stroke-width:0.88215655000000004;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:100;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new"
+         sodipodi:type="arc" />
+      <path
+         sodipodi:type="arc"
+         style="opacity:0.12955465999999999;fill:none;stroke:url(#radialGradient3036);stroke-width:1.04254841999999992;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:100"
+         id="path6313"
+         sodipodi:cx="660.96808"
+         sodipodi:cy="255.0668"
+         sodipodi:rx="4.5078058"
+         sodipodi:ry="7.2937827"
+         d="m 665.47588,255.0668 c 0,4.02825 -2.01821,7.29379 -4.5078,7.29379 -2.48959,0 -4.50781,-3.26554 -4.50781,-7.29379 0,-4.02824 2.01822,-7.29378 4.50781,-7.29378 2.48959,0 4.5078,3.26554 4.5078,7.29378 z"
+         transform="matrix(1.2201061,0,0,-0.75406664,232.54879,466.33736)" />
+      <path
+         sodipodi:type="arc"
+         style="fill:url(#linearGradient3076);fill-opacity:1;stroke:url(#linearGradient3078);stroke-width:1;stroke-miterlimit:4;stroke-opacity:0.58823529;stroke-dasharray:none"
+         id="path3839"
+         sodipodi:cx="8"
+         sodipodi:cy="7"
+         sodipodi:rx="2"
+         sodipodi:ry="2"
+         d="M 10,7 C 10,8.1045695 9.1045695,9 8,9 6.8954305,9 6,8.1045695 6,7 6,5.8954305 6.8954305,5 8,5 c 1.1045695,0 2,0.8954305 2,2 z"
+         transform="matrix(1.2,0,0,1.2,1029.4,265.59999)" />
+    </g>
+  </g>
+</svg>
diff --git a/desktop-themes/Green-Submarine/gtk-3.0/assets/radio-normal-ins.png b/desktop-themes/Green-Submarine/gtk-3.0/assets/radio-unselected-insensitive.png
index 44f80c55..44f80c55 100644
--- a/desktop-themes/Green-Submarine/gtk-3.0/assets/radio-normal-ins.png
+++ b/desktop-themes/Green-Submarine/gtk-3.0/assets/radio-unselected-insensitive.png
diff --git a/desktop-themes/Green-Submarine/gtk-3.0/assets/radio-normal.png b/desktop-themes/Green-Submarine/gtk-3.0/assets/radio-unselected.png
index 6a9d7753..6a9d7753 100644
--- a/desktop-themes/Green-Submarine/gtk-3.0/assets/radio-normal.png
+++ b/desktop-themes/Green-Submarine/gtk-3.0/assets/radio-unselected.png
diff --git a/desktop-themes/Green-Submarine/gtk-3.0/assets/radio-unselected.svg b/desktop-themes/Green-Submarine/gtk-3.0/assets/radio-unselected.svg
new file mode 100644
index 00000000..8b0f6b5f
--- /dev/null
+++ b/desktop-themes/Green-Submarine/gtk-3.0/assets/radio-unselected.svg
@@ -0,0 +1,381 @@
+<?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="16"
+   height="16"
+   id="svg814"
+   version="1.1"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="radio-unselected.svg">
+  <defs
+     id="defs816">
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient10354-2"
+       id="linearGradient8378"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-1609.9926,-78.958432)"
+       x1="1205.5752"
+       y1="-186.45331"
+       x2="1205.5752"
+       y2="-202.34555" />
+    <linearGradient
+       id="linearGradient10354-2"
+       inkscape:collect="always">
+      <stop
+         id="stop10356-2"
+         offset="0"
+         style="stop-color:#bcbfb8;stop-opacity:1" />
+      <stop
+         id="stop10358-2"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient10332-5"
+       id="linearGradient8380"
+       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">
+      <stop
+         style="stop-color:#d3d7cf;stop-opacity:1"
+         offset="0"
+         id="stop10334-5" />
+      <stop
+         style="stop-color:#8f9985;stop-opacity:1"
+         offset="1"
+         id="stop10336-29" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient11577-0-5-0-2"
+       id="linearGradient8358"
+       gradientUnits="userSpaceOnUse"
+       x1="662.53418"
+       y1="249.29141"
+       x2="662.53418"
+       y2="262.49979" />
+    <linearGradient
+       id="linearGradient11577-0-5-0-2">
+      <stop
+         id="stop11579-5-6-7-4"
+         offset="0"
+         style="stop-color:#e0e0e0;stop-opacity:1;" />
+      <stop
+         id="stop11581-8-0-0-9"
+         offset="1"
+         style="stop-color:#f0f0f0;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient12415-4-1-5"
+       id="linearGradient8360"
+       gradientUnits="userSpaceOnUse"
+       x1="664.26984"
+       y1="261.44751"
+       x2="664.26984"
+       y2="248.05356" />
+    <linearGradient
+       id="linearGradient12415-4-1-5">
+      <stop
+         id="stop12417-2-8-0"
+         offset="0"
+         style="stop-color:#d3d3d3;stop-opacity:1;" />
+      <stop
+         id="stop12419-5-0-9"
+         offset="1"
+         style="stop-color:#909090;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient11623-4-5-4"
+       id="linearGradient8362"
+       gradientUnits="userSpaceOnUse"
+       x1="661.04559"
+       y1="251.6946"
+       x2="661.04559"
+       y2="258.26358" />
+    <linearGradient
+       id="linearGradient11623-4-5-4"
+       inkscape:collect="always">
+      <stop
+         id="stop11625-5-6-0"
+         offset="0"
+         style="stop-color:#2e87e3;stop-opacity:1" />
+      <stop
+         id="stop11627-4-4-9"
+         offset="1"
+         style="stop-color:#76b0ec;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient12387-1-5"
+       id="linearGradient8364"
+       gradientUnits="userSpaceOnUse"
+       x1="662.26074"
+       y1="251.66537"
+       x2="662.26074"
+       y2="259.77792" />
+    <linearGradient
+       id="linearGradient12387-1-5"
+       inkscape:collect="always">
+      <stop
+         id="stop12389-7-2"
+         offset="0"
+         style="stop-color:#1b6fc5;stop-opacity:1;" />
+      <stop
+         id="stop12391-1-4"
+         offset="1"
+         style="stop-color:#145393;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient11553-0-7-9"
+       id="linearGradient8366"
+       gradientUnits="userSpaceOnUse"
+       x1="660.16144"
+       y1="246.69635"
+       x2="660.27411"
+       y2="260.70532" />
+    <linearGradient
+       id="linearGradient11553-0-7-9">
+      <stop
+         id="stop11555-5-9-8"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop11557-1-9-0"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient12405-7"
+       id="radialGradient8368"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.4685542,0,0,2.2820942,-309.65132,-324.35943)"
+       cx="660.8656"
+       cy="251.41324"
+       fx="660.8656"
+       fy="251.41324"
+       r="5.0290799" />
+    <linearGradient
+       id="linearGradient12405-7"
+       inkscape:collect="always">
+      <stop
+         id="stop12407-9"
+         offset="0"
+         style="stop-color:#000000;stop-opacity:1;" />
+      <stop
+         id="stop12409-7"
+         offset="1"
+         style="stop-color:#000000;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient12692-5-0"
+       id="radialGradient8370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.4143887,0,0,1.7213698,-937.76662,-194.09437)"
+       cx="663.01904"
+       cy="269.82831"
+       fx="663.01904"
+       fy="269.82831"
+       r="2.3864853" />
+    <linearGradient
+       id="linearGradient12692-5-0"
+       inkscape:collect="always">
+      <stop
+         id="stop12694-4-1"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop12696-5-2"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       r="2.3864853"
+       fy="269.82831"
+       fx="663.01904"
+       cy="269.82831"
+       cx="663.01904"
+       gradientTransform="matrix(2.4143887,0,0,1.7213698,-937.76662,-194.09437)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient5029"
+       xlink:href="#linearGradient12692-5-0"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient11577-0-5-0-2"
+       id="linearGradient3027"
+       gradientUnits="userSpaceOnUse"
+       x1="662.53418"
+       y1="249.29141"
+       x2="662.53418"
+       y2="262.49979" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient12415-4-1-5"
+       id="linearGradient3029"
+       gradientUnits="userSpaceOnUse"
+       x1="664.26984"
+       y1="261.44751"
+       x2="664.26984"
+       y2="248.05356" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient12405-7"
+       id="radialGradient3031"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.4685542,0,0,2.2820942,-309.65132,-324.35943)"
+       cx="660.8656"
+       cy="251.41324"
+       fx="660.8656"
+       fy="251.41324"
+       r="5.0290799" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient12415-4-1-5"
+       id="linearGradient3803"
+       gradientUnits="userSpaceOnUse"
+       x1="664.0022"
+       y1="261.93979"
+       x2="664.0022"
+       y2="248.19382" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient11577-0-5-0-2"
+       id="linearGradient3805"
+       gradientUnits="userSpaceOnUse"
+       x1="662.1817"
+       y1="247.21196"
+       x2="662.1817"
+       y2="260.95795" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient11577-0-5-0-2"
+       id="linearGradient3032"
+       gradientUnits="userSpaceOnUse"
+       x1="662.1817"
+       y1="247.21196"
+       x2="662.1817"
+       y2="260.95795" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient12415-4-1-5"
+       id="linearGradient3034"
+       gradientUnits="userSpaceOnUse"
+       x1="664.0022"
+       y1="261.93979"
+       x2="664.0022"
+       y2="248.19382" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient12405-7"
+       id="radialGradient3036"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.4685542,0,0,2.2820942,-309.65132,-324.35943)"
+       cx="660.8656"
+       cy="251.41324"
+       fx="660.8656"
+       fy="251.41324"
+       r="5.0290799" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient11577-0-5-0-2"
+       id="linearGradient3035"
+       gradientUnits="userSpaceOnUse"
+       x1="660.96808"
+       y1="248.33408"
+       x2="660.96808"
+       y2="261.79953" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="31.621594"
+     inkscape:cx="3.8340214"
+     inkscape:cy="8.6398571"
+     inkscape:document-units="px"
+     inkscape:current-layer="g6305"
+     showgrid="true"
+     borderlayer="true"
+     inkscape:showpageshadow="false"
+     inkscape:window-width="953"
+     inkscape:window-height="924"
+     inkscape:window-x="82"
+     inkscape:window-y="32"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4084"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata819">
+    <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(0,-1036.3622)">
+    <g
+       transform="translate(-1031,770.36221)"
+       id="g6305"
+       style="display:inline;enable-background:new">
+      <path
+         transform="matrix(1.4419432,0,0,-0.89116943,85.921547,501.30773)"
+         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"
+         sodipodi:ry="7.2937827"
+         sodipodi:rx="4.5078058"
+         sodipodi:cy="255.0668"
+         sodipodi:cx="660.96808"
+         id="path6307"
+         style="color:#000000;fill:url(#linearGradient3035);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient3034);stroke-width:0.88215655000000004;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:100;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new"
+         sodipodi:type="arc" />
+      <path
+         sodipodi:type="arc"
+         style="opacity:0.12955466;fill:none;stroke:url(#radialGradient3036);stroke-width:1.04254842;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:100"
+         id="path6313"
+         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(1.2201061,0,0,-0.75406664,232.54879,466.33736)" />
+    </g>
+  </g>
+</svg>
diff --git a/desktop-themes/Green-Submarine/gtk-3.0/assets/sidebar-radio-checked.svg b/desktop-themes/Green-Submarine/gtk-3.0/assets/sidebar-radio-checked.svg
index 28ecf15a..28ecf15a 100755..100644
--- a/desktop-themes/Green-Submarine/gtk-3.0/assets/sidebar-radio-checked.svg
+++ b/desktop-themes/Green-Submarine/gtk-3.0/assets/sidebar-radio-checked.svg
diff --git a/desktop-themes/Green-Submarine/gtk-3.0/assets/sidebar-radio-prelight.svg b/desktop-themes/Green-Submarine/gtk-3.0/assets/sidebar-radio-prelight.svg
index 812624ad..812624ad 100755..100644
--- a/desktop-themes/Green-Submarine/gtk-3.0/assets/sidebar-radio-prelight.svg
+++ b/desktop-themes/Green-Submarine/gtk-3.0/assets/sidebar-radio-prelight.svg
diff --git a/desktop-themes/Green-Submarine/gtk-3.0/assets/sidebar-radio-selected-prelight.svg b/desktop-themes/Green-Submarine/gtk-3.0/assets/sidebar-radio-selected-prelight.svg
index 7ec4500f..9fa228b0 100644
--- a/desktop-themes/Green-Submarine/gtk-3.0/assets/sidebar-radio-selected-prelight.svg
+++ b/desktop-themes/Green-Submarine/gtk-3.0/assets/sidebar-radio-selected-prelight.svg
@@ -13,7 +13,7 @@
    height="16"
    id="svg27352"
    version="1.1"
-   inkscape:version="0.48.4 r9939"
+   inkscape:version="0.48.1 r9760"
    sodipodi:docname="sidebar-radio-selected.svg">
   <defs
      id="defs27354" />
@@ -24,18 +24,18 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="8"
-     inkscape:cx="-3.6523764"
-     inkscape:cy="12.856863"
+     inkscape:zoom="22.197802"
+     inkscape:cx="7.0809381"
+     inkscape:cy="8"
      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" />
+     inkscape:window-width="1280"
+     inkscape:window-height="741"
+     inkscape:window-x="0"
+     inkscape:window-y="26"
+     inkscape:window-maximized="1" />
   <metadata
      id="metadata27357">
     <rdf:RDF>
@@ -54,7 +54,7 @@
      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"
+       style="color:#000000;fill:#a3c3e3;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"
diff --git a/desktop-themes/Green-Submarine/gtk-3.0/assets/sidebar-radio-selected.svg b/desktop-themes/Green-Submarine/gtk-3.0/assets/sidebar-radio-selected.svg
index 887174e8..887174e8 100755..100644
--- a/desktop-themes/Green-Submarine/gtk-3.0/assets/sidebar-radio-selected.svg
+++ b/desktop-themes/Green-Submarine/gtk-3.0/assets/sidebar-radio-selected.svg
diff --git a/desktop-themes/Green-Submarine/gtk-3.0/assets/slider-horizontal.png b/desktop-themes/Green-Submarine/gtk-3.0/assets/slider-horizontal.png
new file mode 100644
index 00000000..5ecd836d
--- /dev/null
+++ b/desktop-themes/Green-Submarine/gtk-3.0/assets/slider-horizontal.png
diff --git a/desktop-themes/Green-Submarine/gtk-3.0/assets/slider-hover.png b/desktop-themes/Green-Submarine/gtk-3.0/assets/slider-hover.png
deleted file mode 100644
index a24d60f6..00000000
--- a/desktop-themes/Green-Submarine/gtk-3.0/assets/slider-hover.png
+++ /dev/null
diff --git a/desktop-themes/Green-Submarine/gtk-3.0/assets/slider-ins.png b/desktop-themes/Green-Submarine/gtk-3.0/assets/slider-ins.png
deleted file mode 100644
index f31f5c90..00000000
--- a/desktop-themes/Green-Submarine/gtk-3.0/assets/slider-ins.png
+++ /dev/null
diff --git a/desktop-themes/Green-Submarine/gtk-3.0/assets/slider-vertical.png b/desktop-themes/Green-Submarine/gtk-3.0/assets/slider-vertical.png
new file mode 100644
index 00000000..d9c06362
--- /dev/null
+++ b/desktop-themes/Green-Submarine/gtk-3.0/assets/slider-vertical.png
diff --git a/desktop-themes/Green-Submarine/gtk-3.0/assets/slider.png b/desktop-themes/Green-Submarine/gtk-3.0/assets/slider.png
deleted file mode 100644
index 3fdda2c9..00000000
--- a/desktop-themes/Green-Submarine/gtk-3.0/assets/slider.png
+++ /dev/null
diff --git a/desktop-themes/Green-Submarine/gtk-3.0/assets/slider_fine_horizontal.svg b/desktop-themes/Green-Submarine/gtk-3.0/assets/slider_fine_horizontal.svg
new file mode 100644
index 00000000..dcb96063
--- /dev/null
+++ b/desktop-themes/Green-Submarine/gtk-3.0/assets/slider_fine_horizontal.svg
@@ -0,0 +1,93 @@
+<?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"
+   id="svg7384"
+   version="1.1"
+   height="12"
+   width="20"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="slider_fine_horizontal.svg">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="898"
+     inkscape:window-height="651"
+     id="namedview16"
+     showgrid="false"
+     inkscape:zoom="14.75"
+     inkscape:cx="3.7906997"
+     inkscape:cy="7.8757062"
+     inkscape:window-x="239"
+     inkscape:window-y="282"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg7384" />
+  <title
+     id="title9167">Gnome Symbolic Icon Theme</title>
+  <metadata
+     id="metadata90">
+    <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>Gnome Symbolic Icon Theme</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs7386" />
+  <g
+     transform="translate(-183.99822,-521.99944)"
+     id="layer9"
+     style="display:inline" />
+  <g
+     transform="translate(-183.99822,-521.99944)"
+     id="layer10" />
+  <g
+     transform="translate(-183.99822,-521.99944)"
+     id="layer11" />
+  <g
+     transform="translate(-183.99822,-521.99944)"
+     id="layer13" />
+  <g
+     transform="translate(-183.99822,-521.99944)"
+     id="layer14" />
+  <g
+     transform="translate(-183.99822,-521.99944)"
+     id="layer15" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#bebebe;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path3490-2"
+     d="m 2.5002225,6.0006706 a 1.5000001,1.5000001 0 0 0 3,0 1.5000001,1.5000001 0 1 0 -3,0 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#bebebe;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path3490-3-0"
+     d="m 6.5002215,6.0006706 a 1.5000005,1.5000005 0 0 0 3.000001,0 1.5000001,1.5000001 0 1 0 -3,0 z" />
+  <path
+     d="m 10.499776,6.0006706 a 1.5000005,1.5000005 0 0 0 3.000001,0 1.5000001,1.5000001 0 1 0 -3,0 z"
+     id="path2997"
+     style="color:#bebebe;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     inkscape:connector-curvature="0" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#bebebe;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path2999"
+     d="m 14.499776,6.0006706 a 1.5000005,1.5000005 0 0 0 3.000001,0 1.5000001,1.5000001 0 1 0 -2.999999,0 z" />
+</svg>
diff --git a/desktop-themes/Green-Submarine/gtk-3.0/assets/slider_fine_vertical.svg b/desktop-themes/Green-Submarine/gtk-3.0/assets/slider_fine_vertical.svg
new file mode 100644
index 00000000..fdec5e38
--- /dev/null
+++ b/desktop-themes/Green-Submarine/gtk-3.0/assets/slider_fine_vertical.svg
@@ -0,0 +1,93 @@
+<?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"
+   id="svg7384"
+   version="1.1"
+   height="20"
+   width="12"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="slider_fine_vertical.svg">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="898"
+     inkscape:window-height="651"
+     id="namedview16"
+     showgrid="false"
+     inkscape:zoom="14.75"
+     inkscape:cx="-8.8813559"
+     inkscape:cy="10.847458"
+     inkscape:window-x="429"
+     inkscape:window-y="363"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg7384" />
+  <title
+     id="title9167">Gnome Symbolic Icon Theme</title>
+  <metadata
+     id="metadata90">
+    <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>Gnome Symbolic Icon Theme</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs7386" />
+  <g
+     transform="translate(-180,-514)"
+     id="layer9"
+     style="display:inline" />
+  <g
+     transform="translate(-180,-514)"
+     id="layer10" />
+  <g
+     transform="translate(-180,-514)"
+     id="layer11" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#bebebe;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path3490-2"
+     d="m 6.0003872,17.499777 a 1.5000001,1.5000001 0 0 0 0,-3 1.5000001,1.5000001 0 1 0 0,3 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#bebebe;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path3490-3-0"
+     d="m 6.0003872,13.499778 a 1.5000004,1.5000004 0 0 0 0,-3 1.5000001,1.5000001 0 1 0 0,2.999999 z" />
+  <g
+     transform="translate(-180,-514)"
+     id="layer13" />
+  <g
+     transform="translate(-180,-514)"
+     id="layer14" />
+  <g
+     transform="translate(-180,-514)"
+     id="layer15" />
+  <path
+     d="m 6.0003872,9.5002235 a 1.5000004,1.5000004 0 0 0 0,-3.0000008 1.5000001,1.5000001 0 1 0 0,2.9999998 z"
+     id="path2992"
+     style="color:#bebebe;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     inkscape:connector-curvature="0" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#bebebe;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path2994"
+     d="m 6.0003872,5.5002235 a 1.5000004,1.5000004 0 0 0 0,-3.0000008 1.5000001,1.5000001 0 1 0 0,2.9999998 z" />
+</svg>
diff --git a/desktop-themes/Green-Submarine/gtk-3.0/assets/switch-dark-off-disabled.svg b/desktop-themes/Green-Submarine/gtk-3.0/assets/switch-dark-off-disabled.svg
new file mode 100644
index 00000000..68f52c80
--- /dev/null
+++ b/desktop-themes/Green-Submarine/gtk-3.0/assets/switch-dark-off-disabled.svg
@@ -0,0 +1,310 @@
+<?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="56"
+   height="20"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="switch-dark-off-disabled.svg"
+   inkscape:export-filename="/usr/share/themes/Gnome-Cupertino/gtk-3.0/assets/switch-off.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient3803">
+      <stop
+         style="stop-color:#282828;stop-opacity:0.40000001;"
+         offset="0"
+         id="stop3805" />
+      <stop
+         style="stop-color:#282828;stop-opacity:0.40000001;"
+         offset="1"
+         id="stop3807" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3795">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop3797" />
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="1"
+         id="stop3799" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3833">
+      <stop
+         style="stop-color:#0f0f0f;stop-opacity:1;"
+         offset="0"
+         id="stop3835" />
+      <stop
+         style="stop-color:#c7c7c7;stop-opacity:0.54491019;"
+         offset="1"
+         id="stop3837" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3809">
+      <stop
+         style="stop-color:#b9b9b9;stop-opacity:1;"
+         offset="0"
+         id="stop3811" />
+      <stop
+         style="stop-color:#b9b9b9;stop-opacity:1;"
+         offset="1"
+         id="stop3813" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3786">
+      <stop
+         style="stop-color:#222222;stop-opacity:0.7609756;"
+         offset="0"
+         id="stop3788" />
+      <stop
+         style="stop-color:#5d5d5d;stop-opacity:1;"
+         offset="1"
+         id="stop3790" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3772">
+      <stop
+         style="stop-color:#000000;stop-opacity:0.36097562;"
+         offset="0"
+         id="stop3774" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0.22352941;"
+         offset="1"
+         id="stop3776" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3763">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop3765" />
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="1"
+         id="stop3767" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3769">
+      <stop
+         style="stop-color:#bebebe;stop-opacity:1;"
+         offset="0"
+         id="stop3771" />
+      <stop
+         style="stop-color:#b4b4b4;stop-opacity:1;"
+         offset="1"
+         id="stop3773" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3759">
+      <stop
+         style="stop-color:#8c8c8c;stop-opacity:0.47058824;"
+         offset="0"
+         id="stop3761" />
+      <stop
+         id="stop3792"
+         offset="0.50000042"
+         style="stop-color:#8c8c8c;stop-opacity:0.47058824;" />
+      <stop
+         style="stop-color:#8c8c8c;stop-opacity:0.47058824;"
+         offset="1"
+         id="stop3763" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3759"
+       id="linearGradient3765"
+       x1="25"
+       y1="1033.3622"
+       x2="25"
+       y2="1051.3622"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.75925924,0,0,0.88888885,7.2407408,115.81826)" />
+    <linearGradient
+       y2="26"
+       x2="35"
+       y1="3"
+       x1="35"
+       gradientTransform="matrix(1.8,0,0,1.125,-33.2,1029.9872)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3967"
+       xlink:href="#linearGradient4071-3-6"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient4071-3-6">
+      <stop
+         style="stop-color:#000000;stop-opacity:0.35294119;"
+         offset="0"
+         id="stop4073-8-9" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop4075-4-4" />
+    </linearGradient>
+    <linearGradient
+       y2="26"
+       x2="35"
+       y1="3"
+       x1="35"
+       gradientTransform="matrix(1.2999999,0,0,0.875,-15.7,1033.0172)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3895"
+       xlink:href="#linearGradient4071-3-6"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="38"
+       x2="35"
+       y1="3"
+       x1="35"
+       gradientTransform="matrix(1.8,0,0,1.125,-33.2,1029.9872)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3950"
+       xlink:href="#linearGradient4071-3"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient4071-3">
+      <stop
+         style="stop-color:#000000;stop-opacity:0.86341465;"
+         offset="0"
+         id="stop4073-8" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0.86829269;"
+         offset="1"
+         id="stop4075-4" />
+    </linearGradient>
+    <linearGradient
+       y2="37.893074"
+       x2="35.304348"
+       y1="3.1030066"
+       x1="35.5"
+       gradientTransform="matrix(1.3333334,0,0,0.99645293,-17.333334,1031.2702)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3912"
+       xlink:href="#linearGradient4071-3"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3786"
+       id="linearGradient3792"
+       x1="43.070576"
+       y1="14.423525"
+       x2="48.311802"
+       y2="14.847058"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3769"
+       id="linearGradient3802"
+       x1="44.5"
+       y1="11.035255"
+       x2="44.5"
+       y2="16.117661"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3809"
+       id="linearGradient3815"
+       x1="54.254425"
+       y1="1.4565123"
+       x2="54.254425"
+       y2="6.629705"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3803"
+       id="linearGradient3810"
+       x1="52.098927"
+       y1="0.59431362"
+       x2="52.098927"
+       y2="7.4919033"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="13.810607"
+     inkscape:cx="15.195906"
+     inkscape:cy="9.9868375"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     showguides="false"
+     inkscape:window-width="1300"
+     inkscape:window-height="917"
+     inkscape:window-x="379"
+     inkscape:window-y="64"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2985"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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="Capa 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1032.3622)">
+    <rect
+       style="fill:url(#linearGradient3765);fill-opacity:1;stroke:none"
+       id="rect2989"
+       width="41"
+       height="16"
+       x="8"
+       y="1034.3622"
+       rx="7"
+       ry="8" />
+    <path
+       style="opacity:0.45400002;color:#000000;fill:url(#linearGradient3912);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 16,1034.3622 c -5,0 -8,3.5837 -8,8 0,4.4163 3,8 6.956522,8 l 26.086956,0 c 5.909333,0 7.956522,-3.5837 7.956522,-8 0,-4.4162 -2.090666,-8 -8,-8 z m 14,1 11,0 c 5.212862,0 7,4 7,7 0,3 -1.786936,7 -7,7 l -26,0 c -4,0 -6,-4 -6,-7 0,-3 2,-7 7,-7 z"
+       id="rect4944"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ssssssscssssscc"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
+    <path
+       sodipodi:type="arc"
+       style="fill:url(#linearGradient3802);fill-opacity:1;stroke:url(#linearGradient3792);stroke-width:0.44922532999999998;stroke-linecap:square;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;opacity:1"
+       id="path3767"
+       sodipodi:cx="44.5"
+       sodipodi:cy="14"
+       sodipodi:rx="4.5"
+       sodipodi:ry="4"
+       d="m 49,14 c 0,2.209139 -2.014719,4 -4.5,4 -2.485281,0 -4.5,-1.790861 -4.5,-4 0,-2.209139 2.014719,-4 4.5,-4 2.485281,0 4.5,1.790861 4.5,4 z"
+       transform="matrix(2.0987442,0,0,2.3610872,-76.394117,1009.307)"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
+  </g>
+</svg>
diff --git a/desktop-themes/Green-Submarine/gtk-3.0/assets/switch-dark-off.svg b/desktop-themes/Green-Submarine/gtk-3.0/assets/switch-dark-off.svg
new file mode 100644
index 00000000..090ae07f
--- /dev/null
+++ b/desktop-themes/Green-Submarine/gtk-3.0/assets/switch-dark-off.svg
@@ -0,0 +1,337 @@
+<?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="56"
+   height="20"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="switch-dark-off.svg"
+   inkscape:export-filename="/usr/share/themes/Gnome-Cupertino/gtk-3.0/assets/switch-off.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient3803">
+      <stop
+         style="stop-color:#202020;stop-opacity:0.5529412;"
+         offset="0"
+         id="stop3805" />
+      <stop
+         style="stop-color:#484848;stop-opacity:0.1254902;"
+         offset="1"
+         id="stop3807" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3795">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop3797" />
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="1"
+         id="stop3799" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3833">
+      <stop
+         style="stop-color:#0f0f0f;stop-opacity:1;"
+         offset="0"
+         id="stop3835" />
+      <stop
+         style="stop-color:#c7c7c7;stop-opacity:0.54491019;"
+         offset="1"
+         id="stop3837" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3809">
+      <stop
+         style="stop-color:#969696;stop-opacity:1;"
+         offset="0"
+         id="stop3811" />
+      <stop
+         style="stop-color:#aaaaaa;stop-opacity:1;"
+         offset="1"
+         id="stop3813" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3786">
+      <stop
+         style="stop-color:#1c1c1c;stop-opacity:0.74509805;"
+         offset="0"
+         id="stop3788" />
+      <stop
+         style="stop-color:#343434;stop-opacity:1;"
+         offset="1"
+         id="stop3790" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3772">
+      <stop
+         style="stop-color:#000000;stop-opacity:0.36097562;"
+         offset="0"
+         id="stop3774" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0.22352941;"
+         offset="1"
+         id="stop3776" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3763">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop3765" />
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="1"
+         id="stop3767" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3769">
+      <stop
+         style="stop-color:#cdcdcd;stop-opacity:1;"
+         offset="0"
+         id="stop3771" />
+      <stop
+         style="stop-color:#9b9b9b;stop-opacity:1;"
+         offset="1"
+         id="stop3773" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3759">
+      <stop
+         style="stop-color:#323232;stop-opacity:1;"
+         offset="0"
+         id="stop3761" />
+      <stop
+         id="stop3801"
+         offset="0.68748617"
+         style="stop-color:#2d2d2d;stop-opacity:1;" />
+      <stop
+         style="stop-color:#1e1e1e;stop-opacity:1;"
+         offset="1"
+         id="stop3763" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3759"
+       id="linearGradient3765"
+       x1="25"
+       y1="1033.3622"
+       x2="25"
+       y2="1051.3622"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.75925924,0,0,0.88888885,7.2407408,-1968.9061)" />
+    <linearGradient
+       y2="26"
+       x2="35"
+       y1="3"
+       x1="35"
+       gradientTransform="matrix(1.8,0,0,1.125,-33.2,1029.9872)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3967"
+       xlink:href="#linearGradient4071-3-6"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient4071-3-6">
+      <stop
+         style="stop-color:#000000;stop-opacity:0.27450982;"
+         offset="0"
+         id="stop4073-8-9" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0.09268293;"
+         offset="1"
+         id="stop4075-4-4" />
+    </linearGradient>
+    <linearGradient
+       y2="26"
+       x2="35"
+       y1="3"
+       x1="35"
+       gradientTransform="matrix(1.2999999,0,0,0.875,-15.7,1033.0172)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3895"
+       xlink:href="#linearGradient4071-3-6"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="38"
+       x2="35"
+       y1="3"
+       x1="35"
+       gradientTransform="matrix(1.8,0,0,1.125,-33.2,1029.9872)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3950"
+       xlink:href="#linearGradient4071-3"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient4071-3">
+      <stop
+         style="stop-color:#000000;stop-opacity:0.59215689;"
+         offset="0"
+         id="stop4073-8" />
+      <stop
+         style="stop-color:#242424;stop-opacity:0.54901963;"
+         offset="1"
+         id="stop4075-4" />
+    </linearGradient>
+    <linearGradient
+       y2="19.159962"
+       x2="35.5"
+       y1="6.1136856"
+       x1="35.5"
+       gradientTransform="matrix(1.3333334,0,0,0.99645293,-17.333334,1031.2702)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3912"
+       xlink:href="#linearGradient4071-3"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3786"
+       id="linearGradient3792"
+       x1="43.070576"
+       y1="14.423525"
+       x2="48.311802"
+       y2="14.847058"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3769"
+       id="linearGradient3802"
+       x1="44.5"
+       y1="11.035255"
+       x2="44.5"
+       y2="16.117661"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3809"
+       id="linearGradient3815"
+       x1="54.254425"
+       y1="1.4565123"
+       x2="54.254425"
+       y2="6.629705"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3803"
+       id="linearGradient3810"
+       x1="52.098927"
+       y1="0.59431362"
+       x2="52.098927"
+       y2="7.4919033"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="13.810607"
+     inkscape:cx="25.419639"
+     inkscape:cy="4.1579843"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     showguides="false"
+     inkscape:window-width="1300"
+     inkscape:window-height="917"
+     inkscape:window-x="421"
+     inkscape:window-y="68"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2985"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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="Capa 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1032.3622)">
+    <rect
+       style="fill:url(#linearGradient3765);fill-opacity:1;stroke:none"
+       id="rect2989"
+       width="41"
+       height="16"
+       x="8"
+       y="-1050.3622"
+       rx="7"
+       ry="8"
+       transform="scale(1,-1)" />
+    <path
+       transform="matrix(1.4746667,0,0,2.2805,-44.386668,1011.3132)"
+       d="m 49,14 c 0,2.209139 -2.014719,4 -4.5,4 -2.485281,0 -4.5,-1.790861 -4.5,-4 0,-2.209139 2.014719,-4 4.5,-4 2.485281,0 4.5,1.790861 4.5,4 z"
+       sodipodi:ry="4"
+       sodipodi:rx="4.5"
+       sodipodi:cy="14"
+       sodipodi:cx="44.5"
+       id="path3791"
+       style="fill:#000000;fill-opacity:0.05490196;stroke:none"
+       sodipodi:type="arc" />
+    <path
+       style="opacity:0.2;color:#000000;fill:url(#linearGradient3895);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 15.825,1035.3622 c -5.7616,0 -6.825,3.4019 -6.825,7.28 0,3.8781 1.0634,6.72 6.825,6.72 l 25.35,0 c 5.761602,0 6.825,-2.8419 6.825,-6.72 0,-3.8781 -1.063398,-7.28 -6.825,-7.28 z m 0,1.4 25.35,0 c 4.319184,0 5.380555,2.973 5.380555,5.88 0,2.9071 -1.061371,5.32 -5.380555,5.32 l -25.35,0 c -4.319183,0 -5.380556,-2.4129 -5.380556,-5.32 0,-2.907 1.061373,-5.88 5.380556,-5.88 z"
+       id="rect4950"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ssssssssssssss" />
+    <path
+       style="opacity:0.45400002000000000;color:#000000;fill:url(#linearGradient3912);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 16,1034.3622 c -5,0 -8,3.5837 -8,8 0,4.4163 3,8 6.956522,8 l 26.086956,0 c 5.909333,0 7.956522,-3.5837 7.956522,-8 0,-4.4162 -2.090666,-8 -8,-8 z m 14,1 11,0 c 5.212862,0 7,4 7,7 0,3 -1.786936,7 -7,7 l -26,0 c -4,0 -6,-4 -6,-7 0,-3 2,-7 7,-7 z"
+       id="rect4944"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ssssssscssssscc"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
+    <path
+       sodipodi:type="arc"
+       style="fill:url(#linearGradient3802);fill-opacity:1;stroke:url(#linearGradient3792);stroke-width:0.44922532999999998;stroke-linecap:square;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="path3767"
+       sodipodi:cx="44.5"
+       sodipodi:cy="14"
+       sodipodi:rx="4.5"
+       sodipodi:ry="4"
+       d="m 49,14 c 0,2.209139 -2.014719,4 -4.5,4 -2.485281,0 -4.5,-1.790861 -4.5,-4 0,-2.209139 2.014719,-4 4.5,-4 2.485281,0 4.5,1.790861 4.5,4 z"
+       transform="matrix(2.0987442,0,0,2.3610872,-76.394117,1009.307)"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
+    <path
+       transform="matrix(1.8888697,0,0,2.1249784,-67.054702,1012.6125)"
+       d="m 49,14 c 0,2.209139 -2.014719,4 -4.5,4 -2.485281,0 -4.5,-1.790861 -4.5,-4 0,-2.209139 2.014719,-4 4.5,-4 2.485281,0 4.5,1.790861 4.5,4 z"
+       sodipodi:ry="4"
+       sodipodi:rx="4.5"
+       sodipodi:cy="14"
+       sodipodi:cx="44.5"
+       id="path3764"
+       style="fill:none;stroke:#ffffff;stroke-width:0.49922532;stroke-linecap:square;stroke-miterlimit:4;stroke-opacity:0.2477876;stroke-dasharray:none"
+       sodipodi:type="arc" />
+  </g>
+</svg>
diff --git a/desktop-themes/Green-Submarine/gtk-3.0/assets/switch-dark-on-disabled.svg b/desktop-themes/Green-Submarine/gtk-3.0/assets/switch-dark-on-disabled.svg
new file mode 100644
index 00000000..fcc4211f
--- /dev/null
+++ b/desktop-themes/Green-Submarine/gtk-3.0/assets/switch-dark-on-disabled.svg
@@ -0,0 +1,396 @@
+<?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="56"
+   height="20"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="switch-dark-on-disabled.svg"
+   inkscape:export-filename="/usr/share/themes/Gnome-Cupertino/gtk-3.0/assets/switch-off.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient3851">
+      <stop
+         id="stop3853"
+         offset="0"
+         style="stop-color:#aac0d7;stop-opacity:0.84313726;" />
+      <stop
+         style="stop-color:#5782c1;stop-opacity:0.58682632;"
+         offset="0.70714289"
+         id="stop3855" />
+      <stop
+         id="stop3857"
+         offset="1"
+         style="stop-color:#515f85;stop-opacity:0.01960784;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3803">
+      <stop
+         style="stop-color:#282828;stop-opacity:0.40000001;"
+         offset="0"
+         id="stop3805" />
+      <stop
+         style="stop-color:#282828;stop-opacity:0.40000001;"
+         offset="1"
+         id="stop3807" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3833">
+      <stop
+         style="stop-color:#0f0f0f;stop-opacity:1;"
+         offset="0"
+         id="stop3835" />
+      <stop
+         style="stop-color:#0b0b0b;stop-opacity:1;"
+         offset="1"
+         id="stop3837" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3809">
+      <stop
+         style="stop-color:#bdbdbd;stop-opacity:1;"
+         offset="0"
+         id="stop3811" />
+      <stop
+         style="stop-color:#f5f5f5;stop-opacity:1;"
+         offset="1"
+         id="stop3813" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3786">
+      <stop
+         style="stop-color:#5d5d5d;stop-opacity:1;"
+         offset="0"
+         id="stop3788" />
+      <stop
+         style="stop-color:#1e1e1e;stop-opacity:0.76078433;"
+         offset="1"
+         id="stop3790" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3772">
+      <stop
+         style="stop-color:#000000;stop-opacity:0.36097562;"
+         offset="0"
+         id="stop3774" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0.22352941;"
+         offset="1"
+         id="stop3776" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3763">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop3765" />
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="1"
+         id="stop3767" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3769">
+      <stop
+         style="stop-color:#bebebe;stop-opacity:1;"
+         offset="0"
+         id="stop3771" />
+      <stop
+         style="stop-color:#b4b4b4;stop-opacity:1;"
+         offset="1"
+         id="stop3773" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3759">
+      <stop
+         style="stop-color:#909090;stop-opacity:0.47058824;"
+         offset="0"
+         id="stop3761" />
+      <stop
+         id="stop3792"
+         offset="0.50000042"
+         style="stop-color:#a0a0a0;stop-opacity:0.47058824;" />
+      <stop
+         style="stop-color:#aaaaaa;stop-opacity:0.47058824;"
+         offset="1"
+         id="stop3763" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3759"
+       id="linearGradient3765"
+       x1="25"
+       y1="1033.3622"
+       x2="25"
+       y2="1051.3622"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.75925924,0,0,0.88888885,7.2407408,115.81826)" />
+    <linearGradient
+       y2="26"
+       x2="35"
+       y1="3"
+       x1="35"
+       gradientTransform="matrix(1.8,0,0,1.125,-33.2,1029.9872)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3967"
+       xlink:href="#linearGradient4071-3-6"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient4071-3-6">
+      <stop
+         style="stop-color:#000000;stop-opacity:0.60392159;"
+         offset="0"
+         id="stop4073-8-9" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop4075-4-4" />
+    </linearGradient>
+    <linearGradient
+       y2="26"
+       x2="35"
+       y1="3"
+       x1="35"
+       gradientTransform="matrix(1.2999999,0,0,0.875,-15.7,1033.0172)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3895"
+       xlink:href="#linearGradient4071-3-6"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="38"
+       x2="35"
+       y1="3"
+       x1="35"
+       gradientTransform="matrix(1.8,0,0,1.125,-33.2,1029.9872)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3950"
+       xlink:href="#linearGradient4071-3"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient4071-3">
+      <stop
+         style="stop-color:#4b4b4b;stop-opacity:0.50980395;"
+         offset="0"
+         id="stop4073-8" />
+      <stop
+         style="stop-color:#5f5f5f;stop-opacity:0.12156863;"
+         offset="1"
+         id="stop4075-4" />
+    </linearGradient>
+    <linearGradient
+       y2="37.893074"
+       x2="35.304348"
+       y1="3.1030066"
+       x1="35.5"
+       gradientTransform="matrix(1.3333334,0,0,0.99645293,-17.333334,1031.2702)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3912"
+       xlink:href="#linearGradient4071-3"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3786"
+       id="linearGradient3792"
+       x1="40.688198"
+       y1="13.999991"
+       x2="48.311802"
+       y2="13.999991"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3769"
+       id="linearGradient3802"
+       x1="44.5"
+       y1="11.035255"
+       x2="44.5"
+       y2="16.117661"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3809"
+       id="linearGradient3815"
+       x1="54.353218"
+       y1="-0.09542387"
+       x2="54.353218"
+       y2="8.0954666"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3833"
+       id="linearGradient3839"
+       x1="51.380428"
+       y1="-0.26788515"
+       x2="51.380428"
+       y2="8.3541021"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3769"
+       id="linearGradient3921"
+       gradientUnits="userSpaceOnUse"
+       x1="44.5"
+       y1="11.035255"
+       x2="44.5"
+       y2="16.117661" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3786"
+       id="linearGradient3923"
+       gradientUnits="userSpaceOnUse"
+       x1="40.688198"
+       y1="14.847058"
+       x2="47.835327"
+       y2="12.305857" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3803"
+       id="linearGradient3810"
+       x1="55.757896"
+       y1="-0.22028424"
+       x2="55.691422"
+       y2="7.4919033"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3809"
+       id="linearGradient3812"
+       gradientUnits="userSpaceOnUse"
+       x1="54.254425"
+       y1="-0.26788515"
+       x2="54.254425"
+       y2="7.4919033" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3759-1"
+       id="linearGradient3765-1"
+       x1="25"
+       y1="1033.3622"
+       x2="25"
+       y2="1051.3622"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.75925924,0,0,0.88888885,7.2407408,115.81826)" />
+    <linearGradient
+       id="linearGradient3759-1">
+      <stop
+         style="stop-color:#97b3ce;stop-opacity:0.85628742;"
+         offset="0"
+         id="stop3761-3" />
+      <stop
+         id="stop3792-3"
+         offset="0.50000042"
+         style="stop-color:#4372b7;stop-opacity:0.58682632;" />
+      <stop
+         style="stop-color:#324882;stop-opacity:0.40718561;"
+         offset="1"
+         id="stop3763-3" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3851"
+       id="radialGradient3859"
+       cx="32.634705"
+       cy="1042.8505"
+       fx="32.634705"
+       fy="1042.8505"
+       r="14"
+       gradientTransform="matrix(1.0359993,0.01130084,-9.5854376e-8,0.64285596,-0.80943249,371.59075)"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="13.810607"
+     inkscape:cx="32.515785"
+     inkscape:cy="15.417446"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     showguides="false"
+     inkscape:window-width="985"
+     inkscape:window-height="911"
+     inkscape:window-x="925"
+     inkscape:window-y="35"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2985"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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="Capa 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1032.3622)">
+    <rect
+       style="fill:url(#linearGradient3765);fill-opacity:1;stroke:none"
+       id="rect2989"
+       width="41"
+       height="16"
+       x="8"
+       y="1034.3622"
+       rx="7"
+       ry="8" />
+    <path
+       style="opacity:0.45400002;color:#000000;fill:url(#linearGradient3912);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 16,1034.3622 c -5,0 -8,3.5837 -8,8 0,4.4163 3,8 6.956522,8 l 26.086956,0 c 5.909333,0 7.956522,-3.5837 7.956522,-8 0,-4.4162 -2.090666,-8 -8,-8 z m 14,1 11,0 c 5.212862,0 7,4 7,7 0,3 -1.786936,7 -7,7 l -26,0 c -4,0 -6,-4 -6,-7 0,-3 2,-7 7,-7 z"
+       id="rect4944"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ssssssscssssscc"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
+    <path
+       sodipodi:type="arc"
+       style="fill:url(#linearGradient3921);fill-opacity:1;stroke:url(#linearGradient3923);stroke-width:0.44922534;stroke-linecap:square;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="path3767"
+       sodipodi:cx="44.5"
+       sodipodi:cy="14"
+       sodipodi:rx="4.5"
+       sodipodi:ry="4"
+       d="m 49,14 c 0,2.209139 -2.014719,4 -4.5,4 -2.485281,0 -4.5,-1.790861 -4.5,-4 0,-2.209139 2.014719,-4 4.5,-4 2.485281,0 4.5,1.790861 4.5,4 z"
+       transform="matrix(2.0987442,0,0,2.3610872,-53.693768,1009.307)"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
+    <path
+       transform="matrix(1.8888697,0,0,2.1249784,-44.354702,1012.6125)"
+       d="m 49,14 c 0,2.209139 -2.014719,4 -4.5,4 -2.485281,0 -4.5,-1.790861 -4.5,-4 0,-2.209139 2.014719,-4 4.5,-4 2.485281,0 4.5,1.790861 4.5,4 z"
+       sodipodi:ry="4"
+       sodipodi:rx="4.5"
+       sodipodi:cy="14"
+       sodipodi:cx="44.5"
+       id="path3764"
+       style="fill:none;stroke:#ffffff;stroke-width:0.49922532;stroke-linecap:square;stroke-miterlimit:4;stroke-opacity:0.2477876;stroke-dasharray:none"
+       sodipodi:type="arc" />
+  </g>
+</svg>
diff --git a/desktop-themes/Green-Submarine/gtk-3.0/assets/switch-dark-on.svg b/desktop-themes/Green-Submarine/gtk-3.0/assets/switch-dark-on.svg
new file mode 100644
index 00000000..b267df7d
--- /dev/null
+++ b/desktop-themes/Green-Submarine/gtk-3.0/assets/switch-dark-on.svg
@@ -0,0 +1,422 @@
+<?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="56"
+   height="20"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="switch-dark-on.svg"
+   inkscape:export-filename="/usr/share/themes/Gnome-Cupertino/gtk-3.0/assets/switch-off.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient3851">
+      <stop
+         id="stop3853"
+         offset="0"
+         style="stop-color:#a6e06e;stop-opacity:0.57647061;" />
+      <stop
+         style="stop-color:#97cc64;stop-opacity:0.25490198;"
+         offset="0.70714289"
+         id="stop3855" />
+      <stop
+         id="stop3857"
+         offset="1"
+         style="stop-color:#91c460;stop-opacity:0.01960784;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3803">
+      <stop
+         style="stop-color:#4c4c4c;stop-opacity:1;"
+         offset="0"
+         id="stop3805" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0.23952095;"
+         offset="1"
+         id="stop3807" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3833">
+      <stop
+         style="stop-color:#0f0f0f;stop-opacity:1;"
+         offset="0"
+         id="stop3835" />
+      <stop
+         style="stop-color:#0b0b0b;stop-opacity:1;"
+         offset="1"
+         id="stop3837" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3809">
+      <stop
+         style="stop-color:#107dd8;stop-opacity:1;"
+         offset="0"
+         id="stop3811" />
+      <stop
+         style="stop-color:#d6ecfc;stop-opacity:1;"
+         offset="1"
+         id="stop3813" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3786">
+      <stop
+         style="stop-color:#515457;stop-opacity:1;"
+         offset="0"
+         id="stop3788" />
+      <stop
+         style="stop-color:#202020;stop-opacity:0.74509805;"
+         offset="1"
+         id="stop3790" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3772">
+      <stop
+         style="stop-color:#000000;stop-opacity:0.36097562;"
+         offset="0"
+         id="stop3774" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0.22352941;"
+         offset="1"
+         id="stop3776" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3763">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop3765" />
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="1"
+         id="stop3767" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3769">
+      <stop
+         style="stop-color:#cdcdcd;stop-opacity:1;"
+         offset="0"
+         id="stop3771" />
+      <stop
+         style="stop-color:#9b9b9b;stop-opacity:1;"
+         offset="1"
+         id="stop3773" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3759">
+      <stop
+         style="stop-color:#77a14e;stop-opacity:1;"
+         offset="0"
+         id="stop3761" />
+      <stop
+         id="stop3812"
+         offset="0.6249997"
+         style="stop-color:#5e803e;stop-opacity:1;" />
+      <stop
+         style="stop-color:#48612f;stop-opacity:1;"
+         offset="1"
+         id="stop3763" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3759"
+       id="linearGradient3765"
+       x1="24.707317"
+       y1="1033.3619"
+       x2="24.707317"
+       y2="1051.3619"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.75925924,0,0,0.88888885,7.2407408,-1968.9061)" />
+    <linearGradient
+       y2="26"
+       x2="35"
+       y1="3"
+       x1="35"
+       gradientTransform="matrix(1.8,0,0,1.125,-33.2,1029.9872)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3967"
+       xlink:href="#linearGradient4071-3-6"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient4071-3-6">
+      <stop
+         style="stop-color:#040404;stop-opacity:0.47058824;"
+         offset="0"
+         id="stop4073-8-9" />
+      <stop
+         style="stop-color:#b2b2b2;stop-opacity:1;"
+         offset="1"
+         id="stop4075-4-4" />
+    </linearGradient>
+    <linearGradient
+       y2="26"
+       x2="35"
+       y1="3"
+       x1="35"
+       gradientTransform="matrix(1.2999999,0,0,0.875,-15.7,1033.0172)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3895"
+       xlink:href="#linearGradient4071-3-6"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="38"
+       x2="35"
+       y1="3"
+       x1="35"
+       gradientTransform="matrix(1.8,0,0,1.125,-33.2,1029.9872)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3950"
+       xlink:href="#linearGradient4071-3"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient4071-3">
+      <stop
+         style="stop-color:#000000;stop-opacity:0.66486484;"
+         offset="0"
+         id="stop4073-8" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0.24324325;"
+         offset="1"
+         id="stop4075-4" />
+    </linearGradient>
+    <linearGradient
+       y2="37.893074"
+       x2="35.304348"
+       y1="3.1030066"
+       x1="35.5"
+       gradientTransform="matrix(1.3333334,0,0,0.99645293,-17.333334,1031.2702)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3912"
+       xlink:href="#linearGradient4071-3"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3786"
+       id="linearGradient3792"
+       x1="40.688198"
+       y1="13.999991"
+       x2="48.311802"
+       y2="13.999991"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3769"
+       id="linearGradient3802"
+       x1="44.5"
+       y1="11.035255"
+       x2="44.5"
+       y2="16.117661"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3809"
+       id="linearGradient3815"
+       x1="54.353218"
+       y1="-0.09542387"
+       x2="54.353218"
+       y2="8.0954666"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3833"
+       id="linearGradient3839"
+       x1="51.380428"
+       y1="-0.26788515"
+       x2="51.380428"
+       y2="8.3541021"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3769"
+       id="linearGradient3921"
+       gradientUnits="userSpaceOnUse"
+       x1="44.5"
+       y1="11.035255"
+       x2="44.5"
+       y2="16.117661" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3786"
+       id="linearGradient3923"
+       gradientUnits="userSpaceOnUse"
+       x1="40.688198"
+       y1="14.847058"
+       x2="47.835327"
+       y2="12.305857" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3803"
+       id="linearGradient3810"
+       x1="55.757896"
+       y1="-0.22028424"
+       x2="55.691422"
+       y2="7.4919033"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3809"
+       id="linearGradient3812"
+       gradientUnits="userSpaceOnUse"
+       x1="54.254425"
+       y1="-0.26788515"
+       x2="54.254425"
+       y2="7.4919033" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3759-1"
+       id="linearGradient3765-1"
+       x1="25"
+       y1="1033.3622"
+       x2="25"
+       y2="1051.3622"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.75925924,0,0,0.88888885,7.2407408,115.81826)" />
+    <linearGradient
+       id="linearGradient3759-1">
+      <stop
+         style="stop-color:#97b3ce;stop-opacity:0.85628742;"
+         offset="0"
+         id="stop3761-3" />
+      <stop
+         id="stop3792-3"
+         offset="0.50000042"
+         style="stop-color:#4372b7;stop-opacity:0.58682632;" />
+      <stop
+         style="stop-color:#324882;stop-opacity:0.40718561;"
+         offset="1"
+         id="stop3763-3" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3851"
+       id="radialGradient3859"
+       cx="32.634705"
+       cy="1042.8505"
+       fx="32.634705"
+       fy="1042.8505"
+       r="14"
+       gradientTransform="matrix(0.81093738,0.01130084,-7.5030839e-8,0.64285596,8.1426188,371.59075)"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="13.810607"
+     inkscape:cx="15.579643"
+     inkscape:cy="9.5885927"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     showguides="false"
+     inkscape:window-width="1300"
+     inkscape:window-height="917"
+     inkscape:window-x="584"
+     inkscape:window-y="120"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2985"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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="Capa 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1032.3622)">
+    <rect
+       style="fill:url(#linearGradient3765);fill-opacity:1;stroke:none"
+       id="rect2989"
+       width="41"
+       height="16"
+       x="8"
+       y="-1050.3622"
+       rx="7"
+       ry="8"
+       transform="scale(1,-1)" />
+    <rect
+       style="opacity:0.43000004;fill:url(#radialGradient3859);fill-opacity:1;stroke:none"
+       id="rect2989-0"
+       width="22.700001"
+       height="16.000002"
+       x="19.5"
+       y="1034.3622"
+       rx="3.8756099"
+       ry="8.000001" />
+    <path
+       transform="matrix(1.4746667,0,0,2.2805,-30.186668,1011.3132)"
+       d="m 49,14 c 0,2.209139 -2.014719,4 -4.5,4 -2.485281,0 -4.5,-1.790861 -4.5,-4 0,-2.209139 2.014719,-4 4.5,-4 2.485281,0 4.5,1.790861 4.5,4 z"
+       sodipodi:ry="4"
+       sodipodi:rx="4.5"
+       sodipodi:cy="14"
+       sodipodi:cx="44.5"
+       id="path3791"
+       style="fill:#000000;fill-opacity:0.07843137;stroke:none"
+       sodipodi:type="arc" />
+    <path
+       style="opacity:0.2;color:#000000;fill:url(#linearGradient3895);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 15.825,1035.3622 c -5.7616,0 -6.825,3.4019 -6.825,7.28 0,3.8781 1.0634,6.72 6.825,6.72 l 25.35,0 c 5.761602,0 6.825,-2.8419 6.825,-6.72 0,-3.8781 -1.063398,-7.28 -6.825,-7.28 z m 0,1.4 25.35,0 c 4.319184,0 5.380555,2.973 5.380555,5.88 0,2.9071 -1.061371,5.32 -5.380555,5.32 l -25.35,0 c -4.319183,0 -5.380556,-2.4129 -5.380556,-5.32 0,-2.907 1.061373,-5.88 5.380556,-5.88 z"
+       id="rect4950"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ssssssssssssss" />
+    <path
+       style="opacity:0.45400002;color:#000000;fill:url(#linearGradient3912);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 16,1034.3622 c -5,0 -8,3.5837 -8,8 0,4.4163 3,8 6.956522,8 l 26.086956,0 c 5.909333,0 7.956522,-3.5837 7.956522,-8 0,-4.4162 -2.090666,-8 -8,-8 z m 14,1 11,0 c 5.212862,0 7,4 7,7 0,3 -1.786936,7 -7,7 l -26,0 c -4,0 -6,-4 -6,-7 0,-3 2,-7 7,-7 z"
+       id="rect4944"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ssssssscssssscc"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
+    <path
+       sodipodi:type="arc"
+       style="fill:url(#linearGradient3921);fill-opacity:1;stroke:url(#linearGradient3923);stroke-width:0.44922534;stroke-linecap:square;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="path3767"
+       sodipodi:cx="44.5"
+       sodipodi:cy="14"
+       sodipodi:rx="4.5"
+       sodipodi:ry="4"
+       d="m 49,14 c 0,2.209139 -2.014719,4 -4.5,4 -2.485281,0 -4.5,-1.790861 -4.5,-4 0,-2.209139 2.014719,-4 4.5,-4 2.485281,0 4.5,1.790861 4.5,4 z"
+       transform="matrix(2.0987442,0,0,2.3610872,-53.693768,1009.307)"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
+    <path
+       transform="matrix(1.8888697,0,0,2.1249784,-44.354702,1012.6125)"
+       d="m 49,14 c 0,2.209139 -2.014719,4 -4.5,4 -2.485281,0 -4.5,-1.790861 -4.5,-4 0,-2.209139 2.014719,-4 4.5,-4 2.485281,0 4.5,1.790861 4.5,4 z"
+       sodipodi:ry="4"
+       sodipodi:rx="4.5"
+       sodipodi:cy="14"
+       sodipodi:cx="44.5"
+       id="path3764"
+       style="fill:none;stroke:#ffffff;stroke-width:0.49922532;stroke-linecap:square;stroke-miterlimit:4;stroke-opacity:0.2477876;stroke-dasharray:none"
+       sodipodi:type="arc" />
+  </g>
+</svg>
diff --git a/desktop-themes/Green-Submarine/gtk-3.0/assets/switch-off-disabled.svg b/desktop-themes/Green-Submarine/gtk-3.0/assets/switch-off-disabled.svg
new file mode 100644
index 00000000..1734ec49
--- /dev/null
+++ b/desktop-themes/Green-Submarine/gtk-3.0/assets/switch-off-disabled.svg
@@ -0,0 +1,306 @@
+<?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="56"
+   height="20"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="switch-off-disabled.svg"
+   inkscape:export-filename="/usr/share/themes/Gnome-Cupertino/gtk-3.0/assets/switch-off.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient3803">
+      <stop
+         style="stop-color:#484848;stop-opacity:0.25882354;"
+         offset="0"
+         id="stop3805" />
+      <stop
+         style="stop-color:#484848;stop-opacity:0.25882354;"
+         offset="1"
+         id="stop3807" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3795">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop3797" />
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="1"
+         id="stop3799" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3833">
+      <stop
+         style="stop-color:#0f0f0f;stop-opacity:1;"
+         offset="0"
+         id="stop3835" />
+      <stop
+         style="stop-color:#c7c7c7;stop-opacity:0.54491019;"
+         offset="1"
+         id="stop3837" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3809">
+      <stop
+         style="stop-color:#b9b9b9;stop-opacity:1;"
+         offset="0"
+         id="stop3811" />
+      <stop
+         style="stop-color:#b9b9b9;stop-opacity:1;"
+         offset="1"
+         id="stop3813" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3786">
+      <stop
+         style="stop-color:#a0a0a0;stop-opacity:0.6682927;"
+         offset="0"
+         id="stop3788" />
+      <stop
+         style="stop-color:#b7b7b7;stop-opacity:1;"
+         offset="1"
+         id="stop3790" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3772">
+      <stop
+         style="stop-color:#000000;stop-opacity:0.36097562;"
+         offset="0"
+         id="stop3774" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0.22352941;"
+         offset="1"
+         id="stop3776" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3763">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop3765" />
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="1"
+         id="stop3767" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3769">
+      <stop
+         style="stop-color:#d2d2d2;stop-opacity:1;"
+         offset="0"
+         id="stop3771" />
+      <stop
+         style="stop-color:#d2d2d2;stop-opacity:1;"
+         offset="1"
+         id="stop3773" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3759">
+      <stop
+         style="stop-color:#b4b4b4;stop-opacity:0.47058824;"
+         offset="0"
+         id="stop3761" />
+      <stop
+         style="stop-color:#b4b4b4;stop-opacity:0.47058824;"
+         offset="1"
+         id="stop3763" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3759"
+       id="linearGradient3765"
+       x1="25"
+       y1="1033.3622"
+       x2="25"
+       y2="1051.3622"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.75925924,0,0,0.88888885,7.2407408,115.81826)" />
+    <linearGradient
+       y2="26"
+       x2="35"
+       y1="3"
+       x1="35"
+       gradientTransform="matrix(1.8,0,0,1.125,-33.2,1029.9872)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3967"
+       xlink:href="#linearGradient4071-3-6"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient4071-3-6">
+      <stop
+         style="stop-color:#000000;stop-opacity:0.35294119;"
+         offset="0"
+         id="stop4073-8-9" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop4075-4-4" />
+    </linearGradient>
+    <linearGradient
+       y2="26"
+       x2="35"
+       y1="3"
+       x1="35"
+       gradientTransform="matrix(1.2999999,0,0,0.875,-15.7,1033.0172)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3895"
+       xlink:href="#linearGradient4071-3-6"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="38"
+       x2="35"
+       y1="3"
+       x1="35"
+       gradientTransform="matrix(1.8,0,0,1.125,-33.2,1029.9872)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3950"
+       xlink:href="#linearGradient4071-3"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient4071-3">
+      <stop
+         style="stop-color:#4b4b4b;stop-opacity:0.50898206;"
+         offset="0"
+         id="stop4073-8" />
+      <stop
+         style="stop-color:#5f5f5f;stop-opacity:0.11976048;"
+         offset="1"
+         id="stop4075-4" />
+    </linearGradient>
+    <linearGradient
+       y2="37.893074"
+       x2="35.304348"
+       y1="3.1030066"
+       x1="35.5"
+       gradientTransform="matrix(1.3333334,0,0,0.99645293,-17.333334,1031.2702)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3912"
+       xlink:href="#linearGradient4071-3"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3786"
+       id="linearGradient3792"
+       x1="43.070576"
+       y1="14.423525"
+       x2="48.311802"
+       y2="14.847058"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3769"
+       id="linearGradient3802"
+       x1="44.5"
+       y1="11.035255"
+       x2="44.5"
+       y2="16.117661"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3809"
+       id="linearGradient3815"
+       x1="54.254425"
+       y1="1.4565123"
+       x2="54.254425"
+       y2="6.629705"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3803"
+       id="linearGradient3810"
+       x1="52.098927"
+       y1="0.59431362"
+       x2="52.098927"
+       y2="7.4919033"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="13.810607"
+     inkscape:cx="25.654544"
+     inkscape:cy="9.9868375"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     showguides="false"
+     inkscape:window-width="1300"
+     inkscape:window-height="917"
+     inkscape:window-x="379"
+     inkscape:window-y="65"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2985"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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="Capa 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1032.3622)">
+    <rect
+       style="fill:url(#linearGradient3765);fill-opacity:1;stroke:none"
+       id="rect2989"
+       width="41"
+       height="16"
+       x="8"
+       y="1034.3622"
+       rx="7"
+       ry="8" />
+    <path
+       style="opacity:0.45400002;color:#000000;fill:url(#linearGradient3912);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 16,1034.3622 c -5,0 -8,3.5837 -8,8 0,4.4163 3,8 6.956522,8 l 26.086956,0 c 5.909333,0 7.956522,-3.5837 7.956522,-8 0,-4.4162 -2.090666,-8 -8,-8 z m 14,1 11,0 c 5.212862,0 7,4 7,7 0,3 -1.786936,7 -7,7 l -26,0 c -4,0 -6,-4 -6,-7 0,-3 2,-7 7,-7 z"
+       id="rect4944"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ssssssscssssscc"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
+    <path
+       sodipodi:type="arc"
+       style="fill:url(#linearGradient3802);fill-opacity:1;stroke:url(#linearGradient3792);stroke-width:0.44922532999999998;stroke-linecap:square;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="path3767"
+       sodipodi:cx="44.5"
+       sodipodi:cy="14"
+       sodipodi:rx="4.5"
+       sodipodi:ry="4"
+       d="m 49,14 c 0,2.209139 -2.014719,4 -4.5,4 -2.485281,0 -4.5,-1.790861 -4.5,-4 0,-2.209139 2.014719,-4 4.5,-4 2.485281,0 4.5,1.790861 4.5,4 z"
+       transform="matrix(2.0987442,0,0,2.3610872,-76.394117,1009.307)"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
+  </g>
+</svg>
diff --git a/desktop-themes/Green-Submarine/gtk-3.0/assets/switch-off-ins.svg b/desktop-themes/Green-Submarine/gtk-3.0/assets/switch-off-ins.svg
deleted file mode 100644
index e4b2dc90..00000000
--- a/desktop-themes/Green-Submarine/gtk-3.0/assets/switch-off-ins.svg
+++ /dev/null
@@ -1,665 +0,0 @@
-<?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/Green-Submarine/gtk-3.0/assets/switch-off.svg b/desktop-themes/Green-Submarine/gtk-3.0/assets/switch-off.svg
index b05dac32..e655231a 100644
--- a/desktop-themes/Green-Submarine/gtk-3.0/assets/switch-off.svg
+++ b/desktop-themes/Green-Submarine/gtk-3.0/assets/switch-off.svg
@@ -10,523 +10,228 @@
    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"
+   width="56"
+   height="20"
+   id="svg2"
    version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="switch-off.svg">
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="switch-off.svg"
+   inkscape:export-filename="/usr/share/themes/Gnome-Cupertino/gtk-3.0/assets/switch-off.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
   <defs
-     id="defs3484">
+     id="defs4">
     <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">
+       id="linearGradient3803">
       <stop
-         style="stop-color:#000000;stop-opacity:0.1254902;"
+         style="stop-color:#202020;stop-opacity:0.5529412;"
          offset="0"
-         id="stop4135" />
+         id="stop3805" />
       <stop
-         style="stop-color:#000000;stop-opacity:0.0627451;"
+         style="stop-color:#484848;stop-opacity:0.1254902;"
          offset="1"
-         id="stop4137" />
+         id="stop3807" />
     </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">
+       id="linearGradient3795">
       <stop
-         id="stop4066"
+         style="stop-color:#000000;stop-opacity:1;"
          offset="0"
-         style="stop-color:#4a79a5;stop-opacity:0.50980395;" />
+         id="stop3797" />
       <stop
-         id="stop4068"
+         style="stop-color:#000000;stop-opacity:1;"
          offset="1"
-         style="stop-color:#4a79a5;stop-opacity:0;" />
+         id="stop3799" />
     </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">
+       id="linearGradient3833">
       <stop
-         style="stop-color:#ffffff;stop-opacity:0.39285713;"
+         style="stop-color:#0f0f0f;stop-opacity:1;"
          offset="0"
-         id="stop3967" />
+         id="stop3835" />
       <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
+         style="stop-color:#c7c7c7;stop-opacity:0.54491019;"
          offset="1"
-         id="stop3969" />
+         id="stop3837" />
     </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">
+       id="linearGradient3809">
       <stop
-         id="stop3461"
+         style="stop-color:#969696;stop-opacity:1;"
          offset="0"
-         style="stop-color:#4a79a5;stop-opacity:0.50980395;" />
+         id="stop3811" />
       <stop
-         id="stop3463"
+         style="stop-color:#aaaaaa;stop-opacity:1;"
          offset="1"
-         style="stop-color:#4a79a5;stop-opacity:0;" />
+         id="stop3813" />
     </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">
+       id="linearGradient3786">
       <stop
-         style="stop-color:#ffffff;stop-opacity:0.39285713;"
+         style="stop-color:#828282;stop-opacity:0.47058824;"
          offset="0"
-         id="stop3468" />
+         id="stop3788" />
       <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
+         style="stop-color:#888888;stop-opacity:1;"
          offset="1"
-         id="stop3470" />
+         id="stop3790" />
     </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">
+       id="linearGradient3772">
       <stop
-         style="stop-color:#878787;stop-opacity:1;"
+         style="stop-color:#000000;stop-opacity:0.36097562;"
          offset="0"
-         id="stop3988" />
+         id="stop3774" />
       <stop
-         style="stop-color:#4b4b4b;stop-opacity:1;"
+         style="stop-color:#000000;stop-opacity:0.22352941;"
          offset="1"
-         id="stop3990" />
+         id="stop3776" />
     </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">
+       id="linearGradient3763">
       <stop
-         style="stop-color:#828282;stop-opacity:0.68627453;"
+         style="stop-color:#000000;stop-opacity:1;"
          offset="0"
-         id="stop3955" />
+         id="stop3765" />
       <stop
-         style="stop-color:#828282;stop-opacity:0;"
+         style="stop-color:#000000;stop-opacity:1;"
          offset="1"
-         id="stop3957" />
+         id="stop3767" />
     </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">
+       id="linearGradient3769">
       <stop
-         style="stop-color:#ffffff;stop-opacity:0.39285713;"
+         style="stop-color:#e1e1e1;stop-opacity:1;"
          offset="0"
-         id="stop3967-3" />
+         id="stop3771" />
       <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
+         style="stop-color:#c3c3c3;stop-opacity:1;"
          offset="1"
-         id="stop3969-2" />
+         id="stop3773" />
     </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">
+       id="linearGradient3759">
       <stop
-         style="stop-color:#828282;stop-opacity:0.68627453;"
+         style="stop-color:#c3c3c3;stop-opacity:1;"
          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">
+         id="stop3761" />
       <stop
-         style="stop-color:#ffffff;stop-opacity:0.39285713;"
-         offset="0"
-         id="stop3677" />
+         id="stop3801"
+         offset="0.68748617"
+         style="stop-color:#bebebe;stop-opacity:1;" />
       <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
+         style="stop-color:#9e9e9e;stop-opacity:1;"
          offset="1"
-         id="stop3679" />
+         id="stop3763" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient4133-1"
-       id="linearGradient4034"
+       xlink:href="#linearGradient3759"
+       id="linearGradient3765"
+       x1="25"
+       y1="1033.3622"
+       x2="25"
+       y2="1051.3622"
        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" />
+       gradientTransform="matrix(0.75925924,0,0,0.88888885,7.2407408,-1968.9061)" />
     <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"
+       y2="26"
+       x2="35"
+       y1="3"
+       x1="35"
+       gradientTransform="matrix(1.8,0,0,1.125,-33.2,1029.9872)"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.1578947,0,0,1.1,-165.43988,-33.503598)" />
+       id="linearGradient3967"
+       xlink:href="#linearGradient4071-3-6"
+       inkscape:collect="always" />
     <linearGradient
-       id="linearGradient4198">
+       id="linearGradient4071-3-6">
       <stop
-         style="stop-color:#c0c0c0;stop-opacity:1;"
+         style="stop-color:#ffffff;stop-opacity:0.27450982;"
          offset="0"
-         id="stop4200" />
+         id="stop4073-8-9" />
       <stop
-         style="stop-color:#d1d1d1;stop-opacity:1;"
+         style="stop-color:#ffffff;stop-opacity:0.09268293;"
          offset="1"
-         id="stop4202" />
+         id="stop4075-4-4" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3942"
-       id="linearGradient4020"
+       y2="26"
+       x2="35"
+       y1="3"
+       x1="35"
+       gradientTransform="matrix(1.2999999,0,0,0.875,-15.7,1033.0172)"
        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>
+       id="linearGradient3895"
+       xlink:href="#linearGradient4071-3-6"
+       inkscape:collect="always" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4125-9"
-       id="linearGradient3245"
+       y2="38"
+       x2="35"
+       y1="3"
+       x1="35"
+       gradientTransform="matrix(1.8,0,0,1.125,-33.2,1029.9872)"
        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)" />
+       id="linearGradient3950"
+       xlink:href="#linearGradient4071-3"
+       inkscape:collect="always" />
     <linearGradient
-       id="linearGradient4125-9">
+       id="linearGradient4071-3">
       <stop
-         style="stop-color:#ffffff;stop-opacity:0.48627451;"
+         style="stop-color:#000000;stop-opacity:0.59215689;"
          offset="0"
-         id="stop4127-6" />
+         id="stop4073-8" />
       <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
+         style="stop-color:#797979;stop-opacity:0.39024389;"
          offset="1"
-         id="stop4129-9" />
+         id="stop4075-4" />
     </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)"
+       y2="19.159962"
+       x2="35.5"
+       y1="6.1136856"
+       x1="35.5"
+       gradientTransform="matrix(1.3333334,0,0,0.99645293,-17.333334,1031.2702)"
        gradientUnits="userSpaceOnUse"
-       id="linearGradient3706"
-       xlink:href="#linearGradient4125-9"
+       id="linearGradient3912"
+       xlink:href="#linearGradient4071-3"
        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" />
+       xlink:href="#linearGradient3786"
+       id="linearGradient3792"
+       x1="43.070576"
+       y1="14.423525"
+       x2="48.311802"
+       y2="14.847058"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3769"
+       id="linearGradient3802"
+       x1="44.5"
+       y1="11.035255"
+       x2="44.5"
+       y2="16.117661"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3809"
+       id="linearGradient3815"
+       x1="54.254425"
+       y1="1.4565123"
+       x2="54.254425"
+       y2="6.629705"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3803"
+       id="linearGradient3810"
+       x1="52.098927"
+       y1="0.59431362"
+       x2="52.098927"
+       y2="7.4919033"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -535,23 +240,28 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="20.449712"
-     inkscape:cy="22.960427"
+     inkscape:zoom="13.810607"
+     inkscape:cx="22.088866"
+     inkscape:cy="4.1579843"
      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" />
+     showgrid="true"
+     showguides="false"
+     inkscape:window-width="1300"
+     inkscape:window-height="917"
+     inkscape:window-x="421"
+     inkscape:window-y="68"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2985"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
-     id="metadata3487">
+     id="metadata7">
     <rdf:RDF>
       <cc:Work
          rdf:about="">
@@ -563,89 +273,65 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
+     inkscape:label="Capa 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>
+     transform="translate(0,-1032.3622)">
+    <rect
+       style="fill:url(#linearGradient3765);fill-opacity:1;stroke:none"
+       id="rect2989"
+       width="41"
+       height="16"
+       x="8"
+       y="-1050.3622"
+       rx="7"
+       ry="8"
+       transform="scale(1,-1)" />
+    <path
+       transform="matrix(1.4746667,0,0,2.2805,-44.386668,1011.3132)"
+       d="m 49,14 c 0,2.209139 -2.014719,4 -4.5,4 -2.485281,0 -4.5,-1.790861 -4.5,-4 0,-2.209139 2.014719,-4 4.5,-4 2.485281,0 4.5,1.790861 4.5,4 z"
+       sodipodi:ry="4"
+       sodipodi:rx="4.5"
+       sodipodi:cy="14"
+       sodipodi:cx="44.5"
+       id="path3791"
+       style="fill:#000000;fill-opacity:0.05490196;stroke:none"
+       sodipodi:type="arc" />
+    <path
+       style="opacity:0.2;color:#000000;fill:url(#linearGradient3895);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 15.825,1035.3622 c -5.7616,0 -6.825,3.4019 -6.825,7.28 0,3.8781 1.0634,6.72 6.825,6.72 l 25.35,0 c 5.761602,0 6.825,-2.8419 6.825,-6.72 0,-3.8781 -1.063398,-7.28 -6.825,-7.28 z m 0,1.4 25.35,0 c 4.319184,0 5.380555,2.973 5.380555,5.88 0,2.9071 -1.061371,5.32 -5.380555,5.32 l -25.35,0 c -4.319183,0 -5.380556,-2.4129 -5.380556,-5.32 0,-2.907 1.061373,-5.88 5.380556,-5.88 z"
+       id="rect4950"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ssssssssssssss" />
+    <path
+       style="opacity:0.45400002000000000;color:#000000;fill:url(#linearGradient3912);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 16,1034.3622 c -5,0 -8,3.5837 -8,8 0,4.4163 3,8 6.956522,8 l 26.086956,0 c 5.909333,0 7.956522,-3.5837 7.956522,-8 0,-4.4162 -2.090666,-8 -8,-8 z m 14,1 11,0 c 5.212862,0 7,4 7,7 0,3 -1.786936,7 -7,7 l -26,0 c -4,0 -6,-4 -6,-7 0,-3 2,-7 7,-7 z"
+       id="rect4944"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ssssssscssssscc"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
+    <path
+       sodipodi:type="arc"
+       style="fill:url(#linearGradient3802);fill-opacity:1;stroke:url(#linearGradient3792);stroke-width:0.44922532999999998;stroke-linecap:square;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="path3767"
+       sodipodi:cx="44.5"
+       sodipodi:cy="14"
+       sodipodi:rx="4.5"
+       sodipodi:ry="4"
+       d="m 49,14 c 0,2.209139 -2.014719,4 -4.5,4 -2.485281,0 -4.5,-1.790861 -4.5,-4 0,-2.209139 2.014719,-4 4.5,-4 2.485281,0 4.5,1.790861 4.5,4 z"
+       transform="matrix(2.0987442,0,0,2.3610872,-76.394117,1009.307)"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
+    <path
+       transform="matrix(1.8888697,0,0,2.1249784,-67.054702,1012.6125)"
+       d="m 49,14 c 0,2.209139 -2.014719,4 -4.5,4 -2.485281,0 -4.5,-1.790861 -4.5,-4 0,-2.209139 2.014719,-4 4.5,-4 2.485281,0 4.5,1.790861 4.5,4 z"
+       sodipodi:ry="4"
+       sodipodi:rx="4.5"
+       sodipodi:cy="14"
+       sodipodi:cx="44.5"
+       id="path3764"
+       style="fill:none;stroke:#ffffff;stroke-width:0.49922532;stroke-linecap:square;stroke-miterlimit:4;stroke-opacity:0.2477876;stroke-dasharray:none"
+       sodipodi:type="arc" />
   </g>
 </svg>
diff --git a/desktop-themes/Green-Submarine/gtk-3.0/assets/switch-on-disabled.svg b/desktop-themes/Green-Submarine/gtk-3.0/assets/switch-on-disabled.svg
new file mode 100644
index 00000000..2fe7828f
--- /dev/null
+++ b/desktop-themes/Green-Submarine/gtk-3.0/assets/switch-on-disabled.svg
@@ -0,0 +1,396 @@
+<?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="56"
+   height="20"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="switch-on-disabled.svg"
+   inkscape:export-filename="/usr/share/themes/Gnome-Cupertino/gtk-3.0/assets/switch-off.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient3851">
+      <stop
+         id="stop3853"
+         offset="0"
+         style="stop-color:#aac0d7;stop-opacity:0.84313726;" />
+      <stop
+         style="stop-color:#5782c1;stop-opacity:0.58682632;"
+         offset="0.70714289"
+         id="stop3855" />
+      <stop
+         id="stop3857"
+         offset="1"
+         style="stop-color:#515f85;stop-opacity:0.01960784;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3803">
+      <stop
+         style="stop-color:#b4b4b4;stop-opacity:1;"
+         offset="0"
+         id="stop3805" />
+      <stop
+         style="stop-color:#b4b4b4;stop-opacity:0.75609756;"
+         offset="1"
+         id="stop3807" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3833">
+      <stop
+         style="stop-color:#0f0f0f;stop-opacity:1;"
+         offset="0"
+         id="stop3835" />
+      <stop
+         style="stop-color:#0b0b0b;stop-opacity:1;"
+         offset="1"
+         id="stop3837" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3809">
+      <stop
+         style="stop-color:#bdbdbd;stop-opacity:1;"
+         offset="0"
+         id="stop3811" />
+      <stop
+         style="stop-color:#f5f5f5;stop-opacity:1;"
+         offset="1"
+         id="stop3813" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3786">
+      <stop
+         style="stop-color:#b7b7b7;stop-opacity:1;"
+         offset="0"
+         id="stop3788" />
+      <stop
+         style="stop-color:#a0a0a0;stop-opacity:0.66666669;"
+         offset="1"
+         id="stop3790" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3772">
+      <stop
+         style="stop-color:#000000;stop-opacity:0.36097562;"
+         offset="0"
+         id="stop3774" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0.22352941;"
+         offset="1"
+         id="stop3776" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3763">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop3765" />
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="1"
+         id="stop3767" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3769">
+      <stop
+         style="stop-color:#d2d2d2;stop-opacity:1;"
+         offset="0"
+         id="stop3771" />
+      <stop
+         style="stop-color:#d2d2d2;stop-opacity:1;"
+         offset="1"
+         id="stop3773" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3759">
+      <stop
+         style="stop-color:#a0a0a0;stop-opacity:0.47058824;"
+         offset="0"
+         id="stop3761" />
+      <stop
+         id="stop3792"
+         offset="0.50000042"
+         style="stop-color:#a0a0a0;stop-opacity:0.47058824;" />
+      <stop
+         style="stop-color:#a5a5a5;stop-opacity:0.47058824;"
+         offset="1"
+         id="stop3763" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3759"
+       id="linearGradient3765"
+       x1="25"
+       y1="1033.3622"
+       x2="25"
+       y2="1051.3622"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.75925924,0,0,0.88888885,7.2407408,115.81826)" />
+    <linearGradient
+       y2="26"
+       x2="35"
+       y1="3"
+       x1="35"
+       gradientTransform="matrix(1.8,0,0,1.125,-33.2,1029.9872)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3967"
+       xlink:href="#linearGradient4071-3-6"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient4071-3-6">
+      <stop
+         style="stop-color:#000000;stop-opacity:0.60392159;"
+         offset="0"
+         id="stop4073-8-9" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop4075-4-4" />
+    </linearGradient>
+    <linearGradient
+       y2="26"
+       x2="35"
+       y1="3"
+       x1="35"
+       gradientTransform="matrix(1.2999999,0,0,0.875,-15.7,1033.0172)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3895"
+       xlink:href="#linearGradient4071-3-6"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="38"
+       x2="35"
+       y1="3"
+       x1="35"
+       gradientTransform="matrix(1.8,0,0,1.125,-33.2,1029.9872)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3950"
+       xlink:href="#linearGradient4071-3"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient4071-3">
+      <stop
+         style="stop-color:#4b4b4b;stop-opacity:0.50980395;"
+         offset="0"
+         id="stop4073-8" />
+      <stop
+         style="stop-color:#5f5f5f;stop-opacity:0.12156863;"
+         offset="1"
+         id="stop4075-4" />
+    </linearGradient>
+    <linearGradient
+       y2="37.893074"
+       x2="35.304348"
+       y1="3.1030066"
+       x1="35.5"
+       gradientTransform="matrix(1.3333334,0,0,0.99645293,-17.333334,1031.2702)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3912"
+       xlink:href="#linearGradient4071-3"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3786"
+       id="linearGradient3792"
+       x1="40.688198"
+       y1="13.999991"
+       x2="48.311802"
+       y2="13.999991"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3769"
+       id="linearGradient3802"
+       x1="44.5"
+       y1="11.035255"
+       x2="44.5"
+       y2="16.117661"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3809"
+       id="linearGradient3815"
+       x1="54.353218"
+       y1="-0.09542387"
+       x2="54.353218"
+       y2="8.0954666"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3833"
+       id="linearGradient3839"
+       x1="51.380428"
+       y1="-0.26788515"
+       x2="51.380428"
+       y2="8.3541021"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3769"
+       id="linearGradient3921"
+       gradientUnits="userSpaceOnUse"
+       x1="44.5"
+       y1="11.035255"
+       x2="44.5"
+       y2="16.117661" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3786"
+       id="linearGradient3923"
+       gradientUnits="userSpaceOnUse"
+       x1="40.688198"
+       y1="14.847058"
+       x2="47.835327"
+       y2="12.305857" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3803"
+       id="linearGradient3810"
+       x1="55.757896"
+       y1="-0.22028424"
+       x2="55.691422"
+       y2="7.4919033"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3809"
+       id="linearGradient3812"
+       gradientUnits="userSpaceOnUse"
+       x1="54.254425"
+       y1="-0.26788515"
+       x2="54.254425"
+       y2="7.4919033" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3759-1"
+       id="linearGradient3765-1"
+       x1="25"
+       y1="1033.3622"
+       x2="25"
+       y2="1051.3622"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.75925924,0,0,0.88888885,7.2407408,115.81826)" />
+    <linearGradient
+       id="linearGradient3759-1">
+      <stop
+         style="stop-color:#97b3ce;stop-opacity:0.85628742;"
+         offset="0"
+         id="stop3761-3" />
+      <stop
+         id="stop3792-3"
+         offset="0.50000042"
+         style="stop-color:#4372b7;stop-opacity:0.58682632;" />
+      <stop
+         style="stop-color:#324882;stop-opacity:0.40718561;"
+         offset="1"
+         id="stop3763-3" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3851"
+       id="radialGradient3859"
+       cx="32.634705"
+       cy="1042.8505"
+       fx="32.634705"
+       fy="1042.8505"
+       r="14"
+       gradientTransform="matrix(1.0359993,0.01130084,-9.5854376e-8,0.64285596,-0.80943249,371.59075)"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="13.810607"
+     inkscape:cx="18.034162"
+     inkscape:cy="15.417446"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     showguides="false"
+     inkscape:window-width="985"
+     inkscape:window-height="911"
+     inkscape:window-x="925"
+     inkscape:window-y="37"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2985"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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="Capa 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1032.3622)">
+    <rect
+       style="fill:url(#linearGradient3765);fill-opacity:1;stroke:none"
+       id="rect2989"
+       width="41"
+       height="16"
+       x="8"
+       y="1034.3622"
+       rx="7"
+       ry="8" />
+    <path
+       style="opacity:0.45400002;color:#000000;fill:url(#linearGradient3912);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 16,1034.3622 c -5,0 -8,3.5837 -8,8 0,4.4163 3,8 6.956522,8 l 26.086956,0 c 5.909333,0 7.956522,-3.5837 7.956522,-8 0,-4.4162 -2.090666,-8 -8,-8 z m 14,1 11,0 c 5.212862,0 7,4 7,7 0,3 -1.786936,7 -7,7 l -26,0 c -4,0 -6,-4 -6,-7 0,-3 2,-7 7,-7 z"
+       id="rect4944"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ssssssscssssscc"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
+    <path
+       sodipodi:type="arc"
+       style="fill:url(#linearGradient3921);fill-opacity:1;stroke:url(#linearGradient3923);stroke-width:0.44922534;stroke-linecap:square;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="path3767"
+       sodipodi:cx="44.5"
+       sodipodi:cy="14"
+       sodipodi:rx="4.5"
+       sodipodi:ry="4"
+       d="m 49,14 c 0,2.209139 -2.014719,4 -4.5,4 -2.485281,0 -4.5,-1.790861 -4.5,-4 0,-2.209139 2.014719,-4 4.5,-4 2.485281,0 4.5,1.790861 4.5,4 z"
+       transform="matrix(2.0987442,0,0,2.3610872,-53.693768,1009.307)"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
+    <path
+       transform="matrix(1.8888697,0,0,2.1249784,-44.354702,1012.6125)"
+       d="m 49,14 c 0,2.209139 -2.014719,4 -4.5,4 -2.485281,0 -4.5,-1.790861 -4.5,-4 0,-2.209139 2.014719,-4 4.5,-4 2.485281,0 4.5,1.790861 4.5,4 z"
+       sodipodi:ry="4"
+       sodipodi:rx="4.5"
+       sodipodi:cy="14"
+       sodipodi:cx="44.5"
+       id="path3764"
+       style="fill:none;stroke:#ffffff;stroke-width:0.49922532;stroke-linecap:square;stroke-miterlimit:4;stroke-opacity:0.2477876;stroke-dasharray:none"
+       sodipodi:type="arc" />
+  </g>
+</svg>
diff --git a/desktop-themes/Green-Submarine/gtk-3.0/assets/switch-on-ins.svg b/desktop-themes/Green-Submarine/gtk-3.0/assets/switch-on-ins.svg
deleted file mode 100644
index 5965e5c3..00000000
--- a/desktop-themes/Green-Submarine/gtk-3.0/assets/switch-on-ins.svg
+++ /dev/null
@@ -1,655 +0,0 @@
-<?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/Green-Submarine/gtk-3.0/assets/switch-on.png b/desktop-themes/Green-Submarine/gtk-3.0/assets/switch-on.png
deleted file mode 100644
index 45a4fcb3..00000000
--- a/desktop-themes/Green-Submarine/gtk-3.0/assets/switch-on.png
+++ /dev/null
diff --git a/desktop-themes/Green-Submarine/gtk-3.0/assets/switch-on.svg b/desktop-themes/Green-Submarine/gtk-3.0/assets/switch-on.svg
index 71123e11..a6bedd42 100644
--- a/desktop-themes/Green-Submarine/gtk-3.0/assets/switch-on.svg
+++ b/desktop-themes/Green-Submarine/gtk-3.0/assets/switch-on.svg
@@ -10,272 +10,304 @@
    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"
-   sodipodi:docname="switch-on.svg"
-   inkscape:version="0.48.4 r9939"
+   width="56"
+   height="20"
+   id="svg2"
    version="1.1"
-   id="svg3482"
-   height="26"
-   width="48">
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="switch-on.svg"
+   inkscape:export-filename="/usr/share/themes/Gnome-Cupertino/gtk-3.0/assets/switch-off.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
   <defs
-     id="defs3484">
+     id="defs4">
     <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" />
+       id="linearGradient3851">
+      <stop
+         id="stop3853"
+         offset="0"
+         style="stop-color:#b0ed74;stop-opacity:0.9137255;" />
+      <stop
+         style="stop-color:#97cc64;stop-opacity:0.58823532;"
+         offset="0.70714289"
+         id="stop3855" />
+      <stop
+         id="stop3857"
+         offset="1"
+         style="stop-color:#91c460;stop-opacity:0.01960784;" />
+    </linearGradient>
     <linearGradient
-       id="linearGradient4125">
+       id="linearGradient3803">
       <stop
-         style="stop-color:#ffffff;stop-opacity:0.48627451;"
+         style="stop-color:#4c4c4c;stop-opacity:1;"
          offset="0"
-         id="stop4127" />
+         id="stop3805" />
       <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
+         style="stop-color:#000000;stop-opacity:0.23952095;"
          offset="1"
-         id="stop4129" />
+         id="stop3807" />
     </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" />
+       id="linearGradient3833">
+      <stop
+         style="stop-color:#0f0f0f;stop-opacity:1;"
+         offset="0"
+         id="stop3835" />
+      <stop
+         style="stop-color:#0b0b0b;stop-opacity:1;"
+         offset="1"
+         id="stop3837" />
+    </linearGradient>
     <linearGradient
-       id="linearGradient4133">
+       id="linearGradient3809">
       <stop
-         style="stop-color:#000000;stop-opacity:0.1254902;"
+         style="stop-color:#107dd8;stop-opacity:1;"
          offset="0"
-         id="stop4135" />
+         id="stop3811" />
       <stop
-         style="stop-color:#000000;stop-opacity:0.0627451;"
+         style="stop-color:#d6ecfc;stop-opacity:1;"
          offset="1"
-         id="stop4137" />
+         id="stop3813" />
     </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">
+       id="linearGradient3786">
       <stop
-         id="stop4066"
+         style="stop-color:#65696d;stop-opacity:1;"
          offset="0"
-         style="stop-color:#4a79a5;stop-opacity:0.50980395;" />
+         id="stop3788" />
       <stop
-         id="stop4068"
+         style="stop-color:#707070;stop-opacity:0.43137255;"
          offset="1"
-         style="stop-color:#4a79a5;stop-opacity:0;" />
+         id="stop3790" />
     </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">
+       id="linearGradient3772">
       <stop
-         style="stop-color:#ffffff;stop-opacity:0.39285713;"
+         style="stop-color:#000000;stop-opacity:0.36097562;"
          offset="0"
-         id="stop3967" />
+         id="stop3774" />
       <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
+         style="stop-color:#000000;stop-opacity:0.22352941;"
          offset="1"
-         id="stop3969" />
+         id="stop3776" />
     </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">
+       id="linearGradient3763">
       <stop
-         id="stop3461"
+         style="stop-color:#000000;stop-opacity:1;"
          offset="0"
-         style="stop-color:#4a79a5;stop-opacity:0.50980395;" />
+         id="stop3765" />
       <stop
-         id="stop3463"
+         style="stop-color:#000000;stop-opacity:1;"
          offset="1"
-         style="stop-color:#4a79a5;stop-opacity:0;" />
+         id="stop3767" />
     </linearGradient>
-    <radialGradient
+    <linearGradient
+       id="linearGradient3769">
+      <stop
+         style="stop-color:#e1e1e1;stop-opacity:1;"
+         offset="0"
+         id="stop3771" />
+      <stop
+         style="stop-color:#c3c3c3;stop-opacity:1;"
+         offset="1"
+         id="stop3773" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3759">
+      <stop
+         style="stop-color:#77a14e;stop-opacity:1;"
+         offset="0"
+         id="stop3761" />
+      <stop
+         id="stop3812"
+         offset="0.6249997"
+         style="stop-color:#5e7f3e;stop-opacity:1;" />
+      <stop
+         style="stop-color:#48612f;stop-opacity:1;"
+         offset="1"
+         id="stop3763" />
+    </linearGradient>
+    <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient3965"
-       id="radialGradient4222"
+       xlink:href="#linearGradient3759"
+       id="linearGradient3765"
+       x1="24.707317"
+       y1="1033.3619"
+       x2="24.707317"
+       y2="1051.3619"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.75925924,0,0,0.88888885,7.2407408,-1968.9061)" />
+    <linearGradient
+       y2="26"
+       x2="35"
+       y1="3"
+       x1="35"
+       gradientTransform="matrix(1.8,0,0,1.125,-33.2,1029.9872)"
        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" />
+       id="linearGradient3967"
+       xlink:href="#linearGradient4071-3-6"
+       inkscape:collect="always" />
     <linearGradient
-       id="linearGradient3466">
+       id="linearGradient4071-3-6">
       <stop
-         style="stop-color:#ffffff;stop-opacity:0.39285713;"
+         style="stop-color:#040404;stop-opacity:0.47058824;"
          offset="0"
-         id="stop3468" />
+         id="stop4073-8-9" />
       <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
+         style="stop-color:#ffffff;stop-opacity:1;"
          offset="1"
-         id="stop3470" />
+         id="stop4075-4-4" />
     </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4064"
-       id="radialGradient3787"
+    <linearGradient
+       y2="26"
+       x2="35"
+       y1="3"
+       x1="35"
+       gradientTransform="matrix(1.2999999,0,0,0.875,-15.7,1033.0172)"
        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"
+       id="linearGradient3895"
+       xlink:href="#linearGradient4071-3-6"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="38"
+       x2="35"
+       y1="3"
+       x1="35"
+       gradientTransform="matrix(1.8,0,0,1.125,-33.2,1029.9872)"
        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"
+       id="linearGradient3950"
+       xlink:href="#linearGradient4071-3"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient4071-3">
+      <stop
+         style="stop-color:#000000;stop-opacity:0.66486484;"
+         offset="0"
+         id="stop4073-8" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0.24324325;"
+         offset="1"
+         id="stop4075-4" />
+    </linearGradient>
+    <linearGradient
+       y2="37.893074"
+       x2="35.304348"
+       y1="3.1030066"
+       x1="35.5"
+       gradientTransform="matrix(1.3333334,0,0,0.99645293,-17.333334,1031.2702)"
        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
+       id="linearGradient3912"
+       xlink:href="#linearGradient4071-3"
+       inkscape:collect="always" />
+    <linearGradient
        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" />
+       xlink:href="#linearGradient3786"
+       id="linearGradient3792"
+       x1="40.688198"
+       y1="13.999991"
+       x2="48.311802"
+       y2="13.999991"
+       gradientUnits="userSpaceOnUse" />
     <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" />
+       xlink:href="#linearGradient3769"
+       id="linearGradient3802"
+       x1="44.5"
+       y1="11.035255"
+       x2="44.5"
+       y2="16.117661"
+       gradientUnits="userSpaceOnUse" />
     <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
+       xlink:href="#linearGradient3809"
+       id="linearGradient3815"
+       x1="54.353218"
+       y1="-0.09542387"
+       x2="54.353218"
+       y2="8.0954666"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
        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
+       xlink:href="#linearGradient3833"
+       id="linearGradient3839"
+       x1="51.380428"
+       y1="-0.26788515"
+       x2="51.380428"
+       y2="8.3541021"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient3965"
-       id="radialGradient3035"
+       xlink:href="#linearGradient3769"
+       id="linearGradient3921"
        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
+       x1="44.5"
+       y1="11.035255"
+       x2="44.5"
+       y2="16.117661" />
+    <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient4064"
-       id="radialGradient3038"
+       xlink:href="#linearGradient3786"
+       id="linearGradient3923"
        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
+       x1="40.688198"
+       y1="14.847058"
+       x2="47.835327"
+       y2="12.305857" />
+    <linearGradient
        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" />
+       xlink:href="#linearGradient3803"
+       id="linearGradient3810"
+       x1="55.757896"
+       y1="-0.22028424"
+       x2="55.691422"
+       y2="7.4919033"
+       gradientUnits="userSpaceOnUse" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient4133"
-       id="linearGradient3044"
+       xlink:href="#linearGradient3809"
+       id="linearGradient3812"
        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" />
+       x1="54.254425"
+       y1="-0.26788515"
+       x2="54.254425"
+       y2="7.4919033" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient4125"
-       id="linearGradient3049"
+       xlink:href="#linearGradient3759-1"
+       id="linearGradient3765-1"
+       x1="25"
+       y1="1033.3622"
+       x2="25"
+       y2="1051.3622"
        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" />
+       gradientTransform="matrix(0.75925924,0,0,0.88888885,7.2407408,115.81826)" />
+    <linearGradient
+       id="linearGradient3759-1">
+      <stop
+         style="stop-color:#97b3ce;stop-opacity:0.85628742;"
+         offset="0"
+         id="stop3761-3" />
+      <stop
+         id="stop3792-3"
+         offset="0.50000042"
+         style="stop-color:#4372b7;stop-opacity:0.58682632;" />
+      <stop
+         style="stop-color:#324882;stop-opacity:0.40718561;"
+         offset="1"
+         id="stop3763-3" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3851"
+       id="radialGradient3859"
+       cx="32.634705"
+       cy="1042.8505"
+       fx="32.634705"
+       fy="1042.8505"
+       r="14"
+       gradientTransform="matrix(0.81093738,0.01130084,-7.5030839e-8,0.64285596,8.1426188,371.59075)"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -284,25 +316,28 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="11.2"
-     inkscape:cx="24.004861"
-     inkscape:cy="21.560858"
+     inkscape:zoom="13.810607"
+     inkscape:cx="6.5055026"
+     inkscape:cy="9.5885927"
      inkscape:document-units="px"
-     inkscape:current-layer="svg3482"
-     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="658"
-     inkscape:window-y="53"
-     inkscape:window-maximized="0"
-     inkscape:snap-object-midpoints="false"
-     inkscape:snap-center="true" />
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     showguides="false"
+     inkscape:window-width="1300"
+     inkscape:window-height="917"
+     inkscape:window-x="618"
+     inkscape:window-y="88"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2985"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
-     id="metadata3487">
+     id="metadata7">
     <rdf:RDF>
       <cc:Work
          rdf:about="">
@@ -314,86 +349,74 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
+     inkscape:label="Capa 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" />
+     transform="translate(0,-1032.3622)">
     <rect
-       style="fill:none;stroke:#006400;stroke-width:1.5;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" />
+       style="fill:url(#linearGradient3765);fill-opacity:1;stroke:none"
+       id="rect2989"
+       width="41"
+       height="16"
+       x="8"
+       y="-1050.3622"
+       rx="7"
+       ry="8"
+       transform="scale(1,-1)" />
     <rect
-       ry="11"
-       rx="11.856148"
-       y="521.36633"
-       x="352.99213"
-       height="22"
-       width="44"
-       id="rect4193"
-       style="fill:#009800;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)" />
+       style="opacity:0.43000004;fill:url(#radialGradient3859);fill-opacity:1;stroke:none"
+       id="rect2989-0"
+       width="22.700001"
+       height="16.000002"
+       x="19.5"
+       y="1034.3622"
+       rx="3.8756099"
+       ry="8.000001" />
     <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" />
+       transform="matrix(1.4746667,0,0,2.2805,-30.186668,1011.3132)"
+       d="m 49,14 c 0,2.209139 -2.014719,4 -4.5,4 -2.485281,0 -4.5,-1.790861 -4.5,-4 0,-2.209139 2.014719,-4 4.5,-4 2.485281,0 4.5,1.790861 4.5,4 z"
+       sodipodi:ry="4"
+       sodipodi:rx="4.5"
+       sodipodi:cy="14"
+       sodipodi:cx="44.5"
+       id="path3791"
+       style="fill:#000000;fill-opacity:0.07843137;stroke:none"
+       sodipodi:type="arc" />
     <path
+       style="opacity:0.2;color:#000000;fill:url(#linearGradient3895);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 15.825,1035.3622 c -5.7616,0 -6.825,3.4019 -6.825,7.28 0,3.8781 1.0634,6.72 6.825,6.72 l 25.35,0 c 5.761602,0 6.825,-2.8419 6.825,-6.72 0,-3.8781 -1.063398,-7.28 -6.825,-7.28 z m 0,1.4 25.35,0 c 4.319184,0 5.380555,2.973 5.380555,5.88 0,2.9071 -1.061371,5.32 -5.380555,5.32 l -25.35,0 c -4.319183,0 -5.380556,-2.4129 -5.380556,-5.32 0,-2.907 1.061373,-5.88 5.380556,-5.88 z"
+       id="rect4950"
        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" />
+       sodipodi:nodetypes="ssssssssssssss" />
     <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" />
+       style="opacity:0.45400002;color:#000000;fill:url(#linearGradient3912);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 16,1034.3622 c -5,0 -8,3.5837 -8,8 0,4.4163 3,8 6.956522,8 l 26.086956,0 c 5.909333,0 7.956522,-3.5837 7.956522,-8 0,-4.4162 -2.090666,-8 -8,-8 z m 14,1 11,0 c 5.212862,0 7,4 7,7 0,3 -1.786936,7 -7,7 l -26,0 c -4,0 -6,-4 -6,-7 0,-3 2,-7 7,-7 z"
+       id="rect4944"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ssssssscssssscc"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
     <path
        sodipodi:type="arc"
-       style="fill:none;stroke:#006400;stroke-width:0.78928715;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)" />
+       style="fill:url(#linearGradient3921);fill-opacity:1;stroke:url(#linearGradient3923);stroke-width:0.44922534;stroke-linecap:square;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="path3767"
+       sodipodi:cx="44.5"
+       sodipodi:cy="14"
+       sodipodi:rx="4.5"
+       sodipodi:ry="4"
+       d="m 49,14 c 0,2.209139 -2.014719,4 -4.5,4 -2.485281,0 -4.5,-1.790861 -4.5,-4 0,-2.209139 2.014719,-4 4.5,-4 2.485281,0 4.5,1.790861 4.5,4 z"
+       transform="matrix(2.0987442,0,0,2.3610872,-53.693768,1009.307)"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
+    <path
+       transform="matrix(1.8888697,0,0,2.1249784,-44.354702,1012.6125)"
+       d="m 49,14 c 0,2.209139 -2.014719,4 -4.5,4 -2.485281,0 -4.5,-1.790861 -4.5,-4 0,-2.209139 2.014719,-4 4.5,-4 2.485281,0 4.5,1.790861 4.5,4 z"
+       sodipodi:ry="4"
+       sodipodi:rx="4.5"
+       sodipodi:cy="14"
+       sodipodi:cx="44.5"
+       id="path3764"
+       style="fill:none;stroke:#ffffff;stroke-width:0.49922532;stroke-linecap:square;stroke-miterlimit:4;stroke-opacity:0.2477876;stroke-dasharray:none"
+       sodipodi:type="arc" />
   </g>
 </svg>
diff --git a/desktop-themes/Green-Submarine/gtk-3.0/assets/thumbnail-frame.png b/desktop-themes/Green-Submarine/gtk-3.0/assets/thumbnail-frame.png
deleted file mode 100644
index ba5d7212..00000000
--- a/desktop-themes/Green-Submarine/gtk-3.0/assets/thumbnail-frame.png
+++ /dev/null
diff --git a/desktop-themes/Green-Submarine/gtk-3.0/gnome-applications.css b/desktop-themes/Green-Submarine/gtk-3.0/gnome-applications.css
new file mode 100644
index 00000000..315abb10
--- /dev/null
+++ b/desktop-themes/Green-Submarine/gtk-3.0/gnome-applications.css
@@ -0,0 +1,663 @@
+
+EphyWindow {
+    background-image: -gtk-gradient (linear,
+                                     left top, left bottom,
+                                     from (shade(@theme_bg_dark_color, 0.95)),
+                                     to   (shade(@theme_bg_dark_color, 0.92)));
+}
+
+/* gedit line numbers */
+GeditView {
+    background-color: shade (@bg_color, 1.07);
+}
+
+GeditViewFrame .gedit-search-slider {
+    background-image: none;
+    background-color: @theme_bg_color;
+    padding: 6px;
+    border-color: shade (@theme_bg_color, 0.72);
+    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;
+}
+
+TerminalWindow .menubar,
+EphyToolbar.toolbar.menubar,
+GeditWindow .primary-toolbar.toolbar {
+    /* line 3D  (dark) */
+    box-shadow: none;
+    /* linea 3D (clear) */
+    border-bottom-width:  0px;
+}
+
+EphyToolbar.toolbar .raised .button:hover,
+EphyToolbar.toolbar .raised.button:hover,
+EphyToolbar.toolbar .raised .button:active,
+EphyToolbar.toolbar .raised.button:active,
+EphyToolbar.toolbar .raised .button:active:hover,
+EphyToolbar.toolbar .raised.button:active:hover {
+    color: @theme_text_dark_color;
+    text-shadow: 0px 1px @theme_shadow_dark_color;
+}
+
+TerminalWindow,
+TerminalWindow .notebook {
+    background-image: -gtk-gradient (linear,
+                                     left top, left bottom,
+                                     from (shade(@theme_bg_dark_color, 0.95)),
+                                     to   (shade(@theme_bg_dark_color, 0.95)));
+}
+
+TerminalWindow .notebook,
+GeditWindow .notebook,
+EphyNotebook.notebook {
+    border-style: solid;
+    border-width: 1px 0px 0px 0px;
+    border-radius: 0px;
+    border-top-color: @theme_mdi_border_color;
+    border-image: none;
+    background-color: shade(@theme_bg_color, 0.97);
+    background-image: none;
+}
+
+GeditWindow .notebook tab,
+EphyNotebook.notebook tab {
+    background-image: -gtk-gradient (linear,
+                                     left top, left bottom,
+                                     from (shade(@theme_bg_dark_color, 0.95)),
+                                     to   (shade(@theme_bg_dark_color, 0.93)));
+    border-top-color: @theme_mdi_border_color;
+}
+
+TerminalWindow .notebook tab {
+    background-image: -gtk-gradient (linear,
+                                     left top, left bottom,
+                                     from (shade(@theme_bg_dark_color, 1.00)),
+                                     to   (shade(@theme_bg_dark_color, 0.97)));
+    border-top-color: shade(@theme_mdi_border_color, 1.05);
+}
+
+TerminalWindow .notebook tab,
+GeditWindow .notebook tab,
+EphyNotebook.notebook tab {
+    padding: 2px 4px;
+    border-width: 1px 1px 0px 1px;
+    border-style: solid;
+    border-left-color: @theme_mdi_border_color;
+    border-bottom-color: @theme_mdi_border_color;
+    border-right-color: @theme_mdi_border_color;
+    border-image: none;
+    box-shadow: inset  0px  1px @theme_highlight_color,
+                inset  1px  0px @theme_highlight_color,
+                inset -1px  0px @theme_highlight_color;
+}
+
+GeditWindow.notebook tab.top.
+EphyNotebook.notebook tab.top {
+    padding: 3px 4px;
+}
+
+TerminalWindow .notebook tab:active,
+GeditWindow .notebook tab:active,
+EphyNotebook.notebook tab:active {
+    background-image: -gtk-gradient (linear,
+                                     left top, left bottom,
+                                     from (shade(@theme_mdi_bg_color, 0.90)),
+                                     color-stop (0.66, shade(@theme_mdi_bg_color, 0.95)),
+                                     to (shade(@theme_mdi_bg_color, 1.03)));
+    border-width: 1px 1px 0px 1px;
+    border-style: solid; 
+    /* border-radius: 4px; */
+    border-top-color: shade(@theme_mdi_border_color, 0.85);
+    border-left-color: shade(@theme_mdi_border_color, 0.88);
+    border-right-color: shade(@theme_mdi_border_color, 0.88);
+    border-image: none;
+    box-shadow: inset  0px  4px alpha(#000, 0.01),
+                inset  0px  3px alpha(#000, 0.02),
+                inset  0px  2px alpha(#000, 0.03),
+                inset  0px  1px alpha(#000, 0.04),
+                inset  4px  0px alpha(#000, 0.01),
+                inset  3px  0px alpha(#000, 0.02),
+                inset  2px  0px alpha(#000, 0.03),
+                inset  1px  0px alpha(#000, 0.04),
+                inset -4px  0px alpha(#000, 0.01),
+                inset -3px  0px alpha(#000, 0.02),
+                inset -2px  0px alpha(#000, 0.03),
+                inset -1px  0px alpha(#000, 0.04);
+}
+
+GeditWindow .notebook tab:first-child,
+EphyNotebook.notebook tab:first-child,
+GeditWindow .notebook tab:first-child:active,
+EphyNotebook.notebook tab:first-child:active,
+TerminalWindow .notebook tab:first-child,
+TerminalWindow .notebook tab:first-child:active {
+    border-left-width: 0px;
+    border-radius: 0px;
+}
+
+TerminalWindow .notebook tab:last-child,
+TerminalWindow .notebook tab:last-child:active {
+    border-right-width: 0px;
+    border-radius: 0px;
+}
+
+/* to compensate for the use of tabs-themed-dark.css */
+GeditWindow .notebook tab:first-child,
+EphyNotebook.notebook tab:first-child,
+TerminalWindow .notebook tab:first-child,
+GeditWindow .notebook tab:last-child,
+EphyNotebook.notebook tab:last-child,
+TerminalWindow .notebook tab:last-child {
+    border-left-color: @theme_mdi_border_color;
+    border-right-color: @theme_mdi_border_color;
+}
+
+GeditWindow .notebook tab:first-child:active,
+EphyNotebook.notebook tab:first-child:active,
+TerminalWindow .notebook tab:first-child:active,
+GeditWindow .notebook tab:last-child:active,
+EphyNotebook.notebook tab:last-child:active,
+TerminalWindow .notebook tab:last-child:active {
+    border-left-color: shade(@theme_mdi_border_color, 0.88);
+    border-right-color: shade(@theme_mdi_border_color, 0.88);
+}
+
+GeditWindow .notebook tab:first-child,
+EphyNotebook.notebook tab:first-child,
+GeditWindow .notebook tab:first-child:hover,
+EphyNotebook.notebook tab:first-child:hover,
+GeditWindow .notebook tab:first-child:active,
+EphyNotebook.notebook tab:first-child:active {
+    border-radius: 0px;
+}
+
+GeditWindow .notebook tab:last-child,
+EphyNotebook.notebook tab:last-child,
+GeditWindow .notebook tab:last-child:hover,
+EphyNotebook.notebook tab:last-child:hover,
+GeditWindow .notebook tab:last-child:active,
+EphyNotebook.notebook tab:last-child:active {
+    border-radius: 0px;
+}
+
+TerminalWindow .notebook tab:only-child {
+    border-radius: 0px;
+}
+
+GeditWindow .notebook tab:only-child,
+GeditWindow .notebook tab:only-child:active,
+GeditWindow .notebook tab:only-child:hover,
+EphyNotebook.notebook tab:only-child {
+    border-radius: 0px 4px 0px 0px;
+}
+
+TerminalWindow .notebook tab GtkLabel,
+EphyNotebook.notebook tab GtkLabel,
+GeditWindow .notebook tab GtkLabel,
+GeditWindow.notebook tab GtkLabel {
+    padding: 1px 4px;
+    color: @theme_fg_dark_color;
+    text-shadow: 0px 1px @theme_shadow_dark_color;
+}
+
+/* gnome-terminal */
+TerminalScreen {
+    -TerminalScreen-background-darkness: 0.95;
+    background-color: @terminal_background_color;
+    color: @selected_fg_color;
+}
+
+RBDisplayPageTree.frame {
+    border-width: 0px 1px 1px 0px;
+}
+
+RBDisplayPageTree .cell,
+RBDisplayPageTree .cell:hover {
+    /* background-image: none; */
+    background-color: @sidebar_background;
+}
+
+RBSource .toolbar {
+    background-image: none;
+    background-color: transparent;
+    padding: 2px 4px;
+}
+
+RBSource .toolbar .button {
+    padding: 0px 3px;
+    color:  shade(@theme_fg_color, 0.95);
+    text-shadow: 0 1px @theme_shadow_color;
+}
+
+RBSource .toolbar .button:hover {
+    color:  shade(@theme_text_color, 0.95);
+    text-shadow: 0 1px @theme_shadow_color;
+}
+
+RBSource .toolbar .button:active,
+RBSource .toolbar .button:active:hover {
+    color:  shade(@theme_text_color, 0.95);
+    text-shadow: 0 1px @theme_shadow_color;
+}
+
+.info,
+.question,
+NautilusFloatingBar,
+NautilusTrashBar.info,
+NautilusTrashBar,
+NautilusXContentBar.info,
+NautilusSearchBar.info,
+NautilusQueryEditor.info {
+    background-image: -gtk-gradient (linear,
+                                     left top, left bottom,
+                                     from (shade(@nautilus_cluebar_color, 1.00)),
+                                     to   (shade(@nautilus_cluebar_color, 1.00)));
+    border-radius: 0px;
+    border-width: 0px 0px 1px 0px;
+    border-style: solid;
+    border-color: transparent @nautilus_cluebar_color shade(@nautilus_cluebar_color, 0.75);
+    box-shadow: inset  0px  1px alpha(#fff, 0.06),
+                inset  1px  0px alpha(#fff, 0.06),
+                inset -1px  0px alpha(#fff, 0.06),
+                inset  0px -1px alpha(#fff, 0.06);
+}
+
+NautilusSearchBar .entry,
+NautilusSearchBar .entry:focus {
+    -GtkEntry-inner-border: 1;
+}
+
+NautilusSearchBar .entry.image {
+    color: shade(@nautilus_cluebar_color, 0.60);
+}
+
+NautilusTrashBar GtkLabel {
+    color: shade(@theme_fg_color, 1.00);
+    text-shadow: 0 1px @theme_shadow_color;
+}
+
+.info
+.nautilus-cluebar-label {
+    font: bold;
+    color: shade(@theme_fg_color, 1.00);
+    text-shadow: 0 1px @theme_shadow_color;
+}
+
+.question .button,
+.question .button:hover,
+NautilusTrashBar .button,
+NautilusTrashBar .button:hover {
+    background-image: -gtk-gradient (linear,
+                                     left top, left bottom,
+                                     from (shade(@nautilus_cluebar_color, 1.08)),
+                                     color-stop (0.45, shade(@nautilus_cluebar_color, 1.02)),
+                                     color-stop (0.52, shade(@nautilus_cluebar_color, 0.96)),
+                                     to   (shade(@nautilus_cluebar_color, 0.92)));
+    box-shadow: inset  0px  2px alpha(#fff, 0.09),
+                inset  2px  0px alpha(#fff, 0.07),
+                inset -2px  0px alpha(#fff, 0.07),
+                inset  0px -2px alpha(#fff, 0.05),
+                inset  0px  1px shade(@nautilus_cluebar_color, 0.80),
+                inset  1px  0px shade(@nautilus_cluebar_color, 0.70),
+                inset -1px  0px shade(@nautilus_cluebar_color, 0.70),
+                inset  0px -1px shade(@nautilus_cluebar_color, 0.60);
+    color: shade(@theme_fg_color, 1.00);
+    text-shadow: 0px 1px @theme_shadow_color;
+}
+
+.question .button:active,
+.question .button:hover:active,
+NautilusTrashBar .button:active,
+NautilusTrashBar .button:hover:active {
+/* .button:hover:active */
+    background-image: -gtk-gradient (linear,
+                                     left top, left bottom,
+                                     from (shade(@nautilus_cluebar_color, 1.00)),
+                                     color-stop (0.45, shade(@nautilus_cluebar_color, 0.95)),
+                                     color-stop (0.52, shade(@nautilus_cluebar_color, 0.91)),
+                                     to   (shade(@nautilus_cluebar_color, 0.87)));
+    /* outer */
+    border-top-color: alpha(@focused_entry_border, 0.20);
+    border-right-color: alpha(@focused_entry_border, 0.25);
+    border-left-color: alpha(@focused_entry_border, 0.25);
+    border-bottom-color: alpha(#fff, 0.10);
+    box-shadow: inset  0px  2px alpha(#fff, 0.09),
+                inset  2px  0px alpha(#fff, 0.07),
+                inset -2px  0px alpha(#fff, 0.07),
+                inset  0px -2px alpha(#fff, 0.05),
+                inset  0px  1px shade(@nautilus_cluebar_color, 0.75),
+                inset  1px  0px shade(@nautilus_cluebar_color, 0.65),
+                inset -1px  0px shade(@nautilus_cluebar_color, 0.65),
+                inset  0px -1px shade(@nautilus_cluebar_color, 0.55);
+}
+
+.question .button:active,
+.question .button:hover:active,
+NautilusTrashBar .button:active,
+NautilusTrashBar .button:hover:active {
+    color: shade(@theme_text_color, 1.00);
+    text-shadow: 0px 1px @theme_shadow_color;
+}
+
+.question .button:insensitive,
+NautilusTrashBar .button:insensitive {
+/* .button:hover:active */
+    background-image: -gtk-gradient (linear,
+                                     left top, left bottom,
+                                     from (shade(@nautilus_cluebar_color, 0.95)),
+                                     color-stop (0.45, shade(@nautilus_cluebar_color, 0.90)),
+                                     color-stop (0.52, shade(@nautilus_cluebar_color, 0.88)),
+                                     to   (shade(@nautilus_cluebar_color, 0.89)));
+    box-shadow: inset  0px  1px shade(@nautilus_cluebar_color, 0.85),
+                inset  1px  0px shade(@nautilus_cluebar_color, 0.81),
+                inset -1px  0px shade(@nautilus_cluebar_color, 0.81),
+                inset  0px -1px shade(@nautilus_cluebar_color, 0.78);
+}
+
+.question .button:insensitive,
+NautilusTrashBar .button:insensitive {
+    color: mix(@nautilus_cluebar_color, @theme_fg_color, 0.50);
+    text-shadow: none;
+}
+
+NautilusWindow .sidebar .scrollbar {
+    background-image: none;
+    border-style: solid;
+    -GtkRange-stepper-size: 16;
+    -GtkRange-stepper-spacing: 0;
+    -GtkRange-trough-border: 1;
+    -GtkRange-arrow-scaling: 0.666;
+    -GtkRange-slider-width: 13;
+    -GtkRange-trough-under-steppers: 1;
+    -GtkScrollbar-has-backward-stepper: true;
+    -GtkScrollbar-has-forward-stepper: true;
+    -GtkScrollbar-activate-slider: 1;
+    -GtkScrollbar-min-slider-length: 31;
+    -GtkScrollbar-slider-width: 11;
+    -GtkScrolledWindow-scrollbar-spacing: 0;
+    -GtkScrolledWindow-scrollbars-within-bevel: 1;
+}
+
+NautilusWindow .sidebar .scrollbar.trough,
+NautilusWindow .sidebar .scrollbar.trough.vertical {
+    border-radius: 0;
+    border-width: 0 0px 0 1px;
+    border-style: solid;
+    border-color: shade (@theme_bg_color, 0.96);
+}
+
+/* the small line between sidebar and view */
+NautilusWindow GtkPaned.horizontal {
+    -GtkPaned-handle-size: 3px;
+    border-color: transparent;
+}
+
+NautilusWindow .sidebar .frame {
+    border-width: 0px;
+    border-style: none;
+    border-top-width: 0;
+    border-bottom-width: 0;
+}
+
+NautilusWindow .primary-toolbar.toolbar .button,
+NautilusWindow .primary-toolbar.toolbar .button:focus,
+NautilusWindow .primary-toolbar.toolbar .button:hover,
+NautilusWindow .primary-toolbar.toolbar .button:active,
+NautilusWindow .primary-toolbar.toolbar .button:selected,
+NautilusWindow .primary-toolbar.toolbar .button:active:hover,
+NautilusWindow .primary-toolbar.toolbar .button:selected:hover,
+NautilusWindow .primary-toolbar.toolbar .linked.button * *,
+NautilusWindow .primary-toolbar.toolbar .linked .button * *,
+NautilusWindow .primary-toolbar.toolbar .button:first-child,
+NautilusWindow .primary-toolbar.toolbar .button:focus:first-child,
+NautilusWindow .primary-toolbar.toolbar .button:hover:first-child,
+NautilusWindow .primary-toolbar.toolbar .button:active:first-child,
+NautilusWindow .primary-toolbar.toolbar .button:selected:first-child,
+NautilusWindow .primary-toolbar.toolbar .button:active:hover:first-child,
+NautilusWindow .primary-toolbar.toolbar .button:selected:hover:first-child,
+NautilusWindow .primary-toolbar.toolbar .button:last-child,
+NautilusWindow .primary-toolbar.toolbar .button:focus:last-child,
+NautilusWindow .primary-toolbar.toolbar .button:hover:last-child,
+NautilusWindow .primary-toolbar.toolbar .button:active:last-child,
+NautilusWindow .primary-toolbar.toolbar .button:selected:last-child,
+NautilusWindow .primary-toolbar.toolbar .button:active:hover:last-child,
+NautilusWindow .primary-toolbar.toolbar .button:selected:hover:last-child,
+NautilusWindow .primary-toolbar.toolbar .button:only-child,
+NautilusWindow .primary-toolbar.toolbar .button:focus:only-child,
+NautilusWindow .primary-toolbar.toolbar .button:hover:only-child,
+NautilusWindow .primary-toolbar.toolbar .button:active:only-child,
+NautilusWindow .primary-toolbar.toolbar .button:selected:only-child,
+NautilusWindow .primary-toolbar.toolbar .button:active:hover:only-child,
+NautilusWindow .primary-toolbar.toolbar .button:selected:hover:only-child {
+    border-image: none;
+    padding: 2px 4px;
+}
+
+NautilusWindow .primary-toolbar.toolbar .button:hover
+NautilusWindow .primary-toolbar.toolbar .button:active,
+NautilusWindow .primary-toolbar.toolbar .button:active:hover {
+    background-color: transparent;
+    background-image: -gtk-gradient (linear,
+                                     left top, left bottom,
+                                     from (shade(@menu_bg_dark_color, 2.03)),
+                                     to   (shade(@menu_bg_dark_color, 1.17)));
+    border-width: 1px;
+    border-style: solid;
+    border-radius: 5px;
+    border-image: none;
+    border-color: transparent;
+    box-shadow: inset  0px  1px shade(@selected_bg_color, 1.05),
+                inset  1px  0px shade(@selected_bg_color, 0.97),
+                inset  0px -1px shade(@selected_bg_color, 0.93),
+                inset -1px  0px shade(@selected_bg_color, 0.93);
+}
+
+/* forward/back button */
+NautilusWindow .linked .button:first-child,
+NautilusWindow .linked .button:focus:first-child {
+    box-shadow: inset  0px  1px alpha(shade(@button_border, 1.00), 0.70),
+                inset  1px  0px alpha(shade(@button_border, 0.94), 0.80),
+                inset -1px  0px alpha(shade(@button_border, 0.94), 0.80),
+                inset  0px -1px alpha(shade(@button_border, 0.88), 0.90);
+}
+
+NautilusWindow .linked .button:first-child,
+NautilusWindow .linked .button:hover:first-child,
+NautilusWindow .linked .button:focus:first-child,
+NautilusWindow .linked .button:focus:active:first-child,
+NautilusWindow .linked .button:active:first-child,
+NautilusWindow .linked .button:active:hover:first-child,
+NautilusWindow .linked .button:insensitive:first-child {
+    padding: 2px 2px;
+}
+
+/* frame icons nautilus view */
+NautilusView.frame {
+    border-top-width: 0;
+    border-right-width: 0;
+    border-left-width: 0;
+    border-bottom-width: 0;
+    box-shadow: none;
+    background-image: -gtk-gradient (linear,
+                                     left top, left bottom,
+                                     from (shade(@theme_base_color, 1.00)),
+                                     to   (shade(@theme_base_color, 1.00)));
+}
+
+NautilusWindow .notebook {
+    -GtkNotebook-initial-gap: 0;
+    background-color: @theme_base_color;
+    background-image: -gtk-gradient (linear,
+                                     left top, left bottom,
+                                     from (shade(@theme_base_color, 1.00)),
+                                     to   (shade(@theme_base_color, 1.00)));
+    border-width: 0px;
+    border-style: none;
+    border-left-style: none;
+    border-right-style: none;
+    border-radius: 0px;
+    border-top-color: shade(@notebook_border, 1.00);
+    border-left-color: @transparent;
+    border-bottom-color: @transparent;
+    border-right-color: @transparent;
+    box-shadow: none;
+}
+
+NautilusWindow .notebook tab {
+    border-width: 0px 1px;
+    border-style: solid;
+    border-color: shade(@notebook_border, 1.00);
+    background-image: -gtk-gradient (linear,
+                                     left top, left bottom,
+                                     from (shade(@sidebar_background, 0.90)),
+                                     color-stop (0.15, shade(@sidebar_background, 1.00)),
+                                     to   (shade(@sidebar_background, 1.00)));
+    box-shadow: inset  0px  1px alpha(#000, 0.08),
+                inset  1px  0px alpha(#000, 0.04),
+                inset -1px  0px alpha(#000, 0.04),
+                inset  0px -1px shade(@notebook_border, 1.00);
+}
+
+NautilusWindow .notebook tab:active {
+    background-image: -gtk-gradient (linear,
+                                     left top, left bottom,
+                                     from (shade(@theme_base_color, 0.90)),
+                                     color-stop (0.15, shade(@theme_base_color, 1.00)),
+                                     to   (shade(@theme_base_color, 1.00)));
+    border-image: none;
+    border-left-color: shade(@notebook_border, 1.00);
+    border-right-color: shade(@notebook_border, 1.00);
+    box-shadow: inset  0px  1px alpha(#000, 0.08),
+                inset  1px  0px alpha(#fff, 0.04),
+                inset -1px  0px alpha(#fff, 0.04);
+}
+
+NautilusWindow .notebook tab.top {
+    padding: 1px 6px;
+}
+
+NautilusWindow .notebook tab:first-child,
+NautilusWindow .notebook tab:first-child:active {
+    border-width: 0px 1px 0px 0px;
+    border-radius: 0px;
+}
+
+NautilusWindow .notebook tab:last-child,
+NautilusWindow .notebook tab:last-child:active {
+    border-width: 0px 0px 0px 1px;
+    border-radius: 0px;
+}
+
+NautilusWindow .notebook tab GtkLabel {
+    padding: 0px;
+    color: @theme_text_color;
+    text-shadow: 0px 1px @theme_shadow_color;
+}
+
+NautilusWindow .notebook tab .button GtkImage {
+    border-radius: 3px;
+    color: mix(@theme_fg_color, @sidebar_background, 0.30);
+    border-style: solid;
+    border-color: transparent;
+    border-width: 1px;
+    padding: 0;
+    icon-shadow: 1px 1px @theme_shadow_color;
+}
+
+NautilusWindow .notebook tab .button GtkImage:hover {
+    color: @theme_fg_color; 
+    border-color: alpha(black, 0.1); 
+}
+
+NautilusWindow .notebook tab  .button GtkImage:active,
+NautilusWindow .notebook tab  .button GtkImage:active:hover {
+    background-color: alpha(black, 0.15); 
+    color: shade(@theme_fg_color, 1.00);
+    icon-shadow: 0px 1px @theme_shadow_color;
+    border-color: alpha(black, 0.27) 
+                  alpha(black, 0.13) 
+                  alpha(black, 0.13) 
+                  alpha(black, 0.13); 
+}
+
+/* nautilus */
+.nautilus-canvas-item {
+    border-radius: 3px;
+}
+
+/* desktop mode */
+.nautilus-desktop.nautilus-canvas-item {
+    color: white;
+    text-shadow: 1px 1px black;
+}
+
+.nautilus-desktop.nautilus-canvas-item:active {
+    background-image: none;
+    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;
+}
+
+/* Documents */
+gnome_control_center GtkScrolledWindow.frame, 
+GnomeControlCenter GtkScrolledWindow.frame,
+.documents-scrolledwin.frame {
+    border-width: 0px;
+    border-radius: 0;
+}
+
+.documents-counter {
+    background-image: url('assets/dnd-counter.svg');
+    background-size: contain;
+    background-color: transparent;
+    color: @theme_base_color;
+    font: bold;
+}
+
+RemminaConnectionWindow .toolbar,
+RemminaMain .toolbar {
+    background-image: -gtk-gradient (linear,
+                                     left top, left bottom,
+                                     from (shade(@theme_bg_dark_color, 1.00)),
+                                     to   (shade(@theme_bg_dark_color, 0.95)));
+}
+
+RemminaMain .toolbar {
+    border-bottom-color:  shade(@theme_bg_dark_color, 0.73);
+    border-image: none;
+}
+
+RemminaConnectionWindow .toolbar {
+    border-width: 0px;
+    border-style: none;
+    border-image: none;
+}
+
+ApDocView, /* Abiword */
+EogScrollView, /* Eog */
+CheeseThumbView /* Cheese */
+{
+    background-color: @chrome_bg_color;
+    -EogScrollView-shadow-type: none;
+}
+
+/* dconf editor sidebar */
+DConfDirView.view {
+    background-color: shade (@theme_bg_color, 1.08);
+}
+
diff --git a/desktop-themes/Green-Submarine/gtk-3.0/gtk-dark.css b/desktop-themes/Green-Submarine/gtk-3.0/gtk-dark.css
deleted file mode 100644
index f4b1c147..00000000
--- a/desktop-themes/Green-Submarine/gtk-3.0/gtk-dark.css
+++ /dev/null
@@ -1,56 +0,0 @@
-/* dark colourmap */
-@define-color theme_bg_color #2B3934;
-@define-color theme_fg_color #f0f0f0;
-@define-color theme_base_color #2F3D38;
-@define-color theme_text_color #e6e6e6;
-@define-color theme_selected_bg_color #72B49D;
-@define-color theme_selected_fg_color #FFF;
-@define-color theme_tooltip_bg_color #DBFFF3;
-@define-color theme_tooltip_fg_color #000;
-
-/* misc colors used by gtk+ */
-@define-color info_fg_color rgb (181, 171, 156);
-@define-color info_bg_color rgb (252, 252, 189);
-@define-color warning_fg_color rgb (173, 120, 41);
-@define-color warning_bg_color rgb (250, 173, 61);
-@define-color question_fg_color rgb (97, 122, 214);
-@define-color question_bg_color rgb (138, 173, 212);
-@define-color error_fg_color rgb (166, 38, 38);
-@define-color error_bg_color rgb (237, 54, 54);
-@define-color link_color #00CC85;
-@define-color error_color #cc0000;
-
-/* 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 #1F2724;
-@define-color dark_fg_color #E6E6E6;
-@define-color transparent rgba (0, 0, 0, 0);
-
-@define-color backdrop_selected_bg_color shade (@theme_selected_bg_color, 1.12);
-@define-color backdrop_selected_fg_color @theme_selected_fg_color;
-
-/* Zukitwo colors */
-@define-color toolbar_gradient_base #2B3934;
-@define-color toolbar_gradient_final #202E29;
-@define-color toolbar_border #1B2924;
-@define-color menubar_color @dark_bg_color;
-
-/* WM colors */
-@define-color wm_title @dark_fg_color;
-@define-color wm_highlight shade (@menubar_color, 1.5);
-@define-color wm_title_highlight shade (@menubar_color, 1.5);
-
-@define-color wm_bg_a shade (@menubar_color, 1.4);
-@define-color wm_bg_b @menubar_color;
-
-@import url("gtk-widgets.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("apps/epiphany.css");
diff --git a/desktop-themes/Green-Submarine/gtk-3.0/gtk-widgets-assets.css b/desktop-themes/Green-Submarine/gtk-3.0/gtk-widgets-assets.css
new file mode 100644
index 00000000..f58d72c8
--- /dev/null
+++ b/desktop-themes/Green-Submarine/gtk-3.0/gtk-widgets-assets.css
@@ -0,0 +1,277 @@
+/*************************
+ * Check and Radio items *
+ *************************/
+
+.check,
+.view.cell.check,
+.check row:selected,
+.check row:selected:focus {
+    -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked.png"));
+}
+
+.check:insensitive,
+.check row:selected:insensitive,
+.check row:selected:focus:insensitive {
+    -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-insensitive.png"));
+    background-color: transparent;
+}
+
+.check:active,
+.view.cell.check:active,
+.check row:selected:active,
+.check row:selected:focus:active {
+    -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked.png"));
+
+}
+
+.check:active:insensitive,
+.check row:selected:active:insensitive,
+.check row:selected:focus:active:insensitive {
+    -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-insensitive.png"));
+    background-color: transparent;
+}
+
+.check:inconsistent,
+.check row:selected:inconsistent,
+.check row:selected:focus:inconsistent {
+    -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed.png"));
+
+}
+
+.check:inconsistent:insensitive,
+.check row:selected:inconsistent:insensitive,
+.check row:selected:focus:inconsistent:insensitive {
+    -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-insensitive.png"));
+
+}
+
+.radio,
+.view.cell.radio,
+.radio row:selected,
+.radio row:selected:focus {
+    -gtk-icon-source: -gtk-scaled(url("assets/radio-unselected.png"));
+}
+
+.radio:insensitive,
+.radio row:selected:insensitive,
+.radio row:selected:focus:insensitive {
+    -gtk-icon-source: -gtk-scaled(url("assets/radio-unselected-insensitive.png"));
+}
+
+.radio:active,
+.view.cell.radio:active,
+.radio row:selected:active,
+.radio row:selected:focus:active {
+    -gtk-icon-source: -gtk-scaled(url("assets/radio-selected.png"));
+}
+
+.radio:active:insensitive,
+.radio row:selected:active:insensitive,
+.radio row:selected:focus:active:insensitive {
+    -gtk-icon-source: -gtk-scaled(url("assets/radio-selected-insensitive.png"));
+}
+
+.radio:inconsistent,
+.radio row:selected:inconsistent,
+.radio row:selected:focus:inconsistent {
+    -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed.png"));
+
+}
+
+.radio:inconsistent:insensitive,
+.radio row:selected:inconsistent:insensitive,
+.radio row:selected:focus:inconsistent:insensitive {
+    -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-insensitive.png"));
+    background-color: transparent;
+}
+
+.sidebar .view.radio:active,
+.sidebar .view.radio:active:focus,
+.sidebar .view.radio:active:hover {
+    -gtk-icon-source: -gtk-scaled(url("assets/sidebar-radio-checked.svg"));
+}
+
+.sidebar .view.radio:hover {
+    -gtk-icon-source: -gtk-scaled(url("assets/sidebar-radio-prelight.svg"));
+}
+
+.sidebar .view.radio:active:selected,
+.sidebar .view.radio:active:selected:focus {
+    -gtk-icon-source: -gtk-scaled(url("assets/sidebar-radio-selected.svg"));
+}
+
+.sidebar .view.radio:selected:hover,
+.sidebar .view.radio:selected:focus {
+    -gtk-icon-source: -gtk-scaled(url("assets/sidebar-radio-selected-prelight.svg"));
+}
+
+/* Now draw menu check and radio items */
+
+.menuitem.radio:hover,
+.menuitem.radio:insensitive,
+.menuitem.check:hover,
+.menuitem.check:insensitive {
+    background-color: transparent;
+    background: none;
+    border-style: none;
+    border-image: none;
+}
+
+.menuitem.radio {
+    -gtk-icon-source: -gtk-scaled(url("assets/radio-menuitem-unselected.svg"));
+}
+
+.menuitem.radio:active {
+    -gtk-icon-source: -gtk-scaled(url("assets/radio-menuitem-checked.svg"));
+}
+
+.menuitem.radio:active:hover {
+    -gtk-icon-source: -gtk-scaled(url("assets/radio-menuitem-checked-prelight.svg"));
+}
+
+.menuitem.radio:active:insensitive {
+    -gtk-icon-source: -gtk-scaled(url("assets/radio-menuitem-checked-insensitive.svg"));
+}
+
+.menuitem.radio:inconsistent {
+    -gtk-icon-source: -gtk-scaled(url("assets/radio-menuitem-mixed.svg"));
+}
+
+.menuitem.radio:inconsistent:hover {
+    -gtk-icon-source: -gtk-scaled(url("assets/radio-menuitem-mixed-prelight.svg"));
+}
+
+.menuitem.radio:inconsistent:insensitive {
+    -gtk-icon-source: -gtk-scaled(url("assets/radio-menuitem-mixed-insensitive.svg"));
+}
+
+.menuitem.check {
+    -gtk-icon-source: -gtk-scaled(url("assets/checkbox-menuitem-unchecked.svg"));
+}
+
+.menuitem.check:active{
+    -gtk-icon-source: -gtk-scaled(url("assets/checkbox-menuitem-checked.svg"));
+}
+
+.menuitem.check:active:hover {
+    -gtk-icon-source: -gtk-scaled(url("assets/checkbox-menuitem-checked-prelight.svg"));
+}
+
+.menuitem.check:active:insensitive {
+    -gtk-icon-source: -gtk-scaled(url("assets/checkbox-menuitem-checked-insensitive.svg"));
+}
+
+.menuitem.check:inconsistent {
+    -gtk-icon-source: -gtk-scaled(url("assets/checkbox-menuitem-mixed.svg"));
+}
+
+.menuitem.check:inconsistent:hover {
+    -gtk-icon-source: -gtk-scaled(url("assets/checkbox-menuitem-mixed-prelight.svg"));
+}
+
+.menuitem.check:inconsistent:insensitive {
+    -gtk-icon-source: -gtk-scaled(url("assets/checkbox-menuitem-mixed-insensitive.svg"));
+}
+
+.primary-toolbar GtkComboBox.combobox-entry .button,
+GtkComboBox.combobox-entry .button,
+.primary-toolbar GtkComboBox.combobox-entry .button:nth-child(last),
+GtkComboBox.combobox-entry .button:nth-child(last) {
+
+}
+
+.primary-toolbar GtkComboBox.combobox-entry .button:active,
+.primary-toolbar GtkComboBox.combobox-entry .button:hover:active,
+GtkComboBox.combobox-entry .button:active,
+GtkComboBox.combobox-entry .button:hover:active,
+.primary-toolbar GtkComboBox.combobox-entry .button:active:nth-child(last),
+.primary-toolbar GtkComboBox.combobox-entry .button:hover:active:nth-child(last),
+GtkComboBox.combobox-entry .button:active:nth-child(last),
+GtkComboBox.combobox-entry .button:hover:active:nth-child(last) {
+   
+}
+
+/* for RTL languages */
+.primary-toolbar GtkComboBox.combobox-entry .button:nth-child(first),
+GtkComboBox.combobox-entry .button:nth-child(first) {
+
+}
+
+.primary-toolbar GtkComboBox.combobox-entry .button:active:nth-child(first),
+.primary-toolbar GtkComboBox.combobox-entry .button:hover:active:nth-child(first),
+GtkComboBox.combobox-entry .button:active:nth-child(first),
+GtkComboBox.combobox-entry .button:hover:active:nth-child(first) {
+
+}
+
+GtkScale.trough,
+GtkScale.trough.horizontal {
+
+}
+
+GtkScale.trough.vertical {
+
+}
+
+
+GtkScale.progressbar.horizontal {
+    
+}
+
+GtkScale.progressbar.vertical {
+    
+}
+
+GtkScale.slider,
+GtkScale.slider.horizontal,
+GtkScale.slider.horizontal:hover {
+    background-image: url("assets/scale-slider-hor.svg");
+}
+
+GtkScale.slider:insensitive,
+GtkScale.slider.horizontal:insensitive {
+    background-image: url("assets/scale-slider-insensitive-hor.svg");
+}
+
+GtkScale.slider.vertical {
+    background-image: url("assets/scale-slider-ver.svg");
+}
+
+GtkScale.slider.vertical:insensitive {
+    background-image: url("assets/scale-slider-insensitive-ver.svg");
+}
+
+GtkScale.scale-has-marks-above.slider.horizontal,
+GtkScale.scale-has-marks-above.slider.horizontal:hover {
+    background-image: url("assets/scale-slider-marks-above-horizontal.svg");
+}
+
+GtkScale.scale-has-marks-above.slider.horizontal:insensitive {
+    background-image: url("assets/scale-slider-marks-above-horizontal-insensitive.svg");
+}
+
+GtkScale.scale-has-marks-above.slider.vertical {
+    background-image: url("assets/scale-slider-marks-above-vertical.svg");
+}
+
+GtkScale.scale-has-marks-above.slider.vertical:insensitive {
+    background-image: url("assets/scale-slider-marks-above-vertical-insensitive.svg");
+}
+
+GtkScale.scale-has-marks-below.slider.horizontal,
+GtkScale.scale-has-marks-below.slider.horizontal:hover {
+    background-image: url("assets/scale-slider-marks-below-horizontal.svg");
+}
+
+GtkScale.scale-has-marks-below.slider.horizontal:insensitive {
+    background-image: url("assets/scale-slider-marks-below-horizontal-insensitive.svg");
+}
+
+GtkScale.scale-has-marks-below.slider.vertical {
+    background-image: url("assets/scale-slider-marks-below-vertical.svg");
+}
+
+GtkScale.scale-has-marks-below.slider.vertical:insensitive {
+    background-image: url("assets/scale-slider-marks-below-vertical-insensitive.svg");
+}
+
diff --git a/desktop-themes/Green-Submarine/gtk-3.0/gtk-widgets.css b/desktop-themes/Green-Submarine/gtk-3.0/gtk-widgets.css
index cc3906ba..fe41ac4c 100644
--- a/desktop-themes/Green-Submarine/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/Green-Submarine/gtk-3.0/gtk-widgets.css
@@ -1,3093 +1,4615 @@
-/* default */
-* {
-	-GtkArrow-arrow-scaling: 0.7;
-	-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: 16;
-	-GtkCheckMenuItem-indicator-size: 14;
-	-GtkComboBox-arrow-scaling: 0.75;
-	-GtkExpander-expander-size: 8;
-	-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.7;
-	-GtkNotebook-tab-overlap: 1;
-	-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;
-	-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: 0px;
-	-GtkWidget-link-color: @link_color;
-	-GtkWidget-visited-link-color: @link_color;
-	-GtkWindow-resize-grip-default: true;
-	-GtkWindow-resize-grip-width: 16;
-	-GtkWindow-resize-grip-height: 16;
-	-WnckTasklist-fade-overlay-rect: 0;
-
-	border-width: 1px;
-	border-color: shade (@theme_bg_color, 0.8);
-
-	engine: unico;
-
-	-unico-focus-border-color: alpha (@theme_selected_bg_color, 0.5);
-	-unico-focus-border-radius: 3;
-	-unico-focus-fill-color: alpha (@theme_selected_bg_color, 0.1);
-	-unico-focus-outer-stroke-color: @transparent;
-
-	-unico-inner-stroke-color: shade (@theme_bg_color, 1.1);
-	-unico-inner-stroke-width: 0;
-}
-
-GtkWindow {
-	color: @theme_fg_color;
-}
-
-/***************
- * Base States *
- ***************/
-
-.background {
-	color: @theme_fg_color;
-	background-color: @theme_bg_color;
-}
-
-.background:backdrop {
-	text-shadow: none;
-	icon-shadow: none;
-}
-
-*:insensitive {
-	color: shade (@theme_bg_color, 0.6);
-	text-shadow: 0px 1px alpha (shade (@theme_bg_color, 1.25), 0.5);
-}
-
-*:active {
-}
-
-*:active:hover:insensitive {
-}
-
-*:active:insensitive {
-}
-
-*:hover {
-}
-
-*:hover:insensitive {
-}
-
-*:selected,
-*:selected:focused {
-	background-color: @theme_selected_bg_color;
-	color: @theme_selected_fg_color;
-}
-
-*:selected:backdrop,
-*:selected:focused:backdrop {
-	background-color: @backdrop_selected_bg_color;
-	color: @backdrop_selected_fg_color;
-}
-
-.dnd {
-	border-width: 1px;
-	border-style: solid;
-	border-color: @theme_selected_bg_color;
-	border-radius: 0px;
-
-	-unico-outer-stroke-color: transparent;
-	-unico-outer-stroke-width: 1px;
-}
-
-/******************
- * common effects *
- ******************/
-/* border and inner stroke */
-.button,
-.frame {
-	border-style: solid;
-
-	-unico-border-gradient: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@theme_bg_color, 0.7)),
-		to (shade (@theme_bg_color, 0.7)));
-}
-
-.frame {
-	-unico-inner-stroke-color: alpha (shade (@theme_bg_color, 1.26), 0.2);
-	-unico-inner-stroke-gradient: none;
-	-unico-inner-stroke-width: 1px;
-}
-
-.button:insensitive,
-.frame:insensitive {
-	-unico-border-gradient: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@theme_bg_color, 0.8)),
-		to (shade (@theme_bg_color, 0.8)));
-}
-
-/* inset */
-GtkComboBox.combobox-entry .button,
-.button:active,
-.button:insensitive,
-.check,
-.entry,
-.radio {
-	-unico-outer-stroke-gradient: -gtk-gradient (linear, left top, left bottom,
-		from (alpha (shade (@theme_bg_color, 0.85), 0.2)),
-		to (alpha (shade (@theme_bg_color, 1.18), 0.6)));
-	-unico-outer-stroke-width: 1px;
-}
-
-/* shadow */
-.button,
-.check:active,
-.frame,
-.radio:active {
-	-unico-outer-stroke-gradient: -gtk-gradient (linear, left top, left bottom,
-		from (alpha (shade (@theme_bg_color, 0.05), 0.05)),
-		to (alpha (shade (@theme_bg_color, 0.05), 0.09)));
-	-unico-outer-stroke-width: 1px;
-}
-
-/*************
- * assistant *
- *************/
-GtkAssistant .sidebar .highlight {
-	color: @theme_fg_color;
-	font: bold;
-}
-
-GtkAssistant .sidebar {
-	background-color: shade (@theme_bg_color, 0.97);
-	border-right-color: shade (@theme_bg_color, 0.8);
-	border-radius: 0;
-	border-style: solid;
-	border-width: 0 1px 0 0;
-	padding: 12px;
-
-	color: mix (@theme_fg_color, @theme_bg_color, 0.40);
-	text-shadow: 0px 1px shade (@theme_bg_color, 1.04);
-
-	-unico-border-gradient: none;
-	-unico-inner-stroke-right-color: shade (@theme_bg_color, 0.94);
-	-unico-inner-stroke-width: 0 1px 0 0;
-	-unico-outer-stroke-width: 0;
-}
-
-/**************
- * background *
- **************/
-.background {
-	background-color: @theme_bg_color;
-	border-width: 0;
-}
-
-/**********
- * button *
- **********/
-.button {
-    padding: 3px;
-    transition: all 200ms ease-out;
-    -unico-focus-border-color: alpha (@theme_selected_bg_color, 0.7);
-    -unico-focus-fill-color: @transparent;
-    -unico-focus-outer-stroke-color: alpha (@theme_selected_bg_color, 0.2);
-}
-
-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: 2px;
-	border-style: solid;
-
-	color: @theme_fg_color;
-	text-shadow: 0px 1px alpha (shade (@button_bg_color, 1.25), 0.4);
-
-	-unico-border-gradient: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@theme_bg_color, 0.7)),
-		to (shade (@theme_bg_color, 0.6)));
-	-unico-glow-color: shade (@button_bg_color, 1.14);
-	-unico-glow-radius: 0;
-	-unico-inner-stroke-color: shade (@button_bg_color, 1.11);
-	-unico-inner-stroke-width: 1px 1px 0 1px;
-}
-
-.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:active {
-	background-image: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@theme_bg_color, 0.9)),
-		to (shade (@theme_bg_color, 0.85)));
-
-	-unico-focus-outer-stroke-color: @transparent;
-	-unico-border-gradient: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@theme_bg_color, 0.6)),
-		to (shade (@theme_bg_color, 0.6)));
-	-unico-glow-radius: 0;
-	-unico-inner-stroke-color: shade (@theme_bg_color, 0.8);
-	-unico-inner-stroke-width: 1px 1px 0 1px;
-}
-
-.button:active:hover {
-	background-image: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@theme_bg_color, 0.95)),
-		to (shade (@theme_bg_color, 0.9)));
-
-	-unico-border-gradient: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@theme_bg_color, 0.6)),
-		to (shade (@theme_bg_color, 0.6)));
-	-unico-inner-stroke-color: shade (@theme_bg_color, 0.85);
-}
-
-.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)));
-
-	text-shadow: 0px 1px alpha (shade (@button_bg_color, 1.25), 0.4);
-
-	-unico-border-gradient: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@button_insensitive_bg_color, 0.7)),
-		to (shade (@button_insensitive_bg_color, 0.8)));
-	-unico-inner-stroke-gradient: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@button_insensitive_bg_color, 1.1)),
-		to (shade (@button_insensitive_bg_color, 1.1)));
-	-unico-inner-stroke-width: 1px 1px 0 1px;
-}
-
-.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)));
-
-	-unico-inner-stroke-gradient: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@button_insensitive_bg_color, 0.95)),
-		to (shade (@button_insensitive_bg_color, 0.98)));
-}
-
-GtkComboBox.combobox-entry .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 (@theme_bg_color, 0.82);
-	border-right-color: shade (@theme_bg_color, 0.78);
-	border-bottom-color: shade (@theme_bg_color, 0.64);
-	border-left-color: shade (@theme_bg_color, 0.78);
-	padding: 1px;
-
-	text-shadow: 0px 1px alpha (shade (@theme_bg_color, 1.26), 0.5);
-
-	-unico-glow-color: shade (@theme_bg_color, 1.02);
-	-unico-border-gradient: none;
-	-unico-glow-radius: 0;
-	-unico-inner-stroke-color: shade (@theme_bg_color, 1.9);
-}
-
-GtkComboBox.combobox-entry .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 (@theme_bg_color, 0.85);
-	border-right-color: shade (@theme_bg_color, 0.82);
-	border-bottom-color: shade (@theme_bg_color, 0.67);
-	border-left-color: shade (@theme_bg_color, 0.82);
-
-	-unico-border-gradient: none;
-	-unico-glow-color: shade (@theme_bg_color, 1.07);
-	-unico-inner-stroke-color: shade (@theme_bg_color, 1.9);
-}
-
-GtkComboBox.combobox-entry .button:active,
-.inline-toolbar.toolbar .button:active {
-	background-image: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@theme_bg_color, 0.9)),
-		to (shade (@theme_bg_color, 0.85)));
-	border-top-color: shade (@theme_bg_color, 0.62);
-	border-right-color: shade (@theme_bg_color, 0.72);
-	border-bottom-color: shade (@theme_bg_color, 0.76);
-	border-left-color: shade (@theme_bg_color, 0.72);
-
-	-unico-border-gradient: none;
-	-unico-inner-stroke-color: shade (@theme_bg_color, 0.8);
-}
-
-GtkComboBox.combobox-entry .button:active:hover,
-.inline-toolbar.toolbar .button:active:hover {
-	background-image: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@theme_bg_color, 0.95)),
-		to (shade (@theme_bg_color, 0.9)));
-	border-top-color: shade (@theme_bg_color, 0.64);
-	border-right-color: shade (@theme_bg_color, 0.74);
-	border-bottom-color: shade (@theme_bg_color, 0.79);
-	border-left-color: shade (@theme_bg_color, 0.74);
-
-	-unico-border-gradient: none;
-	-unico-inner-stroke-color: shade (@theme_bg_color, 0.85);
-}
-
-GtkComboBox.combobox-entry .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 (@theme_bg_color, 0.86);
-	border-right-color: shade (@theme_bg_color, 0.86);
-	border-bottom-color: shade (@theme_bg_color, 0.86);
-	border-left-color: shade (@theme_bg_color, 0.9);
-
-	-unico-border-gradient: none;
-	-unico-inner-stroke-gradient: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@button_insensitive_bg_color, 1.1)),
-		to (shade (@button_insensitive_bg_color, 1.1)));
-}
-
-/* default button */
-.button.default {
-	background-image: -gtk-gradient (linear, left top, left bottom,
-		from (mix (shade (@theme_selected_bg_color, 3.1), @theme_bg_color, 0.3)),
-		to (mix (shade (@theme_selected_bg_color, 2.6), @theme_bg_color, 0.3)));
-
-	text-shadow: 0px 1px alpha (shade (@theme_selected_bg_color, 1.26), 0.4);
-
-	-unico-focus-border-color: @transparent;
-	-unico-focus-outer-stroke-color: alpha (@theme_selected_bg_color, 0.2);
-
-	-unico-border-gradient: -gtk-gradient (linear, left top, left bottom,
-		from (mix (shade (@theme_selected_bg_color, 0.7), @theme_bg_color, 0.3)),
-		to (mix (shade (@theme_selected_bg_color, 0.54), @theme_bg_color, 0.3)));
-	-unico-glow-color: mix (shade (@theme_selected_bg_color, 1.5), @theme_bg_color, 0.3);
-	-unico-inner-stroke-gradient: -gtk-gradient (linear, left top, left bottom,
-		from (mix (shade (@theme_selected_bg_color, 1.38), @theme_bg_color, 0.3)),
-		to (mix (shade (@theme_selected_bg_color, 1.24), @theme_bg_color, 0.3)));
-	-unico-inner-stroke-width: 1px 1px 0 1px;
-}
-
-.button.default:hover {
-	background-image: -gtk-gradient (linear, left top, left bottom,
-		from (mix (shade (@theme_selected_bg_color, 3.15), @theme_bg_color, 0.3)),
-		to (mix (shade (@theme_selected_bg_color, 2.65), @theme_bg_color, 0.3)));
-
-	-unico-border-gradient: -gtk-gradient (linear, left top, left bottom,
-		from (mix (shade (@theme_selected_bg_color, 0.7), @theme_bg_color, 0.3)),
-		to (mix (shade (@theme_selected_bg_color, 0.54), @theme_bg_color, 0.3)));
-	-unico-glow-color: mix (shade (@theme_selected_bg_color, 1.5), @theme_bg_color, 0.3);
-	-unico-inner-stroke-gradient: -gtk-gradient (linear, left top, left bottom,
-		from (mix (shade (@theme_selected_bg_color, 1.38), @theme_bg_color, 0.3)),
-		to (mix (shade (@theme_selected_bg_color, 1.24), @theme_bg_color, 0.3)));
-}
-
-.button.default:active {
-	background-image: -gtk-gradient (linear, left top, left bottom,
-		from (mix (shade (@theme_selected_bg_color, 0.9), @theme_bg_color, 0.3)),
-		to (mix (shade (@theme_selected_bg_color, 0.8), @theme_bg_color, 0.3)));
-
-	-unico-border-gradient: -gtk-gradient (linear, left top, left bottom,
-		from (mix (shade (@theme_selected_bg_color, 0.7), @theme_bg_color, 0.3)),
-		to (mix (shade (@theme_selected_bg_color, 0.7), @theme_bg_color, 0.3)));
-	-unico-inner-stroke-gradient: -gtk-gradient (linear, left top, left bottom,
-		from (mix (shade (@theme_selected_bg_color, 0.77), @theme_bg_color, 0.3)),
-		to (mix (shade (@theme_selected_bg_color, 0.77), @theme_bg_color, 0.3)));
-}
-
-.button.default:active:hover {
-	background-image: -gtk-gradient (linear, left top, left bottom,
-		from (mix (shade (@theme_selected_bg_color, 0.98), @theme_bg_color, 0.3)),
-		to (mix (shade (@theme_selected_bg_color, 0.88), @theme_bg_color, 0.3)));
-
-	-unico-border-gradient: -gtk-gradient (linear, left top, left bottom,
-		from (mix (shade (@theme_selected_bg_color, 0.7), @theme_bg_color, 0.3)),
-		to (mix (shade (@theme_selected_bg_color, 0.7), @theme_bg_color, 0.3)));
-	-unico-inner-stroke-gradient: -gtk-gradient (linear, left top, left bottom,
-		from (mix (shade (@theme_selected_bg_color, 0.82), @theme_bg_color, 0.3)),
-		to (mix (shade (@theme_selected_bg_color, 0.82), @theme_bg_color, 0.3)));
-}
-
-.button.default:insensitive {
-	background-image: -gtk-gradient (linear, left top, left bottom,
-		from (mix (shade (@theme_bg_color, 0.95), @theme_bg_color, 0.3)),
-		to (mix (shade (@theme_bg_color, 0.95), @theme_bg_color, 0.3)));
-
-	-unico-glow-radius: 0;
-	-unico-inner-stroke-gradient: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@button_insensitive_bg_color, 1.08)),
-		to (shade (@button_insensitive_bg_color, 1.0)));
-}
-
-/* Middle button */
-.linked .entry,
-.linked .button,
-.linked .button:active,
-.linked .button:active:hover,
-.linked .button:insensitive,
-.primary-toolbar .linked .entry,
-.primary-toolbar .linked .button,
-.primary-toolbar .linked .button:active,
-.primary-toolbar .linked .button:active:hover,
-.primary-toolbar .linked .button:insensitive {
-	border-width: 1px;
-	border-right-width: 0;
-
-	border-radius: 0;
-
-	-unico-outer-stroke-width: 1px 0 1px 0;
-}
-
-/* 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,
-.primary-toolbar .linked .entry:first-child,
-.primary-toolbar .linked .button:first-child,
-.primary-toolbar .linked .button:active:first-child,
-.primary-toolbar .linked .button:active:hover:first-child,
-.primary-toolbar .linked .button:insensitive:first-child {
-	border-width: 1px;
-	border-right-width: 0;
-
-	border-radius: 2px;
-	border-bottom-right-radius: 0;
-	border-top-right-radius: 0;
-
-	-unico-outer-stroke-width: 1px 0 1px 1px;
-}
-
-/* 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,
-.primary-toolbar .linked .entry:last-child,
-.primary-toolbar .linked .button:last-child,
-.primary-toolbar .linked .button:active:last-child,
-.primary-toolbar .linked .button:active:hover:last-child,
-.primary-toolbar .linked .button:insensitive:last-child {
-	border-width: 1px;
-
-	border-radius: 2px;
-	border-bottom-left-radius: 0;
-	border-top-left-radius: 0;
-
-	-unico-outer-stroke-width: 1px 1px 1px 0;
-}
-
-/* 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,
-.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-width: 1px;
-
-	border-radius: 2px;
-
-	-unico-outer-stroke-width: 1px;
-}
-
-/****************
- * cell and row *
- ****************/
-.cell {
-	background-color: @theme_base_color;
-	border-radius: 0;
-	border-width: 0;
-}
-
-.cell:selected {
-}
-
-row:hover {
-}
-
-row:insensitive {
-}
-
-row:selected,
-row:selected:focused {
-	border-width: 1px 0 0 0;
-	border-style: solid;
-	border-color: shade (@theme_selected_bg_color, 0.85);
-	background-image: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@theme_selected_bg_color, 1.0)),
-		to (shade (@theme_selected_bg_color, 0.85)));
-}
-
-row:selected:backdrop,
-row:selected:focused:backdrop {
-	border-width: 1px 0 0 0;
-	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)));
-}
-
-/*************************
- * Check and Radio items *
- *************************/
-
-/* draw regular check and radio items using our SVG assets */
-.check,
-.view.cell.check {
-	background-image: url("assets/check-normal.png");
-	background-repeat: no-repeat;
-	background-position: center;
-}
-
-.check row:selected,
-.check row:selected:focus {
-	background-image: url("assets/check-normal.png");
-}
-
-.check:insensitive {
-	background-image: url("assets/check-normal-ins.png");
-}
-
-.check row:insensitive {
-	background-color: transparent;
-}
-
-.check row:selected:insensitive,
-.check row:selected:focus:insensitive {
-	background-color: transparent;
-	background-image: url("assets/check-normal-ins.png");
-}
-
-.check:active,
-.view.cell.check:active {
-	background-image: url("assets/check-active.png");
-}
-
-.check row:selected:active,
-.check row:selected:focus:active {
-	background-image: url("assets/check-active.png");
-}
-
-.check:active:insensitive {
-	background-image: url("assets/check-active-ins.png");
-}
-
-.check row:selected:active:insensitive,
-.check row:selected:focus:active:insensitive {
-	background-image: url("assets/check-active-ins.png");
-}
-
-.check:inconsistent {
-	background-image: url("assets/check-mixed-active.png");
-}
-
-.check row:selected:inconsistent,
-.check row:selected:focus:inconsistent {
-	background-image: url("assets/check-mixed-active.png");
-}
-
-.check:inconsistent:insensitive {
-	background-image: url("assets/check-mixed-active-ins.png");
-}
-
-.check row:selected:inconsistent:insensitive,
-.check row:selected:focus:inconsistent:insensitive {
-	background-image: url("assets/check-mixed-active-ins.png");
-}
-
-.radio,
-.view.cell.radio {
-	background-image: url("assets/radio-normal.png");
-	background-repeat: no-repeat;
-	background-position: center;
-}
-
-.radio row:selected,
-.radio row:selected:focus {
-	background-image: url("assets/radio-normal.png");
-}
-
-.radio:insensitive {
-	background-image: url("assets/radio-normal-ins.png");
-}
-
-.radio row:insensitive {
-	background-color: transparent;
-}
-
-.radio row:selected:insensitive,
-.radio row:selected:focus:insensitive {
-	background-image: url("assets/radio-normal-ins.png");
-}
-
-.radio:active,
-.view.cell.radio:active {
-	background-image: url("assets/radio-active.png");
-}
-
-.radio row:selected:active,
-.radio row:selected:focus:active {
-	background-image: url("assets/radio-active.png");
-}
-
-.radio:active:insensitive {
-	background-image: url("assets/radio-active-ins.png");
-}
-
-.radio row:selected:active:insensitive,
-.radio row:selected:focus:active:insensitive {
-	background-image: url("assets/radio-active-ins.png");
-}
-
-.radio:inconsistent {
-	background-image: url("assets/radio-mixed-active.png");
-}
-
-.radio row:selected:inconsistent,
-.radio row:selected:focus:inconsistent {
-	background-image: url("assets/radio-mixed-active.png");
-}
-
-.radio:inconsistent:insensitive {
-	background-image: url("assets/radio-mixed-active-ins.png");
-}
-
-.radio row:selected:inconsistent:insensitive,
-.radio row:selected:focus:inconsistent:insensitive {
-	background-image: url("assets/radio-mixed-active-ins.png");
-}
-
-.sidebar .view.radio:active,
-.sidebar .view.radio:active:focus,
-.sidebar .view.radio:active:hover {
-	background-image: url("assets/sidebar-radio-checked.svg");
-}
-
-.sidebar .view.radio:hover {
-	background-image: url("assets/sidebar-radio-prelight.svg");
-}
-
-.sidebar .view.radio:active:selected,
-.sidebar .view.radio:active:selected:focus {
-	background-image: url("assets/sidebar-radio-selected.svg");
-}
-
-.sidebar .view.radio:selected:hover,
-.sidebar .view.radio:selected:focus {
-	background-image: url("assets/sidebar-radio-selected-prelight.svg");	
-}
-
-/*****************
- * column-header *
- *****************/
-column-header .button,
-column-header .button:active {
-	-GtkButton-inner-border: 0;
-	background-image: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@theme_bg_color,1.1)),
-		to (shade (@theme_bg_color,1.0)));
-	border-radius: 0;
-	border-width: 0;
-
-	-unico-focus-border-radius: 0;
-	-unico-focus-border-color: @transparent;
-	-unico-focus-fill-color: alpha (@theme_selected_bg_color, 0.2);
-	-unico-focus-outer-stroke-color: @transparent;
-
-	-unico-glow-radius: 0;
-	-unico-outer-stroke-width: 0;
-}
-
-column-header .button {
-	background-image: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@theme_bg_color,1.1)),
-		to (shade (@theme_bg_color,1.0)));
-
-	text-shadow: 0px 1px alpha (shade (@theme_bg_color, 1.25), 0.4);
-
-	-unico-border-gradient: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@theme_bg_color,1.1)),
-		to (shade (@theme_bg_color,1.0)));
-	-unico-glow-color: shade (@theme_bg_color, 1.02);
-	-unico-inner-stroke-gradient: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@theme_bg_color,1.2)),
-		to (shade (@theme_bg_color,0.94)));
-	-unico-inner-stroke-width: 1px 0 1px 0;
-	border-width: 0;
-}
-
-column-header .button:hover {
-	background-image: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@theme_bg_color,1.2)),
-		to (shade (@theme_bg_color,1.1)));
-
-	-unico-border-gradient: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@theme_bg_color,1.1)),
-		to (shade (@theme_bg_color,1.0)));
-	-unico-inner-stroke-gradient: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@theme_bg_color,1.24)),
-		to (shade (@theme_bg_color,0.98)));
-	-unico-inner-stroke-width: 1px 0 1px 0;
-}
-
-column-header:nth-child(last) .button {
-	border-width: 0;
-}
-
-/******************
- * combobox entry *
- ******************/
-.primary-toolbar GtkComboBox.combobox-entry .entry,
-.primary-toolbar GtkComboBox.combobox-entry .entry:active,
-.primary-toolbar GtkComboBox.combobox-entry .entry:focused,
-.primary-toolbar GtkComboBox.combobox-entry .entry:insensitive,
-GtkComboBox.combobox-entry .entry,
-GtkComboBox.combobox-entry .entry:active,
-GtkComboBox.combobox-entry .entry:focused,
-GtkComboBox.combobox-entry .entry:insensitive {
-	border-top-right-radius: 0;
-	border-bottom-right-radius: 0;
-	border-width: 1px 0 1px 1px;
-
-	-unico-outer-stroke-width: 1px 0 1px 1px;
-}
-
-.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:insensitive {
-	border-top-left-radius: 0;
-	border-bottom-left-radius: 0;
-	border-width: 1px 1px 1px 1px;
-
-	-unico-outer-stroke-width: 1px 1px 1px 0;
-}
-
-GtkComboBox.combobox-entry .button,
-GtkComboBox.combobox-entry .button:hover,
-GtkComboBox.combobox-entry .button:active,
-GtkComboBox.combobox-entry .button:insensitive {
-	border-top-color: shade (@theme_bg_color, 0.64);
-	border-right-color: shade (@theme_bg_color, 0.8);
-	border-bottom-color: shade (@theme_bg_color, 0.86);
-	border-left-color: shade (@theme_bg_color, 0.76);
-}
-
-GtkComboBox {
-	padding: 1px 1px 0;
-}
-
-GtkComboBox .button {
-	padding: 2px;
-}
-
-GtkComboBox .separator {
-	border-width: 0;
-}
-
-/****************
- * drawing area *
- ****************/
-/*
-GtkDrawingArea {
-	background-color: @transparent;
-}
-*/
-
-/*********
- * entry *
- *********/
-.entry {
-	background-image: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@theme_base_color, 0.98)),
-		to (@theme_base_color));
-	background-color: @theme_base_color; /* Fix for Opera */
-	border-top-color: shade (@theme_bg_color, 0.64);
-	border-right-color: shade (@theme_bg_color, 0.76);
-	border-bottom-color: shade (@theme_bg_color, 0.82);
-	border-left-color: shade (@theme_bg_color, 0.76);
-	border-radius: 2px;
-	border-style: solid;
-	padding: 4px 5px 4px 5px;
-
-	color: @theme_text_color;
-
-	-unico-border-gradient: none;
-	-unico-inner-stroke-gradient: -gtk-gradient (linear, left top, left bottom,
-		from (alpha (shade (@theme_bg_color, 0.05), 0.04)),
-		to (alpha (shade (@theme_bg_color, 0.05), 0.02)));
-	-unico-inner-stroke-width: 1px;
-}
-
-.entry:selected,
-.entry:selected:focused {
-	background-color: @theme_selected_bg_color;
-	color: @theme_selected_fg_color;
-}
-
-.entry:focused {
-	-unico-border-gradient: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@theme_selected_bg_color, 0.75)),
-		to (shade (@theme_selected_bg_color, 0.8)));
-	-unico-inner-stroke-color: alpha (@theme_selected_bg_color, 0.3);
-	-unico-inner-stroke-gradient: none;
-}
-
-.entry:insensitive {
-	background-color: shade (@theme_bg_color, 0.96);
-	background-image: none;
-
-	color: mix (@theme_text_color, @theme_base_color, 0.4);
-
-	-unico-inner-stroke-gradient: -gtk-gradient (linear, left top, left bottom,
-		from (alpha (shade (@theme_bg_color, 0.05), 0.04)),
-		to (alpha (shade (@theme_bg_color, 0.05), 0.02)));
-}
-
-.primary-toolbar .entry.progressbar,
-.primary-toolbar .entry.progressbar,
-.entry.progressbar {
-	background-image: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@theme_selected_bg_color, 0.8)),
-		color-stop (0.1, shade (@theme_selected_bg_color, 0.9)),
-		to (shade (@theme_selected_bg_color, 1.1)));
-	border-radius: 2px;
-	border-width: 0;
-
-	color: @theme_selected_fg_color;
-
-	-unico-outer-stroke-width: 0;
-}
-
-/************
- * expander *
- ************/
-.expander {
-	color: @theme_fg_color;
-}
-
-/*********
- * frame *
- *********/
-.frame {
-	border-radius: 2px;
-	-unico-outer-stroke-width: 0;
-}
-
-/************
- * iconview *
- ************/
-GtkIconView.view.cell:selected,
-GtkIconView.view.cell:selected:focused {
-	background-image: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@theme_selected_bg_color, 1.0)),
-		to (shade (@theme_selected_bg_color, 0.9)));
-	border-radius: 2px;
-	border-style: solid;
-	border-width: 1px;
-
-	color: @theme_selected_fg_color;
-
-	-unico-border-gradient: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@theme_selected_bg_color, 0.7)),
-		to (shade (@theme_selected_bg_color, 0.7)));
-	-unico-glow-radius: 0;
-	-unico-glow-color: shade (@theme_selected_bg_color, 1.3);
-	-unico-inner-stroke-gradient: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@theme_selected_bg_color, 1.2)),
-		to (shade (@theme_selected_bg_color, 1.08)));
-	-unico-inner-stroke-width: 1px;
-}
-
-.rubberband {
-	background-color: alpha (@theme_selected_bg_color, 0.35);
-	border-color: @theme_selected_bg_color;
-	border-radius: 0;
-	border-style: solid;
-	border-width: 1px;
-}
-
-/*********
- * image *
- *********/
-GtkImage,
-GtkImage:insensitive,
-GtkLabel,
-GtkLabel:insensitive {
-	background-color: @transparent;
-}
-
-/***********
- * infobar *
- ***********/
-.info {
-	background-image: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@info_bg_color, 1.04)),
-		to (shade (@info_bg_color, 0.96)));
-	border-style: solid;
-	border-width: 1px;
-
-	color: @info_fg_color;
-
-	-unico-border-gradient: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@info_bg_color, 0.8)),
-		to (shade (@info_bg_color, 0.75)));
-	-unico-inner-stroke-gradient: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@info_bg_color, 1.1)),
-		to (shade (@info_bg_color, 1.04)));
-	-unico-inner-stroke-width: 1px;
-}
-
-.warning {
-	background-image: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@warning_bg_color, 1.04)),
-		to (shade (@warning_bg_color, 0.96)));
-	border-style: solid;
-	border-width: 1px;
-
-	color: @warning_fg_color;
-
-	-unico-border-gradient: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@warning_bg_color, 0.8)),
-		to (shade (@warning_bg_color, 0.75)));
-	-unico-inner-stroke-gradient: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@warning_bg_color, 1.1)),
-		to (shade (@warning_bg_color, 1.04)));
-	-unico-inner-stroke-width: 1px;
-}
-
-.question {
-	background-image: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@question_bg_color, 1.04)),
-		to (shade (@question_bg_color, 0.96)));
-	border-style: solid;
-	border-width: 1px;
-
-	color: @question_fg_color;
-
-	-unico-border-gradient: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@question_bg_color, 0.8)),
-		to (shade (@question_bg_color, 0.75)));
-	-unico-inner-stroke-gradient: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@question_bg_color, 1.1)),
-		to (shade (@question_bg_color, 1.04)));
-	-unico-inner-stroke-width: 1px;
-}
-
-.error {
-	background-image: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@error_bg_color, 1.04)),
-		to (shade (@error_bg_color, 0.96)));
-	border-style: solid;
-	border-width: 1px;
-
-	color: @error_fg_color;
-
-	-unico-border-gradient: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@error_bg_color, 0.8)),
-		to (shade (@error_bg_color, 0.75)));
-	-unico-inner-stroke-gradient: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@error_bg_color, 1.1)),
-		to (shade (@error_bg_color, 1.04)));
-	-unico-inner-stroke-width: 1px;
-}
-
-.view.dim-label,
-.dim-label,
-.dim-label:hover,
-.dim-label:focus {
-	color: mix (@theme_fg_color, @theme_bg_color, 0.50);
-}
-
-.dim-label:selected,
-.dim-label:selected:focus {
-	color: mix (@theme_selected_fg_color, @theme_base_color, 0.50);
-}
-
-/********
- * menu *
- ********/
-.menu {
-	background-image: none;
-	background-color: @menubar_color;
-	color: @theme_fg_color;
-	border-style: solid;
-	border-width: 0;
-	padding: 0;
-
-	-unico-inner-stroke-color: shade (@menubar_color, 0.86);
-	-unico-inner-stroke-gradient: none;
-	-unico-inner-stroke-width: 1px;
-}
-
-Genericmenuitem .menu,
-DbusmenuGtkMenu .menu,
-.menubar .menu,
-.primary-toolbar .menu {
-	background-color: @menubar_color;
-	color: @dark_fg_color;
-	-unico-inner-stroke-color: shade (@menubar_color, 0.8);
-}
-
-.menu:selected {
-	background-color: @theme_selected_bg_color;
-}
-
-.menu.button:active,
-.menu.button,
-.menubar .menu.button:active,
-.menubar .menu.button,
-.primary-toolbar .menu.button:active,
-.primary-toolbar .menu.button {
-	background-image: none;
-	background-color: @menubar_color;
-	border-radius: 0;
-	border-style: none;
-	border-width: 1px;
-	color: @dark_fg_color;
-
-	-unico-border-gradient: none;
-	-unico-glow-radius: 0;
-	-unico-inner-stroke-width: 0;
-	-unico-outer-stroke-width: 0;
-}
-
-.menu.button:hover,
-.menu.button:active:hover,
-.menubar .menu.button:hover,
-.menubar .menu.button:active:hover,
-.primary-toolbar .menu.button:hover,
-.primary-toolbar .menu.button:active:hover {
-	background-image: none;
-	background-color: shade (@menubar_color, 1.18);
-	border-radius: 0;
-	border-style: none;
-	border-width: 1px;
-	color: @theme_selected_fg_color;
-
-	-unico-border-gradient: none;
-	-unico-glow-radius: 0;
-	-unico-inner-stroke-width: 0;
-	-unico-outer-stroke-width: 0;
-}
-
-.menu.button:active:insensitive,
-.menu.button:insensitive,
-.menubar .menu.button:active:insensitive,
-.menubar .menu.button:insensitive,
-.primary-toolbar .menu.button:active:insensitive,
-.primary-toolbar .menu.button:insensitive {
-	background-image: none;
-	background-color: @menubar_color;
-	border-radius: 0;
-	border-style: none;
-	border-width: 1px;
-	color: shade (@dark_fg_color, 0.75);
-
-	-unico-border-gradient: none;
-	-unico-glow-radius: 0;
-	-unico-inner-stroke-width: 0;
-	-unico-outer-stroke-width: 0;
-}
-
-/***********
- * menubar *
- ***********/
-.menubar {
-	-GtkWidget-window-dragging: true;
-	color: @dark_fg_color;
-	text-shadow: none;
-	background-image: -gtk-gradient (linear,left top,left bottom,
-		from (@menubar_color),
-		to (shade (@menubar_color, 0.85)));
-	border-width: 0;
-	border-style: none;
-}
-
-/* FIXME - Could use a separate file for the mess in Epiphany. Why did they use buttons in the menubar in the first place? -.- */
-/* disable for nautilus - raveit65 */
-/*.menubar.button,
-.menubar .button {
-	-unico-focus-border-color: @transparent;
-	-unico-border-gradient: none;
-	-unico-outer-stroke-width: 0;
-	-unico-inner-stroke-width: 0;
-	border-width: 0;
-	color: @dark_fg_color;
-	text-shadow: none;
-}
-
-.menubar.button:hover,
-.menubar .button:hover {
-	color: @theme_fg_color;
-}
-*/
-
-
-/***************
- * menubaritem *
- ***************/
-.menubar.menuitem {
-	border-radius: 0;
-	border-width: 1px;
-	color: @dark_fg_color;
-}
-
-.menubar.menuitem:hover,
-.menubar .menuitem:hover {
-	color: @theme_selected_fg_color;
-	text-shadow: none;
-	background-image: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@theme_selected_bg_color, 1.0)),
-		to (shade (@theme_selected_bg_color, 0.85)));
-	border-width: 0px;
-	border-style: solid;
-	-unico-border-gradient: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@theme_selected_bg_color, 1.0)),
-		to (shade (@theme_selected_bg_color, 0.85)));
-}
-
-/************
- * menuitem *
- ************/
-.menuitem {
-	color: @theme_selected_fg_color;
-}
-
-.menuitem {
-	padding: 3px;
-	border-radius: 0;
-	text-shadow: none;
-	border-style: solid;
-	border-width: 0;
-	color: @dark_fg_color;
-/* use @menubar_color instead of theme_selected_bg_color for GTK3-8 to fix dropdown menu color */
-	background-image: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@menubar_color, 1.0)),
-		to (shade (@menubar_color, 0.85)));
-	-unico-bullet-color: @dark_fg_color;
-}
-
-Genericmenuitem .menuitem,
-DbusmenuGtkMenu .menuitem,
-.menubar .menuitem,
-.menu .menuitem,
-.primary-toolbar .menuitem {
-    transition: all 200ms ease-out;
-    color: @dark_fg_color;
-    /* menu color fix for GTK3-8 */
-    background-image: none;
-    background-color: @menubar_color;
-}
-
-/* Workaround for lp:949368 */
-GtkComboBox .menuitem * {
-	color: @dark_fg_color;
-/* menu color fix for GTK3-8 */
-	background-image: -gtk-gradient (linear,left top,left bottom,
-		from (@menubar_color),
-		to (shade (@menubar_color, 0.85)));
-}
-GtkComboBox .menuitem *:hover {
-	color: @theme_selected_fg_color;
-}
-
-.menuitem:hover,
-.menu .menuitem:hover {
-	background-image: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@theme_selected_bg_color, 1.0)),
-		to (shade (@theme_selected_bg_color, 0.85)));
-	color: @theme_selected_fg_color;
-	text-shadow: none;
-	-unico-bullet-color: @theme_selected_fg_color;
-	border-style: solid;
-	border-width: 0;
-}
-
-.menuitem.check,
-.menuitem.radio,
-.menuitem.check:hover,
-.menuitem.radio:hover,
-.menuitem.check:insensitive,
-.menuitem.radio:insensitive {
-	background-image: none;
-	background-color: transparent;
-}
-
-.menuitem.check:active,
-.menuitem.radio:active {
-	background-color: transparent;
-}
-
-.menuitem.check:active {
-	background-image: url("assets/menuitem-checkbox-checked.svg");
-}
-
-.menuitem.check:active:hover {
-	background-image: url("assets/menuitem-checkbox-checked-selected.svg");
-}
-
-.menuitem.check:active:insensitive {
-	background-image: url("assets/menuitem-checkbox-checked-insensitive.svg");
-}
-
-.menuitem.check:inconsistent,
-.menuitem.radio:inconsistent {
-	background-image: url("assets/menuitem-checkbox-mixed.svg");
-}
-
-.menuitem.check:inconsistent:insensitive,
-.menuitem.radio:inconsistent:insensitive {
-	background-image: url("assets/menuitem-checkbox-mixed-insensitive.svg");
-}
-
-.menuitem.check:inconsistent:hover,
-.menuitem.radio:inconsistent:hover {
-	background-image: url("assets/menuitem-checkbox-mixed-selected.svg");
-}
-
-.menuitem.radio:active {
-	background-image: url("assets/menuitem-radio-checked.svg");
-}
-
-.menuitem.radio:active:hover {
-	background-image: url("assets/menuitem-radio-checked-selected.svg");
-}
-
-.menuitem.radio:active:insensitive {
-	background-image: url("assets/menuitem-radio-checked-insensitive.svg");
-}
-
-Genericmenuitem .menuitem:insensitive,
-Genericmenuitem .menuitem *:insensitive,
-DbusmenuGtkMenu .menuitem:insensitive,
-DbusmenuGtkMenu .menuitem *:insensitive,
-.menubar .menuitem:insensitive,
-.menubar .menuitem *:insensitive,
-.primary-toolbar .menuitem:insensitive,
-.primary-toolbar .menuitem *:insensitive {
-	color: mix (@theme_fg_color, @theme_bg_color, 0.5);
-}
-
-Genericmenuitem .menuitem.check:active,
-Genericmenuitem .menuitem.radio:active,
-DbusmenuGtkMenu .menuitem.check:active,
-DbusmenuGtkMenu .menuitem.radio:active,
-.menubar .menuitem.check:active,
-.menubar .menuitem.radio:active,
-.primary-toolbar .menuitem.check:active,
-.primary-toolbar .menuitem.radio:active {
-	color: @dark_fg_color;
-	-unico-bullet-color: @dark_fg_color;
-}
-
-.menuitem.check:active:hover,
-.menuitem.radio:active:hover {
-	color: @theme_selected_fg_color;
-	-unico-bullet-color: @theme_selected_fg_color;
-}
-
-.menubar .menuitem GtkCalendar,
-.menubar .menuitem GtkCalendar.button,
-.menubar .menuitem GtkCalendar.header,
-.menubar .menuitem GtkCalendar.view,
-.primary-toolbar .menuitem GtkCalendar,
-.primary-toolbar .menuitem GtkCalendar.button,
-.primary-toolbar .menuitem GtkCalendar.header,
-.primary-toolbar .menuitem GtkCalendar.view {
-	background-color: @menubar_color;
-	background-image: none;
-	border-radius: 0;
-	border-style: solid;
-	border-width: 0;
-	padding: 0;
-	color: @dark_fg_color;
-}
-
-.menubar .menuitem GtkCalendar,
-.primary-toolbar .menuitem GtkCalendar {
-	background-color: shade (@menubar_color, 1.2);
-	background-image: none;
-}
-
-.menubar .menuitem .entry,
-.primary-toolbar .menuitem .entry {
-	background-color: shade (@theme_bg_color, 1.0);
-	background-image: none;
-
-	color: @theme_fg_color;
-
-	-unico-border-gradient: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@theme_bg_color, 0.75)),
-		to (shade (@theme_bg_color, 0.9)));
-	-unico-outer-stroke-gradient: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@theme_bg_color, 0.98)),
-		to (shade (@theme_bg_color, 1.1)));;
-}
-
-Genericmenuitem .menuitem .accelerator,
-DbusmenuGtkMenu .menuitem .accelerator,
-.menubar .menuitem .accelerator,
-.primary-toolbar .menuitem .accelerator {
-	color: alpha (@theme_selected_fg_color, 0.6);
-}
-
-Genericmenuitem .menuitem .accelerator:hover,
-DbusmenuGtkMenu .menuitem .accelerator:hover,
-.menubar .menuitem .accelerator:hover,
-.primary-toolbar .menuitem .accelerator:hover {
-	color: alpha (@theme_selected_fg_color, 0.8);
-}
-
-Genericmenuitem .menuitem .accelerator:insensitive,
-DbusmenuGtkMenu .menuitem .accelerator:insensitive,
-.menubar .menuitem .accelerator:insensitive,
-.primary-toolbar .menuitem .accelerator:insensitive {
-	color: alpha (@theme_selected_fg_color, 0.4);
-	text-shadow: none;
-}
-
-/*****************
- * Notebooks and *
- * tabs          *
- *****************/
-
-.notebook {
-    padding: 0;
-    background-clip: border-box;
-    background-color: shade (@theme_bg_color, 1.1);
-    border-style: solid;
-    border-color: @borders;
-    border-width: 1px;
-    -GtkNotebook-initial-gap: 0;
-    -GtkNotebook-arrow-spacing: 5;
-    -GtkNotebook-tab-curvature: 0;
-    -GtkNotebook-tab-overlap: 0;
-    -GtkNotebook-has-tab-gap: false;
-    -GtkWidget-focus-padding: 0;
-    -GtkWidget-focus-line-width: 0;
-}
-
-.notebook :hover {
-    -gtk-image-effect: highlight;
-    color: @theme_fg_color;
-}
-
-.notebook.frame.top {
-    border-top: 0px;
-    border-radius: 0px 0px 4px 4px;
-}
-
-.notebook.frame.bottom {
-    border-bottom: 0px;
-    border-radius: 4px 4px 0px 0px;
-}
-
-.notebook.frame.left {
-    border-left: 0px;
-    border-radius: 0px 4px 4px 0px;
-}
-
-.notebook.frame.right {
-    border-right: 0px;
-    border-radius: 4px 0px 0px 4px;
-}
-
-.notebook.header {
-    background-image: linear-gradient(to bottom,
-                                      shade(@theme_bg_color, 0.86),
-                                      shade(@theme_bg_color, 1.05));
-    border-radius: 0px;
-}
-
-.notebook.header.top {
-    border-width: 0px 0px 1px 0px;
-}
-
-.notebook.header.bottom {
-    border-width: 1px 0px 0px 0px;
-}
-
-.notebook.header.left {
-    border-width: 1px 1px 0px 0px;
-}
-
-.notebook.header.right {
-    border-width: 0px 0px 0px 1px;
-}
-
-.notebook.header.frame.top {
-    border-radius: 4px 4px 0px 0px;
-}
-
-.notebook.header.frame.bottom {
-    border-radius: 0px 0px 4px 4px;
-}
-
-.notebook.header.frame.left {
-    border-radius: 4px 0px 0px 4px;
-}
-
-.notebook.header.frame.right {
-    border-radius: 0px 4px 4px 0px;
-}
-
-.notebook tab {
-    border-color: transparent;
-    border-width: 0px;
-    background-image: none;
-    background-color: transparent;
-}
-
-.notebook tab GtkLabel {
-    color: mix (@theme_fg_color, @theme_bg_color, 0.40);
-    font-weight: normal;
-}
-
-.notebook .prelight-page,
-.notebook .prelight-page GtkLabel {
-    color: mix (@theme_fg_color, @theme_bg_color, 0.15);
-}
-
-.notebook .active-page,
-.notebook tab .active-page GtkLabel {
-    color: @theme_fg_color;
-}
-
-/* horizontal tabs */
-
-.notebook tab.top,
-.notebook tab.bottom {
-    padding: 8px 20px 6px;
-}
-
-.notebook tab.top {
-    border-width: 1px 1px 0 1px;
-}
-
-.notebook tab.top:active,
-.notebook tab.top:active:hover {
-    background-image: linear-gradient(to bottom,
-                                      shade(@theme_bg_color, 1.18),
-                                      shade(@theme_bg_color, 1.1));
-    border-radius: 4px 4px 0 0;
-    border-width: 1px 1px 0 1px;
-    border-style: solid;
-    border-color: @borders;
-    box-shadow: none;
-}
-
-.notebook tab.top:hover {
-    background-image: linear-gradient(to bottom,
-                                      alpha(@theme_base_color, 0.0),
-                                      alpha(@theme_base_color, 0.3));
-    border-radius: 4px 4px 0 0;
-    border-width: 1px 1px 0 1px;
-    border-style: solid;
-    border-color: @borders;
-    box-shadow: none;
-}
-
-.notebook tab.top:active {
-    border-bottom-color: @notebook_active_tab_border;
-}
-
-.notebook tab.bottom:active,
-.notebook tab.bottom:active:hover {
-    background-image: linear-gradient(to top,
-                                      shade(@theme_bg_color, 1.18),
-                                      shade(@theme_bg_color, 1.1));
-    border-radius: 0 0 4px 4px;
-    border-style: solid;
-    border-width: 0px 1px 1px 1px;
-    border-color: @borders;
-    box-shadow: none;
-}
-
-.notebook tab.bottom:hover {
-    background-image: linear-gradient(to top,
-                                      alpha(@theme_base_color, 0.0),
-                                      alpha(@theme_base_color, 0.3));
-    border-radius: 0 0 4px 4px;
-    border-style: solid;
-    border-width: 0px 1px 1px 1px;
-    border-color: @borders;
-    box-shadow: none;
-}
-
-/* vertical tabs */
-
-.notebook tab.left,
-.notebook tab.right {
-    padding: 5px 20px;
-}
-
-.notebook tab.left:active,
-.notebook tab.left:active:hover {
-    background-image: linear-gradient(to right,
-                                      shade(@theme_bg_color, 1.18),
-                                      shade(@theme_bg_color, 1.1));
-    border-style: solid;
-    border-width: 1px 0px 1px 1px;
-    border-color: @borders;
-    border-right-color: @notebook_active_tab_border;
-    border-radius: 4px 0px 0px 4px;
-}
-
-.notebook tab.left:hover {
-    background-image: linear-gradient(to right,
-                                      alpha(@theme_base_color, 0.0),
-                                      alpha(@theme_base_color, 0.3));
-    border-style: solid;
-    border-width: 1px 0px 1px 1px;
-    border-color: @borders;
-    border-radius: 4px 0px 0px 4px;
-}
-
-.notebook tab.right:active,
-.notebook tab.right:active:hover {
-    background-image: linear-gradient(to left,
-                                      shade(@theme_bg_color, 1.18),
-                                      shade(@theme_bg_color, 1.1));
-    border-style: solid;
-    border-width: 1px 1px 1px 0px;
-    border-color: @borders;
-    border-right-color: @notebook_active_tab_border;
-    border-radius: 0px 4px 4px 0px;
-}
-
-.notebook tab.right:hover {
-    background-image: linear-gradient(to left,
-                                      alpha(@theme_base_color, 0.0),
-                                      alpha(@theme_base_color, 0.3));
-    border-style: solid;
-    border-width: 1px 1px 1px 0px;
-    border-color: @borders;
-    border-radius: 0px 4px 4px 0px;
-}
-
-.notebook tab.reorderable-page:hover {
-    background-image: linear-gradient(to bottom,
-                                      alpha(@theme_base_color, 0.0),
-                                      alpha(@theme_base_color, 0.3));
-    border-radius: 0;
-    box-shadow: inset 1px 0 alpha(@borders, 0.6), inset -1px 0 alpha(@borders, 0.6);
-    border-style: none;
-}
-
-.notebook tab.reorderable-page:active {
-    background-image: linear-gradient(to bottom,
-                                      shade(@theme_bg_color, 1.18),
-                                      shade(@theme_bg_color, 1.1));
-    border-radius: 4px 4px 0 0;
-    box-shadow: none;
-    border-style: solid;
-}
-
-/* close button styling */
-
-.notebook tab .button {
-    color: mix (@theme_fg_color, @theme_bg_color, 0.85);
-    border-image: none;
-    background-image: none;
-    background-color: transparent;
-    border-radius: 3px;
-    border-style: solid;
-    border-color: transparent;
-    border-width: 1px;
-    padding: 1px;
-    icon-shadow: none;
-}
-
-.notebook .prelight-page .button,
-.notebook tab.prelight-page .button,
-.notebook .active-page .button,
-.notebook tab.active-page .button {
-	color: mix(@theme_fg_color, @theme_base_color, 0.6);
-	icon-shadow: 0 1px @button_text_shadow;
-}
-
-.notebook tab .button:hover {
-	color: @theme_fg_color;
-	border-color: alpha(black, 0.1);
-}
-
-.notebook tab .button:active,
-.notebook tab .button:active:hover {
-	color:  @button_active_text;
-	background-color: alpha(black, 0.08);
-	box-shadow: inset 0 1px alpha(black, 0.05);
-	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);
-}
-
-.notebook.arrow {
-    /* FIXME, why this doesn't work? */
-	-GtkNotebook-arrow-scaling: 0.5;
-    color: shade(@theme_fg_color, 2.6);
-}
-
-.notebook.arrow:hover {
-    color: @theme_selected_bg_color;
-}
-
-.notebook.arrow:active {
-    color: @theme_fg_color;
-}
-
-.notebook.arrow:insensitive {
-    color: rgba(141, 144, 145, 0.3);
-}
-
-.notebook.arrow:backdrop {
-    color: rgba(84, 89, 90, 0.4);
-}
-
-.notebook.arrow:backdrop:insensitive {
-    color: #c7c7c7;
-}
-
-/******************
- * pane separator *
- ******************/
-.sidebar .pane-separator,
-.pane-separator {
-	background-color: @transparent;
-	border-color: shade (@theme_bg_color, 0.84);
-
-	-unico-border-gradient: none;
-	-unico-inner-stroke-color: shade (@theme_bg_color, 1.1);
-	-unico-inner-stroke-gradient: none;
-	-unico-inner-stroke-width: 1px;
-}
-
-/****************
- * Progress bar *
- ****************/
-
-/* progress component */
-.progressbar,
-.toolbar .progressbar,
-.entry.progressbar,
-.progressbar row,
-.progressbar row:hover,
-.progressbar row:selected,
-.progressbar row:selected:focus {
-    background-image: linear-gradient(to right,
-                                      alpha (#000, 0.00),
-                                      alpha (#000, 0.00) 48%,
-                                      alpha (#004, 0.12) 48%,
-                                      alpha (#004, 0.12) 50%,
-                                      alpha (#000, 0.00) 50%,
-                                      alpha (#000, 0.00) 98%,
-                                      alpha (#004, 0.12) 98%,
-                                      alpha (#004, 0.12)),
-                      linear-gradient(to bottom,
-                                      alpha (#000, 0.20),
-                                      alpha (#000, 0.05) 50%,
-                                      alpha (#000, 0.00)),
-                      linear-gradient(to right,
-                                      @progressbar_fill_a,
-                                      @progressbar_fill_b);
-    background-size: 40px auto, auto, auto;
-    box-shadow: inset  0px  1px alpha(black, 0.03),
-                inset  1px  0px alpha(black, 0.03),
-                inset -1px  0px alpha(black, 0.03),
-                inset  0px -1px alpha(white, 0.10);
-    border-width: 1px;
-    border-style: solid;
-    border-radius: 3px;
-    border-top-color:    shade(@button_border_active, 0.80);
-    border-left-color:   shade(@button_border_active, 0.85);
-    border-right-color:  shade(@button_border_active, 0.85);
-    border-bottom-color: shade(@button_border_active, 1.00);
-/* Label font color of progressbar*/
-    color: @theme_fg_color;
-    text-shadow: none;
-}
-
-.progressbar.vertical {
-    background-image: linear-gradient(to top,
-                                      alpha (#000, 0.00),
-                                      alpha (#000, 0.00) 48%,
-                                      alpha (#004, 0.12) 48%,
-                                      alpha (#004, 0.12) 50%,
-                                      alpha (#000, 0.00) 50%,
-                                      alpha (#000, 0.00) 98%,
-                                      alpha (#004, 0.12) 98%,
-                                      alpha (#004, 0.12)),
-                      linear-gradient(to right,
-                                      alpha (#000, 0.20),
-                                      alpha (#000, 0.05) 50%,
-                                      alpha (#000, 0.00)),
-                      linear-gradient(to top,
-                                      @progressbar_fill_a,
-                                      @progressbar_fill_b);
-    background-size: auto 40px, auto, auto;
-    box-shadow: inset  0px  1px alpha(black, 0.03),
-                inset  1px  0px alpha(black, 0.03),
-                inset -1px  0px alpha(white, 0.10),
-                inset  0px -1px alpha(black, 0.03);
-    border-width: 1px;
-    border-style: solid;
-    border-radius: 3px;
-    border-top-color:    shade(@button_border_active, 0.85);
-    border-left-color:   shade(@button_border_active, 0.80);
-    border-right-color:  shade(@button_border_active, 1.00);
-    border-bottom-color: shade(@button_border_active, 0.85);
-/* Label font color of progressbar*/
-    color: @theme_fg_color;
-    text-shadow: none;
-}
-
-GtkProgressBar {
-    /* FIXME - Not working 3.14 */
-    -GtkProgressBar-min-horizontal-bar-height: 16;
-    -GtkProgressBar-min-vertical-bar-width: 16;
-    border-radius: 2px;
-    padding: 0 0 1px 0;
-    text-shadow: none;
-/*    -GtkProgressBar-xspacing: 22;
-    -GtkProgressBar-yspacing: 22; */
-}
-
-/* through component */
-.trough row {
-    padding: 0px;
-    text-shadow: none;
-    border-radius: 2px;
-    padding: 0 0 1px 0;
-}
-
-.trough,
-.toolbar .trough,
-.trough row,
-.trough row:hover {
-    background-image: -gtk-gradient (linear,
-                                     left top, left bottom,
-                                     from (alpha (#000, 0.18)),
-                                     color-stop (0.20, alpha (#000, 0.14)),
-                                     to (alpha (#000, 0.04)));
-    border-style: none;
-    border-width: 0px;
-    border-radius: 2px;
-    padding: 0 0 1px 0;
-    box-shadow: inset  1px  1px alpha(#000, 0.15),
-                inset -1px -1px alpha(#000, 0.15);
-    text-shadow: none;
-}
-
-.trough.vertical {
-    background-image: -gtk-gradient (linear,
-                                     left top, right top,
-                                     from (alpha (#000, 0.18)),
-                                     color-stop (0.20, alpha (#000, 0.14)),
-                                     to (alpha (#000, 0.04)));
-    border-radius: 2px;
-    padding: 0 0 1px 0;
-    text-shadow: none;
-}
-
-.trough row:selected,
-.trough row:selected:focus {
-    background-image: -gtk-gradient (linear,
-                                     left top, left bottom,
-                                     from (mix (@trough_bg_color_a, @theme_selected_bg_color, 0.25)),
-                                     to   (mix (@trough_bg_color_b, @theme_selected_bg_color, 0.25)));
-}
-
-/* level bars as used for password quality or remaining power */
-GtkLevelBar {
-    -GtkLevelBar-min-block-width: 34;
-    -GtkLevelBar-min-block-height: 3;
-}
-
-GtkLevelBar.vertical {
-    -GtkLevelBar-min-block-width: 3;
-    -GtkLevelBar-min-block-height: 34;
-}
-
-.level-bar.trough {
-    padding: 2px;
-}
-
-.level-bar.fill-block {
-    border-width: 1px;
-    border-style: solid;
-    border-color: @button_border_active;
-    background-image: -gtk-gradient (linear,
-                                     0.45 top, 0.55 bottom,
-                                     from (shade (@button_bg_active, 1.30)),
-                                     color-stop (0.40, shade (@button_bg_active, 1.04)),
-                                     color-stop (0.60, shade (@button_bg_active, 0.92)),
-                                     to (shade (@button_bg_active, 1.20)));
-}
-
-.level-bar.indicator-continuous.fill-block {
-    padding: 2px;
-    border-radius: 2px;
-}
-
-.level-bar.indicator-discrete.fill-block.horizontal {
-    margin: 0 1px;
-}
-
-.level-bar.indicator-discrete.fill-block.vertical {
-    margin: 1px 0;
-}
-
-/* discrete indicator border rounding,
-   uncomment when :nth-child will be working
-   on the widget
-
-.level-bar.indicator-discrete.fill-block.horizontal:first-child {
-    border-radius: 2px 0 0 2px;
-}
-
-.level-bar.indicator-discrete.fill-block.horizontal:last-child {
-    border-radius: 0 2px 2px 0;
-}
-
-.level-bar.indicator-discrete.fill-block.vertical:first-child {
-    border-radius: 2px 2px 0 0;
-}
-
-.level-bar.indicator-discrete.fill-block.vertical:last-child {
-    border-radius: 0 0 2px 2px;
-}
-*/
-
-.level-bar.fill-block.level-high {
-    border-color: shade(@success_color, 0.85);
-    background-image: linear-gradient(to bottom,
-                                      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);
-}
-
-.level-bar.fill-block.empty-fill-block:backdrop {
-    border-color: transparent;
-    background-color: transparent;
-}
-
-/************
- * GtkScale *
- ************/
-
-.scale {
-    -GtkScale-slider-length: 14;
-    -GtkRange-slider-width: 14;
-    -GtkRange-trough-border: 1;
-    -GtkWidget-focus-line-width: 0;
-}
-
-.scale.slider,
-.scale.slider:hover,
-.scale.slider:insensitive {
-    border-width: 1px;
-    border-radius: 8px;
-    border-style: none;
-    color: alpha(@theme_base_color, 0.0);
-    background-color: alpha(@theme_base_color, 0.0);
-    /* background-image in -assets variant */
-}
-
-.scale.slider.fine-tune:active,
-.scale.slider.fine-tune:active:hover,
-.scale.slider.fine-tune.horizontal:active,
-.scale.slider.fine-tune.horizontal:active:hover {
-	background-size: 50%;
-	background-repeat: no-repeat;
-	background-position: center;
-}
-
-.toolbar .scale.trough,
-.scale.trough {
-    margin: 7px 0;
-    background-image: -gtk-gradient (linear,
-                     left top,
-                     left bottom,
-                     from (alpha (#000, 0.20)),
-                     color-stop (0.20, alpha (#000, 0.16)),
-                     to (alpha (#000, 0.06)));
-    border-style: none;
-    border-width: 0px;
-    border-radius: 8px;
-    box-shadow: inset  1px  1px alpha(#000, 0.08),
-                inset -1px -1px alpha(#000, 0.08);
-}
-
-.scale.trough.vertical {
-    margin: 0 7px;
-}
-
-.scale.trough:insensitive {
-    background-image: -gtk-gradient (linear,
-                     left top,
-                     left bottom,
-                     from (alpha (#000, 0.03)),
-                     to   (alpha (#000, 0.03)));
-}
-
-.scale.progressbar {
-    background-color: @scale_progress_fill;
-    border-width: 1px;
-    border-radius: 3px;
-    border-style: none;
-}
-
-.scale:insensitive,
-.vertical.scale:insensitive {
-    background-color: transparent;
-}
-
-.scale.mark {
-    color: mix(@theme_bg_color, @theme_text_color, 0.56);
-}
-
-.menubar .menuitem .scale.highlight.left,
-.scale.highlight.left {
-    background-image: -gtk-gradient (linear,
-                                     left top, left bottom,
-                                     from (shade (@scale_fill, 0.90)),
-                                     to (shade (@scale_fill, 1.31)));
-    border-style: none;
-    border-width: 0px;
-    border-radius: 8px;
-    box-shadow: inset  1px  1px alpha(#000, 0.08),
-                inset -1px -1px alpha(#000, 0.08);
-    color:       @theme_selected_fg_color;
-    text-shadow: none;
-}
-
-.menubar .menuitem .scale.highlight.bottom,
-.scale.highlight.bottom {
-    background-image: -gtk-gradient (linear,
-                                     left top, right top,
-                                     from (shade (@scale_fill, 0.90)),
-                                     to (shade (@scale_fill, 1.31)));
-    border-style: none;
-    border-width: 0px;
-    border-radius: 8px;
-    box-shadow: inset  1px  1px alpha(#000, 0.08),
-                inset -1px -1px alpha(#000, 0.08);
-    color:       @theme_selected_fg_color;
-    text-shadow: none;
-}
-
-.scale.highlight.left:insensitive {
-    background-image: -gtk-gradient (linear, left top, left bottom,
-                                     from (shade (@theme_bg_color, 0.85)),
-                                     to (shade (@theme_bg_color, 0.85)));
-    box-shadow: inset  1px  1px alpha(#000, 0.02),
-                inset -1px -1px alpha(#000, 0.02);
-}
-
-.scale.highlight.bottom:insensitive {
-    background-image: -gtk-gradient (linear,  left top, right top,
-                                     from (shade (@theme_bg_color, 0.85)),
-                                     to (shade (@theme_bg_color, 0.85)));
-    box-shadow: inset  1px  1px alpha(#000, 0.02),
-                inset -1px -1px alpha(#000, 0.02);
-}
-
-GtkScale.slider,
-GtkScale.slider.horizontal,
-GtkScale.slider.horizontal:hover {
-    background-image: url("assets/scale-slider-hor.svg");
-}
-
-GtkScale.slider:insensitive,
-GtkScale.slider.horizontal:insensitive {
-    background-image: url("assets/scale-slider-insensitive-hor.svg");
-}
-
-GtkScale.slider.vertical {
-    background-image: url("assets/scale-slider-ver.svg");
-}
-
-GtkScale.slider.vertical:insensitive {
-    background-image: url("assets/scale-slider-insensitive-ver.svg");
-}
-
-GtkScale.scale-has-marks-above.slider.horizontal,
-GtkScale.scale-has-marks-above.slider.horizontal:hover {
-    background-image: url("assets/scale-slider-marks-above-horizontal.svg");
-}
-
-GtkScale.scale-has-marks-above.slider.horizontal:insensitive {
-    background-image: url("assets/scale-slider-marks-above-horizontal-insensitive.svg");
-}
-
-GtkScale.scale-has-marks-above.slider.vertical {
-    background-image: url("assets/scale-slider-marks-above-vertical.svg");
-}
-
-GtkScale.scale-has-marks-above.slider.vertical:insensitive {
-    background-image: url("assets/scale-slider-marks-above-vertical-insensitive.svg");
-}
-
-GtkScale.scale-has-marks-below.slider.horizontal,
-GtkScale.scale-has-marks-below.slider.horizontal:hover {
-    background-image: url("assets/scale-slider-marks-below-horizontal.svg");
-}
-
-GtkScale.scale-has-marks-below.slider.horizontal:insensitive {
-    background-image: url("assets/scale-slider-marks-below-horizontal-insensitive.svg");
-}
-
-GtkScale.scale-has-marks-below.slider.vertical {
-    background-image: url("assets/scale-slider-marks-below-vertical.svg");
-}
-
-GtkScale.scale-has-marks-below.slider.vertical:insensitive {
-    background-image: url("assets/scale-slider-marks-below-vertical-insensitive.svg");
-}
-
-/*************
- * scrollbar *
- *************/
-.scrollbar {
-	background-image: none;
-	border-style: solid;
-	-GtkRange-trough-border: 0;
-	-GtkScrollbar-has-backward-stepper: true;
-	-GtkScrollbar-has-forward-stepper: true;
-	-GtkRange-arrow-scaling: 0.666;
-	-GtkRange-slider-width: 13;
-	-GtkScrollbar-min-slider-length: 42;
-	-GtkRange-stepper-size: 16;
-	-GtkRange-stepper-spacing: 0;
-	-GtkRange-trough-under-steppers: 1;
-}
-
-.scrollbar.trough,
-.scrollbar.trough.vertical {
-	background-image: -gtk-gradient (linear, left top, right top,
-		from (shade (@theme_bg_color, 0.98)),
-		to (shade (@theme_bg_color, 1.06)));
-	border-radius: 0;
-	border-width: 0 0 0 1px;
-	border-style: solid;
-	border-color: shade (@theme_bg_color, 0.96);
-	-unico-border-gradient: -gtk-gradient (linear, left top, right top,
-		from (shade (@theme_bg_color, 0.96)),
-		to (shade (@theme_bg_color, 0.96)));
-	-unico-inner-stroke-width: 0;
-}
-
-.scrollbar.trough.horizontal {
-	background-image: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@theme_bg_color, 0.98)),
-		to (shade (@theme_bg_color, 1.06)));
-	border-radius: 0;
-	border-width: 1px 0 0 0;
-	border-style: solid;
-	border-color: shade (@theme_bg_color, 0.96);
-	-unico-border-gradient: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@theme_bg_color, 0.96)),
-		to (shade (@theme_bg_color, 0.96)));
-}
-
-/* Sliders and buttons */
-.scrollbar.slider.vertical {
-	background-image: -gtk-gradient (linear, left top, right top,
-		from (shade (@theme_bg_color, 0.95)),
-		to (shade (@theme_bg_color, 0.8)));
-	border-color: shade (@theme_bg_color, 0.65);
-	border-radius: 10px;
-	border-width: 1px;
-}
-
-.scrollbar.slider.vertical:hover,
-.scrollbar.slider.vertical:hover:active {
-	background-image: -gtk-gradient (linear, left top, right top,
-		from (shade (@theme_bg_color, 0.85)),
-		to (shade (@theme_bg_color, 0.7)));
-	border-color: shade (@theme_bg_color, 0.6);
-}
-
-.scrollbar.slider.horizontal {
-	background-image: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@theme_bg_color, 0.95)),
-		to (shade (@theme_bg_color, 0.8)));
-	border-color: shade (@theme_bg_color, 0.65);
-	border-radius: 10px;
-	border-width: 1px;
-}
-
-.scrollbar.slider.horizontal:hover,
-.scrollbar.slider.horizontal:hover:active {
-	background-image: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@theme_bg_color, 0.85)),
-		to (shade (@theme_bg_color, 0.7)));
-	border-color: shade (@theme_bg_color, 0.6);
-}
-
-.scrollbar.slider:insensitive {
-	background-color: shade (@theme_bg_color, 0.9);
-}
-
-.scrollbar.trough:insensitive {
-	background-color: shade (@theme_bg_color, 1.06);
-}
-
-/* Fixes a bug in Opera */
-.scrollbar.button {
-	background-image: -gtk-gradient (linear, left top, left bottom,
-		from (@transparent),
-		to (@transparent));
-	background-color: @transparent;
-	-unico-outer-stroke-width: 0;
-	-unico-outer-stroke-color: @transparent;
-	-unico-inner-stroke-width: 0;
-	-unico-inner-stroke-color: @transparent;
-	-unico-inner-stroke-gradient: -gtk-gradient (linear, left top, left bottom,
-		from (@transparent),
-		to (@transparent));
-	-unico-outer-stroke-gradient: -gtk-gradient (linear, left top, left bottom,
-		from (@transparent),
-		to (@transparent));
-	-unico-border-gradient: -gtk-gradient (linear, left top, left bottom,
-		from (@transparent),
-		to (@transparent));
-}
-
-/* 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 *
- *******************/
-GtkScrolledWindow.frame {
-	border-top-color: shade (@theme_bg_color, 0.84);
-	border-right-color: shade (@theme_bg_color, 0.76);
-	border-bottom-color: shade (@theme_bg_color, 0.86);
-	border-left-color: shade (@theme_bg_color, 0.76);
-	border-radius: 0;
-	border-style: solid;
-
-	-unico-border-gradient: none;
-	-unico-inner-stroke-width: 0;
-	-unico-outer-stroke-width: 0;
-}
-
-/*************
- * separator *
- *************/
-.separator {
-	border-color: shade (@theme_bg_color, 0.86);
-	border-style: solid;
-
-	-unico-border-gradient: none;
-	-unico-inner-stroke-color: alpha (shade (@theme_bg_color, 1.26), 0.6);
-	-unico-inner-stroke-gradient: none;
-}
-
-.button .separator,
-.button.separator {
-	border-color: shade (@button_bg_color, 0.84);
-
-	-unico-inner-stroke-color: alpha (shade (@button_bg_color, 1.26), 0.5);
-	-unico-inner-stroke-gradient: none;
-}
-
-.button .separator:insensitive,
-.button.separator:insensitive {
-	border-color: shade (@button_insensitive_bg_color, 0.9);
-
-	-unico-inner-stroke-color: alpha (shade (@button_insensitive_bg_color, 1.26), 0.6);
-	-unico-inner-stroke-gradient: none;
-}
-
-.menuitem.separator {
-	-GtkMenuItem-horizontal-padding: 0;
-	-GtkWidget-separator-height: 0;
-
-	border-color: shade (@theme_bg_color, 0.96);
-	-unico-inner-stroke-color: alpha (shade (@dark_bg_color, 1.26), 0.5);
-}
-
-Genericmenuitem .menuitem.separator,
-DbusmenuGtkMenu .menuitem.separator,
-.menubar .menuitem.separator,
-.primary-toolbar .menuitem.separator {
-	border-color: shade (@dark_bg_color, 0.96);
-
-	-unico-inner-stroke-color: alpha (shade (@dark_bg_color, 1.26), 0.5);
-}
-
-/***********
- * sidebar *
- ***********/
-.sidebar,
-.sidebar .view {
-}
-
-.sidebar row:selected {
-	text-shadow: 0px 1px shade (@theme_selected_bg_color, 0.7);
-}
-
-.sidebar row:hover {
-	background-color: shade (@theme_selected_bg_color, 1.15);
-	color: shade (@theme_fg_color, 0.90);
-	text-shadow: none;
-}
-
-.sidebar .frame {
-	border-width: 0;
-}
-
-/**************
- * spinbutton *
- **************/
-.spinbutton.button:active,
-.spinbutton.button:insensitive,
-.spinbutton.button {
-	border-radius: 0;
-	border-width: 1px 0 1px 1px;
-
-	-unico-outer-stroke-width: 0;
-}
-
-.spinbutton.button:active:nth-child(last),
-.spinbutton.button:insensitive:nth-child(last),
-.spinbutton.button:nth-child(last) {
-	border-radius: 0 2px 2px 0;
-	border-width: 1px;
-}
-
-.spinbutton.button {
-	background-image: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@button_bg_color, 1.1)),
-		to (shade (@button_bg_color, 0.95)));
-
-	-unico-border-gradient: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@theme_bg_color, 0.65)),
-		to (shade (@theme_bg_color, 0.7)));
-}
-
-.spinbutton.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)));
-}
-
-.spinbutton.button:active,
-.spinbutton.button:active:hover {
-	background-image: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@theme_bg_color, 0.9)),
-		to (shade (@theme_bg_color, 0.85)));
-}
-
-.spinbutton.button:insensitive {
-	background-image: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@theme_bg_color, 1.02)),
-		to (shade (@theme_bg_color, 0.98)));
-	border-top-color: shade (@theme_bg_color, 0.64);
-	border-right-color: shade (@theme_bg_color, 0.76);
-	border-bottom-color: shade (@theme_bg_color, 0.82);
-	border-left-color: shade (@theme_bg_color, 0.76);
-
-	color: shade (@theme_bg_color, 0.66);
-
-	-unico-border-gradient: none;
-}
-
-.spinbutton,
-.spinbutton:hover {
-	color: @theme_fg_color;
-}
-
-GtkLinkButton.button,
-GtkLinkButton.button:hover,
-GtkLinkButton.button:active,
-GtkLinkButton.button:active:hover {
-    transition: all 400ms ease-in;
-    text-shadow: none;
-}
-
-/***********
- * spinner *
- ***********/
-
-@keyframes spinner {
-	0.00% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)); }
-
-	12.5% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)); }
-
-	25.0% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)); }
-
-	37.5% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)); }
-
-	50.0% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)); }
-
-	62.5% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)); }
-
-	75.0% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)); }
-
-	87.5% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)); }
-
-	100%  { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)); }
-}
-
-.spinner {
-	background-color: transparent;
-	background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
-		-gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent));
-	background-position: 14% 14%, 0% 50%, 14% 86%, 50% 100%, 86% 86%, 100% 50%, 86% 14%, 50% 0%;
-	background-size: 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 .spinner:active {
-	color: @theme_fg_color;
-}
-
-/*************
- * statusbar *
- *************/
-GtkStatusbar {
-}
-
-/**********
- * switch *
- **********/
-GtkSwitch {
-    padding: 8px; /* 8px to avoid padding list-row issue if active */
-    -GtkSwitch-slider-width: 45px;
-    font-weight: bold;
-    font-size: smaller;
-    box-shadow: inset  0px  2px alpha(#fff, 0.11),
-                inset  2px  0px alpha(#fff, 0.09),
-                inset -2px  0px alpha(#fff, 0.09),
-                inset  0px -2px alpha(#fff, 0.07),
-                inset  0px  1px alpha(shade(@button_border, 1.00), 0.70),
-                inset  1px  0px alpha(shade(@button_border, 0.94), 0.80),
-                inset -1px  0px alpha(shade(@button_border, 0.94), 0.80),
-                inset  0px -1px alpha(shade(@button_border, 0.88), 0.90);
-}
-
-GtkSwitch.trough,
-GtkSwitch.trough:backdrop {
-    border: 1px solid ;
-    border-radius: 6px;
-    color: @theme_fg_color;
-    background-image: linear-gradient(to bottom,
-                                      shade(@theme_bg_color, 0.9));
-    /* outer */
-    border-top-color: transparent;
-    border-left-color: alpha (#000, 0.01);
-    border-right-color: alpha (#000, 0.01);
-    border-bottom-color: alpha (#000, 0.03);
-    box-shadow: inset  0px  2px alpha(#fff, 0.11),
-                inset  2px  0px alpha(#fff, 0.09),
-                inset -2px  0px alpha(#fff, 0.09),
-                inset  0px -2px alpha(#fff, 0.07),
-                inset  0px  1px alpha(shade(@button_border, 1.00), 0.70),
-                inset  1px  0px alpha(shade(@button_border, 0.94), 0.80),
-                inset -1px  0px alpha(shade(@button_border, 0.94), 0.80),
-                inset  0px -1px alpha(shade(@button_border, 0.88), 0.90);
-    text-shadow: 0 1px rgba(0, 0, 0, 0.1);
-}
-
-GtkSwitch.trough:active,
-GtkSwitch.trough:backdrop:active {
-    background-image: linear-gradient(to bottom,
-                                      @theme_selected_bg_color 2px,
-                                      shade(@theme_selected_bg_color, 1.2));
-    color: white;
-}
-
-GtkSwitch.trough:insensitive,
-GtkSwitch.trough:backdrop:insensitive {
-    color: @insensitive_fg_color;
-    border-color: @insensitive_border_color;
-    background-image: none;
-    background-color: @insensitive_bg_color;
-    box-shadow: inset  0px  1px @insensitive_border_color,
-                inset  1px  0px @insensitive_border_color,
-                inset -1px  0px @insensitive_border_color,
-                inset  0px -1px @insensitive_border_color;
-    text-shadow: none;
-}
-
-GtkSwitch.slider,
-GtkSwitch.slider:backdrop {
-    border: 1px solid;
-    border-radius: 6px;
-    color: @theme_fg_color;
-    background-image: -gtk-gradient (linear,
-                                     left top, left bottom,
-                                     from (@button_gradient1),
-                                     color-stop (0.48, @button_gradient2),
-                                     color-stop (0.52, @button_gradient3),
-                                     to   (@button_gradient4));
-    border-top-color: transparent;
-    border-left-color: alpha (#000, 0.01);
-    border-right-color: alpha (#000, 0.01);
-    border-bottom-color: alpha (#000, 0.03);
-    box-shadow: inset  0px  2px alpha(#fff, 0.11),
-                inset  2px  0px alpha(#fff, 0.09),
-                inset -2px  0px alpha(#fff, 0.09),
-                inset  0px -2px alpha(#fff, 0.07),
-                inset  0px  1px alpha(shade(@button_border, 1.00), 0.70),
-                inset  1px  0px alpha(shade(@button_border, 0.94), 0.80),
-                inset -1px  0px alpha(shade(@button_border, 0.94), 0.80),
-                inset  0px -1px alpha(shade(@button_border, 0.88), 0.90);
-    padding: 2px 4px 2px 2px;
-}
-
-GtkSwitch.slider:active,
-GtkSwitch.slider:backdrop:active {
-    color: @theme_fg_color;
-    border-color: transparent;
-    border-radius: 6px;
-    background-image: -gtk-gradient (linear,
-                                     left top, left bottom,
-                                     from (shade (@theme_bg_color, 1.20)),
-                                     color-stop (0.50, shade (@theme_bg_color, 1.00)),
-                                     color-stop (0.50, shade (@theme_bg_color, 0.95)),
-                                     to (shade (@theme_bg_color, 0.80)));
-    box-shadow: inset  0px  1px shade (@theme_fg_color, 1.0),
-                inset  1px  0px shade (@theme_fg_color, 1.0),
-                inset -1px  0px shade (@theme_fg_color, 1.0),
-                inset  0px -1px shade (@theme_fg_color, 1.0);
-    padding: 1px 1px 1px 1px;
-}
-
-GtkSwitch.slider:insensitive,
-GtkSwitch.slider:backdrop:insensitive {
-    color: @insensitive_fg_color;
-    background-image: none;
-    background-color: @insensitive_bg_color;
-    border-color: alpha (#000, 0.00);
-    border-bottom-color: alpha (#000, 0.00);
-    border-image: none;
-    box-shadow: inset  0px  1px @insensitive_border_color,
-                inset  1px  0px @insensitive_border_color,
-                inset -1px  0px @insensitive_border_color,
-                inset  0px -1px @insensitive_border_color;
-}
-
-GtkSwitch.slider:insensitive > GtkLabel,
-GtkSwitch.slider:backdrop:insensitive > GtkLabel {
-    color: inherit;
-}
-
-.list-row GtkSwitch,
-.list-row GtkSwitch:backdrop,
-.list-row:selected GtkSwitch,
-.list-row:selected GtkSwitch:backdrop {
-    box-shadow: none;
-    border-color: shade(@theme_selected_bg_color, 0.4);
-}
-
-.list-row:selected GtkSwitch.slider:dir(rtl) {
-    border-left-color: @borders;
-}
-
-.list-row:selected GtkSwitch.slider:dir(ltr) {
-    border-right-color: @borders;
-}
-
-.list-row:selected GtkSwitch.slider,
-.list-row:selected GtkSwitch.slider:active {
-    border-color: shade(@theme_selected_bg_color, 0.4);
-}
-
-
-/************
- * textview *
- ************/
-GtkTextView {
-	background-color: @theme_base_color;
-}
-
-/***********
- * toolbar *
- ***********/
-.toolbar {
-	border-style: none;
-}
-
-/* primary-toolbar */
-.primary-toolbar,
-.primary-toolbar .toolbar,
-.primary-toolbar.toolbar {
-	-GtkWidget-window-dragging: true;
-
-	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;
-
-	color: @theme_fg_color;
-	text-shadow: 0px 1px alpha (shade (@button_bg_color, 1.25), 0.4);
-
-	-unico-border-gradient: none;
-	-unico-inner-stroke-width: 0;
-}
-
-.primary-toolbar :insensitive {
-	text-shadow: 0px 1px alpha (shade (@button_bg_color, 1.25), 0.4);
-}
-
-.primary-toolbar GtkComboBox,
-.primary-toolbar .button *,
-.primary-toolbar .button {
-	background-color: @transparent;
-	background-image: none;
-	border-radius: 2px;
-	border-width: 1px;
-	border-color: @transparent;
-
-	color: @theme_fg_color;
-	text-shadow: 0px 1px alpha (shade (@button_bg_color, 1.25), 0.4);
-
-	-unico-focus-border-radius: 2;
-	-unico-focus-border-color: alpha (@theme_selected_bg_color, 0.5);
-	-unico-focus-fill-color: alpha (@theme_selected_bg_color, 0.2);
-	-unico-focus-outer-stroke-color: @transparent;
-
-	-unico-inner-stroke-width: 0;
-	-unico-outer-stroke-width: 0;
-}
-
-.primary-toolbar .raised .button,
-.primary-toolbar .raised.button,
-.primary-toolbar .button:hover,
-.primary-toolbar .button:active,
-.primary-toolbar .button:insensitive {
-	border-width: 1px;
-
-	-unico-focus-border-radius: 2;
-	-unico-focus-fill-color: @transparent;
-	-unico-focus-border-color: @transparent;
-	-unico-focus-outer-stroke-color: alpha (@theme_selected_bg_color, 0.5);
-
-	-unico-inner-stroke-width: 1px;
-	-unico-outer-stroke-gradient: -gtk-gradient (linear, left top, left bottom,
-		from (alpha (shade (@theme_bg_color, 0.05), 0.05)),
-		to (alpha (shade (@theme_bg_color, 0.05), 0.09)));
-	-unico-outer-stroke-width: 1px;
-	color: @theme_fg_color;
-}
-
-.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)));
-}
-
-.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 {
-	-unico-focus-border-color: alpha (@theme_selected_bg_color, 0.7);
-	-unico-focus-fill-color: @transparent;
-	-unico-focus-outer-stroke-color: alpha (@theme_selected_bg_color, 0.2);
-	color: @theme_fg_color;
-}
-
-.primary-toolbar GtkComboBox.combobox-entry .button {
-	-unico-inner-stroke-width: 1px;
-	-unico-outer-stroke-gradient: -gtk-gradient (linear, left top, left bottom,
-		from (alpha (shade (@theme_bg_color, 1.2), 0.25)),
-		to (alpha (shade (@theme_bg_color, 1.4), 0.75)));
-}
-
-.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: 0px 1px alpha (shade (@button_bg_color, 1.25), 0.4);
-	-unico-glow-radius: 0;
-	-unico-inner-stroke-width: 1px 1px 0 1px;
-	-unico-outer-stroke-width: 1px;
-	color: @theme_fg_color;
-}
-
-.primary-toolbar .button:active {
-	background-image: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@theme_bg_color, 0.9)),
-		to (shade (@theme_bg_color, 0.85)));
-	color: @theme_fg_color;
-
-	-unico-border-gradient: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@theme_bg_color, 0.6)),
-		to (shade (@theme_bg_color, 0.6)));
-	-unico-outer-stroke-gradient: -gtk-gradient (linear, left top, left bottom,
-		from (alpha (@button_bg_color, 0.0)),
-		to (shade (@button_bg_color, 1.02)));
-	-unico-glow-radius: 0;
-	-unico-inner-stroke-color: shade (@theme_bg_color, 0.8);
-	-unico-inner-stroke-width: 1px 1px 0 1px;
-	-unico-outer-stroke-width: 1px;
-	-unico-focus-outer-stroke-color: @transparent;
-}
-
-.primary-toolbar .button:active:hover {
-	background-image: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@theme_bg_color, 0.95)),
-		to (shade (@theme_bg_color, 0.9)));
-	color: @theme_fg_color;
-
-	-unico-border-gradient: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@theme_bg_color, 0.6)),
-		to (shade (@theme_bg_color, 0.6)));
-	-unico-outer-stroke-gradient: -gtk-gradient (linear, left top, left bottom,
-		from (alpha (@button_bg_color, 0.0)),
-		to (shade (@button_bg_color, 1.02)));
-	-unico-inner-stroke-color: shade (@theme_bg_color, 0.85);
-	-unico-inner-stroke-width: 1px 1px 0 1px;
-	-unico-outer-stroke-width: 1px;
-	-unico-focus-outer-stroke-color: @transparent;
-}
-
-.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: 0px 1px alpha (shade (@button_bg_color, 1.25), 0.4);
-
-	-unico-border-gradient: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@button_insensitive_bg_color, 0.8)),
-		to (shade (@button_insensitive_bg_color, 0.8)));
-	-unico-inner-stroke-gradient: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@button_insensitive_bg_color, 1.08)),
-		to (shade (@button_insensitive_bg_color, 1.0)));
-}
-
-.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: 0px 1px alpha (shade (@button_bg_color, 1.25), 0.4);
-
-	border-width: 1px;
-	-unico-inner-stroke-width: 0;
-	-unico-outer-stroke-width: 0;
-	-unico-border-gradient: none;
-	-unico-inner-stroke-gradient: none;
-}
-
-.primary-toolbar .button *:insensitive {
-	color: mix (@theme_fg_color, @theme_bg_color, 0.5);
-}
-
-.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)));
-
-	-unico-inner-stroke-gradient: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@button_insensitive_bg_color, 0.95)),
-		to (shade (@button_insensitive_bg_color, 0.98)));
-	-unico-inner-stroke-width: 1px 1px 0 1px;
-	-unico-outer-stroke-gradient: -gtk-gradient (linear, left top, left bottom,
-		from (alpha (@button_bg_color, 0.0)),
-		to (shade (@button_bg_color, 1.02)));
-	-unico-outer-stroke-width: 1px;
-	border-width: 1px;
-	-unico-border-gradient: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@button_insensitive_bg_color, 0.7)),
-		to (shade (@button_insensitive_bg_color, 0.8)));
-}
-
-.primary-toolbar .entry,
-.primary-toolbar .entry:active,
-.primary-toolbar .entry:focused {
-	border-radius: 2px;
-
-	color: @theme_text_color;
-
-	-unico-outer-stroke-gradient: -gtk-gradient (linear, left top, left bottom,
-		from (alpha (shade (@theme_bg_color, 0.85), 0.2)),
-		to (alpha (shade (@theme_bg_color, 1.18), 0.6)));
-	-unico-outer-stroke-width: 0;
-}
-
-.primary-toolbar .entry {
-	-unico-border-gradient: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@theme_bg_color, 0.75)),
-		to (shade (@theme_bg_color, 0.95)));
-	-unico-inner-stroke-gradient: -gtk-gradient (linear, left top, left bottom,
-		from (alpha (shade (@theme_bg_color, 0.05), 0.16)),
-		to (alpha (shade (@theme_bg_color, 0.05), 0.08)));
-}
-
-.primary-toolbar .entry:insensitive {
-	-unico-outer-stroke-width: 1px;
-	-unico-outer-stroke-gradient: -gtk-gradient (linear, left top, left bottom,
-		from (alpha (shade (@theme_bg_color, 1.2), 0.18)),
-		to (alpha (shade (@theme_bg_color, 1.4), 0.5)));
-}
-
-.primary-toolbar .entry:focused {
-	-unico-border-gradient: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@theme_selected_bg_color, 0.75)),
-		to (shade (@theme_selected_bg_color, 0.8)));
-	-unico-inner-stroke-color: alpha (@theme_selected_bg_color, 0.2);
-	-unico-inner-stroke-gradient: none;
-}
-
-.primary-toolbar GtkSeparatorToolItem,
-.primary-toolbar .separator,
-.primary-toolbar .separator:insensitive {
-	border-color: alpha (shade (@theme_bg_color, 0.94), 0.0);
-	border-style: solid;
-
-	-unico-border-gradient: none;
-	-unico-inner-stroke-color: alpha (shade (@theme_bg_color, 1.5), 0.0);
-	-unico-inner-stroke-gradient: none;
-}
-
-/* inline-toolbar */
-.inline-toolbar.toolbar {
-	-GtkToolbar-button-relief: normal;
-
-	background-image: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@theme_base_color, 0.93)),
-		to (shade (@theme_base_color, 0.93)));
-	border-radius: 0;
-	border-style: solid;
-	border-width: 1px;
-	padding: 3px 4px 4px 4px;
-}
-
-.inline-toolbar.toolbar:nth-child(last) {
-	border-bottom-color: shade (@theme_bg_color, 0.76);
-	border-color: shade (@theme_bg_color, 0.8);
-	border-radius: 0;
-	border-width: 0 1px 1px 1px;
-}
-
-.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-radius: 0;
-	border-style: solid;
-	border-width: 1px 0 1px 1px;
-	padding: 1px;
-
-	icon-shadow: 0px 1px shade (@theme_bg_color, 1.16);
-
-	-unico-inner-stroke-gradient: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@theme_bg_color, 1.16)),
-		to (shade (@theme_bg_color, 0.98)));
-	-unico-outer-stroke-width: 0;
-}
-
-.inline-toolbar.toolbar .button *:active,
-.inline-toolbar.toolbar .button *:insensitive,
-.inline-toolbar.toolbar GtkToolButton .button:active,
-.inline-toolbar.toolbar GtkToolButton .button:insensitive {
-	-unico-outer-stroke-width: 0;
-	-unico-outer-stroke-gradient: -gtk-gradient (linear, left top, left bottom,
-		from (alpha (shade (@theme_bg_color, 0.05), 0.02)),
-		to (alpha (shade (@theme_bg_color, 0.05), 0.06)));
-}
-
-.inline-toolbar.toolbar .button *:insensitive,
-.inline-toolbar.toolbar GtkToolButton .button:insensitive {
-	background-image: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@theme_bg_color, 1.02)),
-		to (shade (@theme_bg_color, 0.98)));
-
-	-unico-border-gradient: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@theme_bg_color, 0.85)),
-		to (shade (@theme_bg_color, 0.8)));
-	-unico-inner-stroke-gradient: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@theme_bg_color, 1.16)),
-		to (shade (@theme_bg_color, 1.0)));
-}
-
-.inline-toolbar.toolbar .button:nth-child(first),
-.inline-toolbar.toolbar GtkToolButton:nth-child(first) .button {
-	border-radius: 2px 0 0 2px;
-
-	-unico-outer-stroke-width: 0;
-}
-
-.inline-toolbar.toolbar .button:nth-child(last),
-.inline-toolbar.toolbar GtkToolButton:nth-child(last) .button {
-	border-radius: 0 2px 2px 0;
-	border-width: 1px;
-
-	-unico-outer-stroke-width: 0;
-}
-
-/***********
- * tooltip *
- ***********/
-.tooltip {
-	background-color: @theme_tooltip_bg_color;
-	border-color: shade (@theme_tooltip_bg_color, 0.7);
-	border-radius: 0px;
-	border-style: solid;
-	border-width: 1px;
-
-	color: @theme_tooltip_fg_color;
-}
-
-.tooltip * {
-	background-color: @transparent;
-}
-
-/************
- * treeview *
- ************/
-GtkTreeView .entry {
-	background-image: none;
-	border-radius: 0;
-
-	-unico-inner-stroke-gradient: none;
-	-unico-inner-stroke-width: 1px;
-}
-
-.notebook GtkContainer GtkTreeView row:selected {
-	background-color: @theme_selected_bg_color;
-	color: @theme_selected_fg_color;
-}
-
-.notebook GtkContainer GtkTreeView row:hover {
-	background-color: shade (@theme_selected_bg_color, 1.15);
-	color: shade (@theme_fg_color, 0.90);
-	text-shadow: none;
-}
-
-GtkTreeView row:nth-child(even) {
-	background-color: shade (@theme_base_color, 0.97);
-}
-
-GtkTreeView row:nth-child(odd) {
-	background-color: shade (@theme_base_color, 1.0);
-}
-
-GtkTreeView row:nth-child(even):hover {
-	background-color: shade (@theme_selected_bg_color, 1.15);
-	color: shade (@theme_fg_color, 0.90);
-	text-shadow: none;
-}
-
-GtkTreeView row:nth-child(odd):hover {
-	background-color: shade (@theme_selected_bg_color, 1.15);
-	color: shade (@theme_fg_color, 0.90);
-	text-shadow: none;
-}
-
-/* ie. nemo sidebar */
-.sidebar GtkTreeView row:hover {
-	background-color: shade (@theme_selected_bg_color, 1.15);
-	color: shade (@theme_fg_color, 0.90);
-	text-shadow: none;
-}
-
-
-/************
- * viewport *
- ************/
-GtkViewport.frame {
-	border-width: 0;
-	-unico-inner-stroke-width: 0;
-}
-
-/* Makes some applications look strange (gnome-tweak-tool for example.) */
-/* But since the default Adwaita theme has it I'll add it here too to avoid dark gray backgrounds. */
-GtkViewport,
-GtkIconView {
-	background-color: @theme_base_color;
-}
-
-/***************
- * Resize grip *
- ***************/
-
-.grip {
-	background-color: transparent;
-	background-image: url("assets/resize-grip.svg");
-}
-
-/********************************
- * Touch text selection handles *
- ********************************/
-.cursor-handle.bottom {
-	background-image: url("assets/slider.png");
-}
-
-.cursor-handle.top {
-	background-image: url("assets/slider.png");
-}
-
+/***************************************************************
+ * Green-Submarine                                             *
+ * Part of https://github.com/NiceandGently/mate-themes-extras *
+ * Author Wolfgang Ulbrich                                     *
+ ***************************************************************/
+
+* {
+    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: 16;
+    -GtkCheckMenuItem-indicator-size: 12;
+    -GtkComboBox-arrow-scaling: 0.75;
+    -GtkDialog-button-spacing: 4; /* ie. logout dialog */
+    -GtkDialog-action-area-border: 10; /* ie. logout dialog */
+    -GtkExpander-expander-size: 6;
+    -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.7;
+    -GtkNotebook-tab-overlap: 1;
+    -GtkPaned-handle-size: 1;
+    -GtkProgressBar-min-horizontal-bar-height: 16;
+    -GtkProgressBar-min-vertical-bar-width: 16;
+    -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;
+    -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: 6;
+    -GtkToolbar-internal-padding: 0;
+    -GtkTreeView-expander-size: 6; /* arrow size in list/tree views */
+    -GtkTreeView-horizontal-separator: 4;
+    -GtkTreeView-vertical-separator: 4;
+    -GtkWidget-focus-padding: 2;
+    -GtkWidget-focus-line-width: 0;
+    -GtkWidget-link-color: @link_color;
+    -GtkWindow-resize-grip-default: true;
+    -GtkWindow-resize-grip-width: 13;
+    -GtkWindow-resize-grip-height: 13;
+    -GtkWidget-separator-width: 2px;
+    -GtkWidget-separator-height: 2px;
+    -GtkWidget-visited-link-color: @link_color;
+    -GtkWidget-wide-separators: true;
+    -WnckTasklist-fade-overlay-rect: 0;
+    engine: none;
+}
+
+/***************
+ * Base States *
+ ***************/
+
+GtkWindow {
+    color: @theme_fg_color;
+}
+
+.background {
+    color: @theme_fg_color;
+    background-color: @theme_bg_color;
+}
+
+.background:backdrop {
+    text-shadow: none;
+    icon-shadow: none;
+}
+
+*:active {
+    background-color: alpha(shade(@theme_selected_bg_color, 1.90), 0.015);
+}
+
+*:active:hover:insensitive {
+}
+
+*:active:insensitive {
+}
+
+*:hover {
+     background-color: alpha(shade(@menu_bg_color, 1.05), 0.0);
+}
+
+*:hover:insensitive {
+}
+
+*:selected,
+*:selected:focus {
+    background-color: shade(@theme_selected_bg_color, 1.0);
+    color: @theme_selected_fg_color;
+}
+
+*:insensitive {
+    /* inherit the color from parent by default */
+    background-color: inherit;
+    color: @insensitive_fg_color;
+    border-color: @insensitive_border_color;
+    box-shadow: none;
+}
+
+*:backdrop {
+}
+
+.gtkstyle-fallback {
+    background-color: @theme_bg_color;
+    color: @theme_fg_color;
+}
+
+.gtkstyle-fallback:prelight {
+    background-color: shade(@theme_bg_color, 1.10);
+    color: @theme_fg_color;
+}
+
+.gtkstyle-fallback:active {
+    background-color: shade(@theme_bg_color, 0.90);
+    color: @theme_fg_color;
+}
+
+.gtkstyle-fallback:insensitive {
+    background-color: @insensitive_bg_color;
+    color: @insensitive_fg_color;
+}
+
+.gtkstyle-fallback:selected {
+    background-color: @theme_selected_bg_color;
+    color: @theme_selected_fg_color;
+}
+
+/*********
+ * label *
+ *********/
+
+GtkLabel,
+GtkLabel:insensitive {
+    background-color: transparent;
+}
+
+.tooltip,
+.tooltip.background {
+    padding: 4px 4px;
+    color: shade(@theme_tooltip_fg_color, 0.90);
+    border-width: 1px;
+    border-style: solid;
+    border-radius: 3px;
+/*    border-color: @theme_fg_color; */
+    background-color: alpha(@theme_tooltip_bg_color, 0.90);
+    background-clip: padding-box;
+    box-shadow: 0 1px 5px shade (@theme_selected_bg_color, 1.3);
+}
+
+.tooltip {
+    background-color: transparent;
+    padding: 4px 4px;
+}
+
+.grip {
+    background-color: transparent;
+    background-image: url("assets/resize-grip.svg");
+}
+
+.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-radius: 2px;
+}
+
+/*************
+ * separator *
+ *************/
+
+.separator {
+    border-width: 1px;
+    border-style: solid;
+    border-image: none;
+    border-color: mix(@theme_fg_color, @theme_bg_color, 0.95);
+    border-bottom-color: alpha (shade (@theme_bg_color, 1.26), 0.15);
+    border-right-color:  alpha (shade (@theme_bg_color, 1.26), 0.15);
+}
+
+GtkTreeView.view.separator,
+GtkTreeView.separator,
+GtkTreeView.view.separator:hover,
+GtkTreeView.separator:hover,
+.separator,
+.separator:prelight {
+    color: shade (@theme_bg_color, 0.92);
+    border-color: mix(@theme_fg_color, @theme_bg_color, 0.95);
+    border-image: none;
+}
+
+.separator.horizontal {
+    border-width: 1px 0 1px 0;
+}
+
+.separator.vertical {
+    border-width: 0 1px 0 1px;
+}
+
+GtkComboBox .separator {
+    -GtkWidget-wide-separators: true;
+    -GtkWidget-horizontal-separator: 0;
+    -GtkWidget-vertical-separator: 0;
+}
+
+.button .separator,
+.button.separator {
+    border-color: alpha (#000, 0.00);
+}
+
+.button .separator:insensitive,
+.button.separator:insensitive {
+    border-color: alpha (#000, 0.00);
+}
+
+.pane-separator {
+    color: shade (@sidebar_background, 0.95);
+}
+
+.pane-separator:prelight,
+.pane-separator:selected {
+    color: shade (@sidebar_background, 0.95);
+}
+
+GtkStatusbar {
+    padding: 5px;
+    color: @theme_fg_color;
+    -GtkStatusbar-shadow-type: none;
+    font-size: smaller;
+}
+
+GtkStatusbar .frame {
+    padding: 0px;
+    border-width: 0;
+}
+
+.dnd {
+    border-width: 1px;
+    border-style: solid;
+    border-color: @theme_selected_bg_color;
+    border-radius: 0px;
+}
+
+/****************
+ * Text Entries *
+ ****************/
+
+.entry {
+/* Look out !
+This is the background color of mate-control-center 'too' */
+    background-color: @theme_base_color;
+    padding: 3px 4px;
+    -GtkEntry-inner-border: 0;
+    -GtkEntry-progress-border: 0;
+    color: @entry_text_color;
+    background-image: -gtk-gradient(linear,
+                                    left top, left bottom,
+                                    from       (shade(@theme_base_color, 0.86)),
+                                    color-stop (0.15, shade(@theme_base_color, 0.96)),
+                                    color-stop (0.50, shade(@theme_base_color, 0.98)),
+                                    to         (shade(@theme_base_color, 1.00)));
+    /* outer */
+    border-width: 2px;
+    border-style: solid;
+    border-radius: 5px;
+    border-top-color: transparent;
+    border-right-color: alpha(#fff, 0.02);
+    border-left-color: alpha(#fff, 0.02);
+    border-bottom-color: alpha(#fff, 0.03);
+    /* border */
+    box-shadow: inset  0px  3px alpha(#000, 0.03),
+                inset  0px  2px alpha(#000, 0.05),
+                inset  2px  0px alpha(#000, 0.04),
+                inset -2px  0px alpha(#000, 0.04),
+                inset  0px -2px alpha(#000, 0.03),
+                inset  0px  1px shade(@button_border, 0.80),
+                inset  1px  0px shade(@button_border, 0.90),
+                inset -1px  0px shade(@button_border, 0.90),
+                inset  0px -1px shade(@button_border, 1.05);
+}
+
+.entry:focus {
+    box-shadow: inset  0px  1px shade(@selected_bg_color, 1.05),
+                inset  1px  0px shade(@selected_bg_color, 0.97),
+                inset -1px  0px shade(@selected_bg_color, 0.93),
+                inset  0px -1px shade(@selected_bg_color, 0.93);
+}
+
+.entry:insensitive {
+    color: @insensitive_fg_color;
+    background-image: none;
+    background-color: @insensitive_bg_color;
+    border-style: solid;
+    border-color: alpha (#000, 0.00);
+    border-bottom-color: alpha (#000, 0.00);
+    border-image: none;
+    box-shadow: inset  0px  1px @insensitive_border_color,
+                inset  1px  0px @insensitive_border_color,
+                inset -1px  0px @insensitive_border_color,
+                inset  0px -1px @insensitive_border_color;
+}
+
+.entry:selected,
+.entry:selected:focus {
+    background-color: @theme_selected_bg_color;
+    color: @theme_selected_fg_color;
+}
+
+.entry.progressbar {
+    background-color: @theme_selected_bg_color;
+    color: @theme_selected_fg_color;
+    border-width: 1px;
+    border-radius: 3px;
+}
+
+/*******************
+ * Symbolic images *
+ *******************/
+
+.image {
+    color: @internal_element_color;
+}
+
+.image:prelight {
+    color: @internal_element_prelight;
+}
+
+/****************
+ * Progress bar *
+ ****************/
+
+/* progress component */
+.progressbar,
+.toolbar .progressbar,
+.entry.progressbar,
+.progressbar row,
+.progressbar row:hover,
+.progressbar row:selected,
+.progressbar row:selected:focus {
+    background-image: linear-gradient(to right,
+                                      alpha (#000, 0.00),
+                                      alpha (#000, 0.00) 48%,
+                                      alpha (#004, 0.12) 48%,
+                                      alpha (#004, 0.12) 50%,
+                                      alpha (#000, 0.00) 50%,
+                                      alpha (#000, 0.00) 98%,
+                                      alpha (#004, 0.12) 98%,
+                                      alpha (#004, 0.12)),
+                      linear-gradient(to bottom,
+                                      alpha (#000, 0.20),
+                                      alpha (#000, 0.05) 50%,
+                                      alpha (#000, 0.00)),
+                      linear-gradient(to right,
+                                      @progressbar_fill_a,
+                                      @progressbar_fill_b);
+    background-size: 40px auto, auto, auto;
+    box-shadow: inset  0px  1px alpha(black, 0.03),
+                inset  1px  0px alpha(black, 0.03),
+                inset -1px  0px alpha(black, 0.03),
+                inset  0px -1px alpha(white, 0.10);
+    border-width: 1px;
+    border-style: solid;
+    border-radius: 3px;
+    border-top-color: shade(@button_border_active, 0.80);
+    border-left-color: shade(@button_border_active, 0.85);
+    border-right-color: shade(@button_border_active, 0.85);
+    border-bottom-color: shade(@button_border_active, 1.00);
+/* Label font color of progressbar*/
+    color: @theme_fg_color;
+    text-shadow: none;
+}
+
+.progressbar.vertical {
+    background-image: linear-gradient(to top,
+                                      alpha (#000, 0.00),
+                                      alpha (#000, 0.00) 48%,
+                                      alpha (#004, 0.12) 48%,
+                                      alpha (#004, 0.12) 50%,
+                                      alpha (#000, 0.00) 50%,
+                                      alpha (#000, 0.00) 98%,
+                                      alpha (#004, 0.12) 98%,
+                                      alpha (#004, 0.12)),
+                      linear-gradient(to right,
+                                      alpha (#000, 0.20),
+                                      alpha (#000, 0.05) 50%,
+                                      alpha (#000, 0.00)),
+                      linear-gradient(to top,
+                                      @progressbar_fill_a,
+                                      @progressbar_fill_b);
+    background-size: auto 40px, auto, auto;
+    box-shadow: inset  0px  1px alpha(black, 0.03),
+                inset  1px  0px alpha(black, 0.03),
+                inset -1px  0px alpha(white, 0.10),
+                inset  0px -1px alpha(black, 0.03);
+    border-width: 1px;
+    border-style: solid;
+    border-radius: 3px;
+    border-top-color: shade(@button_border_active, 0.85);
+    border-left-color: shade(@button_border_active, 0.80);
+    border-right-color: shade(@button_border_active, 1.00);
+    border-bottom-color: shade(@button_border_active, 0.85);
+/* Label font color of progressbar*/
+    color: @theme_fg_color;
+    text-shadow: none;
+}
+
+GtkProgressBar {
+    /* FIXME - Not working 3.14 */
+    -GtkProgressBar-min-horizontal-bar-height: 16;
+    -GtkProgressBar-min-vertical-bar-width: 16;
+    border-radius: 2px;
+    padding: 0 0 1px 0;
+    text-shadow: none;
+}
+
+/* through component */
+.trough row {
+    padding: 0px;
+    text-shadow: none;
+    border-radius: 2px;
+    padding: 0 0 1px 0;
+}
+
+.trough,
+.toolbar .trough,
+.trough row,
+.trough row:hover {
+    background-image: -gtk-gradient (linear,
+                                     left top, left bottom,
+                                     from (alpha (#000, 0.18)),
+                                     color-stop (0.20, alpha (#000, 0.14)),
+                                     to (alpha (#000, 0.04)));
+    border-style: none;
+    border-width: 0px;
+    border-radius: 2px;
+    padding: 0 0 1px 0;
+    box-shadow: inset  1px  1px alpha(#000, 0.15),
+                inset -1px -1px alpha(#000, 0.15);
+    text-shadow: none;
+}
+
+.trough.vertical {
+    background-image: -gtk-gradient (linear,
+                                     left top, right top,
+                                     from (alpha (#000, 0.18)),
+                                     color-stop (0.20, alpha (#000, 0.14)),
+                                     to (alpha (#000, 0.04)));
+    border-radius: 2px;
+    padding: 0 0 1px 0;
+    text-shadow: none;
+}
+
+.trough row:selected,
+.trough row:selected:focus {
+    background-image: -gtk-gradient (linear,
+                                     left top, left bottom,
+                                     from (mix (@trough_bg_color_a, @theme_selected_bg_color, 0.25)),
+                                     to   (mix (@trough_bg_color_b, @theme_selected_bg_color, 0.25)));
+}
+
+/* level bars as used for password quality or remaining power */
+GtkLevelBar {
+    -GtkLevelBar-min-block-width: 34;
+    -GtkLevelBar-min-block-height: 3;
+}
+
+GtkLevelBar.vertical {
+    -GtkLevelBar-min-block-width: 3;
+    -GtkLevelBar-min-block-height: 34;
+}
+
+.level-bar.trough {
+    padding: 2px;
+}
+
+.level-bar.fill-block {
+    border-width: 1px;
+    border-style: solid;
+    border-color: @button_border_active;
+    background-image: -gtk-gradient (linear,
+                                     0.45 top, 0.55 bottom,
+                                     from (shade (@button_bg_active, 1.30)),
+                                     color-stop (0.40, shade (@button_bg_active, 1.04)),
+                                     color-stop (0.60, shade (@button_bg_active, 0.92)),
+                                     to (shade (@button_bg_active, 1.20)));
+}
+
+.level-bar.indicator-continuous.fill-block {
+    padding: 2px;
+    border-radius: 2px;
+}
+
+.level-bar.indicator-discrete.fill-block.horizontal {
+    margin: 0 1px;
+}
+
+.level-bar.indicator-discrete.fill-block.vertical {
+    margin: 1px 0;
+}
+
+/* discrete indicator border rounding,
+   uncomment when :nth-child will be working
+   on the widget
+
+.level-bar.indicator-discrete.fill-block.horizontal:first-child {
+    border-radius: 2px 0 0 2px;
+}
+
+.level-bar.indicator-discrete.fill-block.horizontal:last-child {
+    border-radius: 0 2px 2px 0;
+}
+
+.level-bar.indicator-discrete.fill-block.vertical:first-child {
+    border-radius: 2px 2px 0 0;
+}
+
+.level-bar.indicator-discrete.fill-block.vertical:last-child {
+    border-radius: 0 0 2px 2px;
+}
+*/
+
+.level-bar.fill-block.level-high {
+    border-color: shade(@success_color, 0.85);
+    background-image: linear-gradient(to bottom,
+                                      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);
+}
+
+.level-bar.fill-block.empty-fill-block:backdrop {
+    border-color: transparent;
+    background-color: transparent;
+}
+
+/************
+ * GtkScale *
+ ************/
+
+.scale {
+    -GtkScale-slider-length: 14;
+    -GtkRange-slider-width: 14;
+    -GtkRange-trough-border: 1;
+    -GtkWidget-focus-line-width: 0;
+}
+
+.scale.slider,
+.scale.slider:hover,
+.scale.slider:insensitive {
+    border-width: 1px;
+    border-radius: 8px;
+    border-style: none;
+    color: alpha(@theme_base_color, 0.0);
+    background-color: alpha(@theme_base_color, 0.0);
+    /* background-image in -assets variant */
+}
+
+.toolbar .scale.trough,
+.scale.trough {
+    margin: 7px 0;
+    background-image: -gtk-gradient (linear,
+                                     left top,
+                                     left bottom,
+                                     from (alpha (#000, 0.20)),
+                                     color-stop (0.20, alpha (#000, 0.16)),
+                                     to (alpha (#000, 0.06)));
+    border-style: none;
+    border-width: 0px;
+    border-radius: 8px;
+    box-shadow: inset  1px  1px alpha(#000, 0.08),
+                inset -1px -1px alpha(#000, 0.08);
+}
+
+.scale.trough.vertical {
+    margin: 0 7px;
+}
+
+.scale.trough:insensitive {
+    background-image: -gtk-gradient (linear,
+                                     left top,
+                                     left bottom,
+                                     from (alpha (#000, 0.03)),
+                                     to   (alpha (#000, 0.03)));
+}
+
+.scale.progressbar {
+    background-color: @scale_progress_fill;
+    border-width: 1px;
+    border-radius: 3px;
+    border-style: none;
+}
+
+.scale:insensitive,
+.vertical.scale:insensitive {
+    background-color: transparent;
+}
+
+.scale.mark {
+    color: mix(@theme_bg_color, @theme_text_color, 0.56);
+}
+
+.menubar .menuitem .scale.highlight.left,
+.scale.highlight.left {
+    background-image: -gtk-gradient (linear,
+                                     left top, left bottom,
+                                     from (shade (@scale_fill, 0.90)),
+                                     to (shade (@scale_fill, 1.31)));
+    border-style: none;
+    border-width: 0px;
+    border-radius: 8px;
+    box-shadow: inset  1px  1px alpha(#000, 0.08),
+                inset -1px -1px alpha(#000, 0.08);
+    color: @theme_selected_fg_color;
+    text-shadow: none;
+}
+
+.menubar .menuitem .scale.highlight.bottom,
+.scale.highlight.bottom {
+    background-image: -gtk-gradient (linear,
+                                     left top, right top,
+                                     from (shade (@scale_fill, 0.90)),
+                                     to (shade (@scale_fill, 1.31)));
+    border-style: none;
+    border-width: 0px;
+    border-radius: 8px;
+    box-shadow: inset  1px  1px alpha(#000, 0.08),
+                inset -1px -1px alpha(#000, 0.08);
+    color: @theme_selected_fg_color;
+    text-shadow: none;
+}
+
+.scale.highlight.left:insensitive {
+    background-image: -gtk-gradient (linear, left top, left bottom,
+                                     from (shade (@theme_bg_color, 0.85)),
+                                     to (shade (@theme_bg_color, 0.85)));
+    box-shadow: inset  1px  1px alpha(#000, 0.02),
+                inset -1px -1px alpha(#000, 0.02);
+}
+
+.scale.highlight.bottom:insensitive {
+    background-image: -gtk-gradient (linear,  left top, right top,
+                                     from (shade (@theme_bg_color, 0.85)),
+                                     to (shade (@theme_bg_color, 0.85)));
+    box-shadow: inset  1px  1px alpha(#000, 0.02),
+                inset -1px -1px alpha(#000, 0.02);
+}
+
+/**********
+ * Frames *
+ **********/
+
+.frame {
+    padding: 2px;
+    border-width: 1px;
+    border-radius: 4px;
+    border-style: solid;
+    border-color: shade (@theme_bg_color, 0.85);
+    border-top-color: shade(@notebook_border, 1.25);
+    border-left-color: shade(@notebook_border, 1.25);
+    border-right-color: shade(@notebook_border, 1.25);
+    border-bottom-color: shade(@notebook_border, 1.25);
+    color: mix(@theme_selected_bg_color, @theme_fg_color, 0.70);
+}
+
+/* only render frames in a GtkScrolledWindow */
+GtkScrolledWindow.frame {
+    border-width: 1px;
+    border-radius: 0;
+    border-style: solid;
+    border-color: shade (@theme_bg_color, 0.85);
+    padding: 0px;
+}
+
+/***********
+ * Buttons *
+ ***********/
+
+.button.menuitem.menubar {
+    padding: 4px 8px;
+}
+
+.button {
+    padding: 4px;
+}
+
+.button {
+    transition: all 400ms ease-out;
+    -GtkButton-image-spacing: 4;
+    -GtkButton-interior-focus: true;
+    -GtkButton-default-border: 0;
+    -GtkButton-inner-border: 3;
+    -GtkArrow-arrow-scaling: 0.5;
+    background-image: -gtk-gradient (linear,
+                                     left top, left bottom,
+                                     from (@button_gradient1),
+                                     color-stop (0.48, @button_gradient2),
+                                     color-stop (0.52, @button_gradient3),
+                                     to   (@button_gradient4));
+    border-width: 1px;
+    border-radius: 6px;
+    border-style: solid;
+    /* outer */
+    border-top-color: transparent;
+    border-left-color: alpha (#000, 0.01);
+    border-right-color: alpha (#000, 0.01);
+    border-bottom-color: alpha (#000, 0.03);
+    box-shadow: inset  0px  2px alpha(#fff, 0.11),
+                inset  2px  0px alpha(#fff, 0.09),
+                inset -2px  0px alpha(#fff, 0.09),
+                inset  0px -2px alpha(#fff, 0.07),
+                inset  0px  1px alpha(shade(@button_border, 1.00), 0.70),
+                inset  1px  0px alpha(shade(@button_border, 0.94), 0.80),
+                inset -1px  0px alpha(shade(@button_border, 0.94), 0.80),
+                inset  0px -1px alpha(shade(@button_border, 0.88), 0.90);
+/* box-shadow Syntax */
+/* box-shadow: [ inset ] horizontal_offset vertical_offset [ blur_radius ] [ spread ] color */
+    color: @theme_fg_color;
+    text-shadow: 0px 1px @theme_shadow_color;
+}
+
+.button.default {
+    transition: all 400ms ease-out;
+    text-shadow: none;
+    color: @theme_fg_color;
+}
+
+/* ie. mate-control-center */
+.button.flat {
+    transition: all 400ms ease-out;
+    padding: 0px;
+    border-color: transparent;
+    background-color: transparent;
+    background-image: none;
+    box-shadow: inset 0 1px rgba(255,255,255,0), 0 1px rgba(255,255,255,0);
+    text-shadow: none;
+    icon-shadow: none;
+    border-image: none;
+}
+
+.button:hover {
+    background-image: -gtk-gradient (linear,
+                                     left top, left bottom,
+                                     from (shade(@button_gradient1, 1.03)),
+                                     color-stop (0.48, shade(@button_gradient2, 1.03)),
+                                     color-stop (0.52, shade(@button_gradient3, 1.03)),
+                                     to   (shade(@button_gradient4, 1.01)));
+    box-shadow: inset  0px  1px shade(@selected_bg_color, 1.05),
+                inset  1px  0px shade(@selected_bg_color, 0.97),
+                inset -1px  0px shade(@selected_bg_color, 0.93),
+                inset  0px -1px shade(@selected_bg_color, 0.93);
+}
+
+.button:active,
+.button:active:hover,
+.button:focus:active {
+    background-image: -gtk-gradient (linear,
+                                     left top, left bottom,
+                                     from (shade (@theme_bg_color, 1.20)),
+                                     color-stop (0.50, shade (@theme_bg_color, 1.00)),
+                                     color-stop (0.50, shade (@theme_bg_color, 0.95)),
+                                     to (shade (@theme_bg_color, 0.80)));
+    border-radius: 6px;
+    box-shadow: inset  0px  1px shade(@selected_bg_color, 1.05),
+                inset  1px  0px shade(@selected_bg_color, 0.97),
+                inset -1px  0px shade(@selected_bg_color, 0.93),
+                inset  0px -1px shade(@selected_bg_color, 0.93);
+}
+
+.button:focus,
+.button.default {
+    border-color: transparent;
+    box-shadow: inset  0px  1px shade(@selected_bg_color, 1.05),
+                inset  1px  0px shade(@selected_bg_color, 0.97),
+                inset -1px  0px shade(@selected_bg_color, 0.93),
+                inset  0px -1px shade(@selected_bg_color, 0.93);
+}
+
+.button:active,
+.button:active:hover {
+    color: @theme_fg_color;
+    text-shadow: 1px 1px @theme_shadow_color;
+}
+
+.button:insensitive {
+    background-image: none;
+    background-color: @insensitive_bg_color;
+    border-color: alpha (#000, 0.00);
+    border-bottom-color: alpha (#000, 0.00);
+    border-image: none;
+    box-shadow: inset  0px  1px @insensitive_border_color,
+                inset  1px  0px @insensitive_border_color,
+                inset -1px  0px @insensitive_border_color,
+                inset  0px -1px @insensitive_border_color;
+}
+
+.button:insensitive {
+    color: @insensitive_fg_color;
+    text-shadow: none;
+}
+
+.path-bar .button,
+.path-bar .button GtkImage,
+.path-bar .button GtkLabel {
+    padding: 2px;
+}
+
+.path-bar .button {
+    border-width: 1px 0px 1px 1px;
+}
+
+.path-bar .button:hover:active {
+    border-left-width: 1px;
+}
+
+.path-bar .button:first-child,
+.path-bar .button:first-child:hover:active {
+    border-right-width: 0px;
+}
+
+.path-bar .button:only-child,
+.path-bar .button:only-child:hover:active {
+    border-radius: 3px;
+    border-right-width: 1px;
+}
+
+.linked.raised .button:first-child,
+.linked.raised .button:first-child:hover:active {
+    border-right-width: 0px;
+}
+
+/***************************/
+/* Linked toolbars-buttons */
+/***************************/
+
+/* Middle toolbar-button */
+.toolbar.menubar .linked .button,
+.toolbar.menubar .linked .button:hover,
+.toolbar .button.raised.linked,
+.toolbar .raised.linked .button,
+.primary-toolbar .linked .button,
+.primary-toolbar .linked .entry,
+.toolbar.menubar .linked .button:active,
+.toolbar.menubar .linked .button:active:hover,
+.toolbar.menubar .linked .button:active:active,
+.toolbar .button.raised.linked:active,
+.toolbar .button.raised.linked:active:hover,
+.toolbar .button.raised.linked:active:active,
+.toolbar .raised.linked .button:active,
+.toolbar .raised.linked .button:hover,
+.toolbar .raised.linked .button:active:hover,
+.toolbar .raised.linked .button:active:active,
+.primary-toolbar .linked .button:active,
+.primary-toolbar .linked .button:active:hover,
+.primary-toolbar .linked .button:active:active,
+.toolbar.menubar .linked .button:insensitive,
+.toolbar .button.raised.linked:insensitive,
+.toolbar .raised.linked .button:insensitive,
+.primary-toolbar .linked .button:insensitive,
+.primary-toolbar .linked .entry:insensitive {
+    border-width: 1px;
+    border-right-width: 0px;
+    border-left-width:  0px;
+    border-radius: 0;
+    padding-left: 4px;
+    padding-right: 4px;
+}
+
+/* Middle toolbar-button hover */
+.toolbar.menubar .linked .button:hover,
+.toolbar .raised.linked .button:hover {
+    box-shadow: inset  0px  1px shade(@selected_bg_color, 1.05),
+                inset  1px  0px shade(@selected_bg_color, 0.97),
+                inset -1px  0px shade(@selected_bg_color, 0.93),
+                inset  0px -1px shade(@selected_bg_color, 0.93);
+}
+
+/* Middle toolbar-button active */
+.toolbar.menubar .linked .button:active,
+.toolbar.menubar .linked .button:active:hover,
+.toolbar.menubar .linked .button:active:active,
+.toolbar .button.raised.linked:active,
+.toolbar .button.raised.linked:active:hover,
+.toolbar .raised.linked .button:active:active,
+.toolbar .raised.linked .button:active,
+.primary-toolbar .linked .button:active,
+.primary-toolbar .linked .button:active:hover,
+.primary-toolbar .linked .button:active:active {
+    /* Remove right border */
+    box-shadow: inset  0px  1px shade(@selected_bg_color, 1.05),
+                inset  1px  0px shade(@selected_bg_color, 0.97),
+                inset -1px  0px shade(@selected_bg_color, 0.93),
+                inset  0px -1px shade(@selected_bg_color, 0.93);
+}
+
+/* Middle toolbar-button insensitive */
+.toolbar.menubar .linked .button:insensitive,
+.toolbar .button.raised.linked:insensitive,
+.toolbar .raised.linked .button:insensitive,
+.primary-toolbar .linked .button:insensitive,
+.primary-toolbar .linked .entry:insensitive {
+     /* remove outer */
+    border-color: alpha (#fff, 0.00);
+    /* Remove right border */
+    box-shadow: inset  0px  1px shade(@theme_button_border_dark, 1.10),
+                inset  1px  0px shade(@theme_button_border_dark, 1.05),
+                inset  0px -1px shade(@theme_button_border_dark, 1.00);
+}
+
+/* Leftmost toolbars-button */
+.toolbar.menubar .linked .button:first-child,
+.toolbar.menubar .linked .button:hover:first-child,
+.toolbar .button.raised.linked:first-child,
+.toolbar .raised.linked .button:first-child,
+.toolbar .raised.linked .button:hover:first-child
+.primary-toolbar .linked .button:first-child,
+.primary-toolbar .linked .entry:first-child,
+.toolbar.menubar .linked .button:active:first-child,
+.toolbar.menubar .linked .button:active:hover:first-child,
+.toolbar.menubar .linked .button:active:active:first-child,
+.toolbar .button.raised.linked:active:first-child,
+.toolbar .button.raised.linked:active:hover:first-child,
+.toolbar .button.raised.linked:active:active:first-child,
+.toolbar .raised.linked .button:active:first-child,
+.toolbar .raised.linked .button:active:hover:first-child,
+.toolbar .raised.linked .button:active:active:first-child,
+.primary-toolbar .linked .button:active:first-child,
+.primary-toolbar .linked .button:active:hover:first-child,
+.primary-toolbar .linked .button:active:active:first-child,
+.toolbar.menubar .linked .button:insensitive:first-child,
+.toolbar .button.raised.linked:insensitive:first-child,
+.toolbar .raised.linked .button:insensitive:first-child,
+.primary-toolbar .linked .button:insensitive:first-child,
+.primary-toolbar .linked .entry:insensitive:first-child {
+    border-width: 1px;
+    border-right-width: 0;
+    border-radius: 5px;
+    border-bottom-right-radius: 0;
+    border-top-right-radius: 0;
+    padding-left: 4px;
+    padding-right: 4px;
+}
+
+/* Leftmost toolbars-button hover */
+.toolbar.menubar .linked .button:hover:first-child,
+.toolbar .raised.linked .button:hover:first-child {
+    box-shadow: inset  0px  1px shade(@selected_bg_color, 1.05),
+                inset  1px  0px shade(@selected_bg_color, 0.97),
+                inset -1px  0px shade(@selected_bg_color, 0.93),
+                inset  0px -1px shade(@selected_bg_color, 0.93);
+}
+
+/* Leftmost toolbars-button active */
+.toolbar.menubar .linked .button:active:first-child,
+.toolbar.menubar .linked .button:active:hover:first-child,
+.toolbar.menubar .linked .button:active:active:first-child,
+.toolbar .button.raised.linked:active:first-child,
+.toolbar .button.raised.linked:active:hover:first-child,
+.toolbar .button.raised.linked:active:active:first-child,
+.toolbar .raised.linked .button:active:first-child,
+.toolbar .raised.linked .button:active:hover:first-child,
+.toolbar .raised.linked .button:active:active:first-child,
+.primary-toolbar .linked .button:active:first-child,
+.primary-toolbar .linked .button:active:hover:first-child,
+.primary-toolbar .linked .button:active:active:first-child {
+    /* Remove right border */
+    box-shadow: inset  0px  1px shade(@selected_bg_color, 1.05),
+                inset  1px  0px shade(@selected_bg_color, 0.97),
+                inset -1px  0px shade(@selected_bg_color, 0.93),
+                inset  0px -1px shade(@selected_bg_color, 0.93);
+}
+
+/* Leftmost toolbars-button insensitive */
+.toolbar.menubar .linked .button:insensitive:first-child,
+.toolbar .button.raised.linked:insensitive:first-child,
+.toolbar .raised.linked .button:insensitive:first-child,
+.primary-toolbar .linked .button:insensitive:first-child,
+.primary-toolbar .linked .entry:insensitive:first-child {
+     /* remove outer */
+    border-color: alpha (#fff, 0.00);
+    /* Remove right border */
+    box-shadow: inset  0px  1px shade(@theme_button_border_dark, 1.10),
+                inset  1px  0px shade(@theme_button_border_dark, 1.05),
+                inset  0px -1px shade(@theme_button_border_dark, 1.00);
+}
+
+/* Rightmost toolbar-button */
+.toolbar.menubar .linked .button:last-child,
+.toolbar.menubar .linked .button:hover:last-child,
+.toolbar .button.raised.linked:last-child,
+.toolbar .raised.linked .button:last-child,
+.toolbar .raised.linked .button:hover:last-child,
+.primary-toolbar .linked .button:last-child,
+.primary-toolbar .linked .entry:last-child,
+.toolbar.menubar .linked .button:active:last-child,
+.toolbar.menubar .linked .button:active:hover:last-child,
+.toolbar.menubar .linked .button:active:active:last-child,
+.toolbar .button.raised.linked:active:last-child,
+.toolbar .button.raised.linked:active:hover:last-child,
+.toolbar .button.raised.linked:active:active:last-child,
+.toolbar .raised.linked .button:active:last-child,
+.toolbar .raised.linked .button:active:hover:last-child,
+.toolbar .raised.linked .button:active:active:last-child,
+.primary-toolbar .linked .button:active:last-child,
+.primary-toolbar .linked .button:active:hover:last-child,
+.primary-toolbar .linked .button:active:active:last-child,
+.toolbar.menubar .linked .button:insensitive:last-child,
+.toolbar .button.raised.linked:insensitive:last-child,
+.toolbar .raised.linked .button:insensitive:last-child,
+.primary-toolbar .linked .button:insensitive:last-child,
+.primary-toolbar .linked .entry:insensitive:last-child {
+    border-width: 1px;
+    border-left-width: 0px;
+    border-radius: 5px;
+    border-bottom-left-radius: 0;
+    border-top-left-radius: 0;
+    padding-left: 4px;
+    padding-right: 4px;
+}
+
+/* Rightmost toolbars-button hover */
+.toolbar.menubar .linked .button:hover:last-child,
+.toolbar .raised.linked .button:hover:last-child {
+    box-shadow: inset  0px  1px shade(@selected_bg_color, 1.05),
+                inset  1px  0px shade(@selected_bg_color, 0.97),
+                inset -1px  0px shade(@selected_bg_color, 0.93),
+                inset  0px -1px shade(@selected_bg_color, 0.93);
+}
+
+/* Rightmost toolbar-button active */
+.toolbar.menubar .linked .button:active:last-child,
+.toolbar.menubar .linked .button:active:hover:last-child,
+.toolbar.menubar .linked .button:active:active:last-child,
+.toolbar .button.raised.linked:active:last-child,
+.toolbar .button.raised.linked:active:hover:last-child,
+.toolbar .button.raised.linked:active:active:last-child,
+.toolbar .raised.linked .button:active:last-child,
+.toolbar .raised.linked .button:active:hover:last-child,
+.toolbar .raised.linked .button:active:active:last-child,
+.primary-toolbar .linked .button:active:last-child,
+.primary-toolbar .linked .button:active:hover:last-child,
+.primary-toolbar .linked .button:active:active:last-child {
+    box-shadow: inset  0px  1px shade(@selected_bg_color, 1.05),
+                inset  1px  0px shade(@selected_bg_color, 0.97),
+                inset -1px  0px shade(@selected_bg_color, 0.93),
+                inset  0px -1px shade(@selected_bg_color, 0.93);
+}
+
+/* Rightmost toolbar-button insensitive */
+.toolbar.menubar .linked .button:insensitive:last-child,
+.toolbar .button.raised.linked:insensitive:last-child,
+.toolbar .raised.linked .button:insensitive:last-child,
+.primary-toolbar .linked .button:insensitive:last-child,
+.primary-toolbar .linked .entry:insensitive:last-child {
+    border-color: alpha (#fff, 0.00); /* Quita outer */
+    box-shadow: inset  0px  1px shade(@theme_button_border_dark, 1.10),
+                inset  1px  0px shade(@theme_button_border_dark, 1.05),
+                inset -1px  0px shade(@theme_button_border_dark, 1.05),
+                inset  0px -1px shade(@theme_button_border_dark, 1.00);
+}
+
+/* Linked single toolbar-button */
+.toolbar.menubar .linked .button:only-child,
+.toolbar.menubar .linked .button:hover:only-child,
+.toolbar .button.raised.linked:only-child,
+.toolbar .raised.linked .button:only-child,
+.toolbar .raised.linked .button:hover:only-child,
+.primary-toolbar .linked .entry:only-child,
+.primary-toolbar .linked .button:only-child,
+.toolbar.menubar .linked .button:active:only-child,
+.toolbar.menubar .linked .button:active:hover:only-child,
+.toolbar.menubar .linked .button:active:active:only-child,
+.toolbar .button.raised.linked:active:only-child,
+.toolbar .raised.linked .button:active:only-child,
+.primary-toolbar .linked .button:active:only-child,
+.toolbar .button.raised.linked:active:hover:only-child,
+.toolbar .button.raised.linked:active:active:only-child,
+.toolbar .raised.linked .button:active:hover:only-child,
+.toolbar .raised.linked .button:active:active:only-child,
+.primary-toolbar .linked .button:active:hover:only-child,
+.primary-toolbar .linked .button:active:active:only-child,
+.toolbar.menubar .linked .button:insensitive:only-child,
+.toolbar .button.raised.linked:insensitive:only-child,
+.toolbar .raised.linked .button:insensitive:only-child,
+.primary-toolbar .linked .entry:insensitive:only-child,
+.primary-toolbar .linked .button:insensitive:only-child {
+    border-width: 1px;
+    border-radius: 5px;
+    padding-left: 4px;
+    padding-right: 4px;
+}
+
+/* Linked single toolbar-button normal */
+.toolbar.menubar .linked .button:only-child,
+.toolbar .button.raised.linked:only-child,
+.toolbar .raised.linked .button:only-child,
+.primary-toolbar .linked .entry:only-child,
+.primary-toolbar .linked .button:only-child {
+    box-shadow: inset  0px  2px alpha(#fff, 0.09),
+                inset  2px  0px alpha(#fff, 0.06),
+                inset -2px  0px alpha(#fff, 0.06),
+                inset  0px -2px alpha(#fff, 0.06),
+                inset  0px  1px shade(@theme_button_border_dark, 1.05),
+                inset  1px  0px shade(@theme_button_border_dark, 1.00),
+                inset -1px  0px shade(@theme_button_border_dark, 1.00),
+                inset  0px -1px shade(@theme_button_border_dark, 0.85);
+}
+
+/* Linked single toolbar-button hover */
+.toolbar .raised.linked .button:hover:only-child,
+.toolbar.menubar .linked .button:hover:only-child {
+    box-shadow: inset  0px  1px shade(@selected_bg_color, 1.05),
+                inset  1px  0px shade(@selected_bg_color, 0.97),
+                inset -1px  0px shade(@selected_bg_color, 0.93),
+                inset  0px -1px shade(@selected_bg_color, 0.93);
+}
+
+/* Linked single toolbar-button active */
+.toolbar.menubar .linked .button:active:only-child,
+.toolbar.menubar .linked .button:active:hover:only-child,
+.toolbar.menubar .linked .button:active:active:only-child,
+.toolbar .button.raised.linked:active:only-child,
+.toolbar .button.raised.linked:active:hover:only-child,
+.toolbar .button.raised.linked:active:active:only-child,
+.toolbar .raised.linked .button:active:only-child,
+.toolbar .raised.linked .button:active:hover:only-child,
+.toolbar .raised.linked .button:active:active:only-child,
+.primary-toolbar .linked .button:active:only-child,
+.primary-toolbar .linked .button:active:hover:only-child,
+.primary-toolbar .linked .button:active:active:only-child {
+    box-shadow: inset  0px  1px shade(@selected_bg_color, 1.05),
+                inset  1px  0px shade(@selected_bg_color, 0.97),
+                inset -1px  0px shade(@selected_bg_color, 0.93),
+                inset  0px -1px shade(@selected_bg_color, 0.93);
+}
+
+/* Linked single toolbar-button insensitive */
+.toolbar.menubar .linked .button:insensitive:only-child,
+.toolbar .button.raised.linked:insensitive:only-child,
+.toolbar .raised.linked .button:insensitive:only-child,
+.primary-toolbar .linked .entry:insensitive:only-child,
+.primary-toolbar .linked .button:insensitive:only-child {
+    border-color: alpha (#fff, 0.00); /* Quita outer */
+    box-shadow: inset  0px  1px shade(@theme_button_border_dark, 1.10),
+                inset  1px  0px shade(@theme_button_border_dark, 1.05),
+                inset -1px  0px shade(@theme_button_border_dark, 1.05),
+                inset  0px -1px shade(@theme_button_border_dark, 1.00);
+}
+
+/* nth-child for linked areas */
+.toolbar .raised.linked.button,
+.toolbar .raised.linked.button:active,
+.toolbar .raised.linked.button:active:hover,
+.toolbar .raised.linked .button,
+.toolbar .raised.linked .button:active,
+.toolbar .raised.linked .button:active:hover {
+}
+
+.toolbar .raised.linked.button:nth-child(first) ,
+.toolbar .raised.linked.button:active:nth-child(first),
+.toolbar .raised.linked.button:active:hover:nth-child(first),
+.toolbar .raised.linked:nth-child(first) .button,
+.toolbar .raised.linked:nth-child(first) .button:active,
+.toolbar .raised.linked:nth-child(first) .button:active:hover {
+}
+
+.toolbar .raised.linked.button:nth-child(last),
+.toolbar .raised.linked.button:active:nth-child(last),
+.toolbar .raised.linked.button:active:hover:nth-child(last),
+.toolbar .raised.linked:nth-child(last) .button,
+.toolbar .raised.linked:nth-child(last) .button:active,
+.toolbar .raised.linked:nth-child(last) .button:active:hover {
+}
+
+/***************************/
+/* Linked standard buttons */
+/***************************/
+
+.linked .entry,
+.linked .button,
+.linked .button:active,
+.linked .button:active:hover,
+.linked .button:focus,
+.linked .button:focus:active,
+.linked .button:insensitive {
+    padding-left: 5px;
+    padding-right: 5px;
+    border-width: 1px 1px 2px 1px;
+    border-radius: 6px;
+}
+
+/* default button */
+.linked .button.default:focus,
+.linked .button.default,
+.linked .button.default:focus:first-child,
+.linked .button.default:first-child {
+    box-shadow: inset  0px  1px shade(@selected_bg_color, 1.05),
+                inset  1px  0px shade(@selected_bg_color, 0.97),
+                inset -1px  0px rgba(255,255,255,0), 0 1px rgba(255,255,255,0),
+                inset  0px -1px shade(@selected_bg_color, 0.93);
+}
+
+.linked .button.default:focus:last-child,
+.linked .button.default:last-child,
+.linked .button.default:focus:only-child,
+.linked .button.default:only-child {
+    box-shadow: inset  0px  1px shade(@selected_bg_color, 1.05),
+                inset  1px  0px shade(@selected_bg_color, 0.97),
+                inset -1px  0px shade(@selected_bg_color, 0.93),
+                inset  0px -1px shade(@selected_bg_color, 0.93);
+}
+
+/* Middle button */
+.linked .entry,
+.linked .button,
+.linked .button:focus,
+.linked .button:insensitive {
+    border-right-width: 0px;
+    border-left-width: 0px;
+    border-width: 1px 0;
+    border-radius: 0;
+    padding: 5px 2px;
+    box-shadow: inset  0px  1px alpha(shade(@button_border, 1.00), 0.70),
+                inset  1px  0px alpha(shade(@button_border, 0.94), 0.80),
+                inset -1px  0px rgba(255,255,255,0), 0 1px rgba(255,255,255,0),
+                inset  0px -1px alpha(shade(@button_border, 0.88), 0.90);
+}
+
+/* Middle Button active */
+.linked .button:active,
+.linked .button:focus:active {
+    background-image: -gtk-gradient (linear,
+                                     left top, left bottom,
+                                     from (shade (@theme_bg_color, 1.20)),
+                                     color-stop (0.50, shade (@theme_bg_color, 1.00)),
+                                     color-stop (0.50, shade (@theme_bg_color, 0.95)),
+                                     to (shade (@theme_bg_color, 0.80)));
+    box-shadow: inset  0px  1px shade(@selected_bg_color, 1.05),
+                inset  1px  0px shade(@selected_bg_color, 0.97),
+                inset -1px  0px rgba(255,255,255,0), 0 1px rgba(255,255,255,0),
+                inset  0px -1px shade(@selected_bg_color, 0.93);
+    background-color: transparent;
+    border-right-width: 0px;
+    border-left-width: 0px;
+    border-width: 1px 0;
+    border-radius: 0;
+    padding: 5px 2px;
+    color: @theme_fg_color;
+    text-shadow: none;
+}
+
+/* Middle button hover */
+.linked .button:hover,
+.linked .button:active:hover {
+    background-image: -gtk-gradient (linear,
+                                     left top, left bottom,
+                                     from (shade(@button_gradient1, 1.03)),
+                                     color-stop (0.48, shade(@button_gradient2, 1.03)),
+                                     color-stop (0.52, shade(@button_gradient3, 1.03)),
+                                     to   (shade(@button_gradient4, 1.01)));
+    background-color: transparent;
+    border-right-width: 0px;
+    border-left-width: 0px;
+    border-width: 1px 0;
+    border-radius: 0;
+    padding: 5px 2px;
+    box-shadow: inset  0px  1px shade(@selected_bg_color, 1.05),
+                inset  1px  0px shade(@selected_bg_color, 0.97),
+                inset -1px  0px rgba(255,255,255,0), 0 1px rgba(255,255,255,0),
+                inset  0px -1px shade(@selected_bg_color, 0.93);
+    color: @theme_fg_color;
+    text-shadow: none;
+}
+
+.linked .button,
+.linked .button:hover,
+.linked .button:focus,
+.linked .button:focus:active,
+.linked .button:active,
+.linked .button:active:hover,
+.linked .button:insensitive {
+    padding: 4px 2px;
+}
+
+/* Leftmost button */
+.linked .entry:first-child,
+.linked .button:first-child,
+.linked .button:focus:first-child,
+.linked .button:insensitive:first-child {
+    border-radius: 6px 0 0 6px;
+    border-width: 1px;
+    border-right-width: 0;
+    padding: 5px 2px;
+    box-shadow: inset  0px  1px alpha(shade(@button_border, 1.00), 0.70),
+                inset  1px  0px alpha(shade(@button_border, 0.94), 0.80),
+                inset -1px  0px rgba(255,255,255,0), 0 1px rgba(255,255,255,0),
+                inset  0px -1px alpha(shade(@button_border, 0.88), 0.90);
+}
+
+/* Leftmost button active */
+.linked .button:active:first-child,
+.linked .button:focus:active:first-child {
+    box-shadow: inset  0px  1px shade(@selected_bg_color, 1.05),
+                inset  1px  0px shade(@selected_bg_color, 0.97),
+                inset -1px  0px rgba(255,255,255,0), 0 1px rgba(255,255,255,0),
+                inset  0px -1px shade(@selected_bg_color, 0.93);
+    background-color: transparent;
+    border-radius: 6px 0 0 6px;
+    border-width: 1px;
+    border-right-width: 0;
+    padding: 5px 2px;
+    color: @theme_fg_color;
+    text-shadow: none;
+}
+
+/* Leftmost button hover */
+.linked .button:hover:first-child,
+.linked .button:active:hover:first-child {
+    background-color: transparent;
+    border-radius: 6px 0 0 6px;
+    border-width: 1px;
+    border-right-width: 0;
+    padding: 5px 2px;
+    box-shadow: inset  0px  1px shade(@selected_bg_color, 1.05),
+                inset  1px  0px shade(@selected_bg_color, 0.97),
+                inset -1px  0px rgba(255,255,255,0), 0 1px rgba(255,255,255,0),
+                inset  0px -1px shade(@selected_bg_color, 0.93);
+    color: @theme_fg_color;
+    text-shadow: none;
+}
+
+.linked .button:first-child,
+.linked .button:hover:first-child,
+.linked .button:focus:first-child,
+.linked .button:focus:active:first-child,
+.linked .button:active:first-child,
+.linked .button:active:hover:first-child,
+.linked .button:insensitive:first-child {
+    padding: 4px 2px;
+}
+
+/* Rightmost button */
+.linked .entry:last-child,
+.linked .button:last-child,
+.linked .button:focus:last-child,
+.linked .button:insensitive:last-child {
+    border-width: 1px;
+    border-radius: 0 6px 6px 0;
+    border-left-width: 0;
+    padding: 5px 2px;
+    box-shadow: inset  0px  1px alpha(shade(@button_border, 1.00), 0.70),
+                inset  1px  0px alpha(shade(@button_border, 0.94), 0.80),
+                inset -1px  0px alpha(shade(@button_border, 0.94), 0.80),
+                inset  0px -1px alpha(shade(@button_border, 0.88), 0.90);
+}
+
+/* Rightmost button active */
+.linked .button:active:last-child,
+.linked .button:focus:active:last-child {
+    box-shadow: inset  0px  1px shade(@selected_bg_color, 1.05),
+                inset  1px  0px shade(@selected_bg_color, 0.97),
+                inset -1px  0px rgba(255,255,255,0), 0 1px rgba(255,255,255,0),
+                inset  0px -1px shade(@selected_bg_color, 0.93);
+    background-color: transparent;
+    border-width: 1px;
+    border-radius: 0 6px 6px 0;
+    border-left-width: 0;
+    padding: 5px 2px;
+    color: @theme_fg_color;
+    text-shadow: none;
+}
+
+/* Rightmost button hover */
+.linked .button:hover:last-child,
+.linked .button:active:hover:last-child {
+    background-color: transparent;
+    border-width: 1px;
+    border-radius: 0 6px 6px 0;
+    border-left-width: 0;
+    padding: 5px 2px;
+    box-shadow: inset  0px  1px shade(@selected_bg_color, 1.05),
+                inset  1px  0px shade(@selected_bg_color, 0.97),
+                inset -1px  0px shade(@selected_bg_color, 0.93),
+                inset  0px -1px shade(@selected_bg_color, 0.93);
+    color: @theme_fg_color;
+    text-shadow: none;
+}
+
+.linked .button:last-child,
+.linked .button:hover:last-child,
+.linked .button:focus:last-child,
+.linked .button:focus:active:last-child,
+.linked .button:active:last-child,
+.linked .button:active:hover:last-child,
+.linked .button:insensitive:last-child {
+    padding: 4px 2px;
+}
+
+/* Linked single button */
+.linked .entry:only-child,
+.linked .button:only-child,
+.linked .button:focus:only-child,
+.linked .button:insensitive:only-child {
+    background-image: none;
+    background-color: transparent;
+    padding-left: 6px;
+    padding-right: 6px;
+    border-width: 1px;
+    border-radius: 6px;
+    border-color: shade (@selected_bg_color, 1.05);
+}
+
+.linked .button:hover:only-child,
+.linked .button:active:only-child,
+.linked .button:active:hover:only-child,
+.linked .button:focus:active:only-child {
+    background-image: none;
+    background-color: transparent;
+    padding-left: 6px;
+    padding-right: 6px;
+    border-width: 1px;
+    border-radius: 6px;
+    box-shadow: inset  0px  1px shade(@selected_bg_color, 1.05),
+                inset  1px  0px shade(@selected_bg_color, 0.97),
+                inset -1px  0px shade(@selected_bg_color, 0.93),
+                inset  0px -1px shade(@selected_bg_color, 0.93);
+}
+
+.linked .button:only-child,
+.linked .button:hover:only-child,
+.linked .button:focus:only-child,
+.linked .button:focus:active:only-child,
+.linked .button:active:only-child,
+.linked .button:active:hover:only-child,
+.linked .button:insensitive:only-child {
+    padding: 4px 2px;
+}
+
+/* vertical */
+/* Middle button */
+
+.vertical.linked .button,
+.vertical.linked .button:focus,
+.vertical.linked .button:insensitive {
+    border-radius: 0px 0px 0 0;
+    border-width: 1px;
+    border-bottom-width: 0;
+    border-top-width: 0;
+    box-shadow: inset  0px  1px alpha(shade(@button_border, 1.00), 0.90),
+                inset  1px  0px alpha(shade(@button_border, 0.94), 0.90),
+                inset -1px  0px alpha(shade(@button_border, 0.88), 0.90),
+                inset  0px -1px alpha(shade(@button_border, 0.88), 0.90);
+}
+
+.vertical.linked .button:hover,
+.vertical.linked .button:active {
+    border-radius: 0px 0px 0 0;
+    border-width: 1px;
+    border-bottom-width: 0;
+    border-top-width: 0;
+    box-shadow: inset  0px  1px shade(@selected_bg_color, 1.05),
+                inset  1px  0px shade(@selected_bg_color, 0.97),
+                inset -1px  0px shade(@selected_bg_color, 0.93),
+                inset  0px -1px shade(@selected_bg_color, 0.93);
+}
+
+/* Top button */
+
+.vertical.linked .button:first-child,
+.vertical.linked .button:focus:first-child,
+.vertical.linked .button:insensitive:first-child {
+    border-radius: 6px 6px 0 0;
+    border-width: 1px;
+    border-bottom-width: 0;
+    box-shadow: inset  0px  1px alpha(shade(@button_border, 1.00), 0.70),
+                inset  1px  0px alpha(shade(@button_border, 0.94), 0.90),
+                inset  -1px 0px alpha(shade(@button_border, 0.88), 0.90);
+
+
+}
+
+.vertical.linked .button:hover:first-child,
+.vertical.linked .button:active:first-child {
+    border-radius: 6px 6px 0 0;
+    border-width: 1px;
+    border-bottom-width: 0;
+    box-shadow: inset  0px  1px shade(@selected_bg_color, 0.97),
+                inset  1px  0px shade(@selected_bg_color, 1.05),
+                inset  -1px 0px shade(@selected_bg_color, 0.93);
+
+}
+
+/* Bottom button */
+
+.vertical.linked .button:last-child,
+.vertical.linked .button:focus:last-child,
+.vertical.linked .button:insensitive:last-child {
+    border-radius: 0 0 6px 6px;
+    border-width: 1px;
+    border-top-width: 0;
+    box-shadow: inset  1px  0px alpha(shade(@button_border, 0.94), 0.90),
+                inset -1px  0px alpha(shade(@button_border, 0.94), 0.90),
+                inset  0px -1px alpha(shade(@button_border, 0.88), 0.70);
+}
+
+.vertical.linked .button:hover:last-child,
+.vertical.linked .button:active:last-child {
+    border-radius: 0 0 6px 6px;
+    border-width: 1px;
+    border-top-width: 0;
+    box-shadow: inset  1px  0px shade(@selected_bg_color, 0.97),
+                inset -1px  0px shade(@selected_bg_color, 0.93),
+                inset  0px -1px shade(@selected_bg_color, 0.93);
+}
+
+/* Single button */
+
+.vertical.linked .button:only-child,
+.vertical.linked .button:focus:only-child,
+.vertical.linked .button:insensitive:only-child {
+    border-radius: 6px 6px 6px 6px;
+    border-width: 1px;
+    padding-left: 6px;
+    padding-right: 6px;
+    box-shadow: inset  0px  1px alpha(shade(@button_border, 0.94), 0.90),
+                inset  1px  0px alpha(shade(@button_border, 0.94), 0.90),
+                inset -1px  0px alpha(shade(@button_border, 0.94), 0.90),
+                inset  0px -1px alpha(shade(@button_border, 0.94), 0.90);
+}
+
+.vertical.linked .button:hover:only-child,
+.vertical.linked .button:active:only-child {
+    border-radius: 6px 6px 6px 6px;
+    border-width: 1px;
+    padding-left: 6px;
+    padding-right: 6px;
+    box-shadow: inset  0px  1px shade(@selected_bg_color, 1.05),
+                inset  1px  0px shade(@selected_bg_color, 0.97),
+                inset -1px  0px shade(@selected_bg_color, 0.93),
+                inset  0px -1px shade(@selected_bg_color, 0.93);
+}
+
+/*************************/
+/* linked inline buttons */
+/*************************/
+
+/* Middle button */
+.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 {
+    /* outer */
+    border-width: 0px;
+    border-right-width: 0px;
+    border-left-width: 0px;
+    border-radius: 0;
+    /* border and inset */
+    box-shadow: inset  0px  1px alpha(#fff, 0.09),
+                inset  2px  0px alpha(#fff, 0.07),
+                inset  1px  0px shade(@button_border, 1.10),
+                inset -1px  0px alpha(#fff, 0.07),
+                inset  0px -1px alpha(#fff, 0.05);
+}
+
+.inline-toolbar.toolbar .button:active,
+.inline-toolbar.toolbar GtkToolButton > .button:active {
+    background-color: transparent;
+    box-shadow: inset  0px  1px alpha(#000, 0.05),
+                inset  2px  0px alpha(#000, 0.03),
+                inset  1px  0px shade(@button_border, 0.80),
+                inset -1px  0px alpha(#000, 0.03),
+                inset  0px -1px alpha(#000, 0.02);
+}
+
+.inline-toolbar.toolbar .button:insensitive,
+.inline-toolbar.toolbar GtkToolButton > .button:insensitive {
+    box-shadow: inset  1px  0px shade(@button_border, 1.10);
+}
+
+/* Leftmost button */
+.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-width: 0px;
+    border-radius: 0px;
+    box-shadow: inset  0px  1px alpha(#fff, 0.09),
+                inset  1px  0px alpha(#fff, 0.07),
+                inset -1px  0px alpha(#fff, 0.07),
+                inset  0px -1px alpha(#fff, 0.05);
+}
+
+.inline-toolbar.toolbar .button:active:first-child,
+.inline-toolbar.toolbar GtkToolButton:first-child > .button:active {
+    background-color: transparent;
+    box-shadow: inset  0px  1px alpha(#000, 0.05),
+                inset  1px  0px alpha(#000, 0.03),
+                inset -1px  0px alpha(#000, 0.03),
+                inset  0px -1px alpha(#000, 0.02);
+}
+
+.inline-toolbar.toolbar .button:insensitive:first-child,
+.inline-toolbar.toolbar GtkToolButton:first-child > .button:insensitive {
+    box-shadow: none;
+}
+
+/* Rightmost button */
+.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-width: 0px;
+    border-radius: 0px;
+    box-shadow: inset  0px  1px alpha(#fff, 0.09),
+                inset  2px  0px alpha(#fff, 0.07),
+                inset  1px  0px shade(@button_border, 1.10),
+                inset -2px  0px alpha(#fff, 0.07),
+                inset -1px  0px shade(@button_border, 1.10),
+                inset  0px -1px alpha(#fff, 0.05);
+}
+
+.inline-toolbar.toolbar .button:active:last-child,
+.inline-toolbar.toolbar GtkToolButton:last-child > .button:active {
+    background-color: transparent;
+    box-shadow: inset  0px  1px alpha(#000, 0.05),
+                inset  2px  0px alpha(#000, 0.03),
+                inset  1px  0px shade(@button_border, 0.80),
+                inset -2px  0px alpha(#000, 0.03),
+                inset -1px  0px shade(@button_border, 0.80),
+                inset  0px -1px alpha(#000, 0.02);
+}
+
+.inline-toolbar.toolbar .button:insensitive:last-child,
+.inline-toolbar.toolbar GtkToolButton:last-child > .button:insensitive {
+    box-shadow: inset  1px  0px shade(@button_border, 1.10),
+                inset -1px  0px shade(@button_border, 1.10);
+}
+
+/* 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-radius: 0px;
+    border-width: 0px;
+    box-shadow: inset  0px  1px alpha(#fff, 0.09),
+                inset -1px  0px alpha(#fff, 0.07),
+                inset  0px -1px alpha(#fff, 0.05),
+                inset  1px  0px shade(@button_border, 1.10);
+}
+
+.inline-toolbar.toolbar .button:active:only-child,
+.inline-toolbar.toolbar GtkToolButton:only-child > .button:active {
+    background-color: transparent;
+    box-shadow: inset  0px  1px alpha(#000, 0.05),
+                inset -1px  0px alpha(#000, 0.03),
+                inset  0px -1px alpha(#000, 0.02),
+                inset  1px  0px shade(@button_border, 0.80);
+}
+
+.inline-toolbar.toolbar .button:insensitive:only-child,
+.inline-toolbar.toolbar GtkToolButton:only-child > .button:insensitive {
+    box-shadow: inset  1px  0px shade(@button_border, 1.10);
+}
+
+/**************
+ * ComboBoxes *
+ **************/
+
+GtkComboBox {
+    padding: 0px;
+    -GtkWidget-focus-padding: 0;
+    -GtkWidget-focus-line-width: 0;
+    -GtkComboBox-arrow-scaling: 0.5;
+    -GtkComboBox-shadow-type: none;
+}
+
+GtkComboBox .cell {
+    /* color combobox read-only */
+    color: @theme_fg_color;
+    text-shadow: 0 1px @theme_shadow_color;
+}
+
+GtkComboBox .separator {
+    /* always disable separators */
+    -GtkWidget-wide-separators: true;
+    -GtkWidget-horizontal-separator: 0;
+    -GtkWidget-vertical-separator: 0;
+}
+
+GtkComboBox .entry,
+GtkComboBox .entry:nth-child(first) {
+    border-width: 2px 0px 2px 2px; /* remove right-outer */
+    border-radius: 4px 0px 0px 4px;
+    /* remove right-border */
+    box-shadow: inset  0px  3px alpha(#000, 0.03),
+                inset  0px  2px alpha(#000, 0.05),
+                inset  2px  0px alpha(#000, 0.04),
+                inset -1px  0px alpha(#000, 0.04),
+                inset  0px -2px alpha(#000, 0.03),
+                inset  0px  1px shade(@button_border, 0.90),
+                inset  1px  0px shade(@button_border, 0.99),
+                inset  0px -1px shade(@button_border, 1.10);
+}
+
+GtkComboBox .entry:focus {
+    border-width: 2px 0px 2px 2px; /* remove right-outer */
+    /* border */
+    box-shadow: inset  0px  3px alpha(#000, 0.03),
+                inset  0px  2px alpha(#000, 0.05),
+                inset  2px  0px alpha(#000, 0.04),
+                inset -1px  0px alpha(#000, 0.04),
+                inset  0px -2px alpha(#000, 0.03),
+                inset  0px  1px alpha(@focused_entry_border, 0.95),
+                inset  1px  0px alpha(@focused_entry_border, 0.95),
+                inset  0px -1px alpha(@focused_entry_border, 0.95);
+}
+
+/* for RTL languages */
+GtkComboBox .entry:nth-child(last) {
+    border-width: 2px 2px 2px 0px;
+    border-radius: 0px 5px 5px 0px;
+    border-image-width: 2px 2px 2px 0px;
+}
+
+GtkComboBox .button {
+    color: @internal_element_color;
+    padding: 2px 3px 2px 6px;
+}
+
+GtkComboBox .button *:prelight {
+    color: @theme_text_color;
+}
+
+.toolbar GtkComboBox .cell {
+    /* color combobox read-only */
+    color: shade(@toolbar_fg_color, 0.94);
+    text-shadow: 0 1px @toolbar_shadow_color;
+}
+
+.primary-toolbar GtkComboBox .cell {
+    /* color combobox read-only */
+    color: shade(@theme_fg_dark_color, 0.94);
+    text-shadow: 0 1px @theme_shadow_dark_color;
+}
+
+.toolbar GtkComboBox .entry,
+.toolbar GtkComboBox .entry:focus {
+    border-width: 1px 0px 1px 1px; /* remove rightr */
+    border-top-color: shade(@toolbar_gradient_base, 0.60);
+    border-left-color: shade(@toolbar_gradient_base, 0.70);
+    border-bottom-color: shade(@toolbar_gradient_base, 0.80);
+    box-shadow: inset  0px  3px alpha(#000, 0.02),
+                inset  0px  2px alpha(#000, 0.04),
+                inset  0px  1px alpha(#000, 0.06),
+                inset  1px  0px alpha(#000, 0.05),
+                inset -1px  0px alpha(#000, 0.05);
+}
+
+.toolbar GtkComboBox.combobox-entry .button {
+    background-image: -gtk-gradient (linear,
+                                     left top, left bottom,
+                                     from (alpha(#fff, 0.04)),
+                                     to   (alpha(#000, 0.07)));
+    border-top-color: alpha (#000, 0.15);
+    border-left-color: alpha (#000, 0.20);
+    border-right-color: alpha (#000, 0.20);
+    border-bottom-color: alpha (#000, 0.25);
+}
+
+.toolbar GtkComboBox.combobox-entry .button:active {
+    background-image: -gtk-gradient (linear,
+                                     left top, left bottom,
+                                     from (alpha(#000, 0.20)),
+                                     to   (alpha(#000, 0.06)));
+    border-top-color: alpha (#000, 0.40);
+    border-left-color: alpha (#000, 0.31);
+    border-right-color: alpha (#000, 0.31);
+    border-bottom-color: alpha (#000, 0.22);
+    box-shadow: inset  0px  2px alpha(#000, 0.02),
+                inset  0px  1px alpha(#000, 0.06),
+                inset  2px  0px alpha(#000, 0.02),
+                inset  1px  0px alpha(#000, 0.04),
+                inset -2px  0px alpha(#000, 0.02),
+                inset -1px  0px alpha(#000, 0.04),
+                inset  0px -1px alpha(#fff, 0.01);
+}
+
+.toolbar GtkComboBox.combobox-entry .button,
+.toolbar GtkComboBox.combobox-entry .button:hover,
+.toolbar GtkComboBox.combobox-entry .button:active,
+.toolbar GtkComboBox.combobox-entry .button:insensitive,
+.toolbar GtkComboBox.combobox-entry .button:nth-child(last),
+.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,
+.primary-toolbar GtkComboBox.combobox-entry .button:nth-child(last) {
+    border-top-left-radius: 0px;
+    border-bottom-left-radius: 0px;
+    border-top-right-radius: 4px;
+    border-bottom-right-radius: 4px;
+    border-width: 1px 1px 1px 1px;
+    padding: 2px 3px;
+}
+
+GtkComboBox.combobox-entry .button,
+GtkComboBox.combobox-entry .button:hover,
+GtkComboBox.combobox-entry .button:active,
+GtkComboBox.combobox-entry .button:insensitive,
+GtkComboBox.combobox-entry .button:nth-child(last) {
+    border-color: transparent;
+    border-top-left-radius: 0px;
+    border-bottom-left-radius: 0px;
+    border-top-right-radius: 5px;
+    border-bottom-right-radius: 5px;
+    border-width: 2px 2px 2px 0px;
+    padding: 2px 3px;
+}
+
+GtkComboBox.combobox-entry .button:hover {
+    border-top-left-radius: 0px;
+    border-bottom-left-radius: 0px;
+    border-top-right-radius: 5px;
+    border-bottom-right-radius: 5px;
+    border-width: 2px 2px 2px 0px;
+    box-shadow: inset  0px  1px shade(@selected_bg_color, 1.05),
+                inset  1px  0px shade(@selected_bg_color, 0.97),
+                inset -1px  0px shade(@selected_bg_color, 0.93),
+                inset  0px -1px shade(@selected_bg_color, 0.93);
+    border-color: transparent;
+}
+
+/* for RTL languages */
+GtkComboBox.combobox-entry .button:nth-child(first) {
+    border-width: 2px 0px 2px 2px;
+    border-radius: 4px 0px 0px 4px;
+}
+
+.primary-toolbar GtkComboBox.combobox-entry .button:nth-child(first) {
+    border-width: 1px 0px 1px 1px;
+    border-radius: 4px 0px 0px 4px;
+}
+
+GtkComboBox.combobox-entry .button:active,
+GtkComboBox.combobox-entry .button:prelight {
+    color: @internal_element_prelight;
+}
+
+.toolbar GtkComboBox.combobox-entry .button:active,
+.toolbar GtkComboBox.combobox-entry .button:prelight,
+.primary-toolbar GtkComboBox.combobox-entry .button:active,
+.primary-toolbar GtkComboBox.combobox-entry .button:prelight {
+    color: @theme_text_dark_color;
+}
+
+/************
+ * Toolbars *
+ ************/
+
+.toolbar {
+    background-image: none;
+    background-color: alpha (@theme_base_color, 0.0);
+}
+
+.toolbar  {
+    padding: 2px 4px;
+    background-color: @toolbar_gradient_base;
+    background-image: -gtk-gradient (linear,
+                                     left top, left bottom,
+                                     from (@toolbar_gradient_base),
+                                     to   (@toolbar_gradient_base));
+    border-width: 0 0 1px 0;
+    border-radius: 0px;
+    border-style: solid;
+    border-bottom-color: shade(@toolbar_gradient_base, 0.90);
+    color: @toolbar_fg_color;
+}
+
+/********************
+ * Menubar Toolbars *
+ ********************/
+
+.toolbar.menubar {
+    padding: 2px 4px 5px 3px;
+    background-image: -gtk-gradient (linear,
+                                     left top, left bottom,
+                                     from (shade (@theme_bg_dark_color, 1.00)),
+                                     to (shade (@theme_bg_dark_color, 0.95)));
+    border-image: none;
+    border-width: 0px 0px 1px 0px;
+    border-radius: 0px;
+    border-style: solid;
+    border-color: shade (@theme_bg_dark_color, 0.72);
+    color: @theme_fg_dark_color;
+    box-shadow: none;
+    -GtkToolbar-button-relief: normal;
+}
+
+/********************
+ * Primary Toolbars *
+ ********************/
+
+/* 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 {
+   background-image: -gtk-gradient (linear,
+                                     left top, left bottom,
+                                     from (shade(@theme_bg_dark_color, 1.00)),
+                                     to   (shade(@theme_bg_dark_color, 0.95)));
+    border-image: none;
+    border-width: 0px 0px 1px 0px;
+    border-radius: 0px;
+    border-style: solid;
+    border-color: transparent;
+    padding: 3px;
+    box-shadow: none;
+    -GtkWidget-window-dragging: true;
+    -GtkToolbar-button-relief: normal;
+    color: @theme_fg_dark_color;
+}
+
+.primary-toolbar .toolbar:insensitive,
+.primary-toolbar.toolbar:insensitive {
+    background-image: none;
+    background-color: shade (@theme_bg_dark_color, 0.97);
+    border-image: none;
+    border-style: solid;
+    border-color: transparent;
+}
+
+/* primary toolbar buttons */
+.toolbar .button,
+.primary-toolbar .toolbar .button,
+.primary-toolbar.toolbar .button {
+    -GtkWidget-focus-line-width: 0;
+    border-image: none;
+    border-style: solid;
+    border-radius: 5px;
+    border-color: transparent;
+    box-shadow: none;
+    background-image: none;
+    background-color: alpha (@theme_base_color, 0.0);
+    padding: 2px 4px;
+}
+
+.toolbar .button {
+    color: shade(@toolbar_fg_color, 1.00);
+    text-shadow: 0px 1px @toolbar_shadow_color;
+}
+
+.toolbar GtkComboBox .button {
+    /* color combobox read-only */
+    color: shade(@toolbar_fg_color, 1.00);
+    text-shadow: 0px 1px @toolbar_shadow_color;
+    background-image: -gtk-gradient (linear,
+                                     left top, left bottom,
+                                     from (alpha(#fff, 0.04)),
+                                     to   (alpha(#000, 0.06)));
+    border-top-color: alpha (#000, 0.15);
+    border-left-color: alpha (#000, 0.20);
+    border-right-color: alpha (#000, 0.20);
+    border-bottom-color: alpha (#000, 0.25);
+}
+
+.primary-toolbar .toolbar .button,
+.primary-toolbar.toolbar .button {
+    color: @theme_fg_dark_color;
+    text-shadow: 0px 1px @theme_shadow_dark_color;
+}
+
+.toolbar .button:insensitive,
+.primary-toolbar .toolbar .button:insensitive,
+.primary-toolbar.toolbar .button:insensitive {
+    background-image: none;
+    background-color: alpha (@theme_base_color, 0.0);
+    border-color: transparent;
+    /* -GtkWidget-focus-line-width: 0; */
+}
+
+.toolbar .button:insensitive {
+    color: mix(@toolbar_gradient_base, @toolbar_fg_color, 0.60);
+    text-shadow: none;
+}
+
+.primary-toolbar .toolbar .button:insensitive,
+.primary-toolbar.toolbar .button:insensitive {
+    color: mix(@theme_bg_dark_color, @theme_fg_dark_color, 0.60);
+    text-shadow: none;
+}
+
+.toolbar .button:hover {
+    background-image: -gtk-gradient (linear,
+                                     left top, left bottom,
+                                     from (alpha(#fff, 0.03)),
+                                     to   (alpha(#000, 0.08)));
+    box-shadow: inset  0px  1px shade(@selected_bg_color, 1.05),
+                inset  1px  0px shade(@selected_bg_color, 0.97),
+                inset -1px  0px shade(@selected_bg_color, 0.93),
+                inset  0px -1px shade(@selected_bg_color, 0.93);
+}
+
+.primary-toolbar .toolbar .button:hover,
+.primary-toolbar.toolbar .button:hover {
+    background-image: -gtk-gradient (linear,
+                                     left top, left bottom,
+                                     from (shade(@menu_bg_dark_color, 2.03)),
+                                     to   (shade(@menu_bg_dark_color, 1.17)));
+    border-style: solid;
+    border-color: transparent;
+    box-shadow: inset  0px  1px shade(@selected_bg_color, 1.05),
+                inset  1px  0px shade(@selected_bg_color, 0.97),
+                inset -1px  0px shade(@selected_bg_color, 0.93),
+                inset  0px -1px shade(@selected_bg_color, 0.93);
+}
+
+.toolbar .button:active,
+.toolbar .button:active:hover,
+.toolbar .button:active:active {
+
+    background-image: -gtk-gradient (linear,
+                                     left top, left bottom,
+                                     from (alpha(#000, 0.20)),
+                                     to   (alpha(#000, 0.06)));
+    border-width: 1px;
+    border-radius: 5px;
+    border-color: transparent;
+    box-shadow: inset  0px  1px shade(@selected_bg_color, 1.05),
+                inset  1px  0px shade(@selected_bg_color, 0.97),
+                inset -1px  0px shade(@selected_bg_color, 0.93),
+                inset  0px -1px shade(@selected_bg_color, 0.93);
+}
+
+.primary-toolbar .toolbar .button:active,
+.primary-toolbar.toolbar .button:active,
+.primary-toolbar .toolbar .button:active:hover,
+.primary-toolbar.toolbar .button:active:hover,
+.primary-toolbar .toolbar .button:active:active,
+.primary-toolbar.toolbar .button:active:active {
+    background-image: -gtk-gradient (linear,
+                                     left top, left bottom,
+                                     from (shade(@menu_bg_dark_color, 2.03)),
+                                     to   (shade(@menu_bg_dark_color, 1.17)));
+    border-image: none;
+    border-color: transparent;
+    border-width: 1px;
+    border-radius: 5px;
+    border-style: solid;
+    box-shadow: inset  0px  1px shade(@selected_bg_color, 1.05),
+                inset  1px  0px shade(@selected_bg_color, 0.97),
+                inset -1px  0px shade(@selected_bg_color, 0.93),
+                inset  0px -1px shade(@selected_bg_color, 0.93);
+}
+
+.toolbar .button:hover,
+.toolbar .button:active {
+/* edge */
+    color: @theme_fg_dark_color;
+    text-shadow: 0px 1px @theme_shadow_dark_color;
+}
+
+/* arrangement epiphany (toolbar.menubar) */
+.primary-toolbar .toolbar .button:hover,
+.primary-toolbar.toolbar .button:hover,
+.primary-toolbar .toolbar .button:active,
+.primary-toolbar.toolbar .button:active,
+.primary-toolbar .toolbar .button:active:hover,
+.primary-toolbar.toolbar .button:active:hover,
+.primary-toolbar .toolbar .button:active:active,
+.primary-toolbar.toolbar .button:active:active {
+    color: @theme_fg_dark_color;
+    text-shadow: 0px 1px @theme_shadow_dark_color;
+}
+
+.toolbar .button:active:insensitive,
+.primary-toolbar .toolbar .button:active:insensitive,
+.primary-toolbar.toolbar .button:active:insensitive {
+    background-image: none;
+    background-color: alpha (@theme_base_color, 0.0);
+    border-color: transparent;
+    icon-shadow: none;
+    text-shadow: none;
+}
+
+.toolbar GtkLabel {
+/* problem with button-menu-menuitem nautilus
+    color: shade(@theme_fg_color, 1.10);
+    text-shadow: 0px 1px @theme_shadow_color;
+*/
+}
+
+.toolbar.menubar GtkLabel,
+.primary-toolbar .toolbar GtkLabel,
+.primary-toolbar.toolbar GtkLabel {
+    color: @theme_fg_dark_color;
+    text-shadow: 0px 1px @theme_shadow_dark_color;
+}
+
+.toolbar GtkSeparatorToolItem,
+.toolbar .separator,
+.toolbar .separator:insensitive {
+    border-color: alpha (#000, 0.24);
+    border-bottom-color: alpha (#fff, 0.08);
+    border-right-color: alpha (#fff, 0.08);
+}
+
+/************************************
+    primary toolbar raised buttons
+*************************************/
+
+.toolbar .raised .button,
+.toolbar .raised.button {
+    padding: 2px;
+}
+
+.toolbar .raised .button,
+.toolbar .raised.button,
+.toolbar .raised .button:first-child,
+.toolbar .raised.button:first-child,
+.toolbar .raised .button:last-child,
+.toolbar .raised.button:last-child,
+.toolbar .raised .button:only-child,
+.toolbar .raised.button:only-child {
+    padding: 2px 4px;
+}
+
+.toolbar.menubar .button {
+    padding: 2px 2px;
+}
+
+.toolbar.menubar .linked .button {
+    padding: 3px 4px;
+}
+
+.toolbar.menubar .button {
+    padding: 2px 4px;
+}
+
+.toolbar NautilusPathBar .button,
+.toolbar.menubar .button,
+.toolbar .raised .button,
+.toolbar .raised.button {
+    background-image: -gtk-gradient (linear,
+                                     left top, left bottom,
+                                     from (@button_raised_gradient_color_a),
+                                     to   (@button_raised_gradient_color_b));
+    border-style: solid;
+    border-color: transparent;
+    -GtkWidget-focus-line-width: 0;
+    color: shade(@theme_fg_dark_color, 1.00);
+}
+
+.toolbar NautilusPathBar .button:insensitive,
+.toolbar .button.raised.linked:insensitive,
+.toolbar .raised.linked .button:insensitive,
+.toolbar .button.raised.linked:insensitive:active,
+.toolbar .raised.linked .button:insensitive:active,
+.toolbar.menubar .button:insensitive,
+.toolbar.menubar .button:insensitive:active,
+.toolbar .raised .button:insensitive,
+.toolbar .raised.button:insensitive,
+.toolbar .raised .button:insensitive:active,
+.toolbar .raised.button:insensitive:active {
+    background-image: -gtk-gradient (linear,
+                                     left top, left bottom,
+                                     from (shade(@button_raised_gradient_color_a, 0.88)),
+                                     to   (shade(@button_raised_gradient_color_b, 1.00)));
+    border-color: transparent;
+    box-shadow: none;
+    color: mix(@theme_bg_dark_color, @theme_fg_dark_color, 0.50);
+}
+
+.toolbar NautilusPathBar .button:hover,
+.toolbar.menubar .button:hover,
+.toolbar .raised .button:hover,
+.toolbar .raised.button:hover {
+    background-image: -gtk-gradient (linear,
+                                     left top, left bottom,
+                                     from (shade(@menu_bg_dark_color, 2.03)),
+                                     to   (shade(@menu_bg_dark_color, 1.17)));
+    border-image: none;
+    border-color: transparent;
+    box-shadow: inset  0px  1px shade(@selected_bg_color, 1.05),
+                inset  1px  0px shade(@selected_bg_color, 0.97),
+                inset -1px  0px shade(@selected_bg_color, 0.93),
+                inset  0px -1px shade(@selected_bg_color, 0.93);
+    color: shade(@theme_fg_dark_color, 1.00);
+}
+
+.toolbar NautilusPathBar .button:active,
+.toolbar.menubar .button:active,
+.toolbar .raised .button:active,
+.toolbar .raised .button:active:hover,
+.toolbar .raised.button:active:hover,
+.toolbar .raised.button:active {
+    background-image: -gtk-gradient (linear,
+                                     left top, left bottom,
+                                     from (shade(@menu_bg_dark_color, 2.03)),
+                                     to   (shade(@menu_bg_dark_color, 1.17)));
+    border-width: 1px;
+    border-style: solid;
+    border-radius: 5px;
+    border-image: none;
+    border-color: transparent;
+    box-shadow: inset  0px  1px shade(@selected_bg_color, 1.05),
+                inset  1px  0px shade(@selected_bg_color, 0.97),
+                inset -1px  0px shade(@selected_bg_color, 0.93),
+                inset  0px -1px shade(@selected_bg_color, 0.93);
+}
+
+/* setup shadows */
+.toolbar NautilusPathBar .button GtkLabel,
+.toolbar .raised .button GtkLabel,
+.toolbar .raised.button GtkLabel {
+    color: @theme_fg_dark_color;
+    text-shadow: 0px 1px @theme_shadow_dark_color;
+}
+
+.toolbar NautilusPathBar .button,
+.toolbar .raised .button,
+.toolbar .raised.button {
+    icon-shadow:  1px  1px @theme_shadow_dark_color;
+}
+
+.toolbar.menubar .button:active,
+.toolbar.menubar .button:hover,
+.toolbar .raised .button:hover,
+.toolbar .raised.button:hover,
+.toolbar .raised .button:active,
+.toolbar .raised.button:active,
+.toolbar .raised .button:active:hover,
+.toolbar .raised.button:active:hover {
+    color: @theme_text_dark_color;
+    text-shadow: 0px 1px @theme_shadow_dark_color;
+}
+
+.toolbar.menubar .button:insensitive,
+.toolbar .raised .button:insensitive,
+.toolbar .raised.button:insensitive {
+    icon-shadow: none;
+    text-shadow: none;
+    color: mix(@theme_bg_dark_color, @theme_fg_dark_color, 0.50);
+}
+
+.toolbar .entry {
+    padding: 4px 4px 4px 6px;
+    color: shade(@toolbar_fg_color, 1.0);
+    background-image: -gtk-gradient (linear,
+                                     left top, left bottom,
+                                     from (shade(@toolbar_gradient_base, 0.95)),
+                                     color-stop (0.15, shade(@toolbar_gradient_base, 1.10)),
+                                     to   (shade(@toolbar_gradient_base, 1.15)));
+}
+
+.toolbar .entry,
+.toolbar.menubar .entry,
+.toolbar .raised .entry,
+.toolbar .raised.entry,
+.primary-toolbar .toolbar .entry,
+.primary-toolbar.toolbar .entry {
+    padding: 4px 4px 4px 6px;
+    color: @entry_text_dark_color;
+    background-image: -gtk-gradient (linear,
+                                     left top, left bottom,
+                                     from (shade(@entry_bg_dark_color, 0.80)),
+                                     color-stop (0.15, shade(@entry_bg_dark_color, 0.95)),
+                                     to   (shade(@entry_bg_dark_color, 1.00)));
+    border-width: 2px;
+    border-style: solid;
+    border-radius: 5px;
+    border-top-color: transparent;
+    border-right-color: alpha(#fff, 0.02);
+    border-left-color: alpha(#fff, 0.02);
+    border-bottom-color: alpha(#fff, 0.07);
+    box-shadow: inset  0px  3px alpha(#000, 0.05),
+                inset  0px  2px alpha(#000, 0.07),
+                inset  2px  0px alpha(#000, 0.04),
+                inset -2px  0px alpha(#000, 0.04),
+                inset  0px -2px alpha(#000, 0.03),
+                inset  0px  1px shade(@theme_entry_border_dark, 0.90),
+                inset  1px  0px shade(@theme_entry_border_dark, 0.99),
+                inset -1px  0px shade(@theme_entry_border_dark, 0.99),
+                inset  0px -1px shade(@theme_entry_border_dark, 1.10);
+}
+
+.toolbar .entry:focus,
+.toolbar.menubar .entry:focus,
+.toolbar .raised .entry:focus,
+.toolbar .raised.entry:focus,
+.primary-toolbar .toolbar .entry:focus,
+.primary-toolbar.toolbar .entry:focus {
+    border-top-color: @focused_dark_entry_outer;
+    border-right-color: alpha(@focused_dark_entry_outer, 0.90);
+    border-left-color: alpha(@focused_dark_entry_outer, 0.90);
+    border-bottom-color: alpha(@focused_dark_entry_outer, 0.85);
+    box-shadow: inset  0px  3px alpha(#000, 0.03),
+                inset  0px  2px alpha(#000, 0.05),
+                inset  2px  0px alpha(#000, 0.04),
+                inset -2px  0px alpha(#000, 0.04),
+                inset  0px -2px alpha(#000, 0.03),
+                inset  0px  1px shade(@focused_dark_entry_border, 0.90),
+                inset  1px  0px shade(@focused_dark_entry_border, 0.95),
+                inset -1px  0px shade(@focused_dark_entry_border, 0.95),
+                inset  0px -1px shade(@focused_dark_entry_border, 1.00);
+}
+
+.toolbar .entry:selected,
+.toolbar.menubar .entry:selected,
+.toolbar .raised .entry:selected,
+.toolbar .raised.entry:selected,
+.primary-toolbar .toolbar .entry:selected,
+.primary-toolbar.toolbar .entry:selected {
+    background-color: @theme_selected_bg_color;
+    color: @theme_selected_fg_color;
+}
+
+/* progressbars on primary toolbar entries are special */
+.primary-toolbar .toolbar .entry.progressbar,
+.primary-toolbar.toolbar .entry.progressbar {
+    background-image: -gtk-gradient (linear,
+                                     left top, left bottom,
+                                     from (shade (@button_bg_active, 1.35)),
+                                     color-stop (0.7, shade (@button_bg_active, 1.15)),
+                                     to (shade (@button_bg_active, 1.35)));
+    border-width: 1px;
+    border-radius: 4px;
+    border-style: solid;
+    border-color: shade(@button_bg_active, 1.00);
+    border-image: none;
+    color: @theme_text_color;
+}
+
+/****************************
+ * Inline toolbars          *
+ ****************************
+ * Buttons + dialog open *
+ ****************************/
+
+.inline-toolbar.toolbar {
+    -GtkToolbar-button-relief: normal;
+    padding: 0px;
+    background-color: alpha(@button_base, 0.0);
+    border-style: none;
+    background-image: -gtk-gradient (linear,
+                                     left top, left bottom,
+                                     from (shade(@button_base, 1.00)),
+                                     color-stop (0.48, shade(@button_base, 0.96)),
+                                     color-stop (0.52, shade(@button_base, 0.93)),
+                                     to (shade(@button_base, 0.94)));
+    border-width: 0 1px 1px 1px;
+    border-style: solid;
+    border-radius: 3px;
+    border-top-color: shade(@button_border, 1.00);
+    border-right-color: shade(@button_border, 1.00);
+    border-left-color: shade(@button_border, 1.00);
+    border-bottom-color: shade(@button_border, 1.00);
+    box-shadow: inset  0px  1px alpha(#fff, 0.09),
+                inset  1px  0px alpha(#fff, 0.07),
+                inset -1px  0px alpha(#fff, 0.07),
+                inset  0px -1px alpha(#fff, 0.05);
+}
+
+.inline-toolbar.toolbar .button {
+    padding: 2px 6px;
+    background-image: -gtk-gradient (linear,
+                                     left top, left bottom,
+                                     from (shade(@button_base, 1.00)),
+                                     color-stop (0.48, shade(@button_base, 0.96)),
+                                     color-stop (0.52, shade(@button_base, 0.93)),
+                                     to (shade(@button_base, 0.94)));
+    border-width: 0px;
+    border-radius: 0 0 4px 4px;
+    border-style: none;
+    box-shadow: none;
+    color: @theme_fg_color;
+    text-shadow: 0 1px @theme_shadow_color;
+    icon-shadow: 1px 1px @theme_shadow_color;
+}
+
+.inline-toolbar.toolbar .button:active,
+.inline-toolbar.toolbar .button:active:hover {
+    background-image: -gtk-gradient (linear,
+                                     left top, left bottom,
+                                     from (shade(@button_base, 0.50)),
+                                     to   (shade(@button_base, 0.70)));
+    box-shadow: inset  0px  1px alpha(#000, 0.05),
+                inset  1px  0px alpha(#000, 0.03),
+                inset -1px  0px alpha(#000, 0.03),
+                inset  0px -1px alpha(#000, 0.02),
+                inset  1px  0px shade(@button_border, 0.75),
+                inset -1px  0px shade(@button_border, 0.75),
+                inset  0px -1px shade(@button_border, 0.78);
+}
+
+.inline-toolbar.toolbar .button:hover {
+    background-image: -gtk-gradient (linear,
+                                     left top, left bottom,
+                                     from (shade(@button_base, 1.03)),
+                                     color-stop (0.48, shade(@button_base, 0.99)),
+                                     color-stop (0.52, shade(@button_base, 0.96)),
+                                     to (shade(@button_base, 0.97)));
+    color: @theme_text_color;
+}
+
+.inline-toolbar.toolbar .button:insensitive {
+    box-shadow: none;
+    background-color: mix(@button_base, @theme_fg_color, 0.10);
+    background-image: none;
+}
+
+.inline-toolbar.toolbar .button:insensitive {
+    color: @insensitive_fg_color;
+    text-shadow: none;
+    icon-shadow: none;
+}
+
+.inline-toolbar.toolbar .button:hover {
+    color: @theme_text_color;
+    text-shadow: 0 1px @theme_shadow_color;
+    icon-shadow: 1px 1px @theme_shadow_color;
+}
+
+.inline-toolbar.toolbar .button:active {
+    color: @theme_selected_fg_color;
+    text-shadow: 0 1px @theme_selected_shadow_color;
+    icon-shadow: 1px 1px @theme_selected_shadow_color;
+}
+
+/*****************
+ * GtkSpinButton *
+ *****************/
+
+.horizontal.entry.spinbutton {
+   padding: 4px 5px;
+}
+
+.spinbutton .button {
+    color: @internal_element_color;
+    border-width: 0;
+    border-radius: 0;
+    border-style: none;
+    border-image: none;
+    background-color: transparent;
+    background-image: none;
+}
+
+.spinbutton .button:insensitive,
+.spinbutton .button:insensitive:last-child,
+.spinbutton .button:insensitive:first-child,
+.spinbutton .button:insensitive:only-child,
+.spinbutton .vertical .button:insensitive,
+.spinbutton .vertical .button:insensitive:last-child,
+.spinbutton .vertical .button:insensitive:first-child,
+.spinbutton .vertical .button:insensitive:only-child {
+    color: @internal_element_insensitive;
+    box-shadow: inset  1px  0px shade(@insensitive_border_color, 0.97);
+    border-color: @insensitive_border_color;
+}
+
+.spinbutton .button,
+.spinbutton .button:hover,
+.spinbutton .button:focus,
+.spinbutton .button:active {
+    border-radius: 0px 0px 0px 0px;
+    color: @internal_element_prelight;
+    box-shadow: inset  0px  1px shade(@selected_bg_color, 1.05),
+                inset  1px  0px shade(@selected_bg_color, 0.97),
+                inset  0px -1px shade(@selected_bg_color, 0.93);
+}
+
+.spinbutton .button:hover {
+    background-image: -gtk-gradient (linear,
+                                     left top, left bottom,
+                                     from (shade(@button_gradient1, 1.03)),
+                                     color-stop (0.48, shade(@button_gradient2, 1.03)),
+                                     color-stop (0.52, shade(@button_gradient3, 1.03)),
+                                     to   (shade(@button_gradient4, 1.01)));
+}
+
+.spinbutton .button:active {
+    background-image: -gtk-gradient (linear,
+                                     left top, left bottom,
+                                     from (shade (@theme_bg_color, 1.20)),
+                                     color-stop (0.50, shade (@theme_bg_color, 1.00)),
+                                     color-stop (0.50, shade (@theme_bg_color, 0.95)),
+                                     to (shade (@theme_bg_color, 0.80)));
+}
+
+.spinbutton .button,
+.spinbutton .button:hover,
+.spinbutton .button:active,
+.spinbutton .button:insensitive {
+    border-radius: 0px 0 0 0px;
+    border-image: none;
+    padding: 6px 3px;
+}
+
+.spinbutton .button:first-child,
+.spinbutton .button:first-child:hover,
+.spinbutton .button:first-child:active {
+    border-radius: 3px 0 0 3px;
+    border-image: none;
+    padding: 6px 3px;
+}
+
+.spinbutton .button:last-child,
+.spinbutton .button:last-child:hover,
+.spinbutton .button:last-child:active {
+    border-radius: 0 3px 3px 0;
+    border-image: none;
+    padding: 6px 3px;
+}
+
+.spinbutton .button:first-child,
+.spinbutton .button:first-child:hover,
+.spinbutton .button:first-child:active,
+.spinbutton .button:last-child,
+.spinbutton .button:last-child:hover,
+.spinbutton .button:last-child:active {
+    box-shadow: inset  0px  1px shade(@selected_bg_color, 1.05),
+                inset  1px  0px shade(@selected_bg_color, 0.97),
+                inset -1px  0px shade(@selected_bg_color, 0.93),
+                inset  0px -1px shade(@selected_bg_color, 0.93);
+}
+
+.spinbutton .button:dir(rtl) {
+    box-shadow: inset -1px 0 @inset_dark_color;
+}
+
+.spinbutton.vertical .button {
+    padding: 4px;
+    icon-shadow: 0 1px @button_text_shadow;
+}
+
+.spinbutton.vertical .button,
+.spinbutton.vertical .button:hover {
+    color: @theme_fg_color;
+}
+
+.spinbutton.vertical .button:insensitive {
+    color: @insensitive_fg_color;
+}
+
+.spinbutton.vertical .button:active {
+    color: @theme_fg_color;
+    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;
+}
+
+/* :active:active to override the dark overriden style for
+   normal spinbutton buttons, yeah we lack !important */
+.spinbutton.vertical .button,
+.spinbutton.vertical .button:active:active {
+    box-shadow: none;
+}
+
+.spinbutton.vertical .button:first-child {
+    padding: 6px 4px;
+    border-image-width: 3px 3px 0 3px;
+    border-width: 1px 1px 0 1px;
+    border-radius: 4px 4px 0px 0px;
+    box-shadow: inset  0px  2px alpha(#fff, 0.11),
+                inset  2px  0px alpha(#fff, 0.09),
+                inset -2px  0px alpha(#fff, 0.09),
+                inset  0px -2px alpha(#fff, 0.07),
+                inset  0px  1px alpha(shade(@button_border, 1.00), 0.70),
+                inset  1px  0px alpha(shade(@button_border, 0.94), 0.80),
+                inset -1px  0px alpha(shade(@button_border, 0.94), 0.80),
+                inset  0px -1px alpha(shade(@button_border, 0.88), 0.90);
+}
+
+.spinbutton.vertical .button:first-child:hover,
+.spinbutton.vertical .button:first-child:active {
+    border-radius: 4px 4px 0px 0;
+    border-image: none;
+    color: @internal_element_prelight;
+    box-shadow: inset  0px  1px shade(@selected_bg_color, 1.05),
+                inset  1px  0px shade(@selected_bg_color, 0.97),
+                inset -1px  0px shade(@selected_bg_color, 0.93),
+                inset  0px -1px shade(@selected_bg_color, 0.93);
+}
+
+.spinbutton.vertical .button:last-child {
+    padding: 6px 4px;
+    border-image-width: 0 3px 4px 3px;
+    border-width: 0px 1px 1px 1px;
+    border-radius: 0px 0px 4px 4px;
+    box-shadow: inset  0px  2px alpha(#fff, 0.11),
+                inset  2px  0px alpha(#fff, 0.09),
+                inset -2px  0px alpha(#fff, 0.09),
+                inset  0px -2px alpha(#fff, 0.07),
+                inset  0px  1px alpha(shade(@button_border, 1.00), 0.70),
+                inset  1px  0px alpha(shade(@button_border, 0.94), 0.80),
+                inset -1px  0px alpha(shade(@button_border, 0.94), 0.80),
+                inset  0px -1px alpha(shade(@button_border, 0.88), 0.90);
+}
+
+.spinbutton.vertical .button:last-child:hover,
+.spinbutton.vertical .button:last-child:active {
+    border-radius: 0px 0px 4px 4px;
+    border-image: none;
+    color: @internal_element_prelight;
+    box-shadow: inset  0px  1px shade(@selected_bg_color, 1.05),
+                inset  1px  0px shade(@selected_bg_color, 0.97),
+                inset -1px  0px shade(@selected_bg_color, 0.93),
+                inset  0px -1px shade(@selected_bg_color, 0.93);
+}
+
+.spinbutton.vertical.entry {
+    border-image: none;
+    border-color: alpha(@borders, 0.1);
+    border-width: 0 0px 0 0px;
+    border-style: none;
+    border-radius: 0;
+    padding: 4px 1px 4px 1px;
+    box-shadow: inset  0px  2px alpha(#fff, 0.11),
+                inset  2px  0px alpha(#fff, 0.09),
+                inset -2px  0px alpha(#fff, 0.09),
+                inset  0px -2px alpha(#fff, 0.07),
+                inset  1px  0px alpha(shade(@button_border, 0.94), 0.80),
+                inset -1px  0px alpha(shade(@button_border, 0.94), 0.80);
+}
+
+.spinbutton.vertical.entry:insensitive {
+    padding: 4px 1px 4px 1px;
+    border-color: alpha(@borders, 0.1);
+    box-shadow: inset 1px  0px alpha(@borders, 0.4),
+                inset -1px 0px alpha(@borders, 0.4);
+}
+
+.spinbutton.vertical.entry:focus {
+    border-color: alpha(@borders, 0.1);
+    box-shadow: inset 1px 0 0 0 @theme_selected_bg_color,
+                inset -1px 0 0 0 @theme_selected_bg_color;
+}
+
+/* volume button */
+GtkGrid .button,
+GtkGrid .button.flat {
+    transition: all 600ms ease-out;
+}
+
+GtkGrid .button,
+GtkGrid .button.flat,
+GtkGrid .button:hover,
+GtkGrid .button:insensitive,
+GtkGrid .button.flat:hover,
+GtkGrid .button.flat:insensitive {
+    padding: 4px;
+    border-radius: 4px;
+    border-color: transparent;
+    background-color: transparent;
+}
+
+GtkLinkButton,
+GtkLinkButton:hover,
+GtkLinkButton.button.flat,
+GtkLinkButton.button.flat:hover {
+     padding: 4px;
+     border-color: transparent;
+}
+
+/*****************
+ * Notebooks and *
+ * tabs          *
+ *****************/
+
+.notebook {
+    padding: 0;
+    background-clip: border-box;
+    background-color: shade (@theme_bg_color, 1.1);
+    border-style: solid;
+    border-color: @borders;
+    border-width: 1px;
+    -GtkNotebook-initial-gap: 0;
+    -GtkNotebook-arrow-spacing: 5;
+    -GtkNotebook-tab-curvature: 0;
+    -GtkNotebook-tab-overlap: 0;
+    -GtkNotebook-has-tab-gap: false;
+    -GtkWidget-focus-padding: 0;
+    -GtkWidget-focus-line-width: 0;
+}
+
+.notebook :hover {
+    -gtk-image-effect: highlight;
+    color: @theme_fg_color;
+}
+
+.notebook.frame.top {
+    border-top: 0px;
+    border-radius: 0px 0px 4px 4px;
+}
+
+.notebook.frame.bottom {
+    border-bottom: 0px;
+    border-radius: 4px 4px 0px 0px;
+}
+
+.notebook.frame.left {
+    border-left: 0px;
+    border-radius: 0px 4px 4px 0px;
+}
+
+.notebook.frame.right {
+
+    border-right: 0px;
+    border-radius: 4px 0px 0px 4px;
+}
+
+.notebook.header {
+    background-image: linear-gradient(to bottom,
+                                      shade(@theme_bg_color, 0.86),
+                                      shade(@theme_bg_color, 1.05));
+    border-radius: 0px;
+}
+
+.notebook.header.top {
+    border-width: 0px 0px 1px 0px;
+}
+
+.notebook.header.bottom {
+    border-width: 1px 0px 0px 0px;
+}
+
+.notebook.header.left {
+    border-width: 1px 1px 0px 0px;
+}
+
+.notebook.header.right {
+    border-width: 0px 0px 0px 1px;
+}
+
+.notebook.header.frame.top {
+    border-radius: 4px 4px 0px 0px;
+}
+
+.notebook.header.frame.bottom {
+    border-radius: 0px 0px 4px 4px;
+}
+
+.notebook.header.frame.left {
+    border-radius: 4px 0px 0px 4px;
+}
+
+.notebook.header.frame.right {
+    border-radius: 0px 4px 4px 0px;
+}
+
+.notebook tab {
+    border-color: transparent;
+    border-width: 0px;
+    background-image: none;
+    background-color: transparent;
+}
+
+.notebook tab GtkLabel {
+    color: mix (@theme_fg_color, @theme_bg_color, 0.40);
+    font-weight: normal;
+}
+
+.notebook .prelight-page,
+.notebook .prelight-page GtkLabel {
+    color: mix (@theme_fg_color, @theme_bg_color, 0.15);
+}
+
+.notebook .active-page,
+.notebook tab .active-page GtkLabel {
+    color: @theme_fg_color;
+}
+
+/* horizontal tabs */
+
+.notebook tab.top,
+.notebook tab.bottom {
+    padding: 8px 20px 6px;
+}
+
+.notebook tab.top {
+    border-width: 1px 1px 0 1px;
+}
+
+.notebook tab.top:active,
+.notebook tab.top:active:hover {
+    background-image: linear-gradient(to bottom,
+                                      shade(@theme_bg_color, 1.18),
+                                      shade(@theme_bg_color, 1.1));
+    border-radius: 4px 4px 0 0;
+    border-width: 1px 1px 0 1px;
+    border-style: solid;
+    border-color: @borders;
+    box-shadow: none;
+}
+
+.notebook tab.top:hover {
+    background-image: linear-gradient(to bottom,
+                                      alpha(@theme_base_color, 0.0),
+                                      alpha(@theme_base_color, 0.3));
+    border-radius: 4px 4px 0 0;
+    border-width: 1px 1px 0 1px;
+    border-style: solid;
+    border-color: @borders;
+    box-shadow: none;
+}
+
+.notebook tab.top:active {
+    border-bottom-color: @notebook_active_tab_border;
+}
+
+.notebook tab.bottom:active,
+.notebook tab.bottom:active:hover {
+    background-image: linear-gradient(to top,
+                                      shade(@theme_bg_color, 1.18),
+                                      shade(@theme_bg_color, 1.1));
+    border-radius: 0 0 4px 4px;
+    border-style: solid;
+    border-width: 0px 1px 1px 1px;
+    border-color: @borders;
+    box-shadow: none;
+}
+
+.notebook tab.bottom:hover {
+    background-image: linear-gradient(to top,
+                                      alpha(@theme_base_color, 0.0),
+                                      alpha(@theme_base_color, 0.3));
+    border-radius: 0 0 4px 4px;
+    border-style: solid;
+    border-width: 0px 1px 1px 1px;
+    border-color: @borders;
+    box-shadow: none;
+}
+
+/* vertical tabs */
+
+.notebook tab.left,
+.notebook tab.right {
+    padding: 5px 20px;
+}
+
+.notebook tab.left:active,
+.notebook tab.left:active:hover {
+    background-image: linear-gradient(to right,
+                                      shade(@theme_bg_color, 1.18),
+                                      shade(@theme_bg_color, 1.1));
+    border-style: solid;
+    border-width: 1px 0px 1px 1px;
+    border-color: @borders;
+    border-right-color: @notebook_active_tab_border;
+    border-radius: 4px 0px 0px 4px;
+}
+
+.notebook tab.left:hover {
+    background-image: linear-gradient(to right,
+                                      alpha(@theme_base_color, 0.0),
+                                      alpha(@theme_base_color, 0.3));
+    border-style: solid;
+    border-width: 1px 0px 1px 1px;
+    border-color: @borders;
+    border-radius: 4px 0px 0px 4px;
+}
+
+.notebook tab.right:active,
+.notebook tab.right:active:hover {
+    background-image: linear-gradient(to left,
+                                      shade(@theme_bg_color, 1.18),
+                                      shade(@theme_bg_color, 1.1));
+    border-style: solid;
+    border-width: 1px 1px 1px 0px;
+    border-color: @borders;
+    border-right-color: @notebook_active_tab_border;
+    border-radius: 0px 4px 4px 0px;
+}
+
+.notebook tab.right:hover {
+    background-image: linear-gradient(to left,
+                                      alpha(@theme_base_color, 0.0),
+                                      alpha(@theme_base_color, 0.3));
+    border-style: solid;
+    border-width: 1px 1px 1px 0px;
+    border-color: @borders;
+    border-radius: 0px 4px 4px 0px;
+}
+
+.notebook tab.reorderable-page:hover {
+    background-image: linear-gradient(to bottom,
+                                      alpha(@theme_base_color, 0.0),
+                                      alpha(@theme_base_color, 0.3));
+    border-radius: 0;
+    box-shadow: inset 1px 0 alpha(@borders, 0.6), inset -1px 0 alpha(@borders, 0.6);
+    border-style: none;
+}
+
+.notebook tab.reorderable-page:active {
+    background-image: linear-gradient(to bottom,
+                                      shade(@theme_bg_color, 1.18),
+                                      shade(@theme_bg_color, 1.1));
+    border-radius: 4px 4px 0 0;
+    box-shadow: none;
+    border-style: solid;
+}
+
+/* close button styling */
+
+.notebook tab .button {
+    color: mix (@theme_fg_color, @theme_bg_color, 0.85);
+    border-image: none;
+    background-image: none;
+    background-color: transparent;
+    border-radius: 3px;
+    border-style: solid;
+    border-color: transparent;
+    border-width: 1px;
+    padding: 1px;
+    icon-shadow: none;
+}
+
+.notebook .prelight-page .button,
+.notebook tab.prelight-page .button,
+.notebook .active-page .button,
+.notebook tab.active-page .button {
+	color: mix(@theme_fg_color, @theme_base_color, 0.6);
+	icon-shadow: 0 1px @button_text_shadow;
+}
+
+.notebook tab .button:hover {
+	color: @theme_fg_color;
+	border-color: alpha(black, 0.1);
+}
+
+.notebook tab .button:active,
+.notebook tab .button:active:hover {
+	color:  @button_active_text;
+	background-color: alpha(black, 0.08);
+	box-shadow: inset 0 1px alpha(black, 0.05);
+	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);
+}
+
+.notebook.arrow {
+    /* FIXME, why this doesn't work? */
+	-GtkNotebook-arrow-scaling: 0.5;
+    color: shade(@theme_fg_color, 2.6);
+}
+
+.notebook.arrow:hover {
+    color: @theme_selected_bg_color;
+}
+
+.notebook.arrow:active {
+    color: @theme_fg_color;
+}
+
+.notebook.arrow:insensitive {
+    color: rgba(141, 144, 145, 0.3);
+}
+
+.notebook.arrow:backdrop {
+    color: rgba(84, 89, 90, 0.4);
+}
+
+.notebook.arrow:backdrop:insensitive {
+    color: #c7c7c7;
+}
+
+/*************************
+ * Check and Radio items *
+ *************************/
+
+.check,
+.radio,
+.check:insensitive,
+.radio:insensitive {
+    background-color: transparent;
+    border-style: none;
+}
+
+GtkCheckButton:hover,
+GtkCheckButton:active:hover,
+GtkCheckButton:selected,
+GtkCheckButton:selected:focus {
+    background-color: transparent;
+}
+
+GtkCheckButton.text-button, GtkRadioButton.text-button {
+  padding: 1px;
+  outline-offset: 0; }
+
+/***************
+ * Header bars *
+ ***************/
+
+.header-bar {
+    border-width: 0 0 1px;
+    border-style: solid;
+    border-color: shade(@borders, 0.90);
+    border-radius: 6px 6px 0px 0px;
+    box-shadow: inset 0 -1px shade(@wm_bg_b, 0.95);
+    background-color: @theme_bg_dark_color;
+    padding: 6px 6px 5px 6px;
+}
+
+.header-bar:backdrop {
+    border-image: linear-gradient(to top,
+                                  @unfocused_borders,
+                                  @unfocused_borders 1px,
+                                  @theme_unfocused_bg_color 1px) 0 0 2;
+    box-shadow: none;
+    background-color: @theme_bg_dark_color;
+}
+
+.header-bar .button,
+.header-bar .button:last-child,
+.header-bar .button:first-child,
+.header-bar .button:only-child {
+    background-image: none;
+    text-shadow: none;
+    icon-shadow: none;
+    color: @theme_fg_dark_color;
+    border-width: 1px;
+    border-radius: 5px;
+    padding-left:  4px;
+    padding-right: 4px;
+}
+
+.header-bar:backdrop .button {
+    border-width: 1px;
+    border-radius: 5px;
+    padding-left:  4px;
+    padding-right: 4px;
+    color: @theme_text_dark_color;
+    background-image: -gtk-gradient (linear,
+                                     left top, left bottom,
+                                     from (shade(@theme_unfocused_bg_color, 1.05)),
+                                     to   (shade(@theme_unfocused_bg_color, 0.85)));
+}
+
+.header-bar .button:active:first-child,
+.header-bar .button:hover:first-child,
+.header-bar .button:active:hover:first-child,
+.header-bar .button:active:active:first-child,
+.header-bar .button:active:last-child,
+.header-bar .button:hover:last-child,
+.header-bar .button:active:hover:last-child,
+.header-bar .button:active:active:last-child,
+.header-bar .button:active:only-child,
+.header-bar .button:hover:only-child,
+.header-bar .button:active:hover:only-child,
+.header-bar .button:active:active:only-child {
+    border-width: 1px;
+    border-radius: 5px;
+    background-image: -gtk-gradient (linear,
+                                     left top, left bottom,
+                                     from (shade(@menu_bg_dark_color, 2.03)),
+                                     to   (shade(@menu_bg_dark_color, 1.17)));
+    border-top-color: shade(@button_raised_gradient_color_a, 0.50);
+    border-bottom-color: shade(@button_raised_gradient_color_a, 0.50);
+    border-right-color: shade(@button_raised_gradient_color_a, 0.50);
+    border-left-color: shade(@button_raised_gradient_color_a, 0.50);
+    box-shadow: inset  0px  1px shade(@selected_bg_color, 1.05),
+                inset  1px  0px shade(@selected_bg_color, 0.97),
+                inset -1px  0px shade(@selected_bg_color, 0.93),
+                inset  0px -1px shade(@selected_bg_color, 0.93);
+}
+
+.header-bar .button:active,
+.header-bar .button:active:hover {
+    background-image: -gtk-gradient (linear,
+                                     left top, left bottom,
+                                     from (shade(@menu_bg_dark_color, 2.03)),
+                                     to   (shade(@menu_bg_dark_color, 1.17)));
+    border-width: 1px;
+    border-radius: 5px;
+}
+
+.header-bar .button:insensitive,
+.header-bar .button:insensitive:last-child,
+.header-bar .button:insensitive:first-child {
+    color: @theme_text_dark_color;
+    background-image: none;
+    background-color: @theme_bg_dark_color;
+    border-color: @theme_button_border_dark;
+    border-bottom-width: 1px;
+    box-shadow: none;
+    text-shadow: none;
+    icon-shadow: none;
+}
+
+.header-bar .button:insensitive {
+    background-color: transparent;
+    text-shadow: none;
+    icon-shadow: none;
+}
+
+.header-bar .button.text-button {
+    padding: 2px 6px;
+}
+
+.header-bar .button.image-button {
+    padding: 5px 4px 5px 5px;
+}
+
+.header-bar .title {
+    font: Bold 11;
+    color: @theme_text_dark_color;
+}
+
+.header-bar .subtitle {
+    font: 9;
+    color: @theme_text_dark_color;
+}
+
+.header-bar GtkSeparatorToolItem,
+.header-bar .separator,
+.header-bar .separator:insensitive,
+.header-bar .pane-separator {
+    border-color: alpha (shade(@theme_bg_dark_color, 0.2), 0.24);
+    border-bottom-color: @theme_bg_dark_color;
+    border-right-color: @theme_bg_dark_color;
+}
+
+/****************
+ * GtkAssistant *
+ ****************/
+
+GtkAssistant .sidebar .highlight {
+    color: @theme_text_color;
+    font: bold;
+}
+
+GtkAssistant .sidebar {
+    padding: 5px;
+    background-color: shade (@theme_bg_color, 0.97);
+    border-width: 0px 1px 0px 0px;
+    border-radius: 0px;
+    border-style: solid;
+    border-right-color: @inactive_frame_color;
+    color: mix (@theme_fg_color, @theme_bg_color, 0.40);
+}
+
+/**********
+ * Switch *
+ **********/
+
+GtkSwitch {
+    padding: 8px; /* 8px to avoid padding list-row issue if active */
+    -GtkSwitch-slider-width: 45px;
+    font-weight: bold;
+    font-size: smaller;
+    box-shadow: inset  0px  2px alpha(#fff, 0.11),
+                inset  2px  0px alpha(#fff, 0.09),
+                inset -2px  0px alpha(#fff, 0.09),
+                inset  0px -2px alpha(#fff, 0.07),
+                inset  0px  1px alpha(shade(@button_border, 1.00), 0.70),
+                inset  1px  0px alpha(shade(@button_border, 0.94), 0.80),
+                inset -1px  0px alpha(shade(@button_border, 0.94), 0.80),
+                inset  0px -1px alpha(shade(@button_border, 0.88), 0.90);
+}
+
+GtkSwitch.trough,
+GtkSwitch.trough:backdrop {
+    border: 1px solid ;
+    border-radius: 6px;
+    color: @theme_fg_color;
+    background-image: linear-gradient(to bottom,
+                                      shade(@theme_bg_color, 0.9));
+    /* outer */
+    border-top-color: transparent;
+    border-left-color: alpha (#000, 0.01);
+    border-right-color: alpha (#000, 0.01);
+    border-bottom-color: alpha (#000, 0.03);
+    box-shadow: inset  0px  2px alpha(#fff, 0.11),
+                inset  2px  0px alpha(#fff, 0.09),
+                inset -2px  0px alpha(#fff, 0.09),
+                inset  0px -2px alpha(#fff, 0.07),
+                inset  0px  1px alpha(shade(@button_border, 1.00), 0.70),
+                inset  1px  0px alpha(shade(@button_border, 0.94), 0.80),
+                inset -1px  0px alpha(shade(@button_border, 0.94), 0.80),
+                inset  0px -1px alpha(shade(@button_border, 0.88), 0.90);
+    text-shadow: 0 1px rgba(0, 0, 0, 0.1);
+}
+
+GtkSwitch.trough:active,
+GtkSwitch.trough:backdrop:active {
+    background-image: linear-gradient(to bottom,
+                                      @theme_selected_bg_color 2px,
+                                      shade(@theme_selected_bg_color, 1.2));
+    color: white;
+}
+
+GtkSwitch.trough:insensitive,
+GtkSwitch.trough:backdrop:insensitive {
+    color: @insensitive_fg_color;
+    border-color: @insensitive_border_color;
+    background-image: none;
+    background-color: @insensitive_bg_color;
+    box-shadow: inset  0px  1px @insensitive_border_color,
+                inset  1px  0px @insensitive_border_color,
+                inset -1px  0px @insensitive_border_color,
+                inset  0px -1px @insensitive_border_color;
+    text-shadow: none;
+}
+
+GtkSwitch.slider,
+GtkSwitch.slider:backdrop {
+    border: 1px solid;
+    border-radius: 6px;
+    color: @theme_fg_color;
+    background-image: -gtk-gradient (linear,
+                                     left top, left bottom,
+                                     from (@button_gradient1),
+                                     color-stop (0.48, @button_gradient2),
+                                     color-stop (0.52, @button_gradient3),
+                                     to   (@button_gradient4));
+    border-top-color: transparent;
+    border-left-color: alpha (#000, 0.01);
+    border-right-color: alpha (#000, 0.01);
+    border-bottom-color: alpha (#000, 0.03);
+    box-shadow: inset  0px  2px alpha(#fff, 0.11),
+                inset  2px  0px alpha(#fff, 0.09),
+                inset -2px  0px alpha(#fff, 0.09),
+                inset  0px -2px alpha(#fff, 0.07),
+                inset  0px  1px alpha(shade(@button_border, 1.00), 0.70),
+                inset  1px  0px alpha(shade(@button_border, 0.94), 0.80),
+                inset -1px  0px alpha(shade(@button_border, 0.94), 0.80),
+                inset  0px -1px alpha(shade(@button_border, 0.88), 0.90);
+    padding: 2px 4px 2px 2px;
+}
+
+GtkSwitch.slider:active,
+GtkSwitch.slider:backdrop:active {
+    color: @theme_fg_color;
+    border-color: transparent;
+    border-radius: 6px;
+    background-image: -gtk-gradient (linear,
+                                     left top, left bottom,
+                                     from (shade (@theme_bg_color, 1.20)),
+                                     color-stop (0.50, shade (@theme_bg_color, 1.00)),
+                                     color-stop (0.50, shade (@theme_bg_color, 0.95)),
+                                     to (shade (@theme_bg_color, 0.80)));
+    box-shadow: inset  0px  1px shade (@theme_fg_color, 1.0),
+                inset  1px  0px shade (@theme_fg_color, 1.0),
+                inset -1px  0px shade (@theme_fg_color, 1.0),
+                inset  0px -1px shade (@theme_fg_color, 1.0);
+    padding: 1px 3px 1px 1px;
+}
+
+GtkSwitch.slider:insensitive,
+GtkSwitch.slider:backdrop:insensitive {
+    background-image: none;
+    background-color: @insensitive_bg_color;
+    border-color: alpha (#000, 0.00);
+    border-bottom-color: alpha (#000, 0.00);
+    border-image: none;
+    box-shadow: inset  0px  1px @insensitive_border_color,
+                inset  1px  0px @insensitive_border_color,
+                inset -1px  0px @insensitive_border_color,
+                inset  0px -1px @insensitive_border_color;
+}
+
+GtkSwitch.slider:insensitive > GtkLabel,
+GtkSwitch.slider:backdrop:insensitive > GtkLabel {
+    color: inherit;
+}
+
+.list-row GtkSwitch,
+.list-row GtkSwitch:backdrop,
+.list-row:selected GtkSwitch,
+.list-row:selected GtkSwitch:backdrop {
+    box-shadow: none;
+    border-color: shade(@theme_selected_bg_color, 0.4);
+}
+
+.list-row:selected GtkSwitch.slider:dir(rtl) {
+    border-left-color: @borders;
+}
+
+.list-row:selected GtkSwitch.slider:dir(ltr) {
+    border-right-color: @borders;
+}
+
+.list-row:selected GtkSwitch.slider,
+.list-row:selected GtkSwitch.slider:active {
+    border-color: shade(@theme_selected_bg_color, 0.4);
+}
+
+/*********
+ * image *
+ *********/
+
+GtkImage,
+GtkImage:insensitive {
+    background-color: @transparent;
+}
+
+/****************
+ * drawing area *
+ ****************/
+
+/************
+ * viewport *
+ ************/
+
+GtkViewport {
+    border-width: 0px;
+    border-style: none;
+    padding: 0px;
+    /* Background color and system config gnome-tweak-tools */
+    background-color: shade(@theme_bg_color, 1.00);
+}
+
+GtkViewport.frame {
+    border-width: 0px;
+    border-style: none;
+    padding: 0px;
+}
+
+GdMainIconView.content-view {
+    -GdMainIconView-icon-size: 40;
+}
+
+GtkIconView.content-view.check {
+    background-image: url("assets/grid-selection-unchecked.svg");
+    background-color: transparent;
+}
+
+GtkIconView.content-view.check:active {
+    background-image: url("assets/grid-selection-checked.svg");
+    background-color: transparent;
+}
+
+GtkIconView,
+GtkViewport {
+    /* avoid resizing theme thumbnails in mate-appearance-properties */
+    padding: 0px;
+}
+
+GtkIconView {
+    /* view icons gnome-control-center */
+    border-width: 0px;
+    border-style: none;
+    /* background view mate-appearance-properties */
+    background-color: @base_color;
+}
+
+GtkIconView.view.cell:selected,
+GtkIconView.view.cell:selected:focus {
+    /* eg. Configuration center */
+    background-color: alpha(@theme_selected_bg_color, 0.90);
+    background-image: -gtk-gradient (linear,
+                                     0.40 top, 0.60 bottom,
+                                     from (shade (@button_bg_active, 1.14)),
+                                     color-stop (0.45, shade (@button_bg_active, 1.00)),
+                                     color-stop (0.52, shade (@button_bg_active, 0.88)),
+                                     to (shade (@button_bg_active, 0.90)));
+    border-width: 1px;
+    border-style: solid;
+    border-radius: 4px;
+    border-top-color: shade(@button_bg_active, 1.04);
+    border-left-color: shade(@button_bg_active, 0.92);
+    border-right-color: shade(@button_bg_active, 0.92);
+    border-bottom-color: shade(@button_bg_active, 0.80);
+    border-image: none;
+    box-shadow: inset  0px  1px alpha(#fff, 0.08),
+                inset  1px  0px alpha(#fff, 0.07),
+                inset -1px  0px alpha(#fff, 0.07),
+                inset  0px -1px alpha(#fff, 0.06);
+    -GtkWidget-focus-line-width: 0;
+    text-shadow: 0px 1px @theme_selected_shadow_color;
+}
+
+GtkIconView.view.cell:hover,
+GtkIconView.view.cell:hover:focus {
+    background-color: alpha(@theme_selected_bg_color, 0.10);
+    border-style: none;
+    border-radius: 4px;
+}
+
+.view {
+    background-color: @theme_base_color;
+    color: @theme_fg_color;
+    text-shadow: 0px 1px @theme_shadow_color;
+}
+
+.view:selected {
+    background-color: shade(@theme_selected_bg_color, 1.10);
+    background-image: -gtk-gradient (linear,
+                                     left top, left bottom,
+                                     from (shade(@theme_selected_bg_color, 1.0)),
+                                     to (shade(@theme_selected_bg_color, 1.1)));
+    color: @theme_selected_fg_color;
+    text-shadow: 0px 1px @theme_selected_shadow_color;
+    text-shadow: none;
+}
+
+.view:selected:focus {
+    background-color: shade(@theme_selected_bg_color, 1.10);
+    background-image: -gtk-gradient (linear,
+                                     left top, left bottom,
+                                     from (shade(@theme_selected_bg_color, 1.0)),
+                                     to (shade(@theme_selected_bg_color, 1.1)));
+    color: @theme_selected_fg_color;
+    text-shadow: 0px 1px @theme_selected_shadow_color;
+}
+
+.view:active {
+    background-color: shade(@theme_bg_color, 0.915);
+    color: @theme_text_color;
+    text-shadow: 0px 1px @theme_shadow_color;
+}
+
+GtkTreeView {
+    -GtkWidget-focus-line-width: 0;
+    -GtkWidget-focus-padding: 1;
+}
+
+GtkTreeView.dnd {
+    border-color: @internal_element_color;
+    border-radius: 2px;
+    border-width: 1px;
+    border-style: solid;
+}
+
+GtkTreeView row:nth-child(odd):selected:hover,
+GtkTreeView row:nth-child(even):selected:hover,
+GtkTreeView row:nth-child(odd):active:hover,
+GtkTreeView row:nth-child(even):active:hover,
+.notebook GtkContainer GtkTreeView row:selected {
+    background-image: -gtk-gradient (linear,
+                                     left top,
+                                     left bottom,
+                                     from (shade(@sidebar_selected_bg, 0.90)),
+                                     color-stop (0.40, shade (@sidebar_selected_bg, 0.98)),
+                                     to (shade(@sidebar_selected_bg, 1.05)));
+    color: @theme_selected_fg_color;
+}
+
+GtkTreeView row:nth-child(odd) {
+    background-color: shade(@theme_base_color, 0.95);
+}
+
+GtkTreeView row:nth-child(even) {
+    background-color: shade(@theme_base_color, 1.00);
+}
+
+.view row:hover,
+GtkTreeView row:nth-child(odd):hover,
+GtkTreeView row:nth-child(even):hover,
+.notebook GtkContainer GtkTreeView row:hover {
+    background-image: -gtk-gradient (linear,
+                                     left top,
+                                     left bottom,
+                                     from (shade(@theme_bg_color, 1.05)),
+                                     color-stop (0.40, shade (@theme_bg_color, 1.13)),
+                                     to (shade(@theme_bg_color, 1.10)));
+    color: shade (@theme_fg_color, 0.90);
+    text-shadow: none;
+}
+
+column-header {
+    padding: 0px 2px;
+}
+
+column-header .button:active,
+column-header .button:active:hover {
+    background-image: -gtk-gradient (linear,
+                                     left top, left bottom,
+                                     from (shade (@theme_bg_color, 1.20)),
+                                     color-stop (0.50, shade (@theme_bg_color, 1.00)),
+                                     color-stop (0.50, shade (@theme_bg_color, 0.95)),
+                                     to (shade (@theme_bg_color, 0.80)));
+    border-width: 0px 1px 1px 0px;
+    border-style: solid;
+    border-radius: 0px;
+    border-left-color: shade(@button_bg_active, 0.78);
+    border-right-color: shade(@button_bg_active, 0.78);
+    border-bottom-color: shade(@button_bg_active, 0.70);
+    border-image: none;
+    box-shadow: inset  0px  1px alpha(#fff, 0.08),
+                inset  1px  0px alpha(#fff, 0.07),
+                inset -1px  0px alpha(#fff, 0.07),
+                inset  0px -1px alpha(#fff, 0.06);
+}
+
+column-header .button:hover,
+column-header .button {
+    padding: 0px 4px 1px;
+    -GtkWidget-focus-line-width: 0;
+    background-image: -gtk-gradient (linear,
+                                     left top, left bottom,
+                                     from (shade(@button_base, 1.00)),
+                                     color-stop (0.48, shade(@button_base, 0.96)),
+                                     color-stop (0.52, shade(@button_base, 0.92)),
+                                     to (shade(@button_base, 0.93)));
+    border-width: 0px 1px 1px 0px;
+    border-style: solid;
+    border-radius: 0px;
+    border-top-color: transparent;
+    border-left-color: shade(@button_border, 1.05);
+    border-right-color: shade(@button_border, 1.05);
+    border-bottom-color: shade(@button_border, 0.95);
+    border-image: none;
+    box-shadow: inset  0px  1px alpha(#fff, 0.09),
+                inset  1px  0px alpha(#fff, 0.07),
+                inset -1px  0px alpha(#fff, 0.07),
+                inset  0px -1px alpha(#fff, 0.05);
+}
+
+column-header .button:focus {
+    border-width: 0px 1px 1px 0px;
+    border-style: solid;
+    border-radius: 0px;
+    border-top-color: transparent;
+    border-left-color: shade(@button_border, 1.05);
+    border-right-color: shade(@button_border, 1.05);
+    border-bottom-color: shade(@button_border, 0.95);
+    border-image: none;
+    box-shadow: inset  0px  1px alpha(#fff, 0.09),
+                inset  1px  0px alpha(#fff, 0.07),
+                inset -1px  0px alpha(#fff, 0.07),
+                inset  0px -1px alpha(#fff, 0.05);
+}
+
+column-header .button:insensitive {
+    background-image: none;
+    background-color: @insensitive_bg_color;
+    border-color: @insensitive_border_color;
+    border-image: none;
+    box-shadow: none;
+}
+
+column-header .button GtkArrow {
+    color: @internal_element_color;
+}
+
+column-header:nth-child(last) .button {
+    border-width: 0px 0px 1px 0px;
+}
+
+row:insensitive {
+    border-width: 0px;
+}
+
+row:selected,
+row:selected:focus {
+    border-width: 1px 0 1px 0;
+    border-style: solid;
+    box-shadow: none;
+}
+
+row:selected:backdrop,
+row:selected:focus:backdrop {
+    border-width: 1px 0 1px 0;
+    border-style: solid;
+    text-shadow: none;
+    box-shadow: none;
+}
+
+.cell {
+    color: @theme_fg_color;
+    padding: 0px 2px;
+    border-width: 0px;
+}
+
+.cell:hover {
+    /* take the same background in .view to avoid mouse-over lists */
+    /*background-color: @theme_base_color;*/
+    background-color: alpha(@theme_base_color, 0.0);
+}
+
+/*************
+ * Expanders *
+ *************/
+
+GtkTreeView.view.expander {
+    -gtk-icon-source: -gtk-icontheme("pan-end-symbolic");
+    color: @theme_fg_color;
+}
+GtkTreeView.view.expander:dir(rtl) {
+    -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl");
+}
+GtkTreeView.view.expander:hover {
+    color: @theme_fg_color;
+}
+GtkTreeView.view.expander:selected {
+    color: @theme_selected_fg_color;
+}
+GtkTreeView.view.expander:selected:hover {
+    color: @theme_selected_fg_color;
+}
+GtkTreeView.view.expander:active {
+    -gtk-icon-source: -gtk-icontheme("pan-down-symbolic");
+}
+
+GtkExpander {
+    -gtk-icon-source: -gtk-icontheme("pan-end-symbolic");
+}
+GtkExpander:dir(rtl) {
+    -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl");
+}
+GtkExpander:hover {
+    color: @internal_element_color;
+}
+GtkExpander:active {
+    -gtk-icon-source: -gtk-icontheme("pan-down-symbolic");
+}
+
+.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 {
+    border-style: solid;
+    border-width: 1px;
+    border-color: @expander_row_selected_color;
+    color: @expander_row_selected_color;
+    background-color: @theme_selected_bg_color;
+}
+
+.expander row:selected:hover,
+.expander row:selected:focus:hover {
+    color: @theme_selected_fg_color;
+    border-color: @theme_selected_fg_color;
+}
+
+/**************
+ * List boxes *
+ **************/
+
+.list {
+    background-color: @list_box_bg;
+}
+
+.list-row {
+    padding: 2px;
+    transition: all 200ms ease-in;
+    background-image: none;
+    background-color: @theme_base_color;
+}
+
+.list-row:hover {
+    border-color: shade (@theme_selected_bg_color, 1.6);
+    background-image: -gtk-gradient (linear,
+                                     left top,
+                                     left bottom,
+                                     from (shade(@theme_bg_color, 1.05)),
+                                     color-stop (0.40, shade (@theme_bg_color, 1.13)),
+                                     to (shade(@theme_bg_color, 1.10)));
+    box-shadow: inset  0px  1px shade(@selected_bg_color, 1.05),
+                inset  1px  0px shade(@selected_bg_color, 0.97),
+                inset -1px  0px shade(@selected_bg_color, 0.93),
+                inset  0px -1px shade(@selected_bg_color, 0.93);
+    text-shadow: none;
+    icon-shadow: none;
+    border-image: none;
+    border-radius: 6px;
+    border-style: solid;
+}
+
+.list-row:selected,
+.list-row:selected:hover {
+    border-width: 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, 1.0));
+    box-shadow: none;
+    color: @theme_selected_fg_color;
+}
+
+.list-row:selected:backdrop,
+.list-row:selected:backdrop:hover {
+    border-width: 0;
+    border-style: solid;
+    border-color: shade (@theme_bg_color, 0.85);
+    background-image: linear-gradient(to bottom,
+                                      shade (@theme_bg_color, 0.94),
+                                      shade (@theme_bg_color, 0.94));
+    color: @theme_fg_color;
+    text-shadow: none;
+    box-shadow: none;
+}
+
+.list-row.button {
+    border-color: transparent;
+    background-color: @theme_base_color;
+    background-image: none;
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0);
+    text-shadow: none;
+    icon-shadow: none;
+    border-image: none;
+    border-radius: 0;
+    border: none;
+}
+
+.list-row.button:selected,
+.list-row.button:selected:hover,
+.list-row.button:active,
+.list-row.button:active:hover {
+    border-color: shade (@theme_selected_bg_color, 1.6);
+    background-image: -gtk-gradient (linear,
+                                     left top,
+                                     left bottom,
+                                     from (shade(@sidebar_selected_bg, 0.90)),
+                                     color-stop (0.40, shade (@sidebar_selected_bg, 0.98)),
+                                     to (shade(@sidebar_selected_bg, 1.05)));
+    color:  @theme_selected_fg_color;
+    text-shadow: none;
+    icon-shadow: none;
+    border-image: none;
+    border-radius: 6px;
+    border-style: solid;
+}
+
+.list-row.button:hover {
+    border-color: shade (@theme_selected_bg_color, 1.6);
+    background-image: -gtk-gradient (linear,
+                                     left top,
+                                     left bottom,
+                                     from (shade(@theme_bg_color, 1.05)),
+                                     color-stop (0.40, shade (@theme_bg_color, 1.13)),
+                                     to (shade(@theme_bg_color, 1.10)));
+    box-shadow: inset  0px  1px shade(@selected_bg_color, 1.05),
+                inset  1px  0px shade(@selected_bg_color, 0.97),
+                inset -1px  0px shade(@selected_bg_color, 0.93),
+                inset  0px -1px shade(@selected_bg_color, 0.93);
+    text-shadow: none;
+    icon-shadow: none;
+    border-image: none;
+    border-radius: 6px;
+    border-style: solid;
+}
+
+/**************
+ * Calendar   *
+ **************/
+
+GtkCalendar {
+    border-radius: 3px;
+    border-color: shade (@theme_fg_color, 0.8);
+    padding: 1px 1px 3px 1px;
+}
+
+GtkCalendar.view {
+    border-radius: 3px;
+    border-style: solid;
+    border-width: 1px;
+    padding: 2px;
+}
+
+GtkCalendar.header {
+    border-radius: 3px 3px 0px 0px;
+    background-image: linear-gradient(to bottom,
+                                      shade(@theme_bg_color, 1.04),
+                                      shade(@theme_bg_color, 0.89));
+    border-width: 0;
+}
+
+GtkCalendar.expander,
+GtkCalendar.button,
+GtkCalendar.button.flat,
+GtkCalendar.button:insensitive {
+    border-color: transparent;
+    background-image: none;
+    background-color: transparent;
+    border-radius: 0px;
+    box-shadow: none;
+}
+
+/* disable shadows and button background on arrows */
+GtkCalendar.button:first-child,
+GtkCalendar.button:last-child {
+    box-shadow: none;
+    background-image: none;
+}
+
+/* disable button background on arrows */
+GtkCalendar.button:hover:first-child,
+GtkCalendar.button:hover:last-child {
+    background-image: none;
+}
+
+.highlight,
+GtkCalendar.highlight {
+    background-color: @theme_selected_bg_color;
+    color: @theme_selected_fg_color;
+    border-radius: 0px;
+    padding: 0px;
+    border-width: 0;
+    border-color: transparent;
+}
+
+.menuitem GtkCalendar,
+.menuitem GtkCalendar.button,
+.menuitem GtkCalendar.header,
+.menuitem GtkCalendar.view {
+/*    background-color: @menu_bg_color; */
+    background-color: shade(@theme_bg_dark_color, 0.82);
+    background-image: none;
+    border-radius: 0px;
+    border-style: solid;
+    border-width: 0px;
+    padding: 0px;
+    color: @theme_base_color;
+}
+
+.menuitem GtkCalendar {
+    background-color: shade (@menu_bg_color, 1.3);
+    background-image: none;
+}
+
+/**************
+ * GtkInfoBar *
+ **************/
+
+GtkInfoBar {
+    border-width: 0;
+    border-style: none;
+}
+
+.info,
+.question,
+.warning,
+.error {
+    background-color: @info_bg_color;
+    color: @infobar_fg_color;
+    text-shadow: none;
+    border-color: darker(@info_bg_color);
+}
+
+.warning {
+    color: @warning_fg_color;
+}
+
+.info .button.close,
+.warning .button.close,
+.question .button.close,
+.error .button.close {
+    color: @theme_fg_color;
+    icon-shadow: none;
+}
+
+.info .button.close:hover,
+.warning .button.close:hover,
+.question .button.close:hover,
+.error .button.close:hover {
+    background-image: linear-gradient(to bottom,
+                                      alpha(white, 0.3),
+                                      alpha(white, 0.2) 30%,
+                                      alpha(black, 0.02));
+}
+
+.info .button.close:active,
+.warning .button.close:active,
+.question .button.close:active,
+.error .button.close:active {
+    color: @infobar_fg_color;
+    background-image: linear-gradient(to bottom,
+                                      alpha(black, 0.1),
+                                      transparent);
+}
+
+.info .entry,
+.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,
+.question .entry,
+.question .entry:focus,
+.question .button,
+.question .button:insensitive,
+.question .button:active {
+    color: @theme_fg_color;
+    border-color: darker(@info_bg_color);
+    border-style: solid;
+    border-width: 1px;
+}
+
+/* Warning Bar */
+GtkInfoBar.horizontal.error {
+    background-color: @error_bg_color;
+    color: @error_fg_color;
+    border-color: darker(@error_bg_color);
+    border-width: 1px ;
+    border-style: solid;
+}
+
+/* Question Bar */
+GtkInfoBar.horizontal.info .horizontal {
+    background-color: @question_bg_color;
+    color: @question_fg_color;
+}
+
+GtkInfoBar.horizontal.info .horizontal .button.flat.raised.close,
+GtkInfoBar.horizontal.info .horizontal .button.flat.raised.close:hover,
+GtkInfoBar.horizontal.info .horizontal .button.flat.raised.close:active {
+    border-radius: 3px;
+    box-shadow: none;
+}
+
+/***************
+ * Dialog      *
+ ***************/
+
+.prompt,
+GtkMessageDialog {
+    -GtkDialog-content-area-border: 0;
+    -GtkDialog-action-area-border: 12;
+    -GtkDialog-button-spacing: 0;
+    margin: 0;
+    padding: 0;
+}
+
+/* ie. mate-keyboard-properties option window */
+GtkDialog GtkScrolledWindow.frame {
+    border-color: @notebook_border;
+    border-style: solid;
+    border-width: 1px;
+    border-radius: 2px;
+}
+
+GtkDialog GtkScrolledWindow.frame GtkViewport .vertical {
+    background-color: shade (@theme_bg_color, 1.10);
+}
+
+GtkDialog GtkScrolledWindow.frame GtkViewport .vertical GtkExpander .vertical {
+    background-color: @theme_base_color;
+    border-radius: 3px;
+    border-color: @notebook_border;
+    border-style: solid;
+    border-width: 1px;
+}
+
+/* middle buttons */
+.dialog-action-area.linked .button,
+.dialog-action-area.linked .button:active,
+.dialog-action-area.linked .button:active:hover,
+.dialog-action-area.linked .button:insensitive {
+    border-right-width: 0px;
+    border-left-width:  0px;
+    border-width: 1px 0;
+    border-radius: 0;
+    padding: 1px 2px;
+}
+
+/* left button */
+.dialog-action-area.linked .button:first-child,
+.dialog-action-area.linked .button:active:first-child,
+.dialog-action-area.linked .button:active:hover:first-child,
+.dialog-action-area.linked .button:insensitive:first-child {
+    border-radius: 6px 0 0 6px;
+    border-width: 1px;
+    border-right-width: 0;
+    padding: 1px 2px;
+}
+
+/* right button */
+.dialog-action-area.linked .button:last-child,
+.dialog-action-area.linked .button:active:last-child,
+.dialog-action-area.linked .button:active:hover:last-child,
+.dialog-action-area.linked .button:insensitive:last-child {
+    border-width: 1px;
+    border-radius: 0 6px 6px 0;
+    border-left-width: 0;
+    padding: 1px 2px;
+}
+
+/* single button */
+.dialog-action-area.linked .button:only-child,
+.dialog-action-area.linked .button:active:only-child,
+.dialog-action-area.linked .button:active:hover:only-child,
+.dialog-action-area.linked .button:insensitive:only-child {
+    padding-left: 6px;
+    padding-right: 6px;
+    border-width: 1px;
+    border-radius: 6px;
+}
+
+.dialog-action-area.linked .button:only-child {
+    border-width: 0px;
+    background-image: -gtk-gradient (linear,
+                                     left top, left bottom,
+                                     from (@button_gradient1),
+                                     color-stop (0.48, @button_gradient2),
+                                     color-stop (0.52, @button_gradient3),
+                                     to   (@button_gradient4));
+    box-shadow: inset  0px  2px alpha(#fff, 0.11),
+                inset  2px  0px alpha(#fff, 0.09),
+                inset -2px  0px alpha(#fff, 0.09),
+                inset  0px -2px alpha(#fff, 0.07),
+                inset  0px  1px alpha(shade(@button_border, 1.00), 0.70),
+                inset  1px  0px alpha(shade(@button_border, 0.94), 0.80),
+                inset -1px  0px alpha(shade(@button_border, 0.94), 0.80),
+                inset  0px -1px alpha(shade(@button_border, 0.88), 0.90);
+}
+
+.dialog-action-area.linked .button:focus:only-child {
+    box-shadow: inset  0px  1px shade(@selected_bg_color, 1.05),
+                inset  1px  0px shade(@selected_bg_color, 0.97),
+                inset -1px  0px shade(@selected_bg_color, 0.93),
+                inset  0px -1px shade(@selected_bg_color, 0.93);
+}
+
+.dialog-action-area.linked .button:hover:only-child {
+    background-image: -gtk-gradient (linear,
+                                     left top, left bottom,
+                                     from (shade(@button_gradient1, 1.03)),
+                                     color-stop (0.48, shade(@button_gradient2, 1.03)),
+                                     color-stop (0.52, shade(@button_gradient3, 1.03)),
+                                     to   (shade(@button_gradient4, 1.01)));
+}
+
+.dialog-action-area.linked .button:active:only-child {
+    background-image: -gtk-gradient (linear,
+                                     left top, left bottom,
+                                     from (shade (@theme_bg_color, 1.20)),
+                                     color-stop (0.50, shade (@theme_bg_color, 1.00)),
+                                     color-stop (0.50, shade (@theme_bg_color, 0.95)),
+                                     to (shade (@theme_bg_color, 0.80)));
+}
+
+.dialog-action-area.linked .button.suggested-action,
+.dialog-action-area.linked .button.suggested-action:active,
+.dialog-action-area.linked .button.suggested-action:insensitive {
+    box-shadow: none;
+}
+
+/**************
+ * Dim labels *
+ **************/
+
+.view.dim-label,
+.dim-label,
+.dim-label:hover,
+.dim-label:focus {
+    color: mix (@theme_fg_color, @theme_bg_color, 0.27);
+    text-shadow: none;
+}
+
+.dim-label:selected,
+.dim-label:selected:focus {
+    color: @theme_selected_fg_color;
+    text-shadow: none;
+}
+
+/*******
+ * OSD *
+ *******/
+
+.background.osd {
+	color: @osd_fg;
+	background-image: none;
+	background-color: @osd_bg;
+}
+
+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,
+.osd .button {
+	padding: 4px;
+	background-image: linear-gradient(to bottom,
+	                                  @osd_button_bg_a,
+	                                  @osd_button_bg_b 68%,
+	                                  @osd_button_bg_c);
+	color: @osd_button_fg;
+	text-shadow: 0 -1px @osd_button_shadow;
+	icon-shadow: 0 -1px @osd_button_shadow;
+}
+
+.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 .linked .button:hover:first-child,
+.osd .linked .button:hover:last-child,
+.osd .linked .button:hover:only-child {
+    background-image: none;
+    padding: 4px;
+}
+
+.osd.button:active,
+.osd.button:hover:active,
+.osd .button:active,
+.osd .button:hover:active {
+	color: @osd_button_fg_active;
+}
+
+.osd.button:insensitive,
+.osd.button:active:insensitive,
+.osd .button:insensitive,
+.osd .button:active:insensitive {
+	color: @osd_button_fg_insensitive;
+}
+
+.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: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 GtkMenuButton.button:active {
+    background-color: transparent;
+    border-color: @osd_button_border;
+}
+
+.osd GtkMenuButton.button:active {
+    color: @osd_button_fg_active;
+    text-shadow: 0 -1px @osd_button_shadow;
+}
+
+.osd.toolbar {
+	color: @osd_fg;
+	text-shadow: 0 1px @osd_text_shadow;
+	padding: 10px;
+	border-style: none;
+	border-radius: 7px;
+	background-image: linear-gradient(to left,
+	                                  shade(@theme_selected_bg_color, 1.1),
+	                                  shade(@theme_selected_bg_color, 0.65));
+	background-color: transparent;
+	-GtkToolbar-button-relief: normal;
+}
+
+.osd.toolbar .button,
+.osd.toolbar .linked .button {
+	padding: 4px;
+	border-width: 1px;
+	border-radius: 5px;
+}
+
+.osd.toolbar .button:first-child {
+	border-radius: 5px 0 0 5px;
+	border-width: 1px 0 1px 1px;
+	box-shadow: inset -1px 0 @osd_button_inset;
+}
+
+.osd.toolbar .button:last-child {
+	box-shadow: none;
+	border-radius: 0 5px 5px 0;
+	border-width: 1px 1px 1px 0;
+}
+
+.osd.toolbar .button:only-child,
+.osd.toolbar GtkToolButton .button,
+.osd.toolbar GtkToolButton:only-child .button,
+.osd.toolbar GtkToolButton:last-child .button,
+.osd.toolbar GtkToolButton:first-child .button {
+	border-width: 1px;
+	border-radius: 5px;
+	border-style: solid;
+	box-shadow: none;
+}
+
+.osd.toolbar .separator {
+	color: shade(@osd_lowlight, 0.80);
+}
+
+/* used by gnome-settings-daemon's media-keys OSD
+   and Epiphany */
+.osd.trough {
+	background-color: @osd_trough_bg;
+	border-width: 0;
+}
+
+.osd.progressbar {
+	background-color: @osd_fg;
+}
+
+.osd .scale.trough {
+	border: 1px solid rgba(0,0,0,0.1);
+	border-image: none;
+	background-image: linear-gradient(to bottom,
+	                                  shade(@osd_button_border, 0.70),
+	                                  shade(@osd_button_border, 0.90));
+	background-color: transparent;
+}
+
+.osd .scale.trough.highlight {
+	background-image: none;
+	background-color: @theme_selected_bg_color;
+}
+
+.osd .scale.trough:insensitive,
+.osd .scale.trough.highlight:insensitive {
+	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,
+GtkProgressBar.osd.trough {
+	padding: 0;
+	border-image: none;
+	border-style: none;
+	border-width: 0;
+	background-image: none;
+	background-color: transparent;
+	border-radius: 0;
+}
+
+.osd GtkProgressBar.progressbar,
+GtkProgressBar.osd.progressbar {
+	border-style: none;
+	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;
+}
+
+/*********************
+ * Spinner Animation *
+ *********************/
+
+@keyframes spinner {
+    0.00% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
+                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)),
+                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)),
+                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)),
+                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)),
+                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)),
+                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)),
+                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)); }
+
+    12.5% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)),
+                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)),
+                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)),
+                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)),
+                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)),
+                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)),
+                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)),
+                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)); }
+
+    25.0% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)),
+                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)),
+                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)),
+                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)),
+                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)),
+                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)),
+                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
+                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)); }
+
+    37.5% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)),
+                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)),
+                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)),
+                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)),
+                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)),
+                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
+                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)),
+                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)); }
+
+    50.0% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)),
+                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)),
+                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)),
+                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)),
+                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
+                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)),
+                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)),
+                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)); }
+
+    62.5% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)),
+                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)),
+                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)),
+                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
+                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)),
+                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)),
+                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)),
+                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)); }
+
+    75.0% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)),
+                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)),
+                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
+                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)),
+                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)),
+                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)),
+                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)),
+                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)); }
+
+    87.5% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)),
+                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
+                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)),
+                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)),
+                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)),
+                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)),
+                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)),
+                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)); }
+
+    100%  { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
+                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)),
+                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)),
+                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)),
+                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)),
+                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)),
+                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)),
+                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)); }
+}
+
+.spinner {
+    background-color: transparent;
+    background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
+                      -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
+                      -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
+                      -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
+                      -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
+                      -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
+                      -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
+                      -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent));
+    background-position: 14% 14%, 0% 50%, 14% 86%, 50% 100%, 86% 86%, 100% 50%, 86% 14%, 50% 0%;
+    background-size: 20% 20%;
+    background-repeat: no-repeat;
+}
+
+.spinner:active {
+    animation: spinner 1s infinite linear;
+}
+
+/****************
+ * print dialog *
+ ****************/
+
+GtkPrintUnixDialog.background .vertical.view.dialog-vbox {
+    background-color: shade (@theme_bg_color, 1.0);
+}
+
+GtkPrintUnixDialog.background .notebook {
+    border-width: 0px 1px 1px 1px;
+    border-radius: 0px 0px 4px 4px;
+}
+
+GtkPrintUnixDialog.background .notebook.header {
+    border-radius: 0px;
+}
+
+GtkPrintUnixDialog.background .notebook tab GtkLabel {
+    color: mix (@theme_fg_color, @theme_bg_color, 0.40);
+    font-weight: normal;
+}
+
+GtkPrintUnixDialog.background .notebook .prelight-page,
+GtkPrintUnixDialog.background .notebook .prelight-page GtkLabel {
+    color: mix (@theme_fg_color, @theme_bg_color, 0.15);
+}
+
+GtkPrintUnixDialog.background .notebook .active-page,
+.notebook tab .active-page GtkLabel {
+    color: @theme_fg_color;
+}
+
+GtkPrintUnixDialog.background .notebook tab.top:active,
+GtkPrintUnixDialog.background .notebook tab.top:active:hover {
+    background-image: linear-gradient(to bottom,
+                                      shade(@theme_bg_color, 1.18),
+                                      shade(@theme_bg_color, 1.1));
+    border-radius: 4px 4px 0 0;
+    border-width: 1px 1px 0 1px;
+    border-style: solid;
+    border-color: @borders;
+    box-shadow: none;
+}
+
+GtkPrintUnixDialog.background .notebook tab.top:hover {
+    background-image: linear-gradient(to bottom,
+                                      alpha(@theme_base_color, 0.0),
+                                      alpha(@theme_base_color, 0.3));
+    border-radius: 4px 4px 0 0;
+    border-width: 1px 1px 0 1px;
+    border-style: solid;
+    border-color: @borders;
+    box-shadow: none;
+}
+
+GtkPrintUnixDialog.background .notebook tab.top:active {
+    border-bottom-color: @notebook_active_tab_border;
+}
+
+GtkPrintUnixDialog.background .notebook .text-button {
+    background-color: transparent;
+}
+
+GtkPrintUnixDialog.background .vertical.view.dialog-vbox .notebook GtkToggleButton.button {
+    padding: 4px;
+    border-radius: 4px;
+}
+
+/******************
+ * GtkFileChooser *
+ ******************/
+
+GtkFileChooserWidget.vertical GtkPaned.horizontal {
+    -GtkPaned-handle-size: 3px;
+    border-color: transparent;
+}
+
+/*****************
+ * Miscellaneous *
+ *****************/
+
+.floating-bar {
+    background-image: linear-gradient(to bottom,
+                                      @theme_bg_color 20%,
+                                      shade(@theme_bg_color, 0.95));
+    background-color: @theme_bg_color;
+    border-color: shade(@theme_bg_color, 0.85);
+    color: @theme_text_color;
+    text-shadow: 0 1px @theme_shadow_color;
+    border-radius: 3px;
+    border-width: 1px;
+    border-style: solid;
+    box-shadow: inset 1px 1px alpha(#fff, 0.07), -1px -1px alpha(#fff, 0.07);
+}
+
+.floating-bar.top {
+    border-top-width: 0;
+    border-top-right-radius: 0;
+    border-top-left-radius: 0;
+}
+
+.floating-bar.right {
+    border-right-width: 0;
+    border-top-right-radius: 0;
+    border-bottom-right-radius: 0;
+}
+
+.floating-bar.bottom {
+    border-bottom-width: 0;
+    border-bottom-right-radius: 0;
+    border-bottom-left-radius: 0;
+}
+
+.floating-bar.left {
+    border-left-width: 0;
+    border-top-left-radius: 0;
+    border-bottom-left-radius: 0;
+}
+
+.floating-bar.bottom.right {
+    box-shadow: inset 1px 1px alpha(#fff, 0.07);
+}
+
+.floating-bar.bottom.left {
+    box-shadow: inset -1px 1px alpha(#fff, 0.07);
+}
+
diff --git a/desktop-themes/Green-Submarine/gtk-3.0/gtk.css b/desktop-themes/Green-Submarine/gtk-3.0/gtk.css
index 6ce7e2c2..ddea0515 100644
--- a/desktop-themes/Green-Submarine/gtk-3.0/gtk.css
+++ b/desktop-themes/Green-Submarine/gtk-3.0/gtk.css
@@ -1,44 +1,95 @@
-/* default color scheme */
+/* Default color scheme */
 @define-color bg_color #CBD9D4;
 @define-color fg_color #101010;
 @define-color base_color #FFF;
 @define-color text_color #1A1A1A;
 @define-color selected_bg_color #72B49D;
-@define-color selected_fg_color #FFF;
+@define-color selected_fg_color #ffffff;
 @define-color tooltip_bg_color #DBFFF3;
-@define-color tooltip_fg_color #000;
+@define-color tooltip_fg_color #000000;
 
-/* other color schemes could simply override these */
+/* Colormap actually used by the theme, to be overridden in other css files */
 @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_shadow_color alpha(#fff, 0.22);
+@define-color theme_selected_bg_color  @selected_bg_color;
 @define-color theme_selected_fg_color @selected_fg_color;
+@define-color theme_selected_shadow_color alpha(#000, 0.18);
 @define-color theme_tooltip_bg_color @tooltip_bg_color;
 @define-color theme_tooltip_fg_color @tooltip_fg_color;
+@define-color menu_bg_color @theme_bg_dark_color;
+@define-color menu_fg_color shade(@theme_fg_dark_color, 1.00);
+@define-color menu_shadow_color @theme_shadow_color;
+
+/**********************[Green-Submarine]***********************/
+@define-color bg_dark_color #1F2724;
+@define-color fg_dark_color #CACCCA;
+@define-color theme_bg_dark_color @bg_dark_color;
+@define-color theme_fg_dark_color @fg_dark_color;
+@define-color theme_text_dark_color #E4E6E4;
+@define-color theme_shadow_dark_color alpha(#000, 0.30);
+@define-color theme_highlight_color alpha(#fff, 0.05);
+@define-color theme_button_border_dark shade(@theme_bg_dark_color, 0.68);
+@define-color theme_entry_border_dark @theme_button_border_dark;
+@define-color theme_path_bg_color shade(@theme_bg_dark_color, 0.90);
+@define-color theme_path_active_color shade(@theme_bg_dark_color, 0.78);
+@define-color theme_mdi_bg_color shade(@theme_bg_dark_color, 0.90);
+@define-color theme_mdi_border_color shade(@theme_bg_dark_color, 0.70);
+
+@define-color menu_bg_dark_color shade(@theme_bg_dark_color, 0.95);
+@define-color menu_fg_dark_color shade(@theme_fg_dark_color, 1.00);
+@define-color menu_shadow_dark_color alpha(#000, 0.30);
+@define-color menu_line_dark_color shade(@theme_bg_dark_color, 0.78);
+@define-color menu_separator shade (@menu_bg_color, 0.96);
+/**************************************************************************/
+
+@define-color button_raised_gradient_color_a shade(@theme_bg_dark_color, 1.10);
+@define-color button_raised_gradient_color_b shade(@theme_bg_dark_color, 0.90);
+@define-color button_raised_linked_shadow alpha(@theme_base_color, 0.70);
+
+@define-color link_color #00CC85;
+@define-color frame_color #7F807F;
+@define-color inactive_frame_color #B9BBB9;
+@define-color warning_color #ABF500;
+@define-color error_color #00CC00;
+@define-color success_color #4E9A06;
 
-/* misc colors used by gtk+ */
 @define-color info_fg_color rgb (181, 171, 156);
-@define-color info_bg_color rgb (252, 252, 189);
+@define-color info_bg_color rgb (172, 232, 116);
 @define-color warning_fg_color rgb (173, 120, 41);
 @define-color warning_bg_color rgb (250, 173, 61);
-@define-color question_fg_color rgb (97, 122, 214);
-@define-color question_bg_color rgb (138, 173, 212);
-@define-color error_fg_color rgb (166, 38, 38);
+@define-color question_fg_color rgb (255, 236, 80);
+@define-color question_bg_color rgb (138, 212, 168);
+@define-color error_fg_color rgb (255, 236, 80);
 @define-color error_bg_color rgb (237, 54, 54);
-@define-color link_color #00CC85;
-@define-color error_color #cc0000;
-@define-color success_color #4E9A06;
 
-/* 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 insensitive_fg_color shade(@bg_color, 0.70);
-@define-color insensitive_border_color shade(@bg_color, 0.80);
-@define-color dark_bg_color #1F2724;
-@define-color dark_fg_color #E6E6E6;
-@define-color transparent rgba (0, 0, 0, 0);
+@define-color os_chrome_bg_color @theme_bg_dark_color;
+@define-color os_chrome_fg_color @theme_fg_dark_color;
+
+@define-color os_chrome_selected_bg_color @theme_selected_bg_color;
+@define-color os_chrome_selected_fg_color @theme_selected_fg_color;
+
+@define-color chrome_bg_color @theme_bg_color;
+@define-color chrome_fg_color @theme_fg_color;
+
+@define-color entry_text_color @theme_text_color;
+@define-color focused_entry_border @theme_selected_bg_color;
+@define-color focused_entry_outer  alpha(@theme_selected_bg_color, 0.45);
+
+@define-color entry_text_dark_color @theme_text_color;
+@define-color entry_bg_dark_color shade(@theme_base_color, 0.88);
+@define-color focused_dark_entry_border shade(@theme_bg_color, 0.45);
+@define-color focused_dark_entry_outer alpha(@theme_selected_bg_color, 0.80);
+
+@define-color focused_entry_inset alpha (#E4F1D7, 0.50);
+
+/* @define-color sidebar_background shade(#E1E5E8, 0.95); */
+@define-color sidebar_background #E1EAE7;
+@define-color sidebar_icon       shade(#E2E8E1, 0.45);
+@define-color sidebar_selected_bg shade(@theme_selected_bg_color,1.00);
+@define-color sidebar_fg_color @theme_text_color;
 
 @define-color button_base shade(@theme_bg_color, 1.15);
 @define-color button_gradient1 shade(@button_base, 0.98);
@@ -49,38 +100,183 @@
 @define-color button_border shade(@theme_bg_color, 0.70);
 @define-color button_border_active shade(@button_bg_active, 0.95);
 
-@define-color backdrop_selected_bg_color shade (@theme_selected_bg_color, 1.12);
-@define-color backdrop_selected_fg_color @theme_selected_fg_color;
+@define-color insensitive_bg_color shade(@bg_color, 0.93);
+@define-color insensitive_fg_color shade(@bg_color, 0.70);
+@define-color insensitive_border_color shade(@bg_color, 0.80);
+
+@define-color trough_bg_color_a shade (@theme_bg_color, 0.88);
+@define-color trough_bg_color_b shade (@theme_bg_color, 0.95);
+
+@define-color internal_element_color #636463;
+@define-color internal_element_prelight @theme_text_color;
+@define-color internal_element_insensitive shade (@internal_element_color, 1.4);
 
 @define-color scale_fill shade(@button_bg_active, 1.00);
 @define-color scale_border_a @internal_element_color;
 @define-color scale_border_b shade (@internal_element_color, 1.25);
-@define-color scale_progress_fill @theme_selected_bg_color;
+
 @define-color progressbar_fill_a @button_bg_active;
 @define-color progressbar_fill_b shade(mix(@button_bg_active, green, 0.10), 1.10);
 
-@define-color trough_bg_color_a shade (@theme_bg_color, 0.88);
-@define-color trough_bg_color_b shade (@theme_bg_color, 0.95);
+@define-color highlighted_border #8B9081;
+@define-color transparent alpha(#000, 0.0);
+
+@define-color notebook_border shade(@theme_bg_color, 0.75);
+
+/* @define-color toolbar_gradient_base shade (mix(#DADED5, @theme_bg_dark_color, 0.75), 0.92); */
+@define-color toolbar_gradient_base shade (@theme_bg_dark_color, 1.00);
+@define-color toolbar_fg_color shade(@theme_fg_dark_color, 1.00);
+@define-color toolbar_shadow_color @theme_shadow_dark_color;
+@define-color toolbar_border_color @theme_button_border_dark;
+@define-color primay-toolbar-border shade (#3c3c3c, 1.0);
+
+@define-color toolbar_active_button_color #909081;
+
+@define-color nautilus_cluebar_color shade(@sidebar_background, 1.00);
+@define-color treeview_focus_border  @nautilus_cluebar_color;
+
+@define-color calc_display_fg_color #fff;
 
-@define-color toolbar_gradient_base #CBD9D4;
-@define-color toolbar_gradient_final #C0CEC9;
-@define-color toolbar_border #BBC9C4;
-@define-color menubar_color @dark_bg_color;
+@define-color expander_row_selected_color #FFF;
+@define-color test #f00;
 
-/* WM colors */
-@define-color wm_title @dark_fg_color;
-@define-color wm_highlight shade (@menubar_color, 1.5);
-@define-color wm_title_highlight shade (@menubar_color, 1.5);
+/**************
+ * List boxes *
+ **************/
 
-@define-color wm_bg_a shade (@menubar_color, 1.4);
-@define-color wm_bg_b @menubar_color;
+@define-color content_view_bg #DBF0C7;
+@define-color list_box_bg #fafafa;
+
+/*****************
+ * GtkSpinButton *
+ *****************/
+
+@define-color inset_light_color alpha(white, 0.45);
+@define-color inset_dark_color alpha(black, 0.07);
+@define-color inset_link_dark_color alpha(green, 0.37);
+
+/*******
+ * OSD *
+ *******/
+@define-color osd_highlight #ffffff;
+@define-color osd_lowlight #515251;
+@define-color osd_base #252621;
+
+@define-color osd_fg #EBEDEB;
+@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_text_shadow alpha(black, 0.75);
+
+@define-color osd_toolbar_bg_a alpha(@osd_base, 0.80);
+@define-color osd_toolbar_bg_b alpha(#101010, 0.80);
+@define-color osd_toolbar_bg_c alpha(shade(@osd_base, 1.02), 0.80);
+
+@define-color osd_button_bg_a alpha(@osd_highlight, 0.16);
+@define-color osd_button_bg_b alpha(@osd_lowlight, 0.05);
+@define-color osd_button_bg_c alpha(@osd_highlight, 0.12);
+
+@define-color osd_button_bg_insensitive alpha(@osd_highlight, 0.25);
+@define-color osd_button_bg_insensitive_active alpha(@osd_highlight, 0.16);
+
+@define-color osd_button_bg_hover_a alpha(@osd_highlight, 0.28);
+@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_backdrop alpha(@osd_highlight, 0.18);
+@define-color osd_button_bg_backdrop_hover alpha(@osd_highlight, 0.25);
+@define-color osd_button_bg_backdrop_active alpha(@osd_highlight, 0.35);
+@define-color osd_button_bg_backdrop_insensitive alpha(@osd_highlight, 0.08);
+
+@define-color osd_button_fg_backdrop shade(@osd_fg, 0.70);
+@define-color osd_button_fg_backdrop_active shade(@osd_fg, 0.95);
+
+@define-color osd_button_fg shade(@osd_fg, 0.80);
+@define-color osd_button_fg_hover shade(@osd_fg, 0.96);
+@define-color osd_button_fg_active shade(@osd_fg, 1.10);
+@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_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);
+
+/* Metacity */
+@define-color wm_highlight #ffffff;
+@define-color wm_title_highlight #ffffff;
+
+@define-color wm_bg_a shade (@bg_color, 1.1);
+@define-color wm_bg_b @bg_color;
+
+@define-color wm_button_bg_a shade (@bg_color, 1.0);
+@define-color wm_button_bg_b shade (@bg_color, 0.85);
+@define-color wm_button_bg_c shade (@bg_color, 0.8);
+@define-color wm_button_bg_d shade (@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 (@bg_color, 0.7);
+@define-color wm_button_bg_active_b shade (@bg_color, 0.9);
+@define-color wm_button_bg_active_c shade (@bg_color, 0.9);
+
+/*************
+ * scrollbar *
+ *************/
+
+@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;
+
+/***********
+ * Popover *
+ ***********/
+@define-color osd_popover_bg alpha(@osd_base, 0.90);
+
+/* GTKHeaderBar colours */
+@define-color borders @theme_bg_dark_color;
+@define-color unfocused_borders @theme_bg_dark_color;
+@define-color theme_unfocused_bg_color @theme_bg_dark_color;
+@define-color button_hover_gradient_color_a @button_raised_gradient_color_a;
+@define-color button_hover_gradient_color_b @button_raised_gradient_color_b;
+@define-color wm_shadow @theme_shadow_dark_color;
+@define-color wm_title @theme_fg_dark_color;
+@define-color wm_title_shadow @wm_shadow;
+@define-color wm_bg_a @theme_bg_dark_color;
+@define-color wm_bg_b @theme_bg_dark_color;
+
+/* terminal view color*/
+@define-color terminal_background_color #343B27;
+
+/* csd border */
+@define-color wm_csd_solid_border_color shade (#3c3c3c, 1.2);
+
+/************************
+ * overshoot/undershoot *
+ ************************/
+
+@define-color overshoot_bg_color alpha (@theme_selected_bg_color, 0.55);
+@define-color overshoot_backdrop_bg_color #C8FA96;
 
 @import url("gtk-widgets.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("apps/epiphany.css");
+@import url("gtk-widgets-assets.css");
+@import url("menu.css");
+@import url("scrollbar.css");
+@import url("sidebar.css");
+@import url("gnome-applications.css");
+@import url("other-applications.css");
+@import url("mate-applications.css");
+
diff --git a/desktop-themes/Green-Submarine/gtk-3.0/mate-applications.css b/desktop-themes/Green-Submarine/gtk-3.0/mate-applications.css
new file mode 100644
index 00000000..ef26ff46
--- /dev/null
+++ b/desktop-themes/Green-Submarine/gtk-3.0/mate-applications.css
@@ -0,0 +1,1273 @@
+/*********************
+ * CAJA File manager *
+ *********************/
+
+/**** View ***/
+
+/* background of all views */
+CajaNavigationWindow .view {
+    background-color: shade (@base_color, 1.0);
+    color: @theme_fg_color;
+}
+
+/* do not flash the desktop with a color during theme switching */
+CajaWindow,
+CajaDesktopWindow FMDesktopIconView .view {
+    background-color: transparent;
+    background-image: none;
+}
+
+.caja-inactive-pane .view {
+    background-color: shade(@less_dark_color, 1.3);
+}
+
+/**** Window ***/
+
+/* caja sidebar */
+CajaWindow FMTreeView .view,
+CajaWindow CajaNotesViewer .view,
+CajaWindow CajaPlacesSidebar .view,
+CajaWindow CajaHistorySidebar .view,
+CajaWindow CajaEmblemSidebar .frame,
+CajaWindow CajaInformationPanel .vertical {
+    background-color: shade (@theme_bg_color, 1.08);
+}
+
+/* the small line between sidebar and view */
+CajaWindow GtkPaned.horizontal {
+    -GtkPaned-handle-size: 3px;
+    border-color: transparent;
+}
+
+CajaWindow FMTreeView .scrollbar,
+CajaWindow CajaNotesViewer .scrollbar,
+CajaWindow CajaPlacesSidebar .scrollbar,
+CajaWindow CajaHistorySidebar .scrollbar,
+CajaWindow CajaEmblemSidebar .scrollbar {
+    background-image: none;
+    border-style: solid;
+    -GtkRange-stepper-size: 16;
+    -GtkRange-stepper-spacing: 0;
+    -GtkRange-trough-border: 0;
+    -GtkRange-arrow-scaling: 0.666;
+    -GtkRange-slider-width: 13;
+    -GtkRange-trough-under-steppers: 1;
+    -GtkScrollbar-has-backward-stepper: true;
+    -GtkScrollbar-has-forward-stepper: true;
+    -GtkScrollbar-activate-slider: 1;
+    -GtkScrollbar-min-slider-length: 31;
+    -GtkScrolledWindow-scrollbar-spacing: 0;
+    -GtkScrolledWindow-scrollbars-within-bevel: 1;
+}
+
+CajaWindow FMTreeView .scrollbar.trough,
+CajaWindow CajaNotesViewer .scrollbar.trough,
+CajaWindow CajaPlacesSidebar .scrollbar.trough,
+CajaWindow CajaHistorySidebar .scrollbar.trough,
+CajaWindow CajaEmblemSidebar .scrollbar.trough,
+CajaWindow FMTreeView .scrollbar.trough.vertical,
+CajaWindow CajaNotesViewer .scrollbar.trough.vertical,
+CajaWindow CajaPlacesSidebar .scrollbar.trough.vertical,
+CajaWindow CajaHistorySidebar .scrollbar.trough.vertical,
+CajaWindow CajaEmblemSidebar .scrollbar.trough.vertical {
+    background-image: -gtk-gradient (linear, left top, left bottom,
+                                    from (shade (@theme_bg_color, 0.98)),
+                                    to (shade (@theme_bg_color, 1.06)));
+    border-radius: 0;
+    border-width: 0 0 0 0;
+    border-style: solid;
+    border-right-color: shade (@theme_bg_color, 0.96);
+    border-left-color: shade (@theme_bg_color, 0.96);
+}
+
+/* selected item in sidebar */
+CajaWindow FMTreeView .view row:selected,
+CajaWindow CajaPlacesSidebar .view row:selected,
+CajaWindow CajaHistorySidebar .view row:selected,
+CajaWindow FMTreeView .view row:selected:hover,
+CajaWindow CajaPlacesSidebar .view row:selected:hover,
+CajaWindow CajaHistorySidebar .view row:selected:hover {
+    background-image: -gtk-gradient (linear,
+                                     left top,
+                                     left bottom,
+                                     from (shade(@sidebar_selected_bg, 0.90)),
+                                     color-stop (0.40, shade (@sidebar_selected_bg, 0.98)),
+                                     to (shade(@sidebar_selected_bg, 1.05)));
+    color:  @theme_selected_fg_color;
+    border-radius: 6px;
+    border-style: solid;
+    border-width: 1px 0px 0px 0px;
+    border-color: shade (@sidebar_selected_bg, 0.90) #bbb shade (@sidebar_selected_bg, 1.05);
+    text-shadow: none;
+/*    padding: 4px; */
+}
+
+/* mouse hover item in sidebar */
+CajaWindow FMTreeView .view row:hover,
+CajaWindow CajaPlacesSidebar .view row:hover,
+CajaWindow CajaHistorySidebar .view row:hover {
+    background-image: -gtk-gradient (linear,
+                                     left top,
+                                     left bottom,
+                                     from (shade(@theme_bg_color, 1.05)),
+                                     color-stop (0.40, shade (@theme_bg_color, 1.13)),
+                                     to (shade(@theme_bg_color, 1.10)));
+    box-shadow: inset  0px  1px shade (@theme_selected_bg_color, 1.0),
+                inset  1px  0px shade (@theme_selected_bg_color, 1.0),
+                inset -1px  0px shade (@theme_selected_bg_color, 1.0),
+                inset  0px -1px shade (@theme_selected_bg_color, 1.0);
+    color: shade (@theme_fg_color, 0.90);
+    border-radius: 6px;
+    text-shadow: none;
+/*    padding: 4px; */
+}
+
+/* shadows and borders looks strange in list view */
+CajaWindow GtkTreeView row:nth-child(odd):hover,
+CajaWindow GtkTreeView row:nth-child(even):hover,
+CajaWindow GtkTreeView row:nth-child(odd):selected,
+CajaWindow GtkTreeView row:nth-child(even):selected,
+CajaWindow GtkTreeView row:nth-child(odd):selected:hover,
+CajaWindow GtkTreeView row:nth-child(even):selected:hover {
+    box-shadow:none;
+    border-radius: 0px;
+}
+
+/* Caja places bar */
+CajaWindow .button.flat:first-child {
+    border-radius: 6px 0 0 6px;
+    border-right-width: 0;
+/* remove left shadow */
+    box-shadow: inset  0px  2px alpha(#fff, 0.11),
+                inset  2px  0px alpha(#fff, 0.09),
+                inset -2px  0px rgba(255,255,255,0), 0 1px rgba(255,255,255,0),
+                inset  0px -2px alpha(#fff, 0.07),
+                inset  0px  1px alpha(shade(@button_border, 1.00), 0.70),
+                inset  1px  0px alpha(shade(@button_border, 0.94), 0.80),
+                inset -1px  0px rgba(255,255,255,0), 0 1px rgba(255,255,255,0),
+                inset  0px -1px alpha(shade(@button_border, 0.88), 0.90);
+}
+
+CajaWindow .button.flat:last-child {
+    border-radius: 0 6px 6px 0;
+    border-left-width: 0;
+    border-left-color: @theme_bg_color;
+    box-shadow: inset  0px  2px alpha(#fff, 0.11),
+                inset  2px  0px alpha(#fff, 0.09),
+                inset -2px  0px alpha(#fff, 0.09),
+                inset  0px -2px alpha(#fff, 0.07),
+                inset  0px  1px alpha(shade(@button_border, 1.00), 0.70),
+                inset  1px  0px alpha(shade(@button_border, 0.94), 0.80),
+                inset -1px  0px alpha(shade(@button_border, 0.94), 0.80),
+                inset  0px -1px alpha(shade(@button_border, 0.88), 0.90);
+}
+
+CajaWindow .button.flat {
+    border-style: none;
+    background-image: -gtk-gradient (linear,
+                                     left top, left bottom,
+                                     from (@button_gradient1),
+                                     to   (@button_gradient4));
+    padding: 0px 5px;
+}
+
+CajaWindow .button.flat:hover:first-child {
+    border-radius: 6px 0 0 6px;
+    border-right-width: 0;
+    border-style: none;
+    background-image: -gtk-gradient (linear,
+                                     left top, left bottom,
+                                     from (shade (@theme_bg_color, 1.20)),
+                                     color-stop (0.50, shade (@theme_bg_color, 1.00)),
+                                     color-stop (0.50, shade (@theme_bg_color, 0.95)),
+                                     to (shade (@theme_bg_color, 0.80)));
+    color: shade(@theme_fg_color, 1.00);
+    text-shadow: 0px 1px @theme_shadow_color;
+    padding: 0px 5px;
+    box-shadow: inset  0px  1px shade(@selected_bg_color, 1.05),
+                inset  1px  0px shade(@selected_bg_color, 0.97),
+                inset -1px  0px rgba(255,255,255,0), 0 1px rgba(255,255,255,0),
+                inset  0px -1px shade(@selected_bg_color, 0.93);
+}
+
+CajaWindow .button.flat:hover:last-child {
+    border-radius: 0 6px 6px 0;
+    border-left-width: 0;
+    border-style: none;
+    background-image: -gtk-gradient (linear,
+                                     left top, left bottom,
+                                     from (shade (@theme_bg_color, 1.20)),
+                                     color-stop (0.50, shade (@theme_bg_color, 1.00)),
+                                     color-stop (0.50, shade (@theme_bg_color, 0.95)),
+                                     to (shade (@theme_bg_color, 0.80)));
+    color: shade(@theme_fg_color, 1.00);
+    text-shadow: 0px 1px @theme_shadow_color;
+    padding: 0px 5px;
+    box-shadow: inset  0px  1px shade(@selected_bg_color, 1.05),
+                inset  1px  0px shade(@selected_bg_color, 0.97),
+                inset -1px  0px shade(@selected_bg_color, 0.93),
+                inset  0px -1px shade(@selected_bg_color, 0.93);
+}
+
+CajaWindow .button.flat:hover {
+    border-style: none;
+    background-image: -gtk-gradient (linear,
+                                     left top, left bottom,
+                                     from (shade(@button_gradient1, 1.03)),
+                                     to   (shade(@button_gradient4, 1.01)));
+    color: shade(@theme_fg_color, 1.00);
+    text-shadow: 0px 1px @theme_shadow_color;
+    padding: 0px 5px;
+}
+
+/* some overrides for button.flat */
+/* zoom button */
+CajaWindow .primary-toolbar .button.flat,
+CajaWindow .primary-toolbar .button.flat:first-child,
+CajaWindow .primary-toolbar .button.flat:last-child {
+    background-color: transparent;
+    background-image: none;
+    border-image: none;
+    box-shadow: none;
+}
+
+/* eventbars, ie. searchbar */
+CajaNotebook .frame GtkEventBox {
+    background-color: shade (@theme_bg_color, 1.05);
+    border-color: @notebook_border;
+    border-width: 1px;
+    border-style: solid;
+    border-radius: 4px;
+}
+
+CajaSearchBar.info {
+    background-image: -gtk-gradient (linear,
+                                     left top, left bottom,
+                                     from (shade(@toolbar_gradient_base, 0.89)),
+                                     color-stop (0.20, shade(@toolbar_gradient_base, 0.97)),
+                                     to   (shade(@toolbar_gradient_base, 1.01)));
+    border-radius: 0px;
+    border-width: 0px 0px 1px 0px;
+    border-style: solid;
+    border-color: alpha(#000, 0.00) @toolbar_gradient_base shade(@toolbar_gradient_base, 0.75);
+    box-shadow: inset  0px  1px alpha(#fff, 0.06),
+                inset  1px  0px alpha(#fff, 0.06),
+                inset -1px  0px alpha(#fff, 0.06),
+                inset  0px -1px alpha(#fff, 0.06);
+    color: @toolbar_fg_color;
+}
+
+.info,
+.question,
+CajaTrashBar.info,
+CajaXContentBar.info,
+CajaQueryEditor.info {
+    background-image: -gtk-gradient (linear,
+                                     left top, left bottom,
+                                     from (shade(@nautilus_cluebar_color, 1.00)),
+                                     to   (shade(@nautilus_cluebar_color, 1.00)));
+    border-radius: 0px;
+    border-width: 0px 0px 1px 0px;
+    border-style: solid;
+    border-color: transparent @nautilus_cluebar_color shade(@nautilus_cluebar_color, 0.75);
+    box-shadow: inset  0px  1px alpha(#fff, 0.06),
+                inset  1px  0px alpha(#fff, 0.06),
+                inset -1px  0px alpha(#fff, 0.06),
+                inset  0px -1px alpha(#fff, 0.06);
+}
+
+CajaSearchBar .entry {
+    box-shadow: inset  0px  3px alpha(#000, 0.03),
+                inset  0px  2px alpha(#000, 0.05),
+                inset  2px  0px alpha(#000, 0.04),
+                inset -2px  0px alpha(#000, 0.04),
+                inset  0px -2px alpha(#000, 0.03),
+                inset  0px  1px shade(@toolbar_gradient_base, 0.70),
+                inset  1px  0px shade(@toolbar_gradient_base, 0.80),
+                inset -1px  0px shade(@toolbar_gradient_base, 0.80),
+                inset  0px -1px shade(@toolbar_gradient_base, 0.90);
+}
+
+CajaSearchBar .entry:focus {
+    /* Like the normal inputl */
+}
+
+CajaSearchBar .entry,
+CajaSearchBar .entry:focus {
+    -GtkEntry-inner-border: 1;
+}
+
+CajaSearchBar .entry.image {
+    color: shade(@nautilus_cluebar_color, 0.60);
+}
+
+.info
+.caja-cluebar-label {
+    font: bold;
+    color: shade(@theme_fg_color, 1.00);
+    text-shadow: 0 1px @theme_shadow_color;
+}
+
+.question .button,
+.question .button:hover,
+CajaTrashBar .button,
+CajaTrashBar .button:hover {
+    background-image: -gtk-gradient (linear,
+                                     left top, left bottom,
+                                     from (shade(@nautilus_cluebar_color, 1.08)),
+                                     color-stop (0.45, shade(@nautilus_cluebar_color, 1.02)),
+                                     color-stop (0.52, shade(@nautilus_cluebar_color, 0.96)),
+                                     to   (shade(@nautilus_cluebar_color, 0.92)));
+    box-shadow: inset  0px  2px alpha(#fff, 0.09),
+                inset  2px  0px alpha(#fff, 0.07),
+                inset -2px  0px alpha(#fff, 0.07),
+                inset  0px -2px alpha(#fff, 0.05),
+                inset  0px  1px shade(@nautilus_cluebar_color, 0.80),
+                inset  1px  0px shade(@nautilus_cluebar_color, 0.70),
+                inset -1px  0px shade(@nautilus_cluebar_color, 0.70),
+                inset  0px -1px shade(@nautilus_cluebar_color, 0.60);
+    color: shade(@theme_fg_color, 1.00);
+    text-shadow: 0px 1px @theme_shadow_color;
+}
+
+.question .button:active,
+.question .button:active:hover,
+CajaTrashBar .button:active,
+CajaTrashBar .button:active:hover {
+/* .button:active:hover */
+    background-image: -gtk-gradient (linear,
+                                     left top, left bottom,
+                                     from (shade(@nautilus_cluebar_color, 1.00)),
+                                     color-stop (0.45, shade(@nautilus_cluebar_color, 0.95)),
+                                     color-stop (0.52, shade(@nautilus_cluebar_color, 0.91)),
+                                     to   (shade(@nautilus_cluebar_color, 0.87)));
+    /* outer */
+    border-top-color: alpha(@focused_entry_border, 0.20);
+    border-right-color: alpha(@focused_entry_border, 0.25);
+    border-left-color: alpha(@focused_entry_border, 0.25);
+    border-bottom-color: alpha(#fff, 0.10);
+    box-shadow: inset  0px  2px alpha(#fff, 0.09),
+                inset  2px  0px alpha(#fff, 0.07),
+                inset -2px  0px alpha(#fff, 0.07),
+                inset  0px -2px alpha(#fff, 0.05),
+                inset  0px  1px shade(@nautilus_cluebar_color, 0.75),
+                inset  1px  0px shade(@nautilus_cluebar_color, 0.65),
+                inset -1px  0px shade(@nautilus_cluebar_color, 0.65),
+                inset  0px -1px shade(@nautilus_cluebar_color, 0.55);
+}
+
+.question .button:active,
+.question .button:active:hover,
+CajaTrashBar .button:active,
+CajaTrashBar .button:active:hover {
+    color: shade(@theme_text_color, 1.00);
+    text-shadow: 0px 1px @theme_shadow_color;
+}
+
+.question .button:insensitive,
+CajaTrashBar .button:insensitive {
+/* .button:active:hover */
+    background-image: -gtk-gradient (linear,
+                                     left top, left bottom,
+                                     from (shade(@nautilus_cluebar_color, 0.95)),
+                                     color-stop (0.45, shade(@nautilus_cluebar_color, 0.90)),
+                                     color-stop (0.52, shade(@nautilus_cluebar_color, 0.88)),
+                                     to (shade(@nautilus_cluebar_color, 0.89)));
+    box-shadow: inset  0px  1px shade(@nautilus_cluebar_color, 0.85),
+                inset  1px  0px shade(@nautilus_cluebar_color, 0.81),
+                inset -1px  0px shade(@nautilus_cluebar_color, 0.81),
+                inset  0px -1px shade(@nautilus_cluebar_color, 0.78);
+}
+
+.question .button:insensitive,
+CajaTrashBar .button:insensitive {
+    color: mix(@nautilus_cluebar_color, @theme_fg_color, 0.50);
+    text-shadow: none;
+}
+
+CajaWindow .sidebar .frame {
+    border-width: 0px;
+    border-style: none;
+}
+
+CajaSearchBar,
+CajaSearchBar,
+CajaWindow .primary-toolbar.toolbar .button * {
+    padding: 2px 4px;
+}
+
+CajaSearchBar .entry,
+CajaLocationBar .entry {
+    padding: 4px 6px;
+    border-style: none;
+    box-shadow: inset  0px  1px shade (@theme_bg_color, 0.80),
+                inset  1px  0px shade (@theme_bg_color, 0.80),
+                inset -1px  0px shade (@theme_bg_color, 0.80),
+                inset  0px -1px shade (@theme_bg_color, 0.80);
+}
+
+CajaSearchBar .entry:focus {
+    box-shadow: inset  0px  1px shade(@selected_bg_color, 1.05),
+                inset  1px  0px shade(@selected_bg_color, 0.97),
+                inset -1px  0px shade(@selected_bg_color, 0.93),
+                inset  0px -1px shade(@selected_bg_color, 0.93);
+}
+
+CajaQueryEditor.vertical .vertical .horizontal .button,
+CajaQueryEditor.vertical .vertical .horizontal .button:hover {
+    padding: 4px 6px;
+}
+
+
+CajaQueryEditor.vertical .vertical .horizontal .text-button,
+CajaQueryEditor.vertical .vertical .horizontal .text-button:hover {
+    padding: 6px;
+}
+
+CajaQueryEditor.vertical .vertical .horizontal .button.flat,
+CajaQueryEditor.vertical .vertical .horizontal .button.flat:hover {
+    border-radius: 5px;
+    padding: 0px 6px;
+}
+
+CajaWindow .primary-toolbar.toolbar .entry {
+    padding: 3px 8px;
+}
+
+CajaWindow .primary-toolbar.toolbar .button,
+CajaWindow .primary-toolbar.toolbar .button:active,
+CajaWindow .primary-toolbar.toolbar .button:hover,
+CajaWindow .primary-toolbar.toolbar .button:active:hover {
+    padding: 0px 1px 0px 1px;
+    border-image: none;
+    border-width: 1px;
+    border-radius: 5px;
+    border-color: transparent;
+}
+
+CajaWindow .primary-toolbar .toolbar .button:active,
+CajaWindow .primary-toolbar.toolbar .button:active,
+CajaWindow .primary-toolbar .toolbar .button:active:hover,
+CajaWindow .primary-toolbar.toolbar .button:active:hover {
+    background-image: -gtk-gradient (linear,
+                                     left top, left bottom,
+                                     from (shade(@menu_bg_dark_color, 2.03)),
+                                     to   (shade(@menu_bg_dark_color, 1.17)));
+    border-width: 1px;
+    border-style: solid; 
+    border-radius: 5px;
+    border-image: none;
+    border-top-color: transparent;
+    border-left-color: alpha (#fff, 0.01);
+    border-right-color: alpha (#fff, 0.01);
+    border-bottom-color: alpha (#fff, 0.05);
+    border-width: 1px;
+    border-radius: 5px;
+    border-style: solid;
+    box-shadow: inset  0px  1px shade(@selected_bg_color, 1.05),
+                inset  1px  0px shade(@selected_bg_color, 0.97),
+                inset -1px  0px shade(@selected_bg_color, 0.93),
+                inset  0px -1px shade(@selected_bg_color, 0.93);
+}
+
+CajaWindow .primary-toolbar .toolbar .button:hover,
+CajaWindow .primary-toolbar.toolbar .button:hover {
+    background-image: -gtk-gradient (linear,
+                                     left top, left bottom,
+                                     from (shade(@menu_bg_dark_color, 2.03)),
+                                     to   (shade(@menu_bg_dark_color, 1.17)));
+    border-width: 1px;
+    border-radius: 5px;
+    border-style: solid;
+    box-shadow: inset  0px  1px shade(@selected_bg_color, 1.05),
+                inset  1px  0px shade(@selected_bg_color, 0.97),
+                inset -1px  0px shade(@selected_bg_color, 0.93),
+                inset  0px -1px shade(@selected_bg_color, 0.93);
+}
+
+/* buttons toolbar caja */
+CajaWindow .toolbar .button GtkImage:active,
+CajaWindow .toolbar .button GtkImage:active:hover,
+CajaWindow .toolbar .button GtkImage:hover,
+CajaWindow .toolbar .button GtkImage {
+    color: @theme_fg_color;
+}
+
+CajaWindow .primary-toolbar.toolbar .button GtkImage {
+    color: @theme_fg_dark_color;
+}
+
+/* ComboBox views */
+CajaWindow .primary-toolbar.toolbar GtkComboBox .button,
+CajaWindow .primary-toolbar.toolbar GtkComboBox .button:hover,
+CajaWindow .primary-toolbar.toolbar GtkComboBox .button:active,
+CajaWindow .primary-toolbar.toolbar GtkComboBox .button:active:hover {
+    padding: 4px 0px 4px 3px;
+}
+
+/* fix for menu transition */ 
+CajaWindow .primary-toolbar.toolbar GtkComboBox .menuitem {
+    background: transparent;
+    transition: all 300ms ease-out;
+}
+
+CajaWindow .primary-toolbar.toolbar GtkComboBox .menuitem:hover {
+    background-color: shade (@theme_bg_dark_color, 1.2);
+}
+
+/* toogle pathbar button */
+CajaWindow GtkPaned .button:active:only-child {
+    background-image: -gtk-gradient (linear,
+                                     left top, left bottom,
+                                     from (@button_gradient1),
+                                     color-stop (0.48, @button_gradient2),
+                                     color-stop (0.52, @button_gradient3),
+                                     to   (@button_gradient4));
+    box-shadow: inset  0px  2px alpha(#fff, 0.11),
+                inset  2px  0px alpha(#fff, 0.09),
+                inset -2px  0px alpha(#fff, 0.09),
+                inset  0px -2px alpha(#fff, 0.07),
+                inset  0px  1px alpha(shade(@button_border, 1.00), 0.70),
+                inset  1px  0px alpha(shade(@button_border, 0.94), 0.80),
+                inset -1px  0px alpha(shade(@button_border, 0.94), 0.80),
+                inset  0px -1px alpha(shade(@button_border, 0.88), 0.90);
+}
+
+/* caja pathbar toogle button */
+CajaWindow GtkPaned .button:hover {
+    background-image: -gtk-gradient (linear,
+                                     left top, left bottom,
+                                     from (shade (@theme_bg_color, 1.20)),
+                                     color-stop (0.50, shade (@theme_bg_color, 1.00)),
+                                     color-stop (0.50, shade (@theme_bg_color, 0.95)),
+                                     to (shade (@theme_bg_color, 0.80)));
+}
+
+CajaPathBar .button {
+    border-image: none;
+    padding: 4px 3px;
+    border-width: 1px;
+    border-left-width: 0;
+    border-right-width: 0;
+    border-radius: 5px;
+    border-color: transparent;
+}
+
+CajaPathBar .button:selected,
+CajaPathBar .button:hover,
+CajaPathBar .button:active,
+CajaPathBar .button:active:hover {
+    background-image: -gtk-gradient (linear,
+                                     left top, left bottom,
+                                     from (shade (@theme_bg_color, 1.20)),
+                                     color-stop (0.50, shade (@theme_bg_color, 1.00)),
+                                     color-stop (0.50, shade (@theme_bg_color, 0.95)),
+                                     to (shade (@theme_bg_color, 0.80)));
+    border-radius: 6px;
+    box-shadow: inset  0px  1px shade(@selected_bg_color, 1.05),
+                inset  1px  0px shade(@selected_bg_color, 0.97),
+                inset -1px  0px shade(@selected_bg_color, 0.93),
+                inset  0px -1px shade(@selected_bg_color, 0.93);
+    padding: 4px 3px;
+    border-width: 1px;
+    border-left-width: 0;
+    border-right-width: 0;
+    border-radius: 5px;
+    border-color: transparent;
+}
+
+.caja-canvas-item {
+    border-radius: 3px;
+}
+
+/* desktop mode */
+.caja-desktop.caja-canvas-item {
+    color: white;
+    text-shadow: 1px 1px black;
+}
+
+.caja-desktop.caja-canvas-item:active {
+    background-image: none;
+    color: @theme_text_color;
+}
+
+.caja-desktop.caja-canvas-item:selected {
+    color: @theme_selected_fg_color;
+}
+
+.caja-desktop.caja-canvas-item:active,
+.caja-desktop.caja-canvas-item:prelight,
+.caja-desktop.caja-canvas-item:selected {
+    text-shadow: none;
+}
+
+/****************
+ * Mate-Panel *
+ ****************/
+
+/* the panel bar itself */
+.mate-panel-menu-bar {
+    background-color: @theme_bg_dark_color;
+    background-image: none;
+    /* normal panel */
+    color: @menu_fg_dark_color;
+    /* transparent panel light desktop background*/
+/*    color: @theme_fg_color; */
+    text-shadow: none;
+}
+
+/* first make all transparent */
+WnckSelector.menubar,
+PanelMenuBar.menubar,
+WnckSelector GtkMenuItem,
+PanelMenuBar GtkMenuItem,
+MatePanelApplet GtkToggleButton.button {
+    border-image: none;
+    background-image: none;
+    background-color: transparent;
+    box-shadow: none;
+}
+
+/* dictionary applet */
+GdictApplet .entry {
+    /* normal panel */
+    color: @menu_fg_dark_color;
+    /* transparent panel light desktop background */
+/*    color: @theme_fg_color; */
+    background-image: none;
+    background-color: transparent;
+    border-width: 1px;
+    padding: 3px 4px;
+}
+
+MatePanelApplet {
+    border-width: 0;
+}
+
+/* panel grip */
+PanelToplevel.background.mate-custom-panel-background {
+    background-color: transparent;
+    border-radius: 3px;
+/* enable for making borders visible */
+/*    box-shadow: inset  0px  1px shade(@selected_bg_color, 1.05),
+                inset  1px  0px shade(@selected_bg_color, 0.97),
+                inset -1px  0px shade(@selected_bg_color, 0.93),
+                inset  0px -1px shade(@selected_bg_color, 0.93); */
+}
+
+/* hide buttons */
+PanelToplevel.background.mate-custom-panel-background .button {
+    background: transparent;
+    border-radius: 4px;
+    padding: 0px;
+    box-shadow: none;
+}
+
+PanelToplevel.background.mate-custom-panel-background .button:hover {
+    box-shadow: inset  0px  1px shade(@selected_bg_color, 1.05),
+                inset  1px  0px shade(@selected_bg_color, 0.97),
+                inset -1px  0px shade(@selected_bg_color, 0.93),
+                inset  0px -1px shade(@selected_bg_color, 0.93);
+}
+
+MatePanelAppletFrameDBus PanelSeparator,
+PanelSeparator {
+    border-width: 0;
+    background-image: -gtk-gradient (linear, left top, left bottom,
+                                     from (shade (@theme_bg_dark_color, 1.03)),
+                                     to (shade (@theme_bg_dark_color, 0.95)));
+    color: shade (@theme_fg_dark_color, 0.45);
+    text-shadow: none;
+}
+
+/* set normal menubar button */
+PanelMenuBar.menubar .menuitem {
+    padding: 5px 5px;
+    transition: all 200ms ease-out;
+}
+
+/* set selected menubar button */
+PanelMenuBar.menubar .menuitem:hover {
+    padding: 5px 5px;
+    background-color: shade (@theme_bg_dark_color, 1.2);
+    background-image: -gtk-gradient (linear,
+                                     left top, left bottom,
+                                     from (shade(@menu_bg_dark_color, 2.03)),
+                                     to   (shade(@menu_bg_dark_color, 1.17)));
+    border-radius: 5px;
+    text-shadow: none;
+    color: shade (@theme_selected_bg_color, 1.6);
+    box-shadow: inset  0px  1px shade(@selected_bg_color, 1.05),
+                inset  1px  0px shade(@selected_bg_color, 0.97),
+                inset -1px  0px shade(@selected_bg_color, 0.93),
+                inset  0px -1px shade(@selected_bg_color, 0.93);
+    text-shadow: none;
+    border-style: none;
+    border-width: 0px;
+}
+
+/* set normal menubar menuitem */
+PanelMenuBar.menubar .menu .menuitem {
+    padding: 6px 6px;
+    transition: all 300ms ease-out;
+}
+
+/* set selected menubar menuitem */
+PanelMenuBar.menubar .menu .menuitem:active:hover,
+PanelMenuBar.menubar .menu .menuitem:hover {
+    padding: 6px;
+    background-color: shade (@theme_bg_dark_color, 1.2);
+    background-image: -gtk-gradient (linear,
+                                     left top, left bottom,
+                                     from (shade(@menu_bg_dark_color, 2.03)),
+                                     to   (shade(@menu_bg_dark_color, 1.17)));
+    border-radius: 5px;
+    text-shadow: none;
+    color: shade (@theme_selected_bg_color, 1.6);
+    box-shadow: inset  0px  1px shade(@selected_bg_color, 1.05),
+                inset  1px  0px shade(@selected_bg_color, 0.97),
+                inset -1px  0px shade(@selected_bg_color, 0.93),
+                inset  0px -1px shade(@selected_bg_color, 0.93);
+    text-shadow: none;
+    border-style: none;
+    border-width: 0px;
+}
+
+/* Mate menu button normal */
+/* makes the arrow visible, nothing more works */
+PanelMenuButton.button {
+    background-image: none;
+    background-color: transparent;
+    color: shade (@menu_fg_color, 1.00);
+}
+
+/* Mate menu menuitem */
+PanelMenuButton .menu .menuitem,
+PanelMenuButton .menu .menuitem:hover {
+    padding: 6px;
+}
+
+/* desktop-applet, clockapplet, drivemount, character-map,
+dictionary */
+
+MatePanelApplet .button,
+MatePanelApplet .button.flat {
+    background-image: none;
+    background-color: transparent;
+/*    border-color: shade (@theme_selected_bg_color, 1.30); */
+    border-radius: 5px;
+    border-width: 0px;
+    /* normal panel */
+    color: @menu_fg_dark_color;
+    /* transparent panel light desktop background*/
+/*    color: @theme_fg_color; */
+    text-shadow: none;
+    padding: 6px;
+}
+
+MatePanelApplet .button:active:hover,
+MatePanelApplet .button:active,
+MatePanelApplet .button.flat:active:hover,
+MatePanelApplet .button.flat:active {
+    background-image: none;
+    border-color: @selected_bg_color;
+    background-color: shade (@selected_bg_color, 0.70);
+    border-radius: 5px;
+    border-width: 0px;
+    color: shade (@theme_text_dark_color, 0.90);
+    text-shadow: none;
+    padding: 6px;
+}
+
+MatePanelApplet .button:hover,
+MatePanelApplet .button.flat:hover {
+    background-image: none;
+    border-color: @selected_bg_color;
+    background-color: shade (@selected_bg_color, 1.10);
+    border-radius: 5px;
+    border-width: 0px;
+    color: @selected_fg_color;
+    text-shadow: none;
+    padding: 6px;
+}
+
+/* drivemount */
+DriveList .button,
+DriveList .button.flat,
+DriveList .button:hover,
+DriveList .button.flat:hover,
+DriveList .button:active,
+DriveList .button.flat:active {
+    padding: 4px;
+    border-radius: 5px;
+    border-color: transparent;
+    box-shadow: none;
+}
+
+/*Wncklist */
+WnckTasklist .button,
+WnckTasklist .button.flat {
+    background-image: none;
+    background-color: transparent;
+    border-radius: 5px;
+    border-width: 1px;
+    color: shade (@theme_text_dark_color, 0.65);
+    text-shadow: none;
+    padding: 2px;
+}
+
+WnckTasklist .button:active:hover,
+WnckTasklist .button:active,
+WnckTasklist .button.flat:active:hover,
+WnckTasklist .button.flat:active {
+    background-image: none;
+    border-color: @selected_bg_color;
+    background-color: shade (@selected_bg_color, 0.70);
+    border-radius: 5px;
+    border-width: 1px;
+    color: shade (@theme_text_dark_color, 0.90);
+    text-shadow: none;
+    padding: 2px;
+}
+
+WnckTasklist .button:hover,
+WnckTasklist .button.flat:hover {
+    background-image: none;
+    border-color: @selected_bg_color;
+    background-color: shade (@selected_bg_color, 1.10);
+    border-radius: 5px;
+    border-width: 1px;
+    color: @theme_fg_color;
+    text-shadow: none;
+    padding: 2px;
+}
+
+/* set normal button WnckSelector */
+WnckSelector.menubar .menuitem {
+    background-image: none;
+    background-color: transparent;
+    border-style: none;
+    border-width: 1px;
+    border-radius: 5px;
+}
+
+/* set selected button WnckSelector */
+WnckSelector.menubar .menuitem:hover {
+    background-image: none;
+    border-color: @selected_bg_color;
+    background-color: shade (@selected_bg_color, 0.70);
+    border-radius: 5px;
+    border-width: 1px;
+    color: shade (@theme_text_dark_color, 0.90);
+    text-shadow: none;
+}
+
+/* set WnckSelector selected menuitem */
+WnckSelector.menubar .menu .menuitem:hover {
+    background-color: shade (@theme_bg_dark_color, 1.2);
+    color: shade (@theme_selected_bg_color, 1.3);
+    background-image: none;
+    border-radius: 6px;
+    text-shadow: none;
+    box-shadow: inset  0px  1px shade (@theme_selected_bg_color, 1.3),
+                inset  1px  0px shade (@theme_selected_bg_color, 1.3),
+                inset -1px  0px shade (@theme_selected_bg_color, 1.3),
+                inset  0px -1px shade (@theme_selected_bg_color, 1.3);
+}
+
+ClockBox,
+.mate-panel-menu-bar.menubar,
+MatePanelApplet > GtkMenuBar.menubar {
+    font: normal;
+}
+
+WnckPager {
+    background-image: none;
+    border-color: transparent;
+    background-color: shade (@terminal_background_color, 1.15);
+}
+
+/* prelight of WnckPager */
+WnckPager:hover {
+    background-image: linear-gradient(to bottom,
+                                      @theme_bg_color,
+                                      shade (@theme_selected_bg_color, 0.86));
+}
+
+NaTrayApplet {
+    -NaTrayApplet-icon-padding: 12px;
+    -NaTrayApplet-icon-size: 16;
+}
+
+/* Classic icon style */
+.mate-panel-menu-bar {
+    -PanelMenuBar-icon-visible: true;
+}
+
+/****************
+ * Mate-terminal *
+ ****************/
+
+/* Background mate-terminal, this isn't the normal way to style that! */
+TerminalWindow .entry {
+    -TerminalWindow-background-darkness: 0.95;
+    background-color: @terminal_background_color;
+    color: @selected_fg_color;
+}
+
+TerminalWindow .grip {
+    background-color: shade (@theme_bg_color, 1.0);
+    background-image: url("assets/resize-grip.svg");
+    -GtkWindow-resize-grip-default: true;
+    -GtkWindow-resize-grip-width: 13;
+    -GtkWindow-resize-grip-height: 13;
+}
+
+/****************
+ * Pluma        *
+ ****************/
+
+/* pluma line numbers */
+PlumaView {
+    background-color: shade (@bg_color, 1.07);
+}
+
+/* Pluma status bar */
+PlumaWindow .button.flat {
+    border-style: none;
+    background-image: -gtk-gradient (linear,
+                                     left top, left bottom,
+                                     from (shade(@nautilus_cluebar_color, 1.08)),
+                                     color-stop (0.45, shade(@nautilus_cluebar_color, 1.02)),
+                                     color-stop (0.52, shade(@nautilus_cluebar_color, 0.96)),
+                                     to   (shade(@nautilus_cluebar_color, 0.92)));
+    box-shadow: inset  0px  2px alpha(#fff, 0.09),
+                inset  2px  0px alpha(#fff, 0.07),
+                inset -2px  0px alpha(#fff, 0.07),
+                inset  0px -2px alpha(#fff, 0.05),
+                inset  0px  1px shade(@nautilus_cluebar_color, 0.80),
+                inset  1px  0px shade(@nautilus_cluebar_color, 0.70),
+                inset -1px  0px shade(@nautilus_cluebar_color, 0.70),
+                inset  0px -1px shade(@nautilus_cluebar_color, 0.60);
+    border-radius: 4px;
+    padding: 2px 5px;
+}
+
+PlumaWindow .button.flat:hover {
+    border-style: none;
+    background-image: -gtk-gradient (linear,
+                                     left top, left bottom,
+                                     from (shade(@nautilus_cluebar_color, 1.08)),
+                                     color-stop (0.45, shade(@nautilus_cluebar_color, 1.02)),
+                                     color-stop (0.52, shade(@nautilus_cluebar_color, 0.96)),
+                                     to   (shade(@nautilus_cluebar_color, 0.92)));
+    box-shadow: inset  0px  1px shade(@selected_bg_color, 1.05),
+                inset  1px  0px shade(@selected_bg_color, 0.97),
+                inset -1px  0px shade(@selected_bg_color, 0.93),
+                inset  0px -1px shade(@selected_bg_color, 0.93);
+    color: shade(@theme_fg_color, 1.00);
+    text-shadow: 0px 1px @theme_shadow_color;
+    border-radius: 4px;
+    padding: 2px 5px;
+}
+
+/* surpress styling of close button */
+PlumaWindow .notebook tab .button.flat,
+PlumaWindow .notebook tab .button.flat:hover {
+    border-color: transparent;
+    background-color: transparent;
+    background-image: none;
+    box-shadow: inset 0 1px rgba(255,255,255,0), 0 1px rgba(255,255,255,0);
+    text-shadow: none;
+    icon-shadow: none;
+    border-image: none;
+}
+
+PlumaCloseButton.button.flat,
+PlumaCloseButton.button.flat:hover,
+PlumaCloseButton:prelight.button.flat,
+PlumaCloseButton:prelight.button.flat:hover {
+    padding: 1px;
+    -gtk-image-effect: highlight;
+}
+
+PlumaWindow .notebook.frame.top,
+PlumaWindow .notebook.header.top {
+    border-width: 0px 0px 0px 0px;
+}
+
+PlumaWindow .notebook tab.top {
+    padding: 8px 4px 7px 6px;
+}
+
+/* Printpreview */
+PlumaPrintPreview.vertical .toolbar.horizontal {
+   background-image: -gtk-gradient (linear,
+                                     left top, left bottom,
+                                     from (shade(@theme_bg_dark_color, 1.00)),
+                                     to   (shade(@theme_bg_dark_color, 0.95)));
+    border-image: none;
+    border-width: 0px 0px 1px 0px;
+    border-radius: 0px;
+    border-style: solid;
+    border-color: transparent;
+    padding: 3px;
+    box-shadow: none;
+    -GtkWidget-window-dragging: true;
+    -GtkToolbar-button-relief: normal;
+    color: @theme_fg_dark_color;
+}
+
+PlumaPrintPreview.vertical .toolbar.horizontal .button {
+    background-image: none;
+    box-shadow: none;
+}
+
+PlumaPrintPreview.vertical .toolbar.horizontal .button:hover {
+    box-shadow: inset  0px  1px shade(@selected_bg_color, 1.05),
+                inset  1px  0px shade(@selected_bg_color, 0.97),
+                inset -1px  0px shade(@selected_bg_color, 0.93),
+                inset  0px -1px shade(@selected_bg_color, 0.93);
+}
+
+PlumaPrintPreview.vertical .toolbar.horizontal .button.text-button {
+    padding: 0px 10px;
+}
+
+PlumaPrintPreview.vertical .toolbar.horizontal .button.text-button:hover {
+    color: @theme_fg_dark_color;
+}
+
+PlumaPrintPreview.vertical GtkLayout {
+    background-color: @theme_base_color;
+}
+
+/* sidebar file-browser */
+PlumaPanel.vertical {
+    background-image: linear-gradient(to bottom,
+                                      shade(@theme_bg_color, 1.14),
+                                      shade(@theme_bg_color, 1.1));
+    border-radius: 4px 4px 0px 0px;
+    border-width: 1px 0px 0px 0px;
+    border-style: solid;
+    border-color: @borders;
+    box-shadow: none;
+}
+
+/* header */
+PlumaPanel.vertical .horizontal .horizontal .label {
+    padding: 4px 2px;
+}
+
+PlumaPanel.vertical PlumaCloseButton.button.flat {
+    box-shadow: none;
+    background-image: none;
+    border-style: none;
+}
+
+PlumaPanel.vertical PlumaCloseButton.button.flat:hover {
+    border-radius: 4px;
+    border-style: none;
+    -gtk-image-effect: highlight;
+    box-shadow: inset  0px  1px shade(@selected_bg_color, 1.05),
+                inset  1px  0px shade(@selected_bg_color, 0.97),
+                inset -1px  0px shade(@selected_bg_color, 0.93),
+                inset  0px -1px shade(@selected_bg_color, 0.93);
+}
+
+PlumaPanel.vertical .notebook {
+    border-radius: 0px;
+}
+
+PlumaFileBrowserWidget.vertical GtkToggleButton.button {
+    padding: 4px ;
+}
+
+PlumaFileBrowserWidget.vertical .toolbar.horizontal {
+   background-image: -gtk-gradient (linear,
+                                     left top, left bottom,
+                                     from (shade(@theme_bg_dark_color, 1.00)),
+                                     to   (shade(@theme_bg_dark_color, 0.95)));
+    border-image: none;
+    border-width: 0px 0px 1px 0px;
+    border-radius: 0px;
+    border-style: solid;
+    border-color: @primay-toolbar-border;
+    padding: 3px 3px;
+    box-shadow: none;
+    -GtkWidget-window-dragging: true;
+    -GtkToolbar-button-relief: normal;
+    color: @theme_fg_dark_color;
+}
+
+PlumaFileBrowserWidget.vertical .horizontal.toolbar .button,
+PlumaFileBrowserWidget.vertical .horizontal.toolbar .button.menu-button {
+    padding: 6px 3px ;
+}
+
+PlumaFileBrowserWidget.vertical .toolbar.horizontal .button.image-button {
+    padding: 6px 4px ;
+}
+
+PlumaFileBrowserWidget.vertical {
+    background-color: @theme_bg_color;
+}
+
+PlumaDocumentsPanel .view,
+PlumaFileBrowserWidget .view {
+    background-color: shade (@theme_bg_color, 1.08);
+}
+
+/* color of of expander arrow */
+PlumaFileBrowserWidget.vertical GtkExpander:hover {
+    color: @theme_fg_color;
+}
+
+PlumaWindow .notebook.frame.bottom,
+PlumaWindow .notebook.header.bottom {
+    border-width: 0px 0px 0px 0px;
+}
+
+PlumaWindow .notebook tab.bottom {
+    padding: 2px 10px 4px 10px;
+}
+
+/***********************
+ * Mate-Control-Center *
+ ***********************/
+
+/* background */
+ShellWindow .enty,
+ShellWindow AppResizer SlabSection {
+    background-color: @theme_base_color;
+}
+
+/* button of sidebar */
+ShellWindow .button.flat {
+    border-image: none;
+    border-radius: 6px;
+    padding: 4px;
+}
+
+ShellWindow .button.flat:hover {
+    border-radius: 6px;
+    padding: 4px;
+}
+
+/* button of applications */
+ShellWindow GtkScrolledWindow .button.flat {
+    padding: 4px 0px;
+    border-image: none;
+}
+
+/* button hover of applications */
+ShellWindow GtkScrolledWindow .button.flat:hover {
+    padding: 4px 0px;
+    border-radius: 12px;
+    background-image: -gtk-gradient (linear,
+                                     left top, left bottom,
+                                     from (shade(@button_gradient1, 1.03)),
+                                     color-stop (0.48, shade(@button_gradient2, 1.03)),
+                                     color-stop (0.52, shade(@button_gradient3, 1.03)),
+                                     to   (shade(@button_gradient4, 1.01)));
+    border-top-color: alpha(@focused_entry_outer, 0.65);
+    border-right-color: alpha(@focused_entry_outer, 0.75);
+    border-left-color: alpha(@focused_entry_outer, 0.75);
+    border-bottom-color: alpha(@focused_entry_outer, 0.80);
+    box-shadow: inset  0px  1px shade(@selected_bg_color, 1.05),
+                inset  1px  0px shade(@selected_bg_color, 0.97),
+                inset -1px  0px shade(@selected_bg_color, 0.93),
+                inset  0px -1px shade(@selected_bg_color, 0.93);
+}
+
+/* logout dialog */
+GsmLogoutDialog * {
+    -GtkDialog-button-spacing: 0;
+}
+
+/***********************
+ * Engrampa *
+ ***********************/
+
+FrWindow .toolbar.primary-toolbar {
+    border-color: @primay-toolbar-border;
+    border-width: 0 0 1px 0;
+}
+
+/* Parole media player needs more testing! */
+
+GtkPaned GtkOverlay GtkRevealer.bottom .button.flat.image-button {
+    border-style: none;
+    background-color: transparent;
+    padding: 4px 6px;
+    box-shadow: inset  0px  1px alpha(shade(@button_border, 1.00), 0.90),
+                inset  1px  0px alpha(shade(@button_border, 0.94), 0.90),
+                inset -1px  0px alpha(shade(@button_border, 0.88), 0.90),
+                inset  0px -1px alpha(shade(@button_border, 0.88), 0.90);
+}
+
+GtkPaned GtkOverlay GtkRevealer.bottom .button.flat.image-button:hover {
+    border-style: none;
+    padding: 4px 6px;
+    box-shadow: inset  0px  1px shade(@selected_bg_color, 1.05),
+                inset  1px  0px shade(@selected_bg_color, 0.97),
+                inset -1px  0px shade(@selected_bg_color, 0.93),
+                inset  0px -1px shade(@selected_bg_color, 0.93);
+}
+
+/*********
+ * Atril *
+ *********/
+
+EvWindow .vertical.primary-toolbar .horizontal.toolbar {
+    padding: 1px 4px;
+}
+
+/* size of page entry */
+EvPageActionWidget .entry {
+    padding: 4px;
+}
+
+EvWindow .toolbar .button,
+EvWindow .toolbar .button.flat {
+    padding: 0px 4px;
+}
+
+EvWindow .vertical.primary-toolbar .horizontal.toolbar EphyZoomControl GtkToggleButton:prelight.button {
+    padding: 4px;
+    border-radius: 4px;
+}
+
+EvSidebar .flat.button {
+    border-radius: 4px;
+    padding: 4px;
+}
+
+/* atril and eom */
+EggToolbarEditor.vertical GtkScrolledWindow .frame {
+    background-color: shade (@base_color, 1.0);
+    border-color: @notebook_border;
+    border-width: 1px;
+    border-radius: 0px;
+    border-style: solid;
+}
+
+/**************
+ * mate-media *
+ **************/
+
+GvcMixerDialog .frame.flat {
+    border-style: none;
+}
+
+GvcMixerDialog .vertical.dialog-vbox .notebook GtkScrolledWindow.frame {
+    border-style: none;
+    border-radius: 0px 0px 4px 4px;
+}
+
+GvcMixerDialog .vertical.dialog-vbox .notebook .frame.flat GtkScrolledWindow.frame {
+    border-width: 1px;
+    border-radius: 0px;
+    border-style: solid;
+}
+
diff --git a/desktop-themes/Green-Submarine/gtk-3.0/menu.css b/desktop-themes/Green-Submarine/gtk-3.0/menu.css
new file mode 100644
index 00000000..657e0ac1
--- /dev/null
+++ b/desktop-themes/Green-Submarine/gtk-3.0/menu.css
@@ -0,0 +1,369 @@
+/*************************
+ * menu  
+ *
+ *************************/
+
+.toolbar .raised .menu,
+.menu {
+    /* menu contextual */
+    background-color: @menu_bg_dark_color;
+    background-image: -gtk-gradient (linear,
+                                     left top, left bottom,
+                                     from (shade(@menu_bg_dark_color, 1.03)),
+                                     to   (shade(@menu_bg_dark_color, 0.97)));
+    border-style: solid;
+    border-width: 1px;
+    border-radius: 0px;
+    border-color: shade(@menu_bg_dark_color, 0.97);
+    border-image: none;
+}
+
+.menu:selected {
+    background-color: @theme_selected_bg_color;
+}
+
+GtkMenuItem,
+GtkMenuItem:insensitive {
+    background-color: @menu_bg_dark_color;
+}
+
+.menubar .menu.button:hover,
+.menubar .menu.button:active,
+.menubar .menu.button:active:insensitive,
+.menubar .menu.button:insensitive,
+.menubar .menu.button,
+.primary-toolbar .menu.button:hover,
+.primary-toolbar .menu.button:active,
+.primary-toolbar .menu.button:active:insensitive,
+.primary-toolbar .menu.button:insensitive,
+.primary-toolbar .menu.button {
+    background-color: shade (@menu_bg_dark_color, 1.07);
+    background-image: -gtk-gradient (linear,
+                                     left top, left bottom,
+                                     from (@menu_bg_dark_color),
+                                     to (shade(@menu_bg_dark_color, 0.96)));
+    border-radius: 0;
+    border-style: none;
+    border-width: 1px;
+    border-image: none;
+}
+
+.menu.button {
+    padding: 0px;
+    background-image: none;
+    background-color: shade (@menu_bg_dark_color, 0.95);
+    color: mix (@menu_fg_dark_color, @menu_bg_dark_color, 0.3);
+    box-shadow: none;
+    border-image: none;
+    border-style: none;
+}
+
+.menu.button GtkArrow {
+    color: @menu_fg_dark_color;
+}
+
+/***********
+ * menubar *
+ ***********/
+.menubar {
+    -GtkWidget-window-dragging: true;
+    /* line 3D  (dark) */
+    box-shadow: inset  0px -1px @menu_line_dark_color;
+    /* line 3D at the buttom of the menu bar */
+    border-width: 0px 0px 1px 0px;
+    border-style: solid;
+    border-radius: 0px;
+    border-color: transparent;
+    border-bottom-color:  shade(@theme_bg_dark_color, 1.60);
+    background-color: shade (@theme_bg_dark_color, 1.00);
+    color: @menu_fg_dark_color;
+}
+
+/***************
+ * menubaritem *
+ ***************/
+.menubar.menuitem  {
+    padding: 5px 5px;
+    transition: all 300ms ease-out;
+    border-radius: 0px;
+    border-width: 0px;
+}
+
+.menubar.menuitem:hover,
+.menubar .menuitem:hover {
+    padding: 5px 5px;
+    background-color: shade (@theme_bg_dark_color, 1.2);
+    border-radius: 5px;
+    color: shade (@theme_selected_bg_color, 1.3);
+    text-shadow: 0px 1px @theme_selected_shadow_color;
+}
+
+/************
+ * menuitem *
+ ************/
+.menubar .menuitem {
+    padding: 5px 5px;
+    transition: all 300ms ease-out;
+    color: @theme_fg_dark_color;
+    text-shadow: 1px 1px @theme_shadow_dark_color;
+}
+
+Genericmenuitem .menuitem,
+DbusmenuGtkMenu .menuitem,
+.toolbar .raised .button .menuitem,
+.toolbar.menubar .button .menuitem,
+.toolbar .menuitem,
+.primary-toolbar .menuitem,
+.primary-toolbar .button .menuitem,
+.menu .menuitem, 
+.menuitem {
+/* Fix height change in nautilus menu item view options */
+    padding: 0px;
+    border-width: 0px;
+}
+
+Genericmenuitem .menuitem,
+DbusmenuGtkMenu .menuitem,
+.toolbar .raised .button .menuitem,
+.toolbar.menubar .button .menuitem,
+.toolbar.menubar .linked .button .menuitem,
+.toolbar .menuitem,
+.primary-toolbar .menuitem,
+.primary-toolbar .button .menuitem,
+.menu .menuitem, 
+.menuitem {
+    transition: all 300ms ease-out;
+    -GtkMenuItem-arrow-scaling: 0.7;
+    padding: 2px 4px;
+    border-radius: 0px;
+    color: @menu_fg_dark_color;
+    text-shadow: 1px 1px @menu_shadow_dark_color;
+    padding: 5px 5px;
+}
+
+.toolbar .menuitem GtkLabel,
+.primary-toolbar .menuitem GtkLabel,
+.toolbar .raised .button .menuitem GtkLabel,
+.toolbar.menubar .button .menuitem GtkLabel,
+.primary-toolbar .button .menuitem GtkLabel {
+    color: @menu_fg_dark_color;
+    text-shadow: 1px 1px @menu_shadow_dark_color;
+}
+
+GtkTreeMenu.menu {
+    background-color: @menu_bg_dark_color;
+}
+
+GtkTreeMenu .menuitem {
+    border-style: none;
+    border-width: 0px;
+}
+
+/* Workaround for lp:949368 */
+.toolbar GtkComboBox .menuitem, 
+GtkComboBox .menuitem {
+    transition: all 300ms ease-out;
+    color: @menu_fg_dark_color;
+    text-shadow: 0px 1px @menu_shadow_dark_color;
+}
+
+GtkComboBox .menuitem:hover {
+    background-color: shade (@theme_bg_dark_color, 1.2);
+    color: shade (@theme_selected_bg_color, 1.3);
+       text-shadow: 0px 1px @theme_selected_shadow_color;
+}
+
+.menuitem:hover,
+.menu .menuitem:hover {
+    /* contextual menu item-selected */
+    background-color: shade (@theme_bg_dark_color, 1.2);
+    background-image: -gtk-gradient (linear,
+                                     left top, left bottom,
+                                     from (shade(@menu_bg_dark_color, 2.03)),
+                                     to   (shade(@menu_bg_dark_color, 1.17)));
+    color: shade (@theme_selected_bg_color, 1.3);
+    text-shadow: 0px 1px @theme_selected_shadow_color;
+    border-radius: 5px;
+    border-width: 1px;
+    border-image: none;
+    padding: 5px 5px;
+    box-shadow: inset  0px  1px shade (@theme_selected_bg_color, 1.3),
+                inset  1px  0px shade (@theme_selected_bg_color, 1.3),
+                inset -1px  0px shade (@theme_selected_bg_color, 1.3),
+                inset  0px -1px shade (@theme_selected_bg_color, 1.3);
+}
+
+.toolbar .menuitem:hover,
+.primary-toolbar .toolbar .button .menuitem:hover,
+.primary-toolbar.toolbar .button .menuitem:hover,
+.toolbar .raised .button .menuitem:hover, /* menuitem opciones visualizacion nautilus  */
+.toolbar.menubar .button .menuitem:hover, 
+GtkComboBox .menuitem:hover, 
+GtkTreeMenu .menuitem:active,
+GtkTreeMenu .menuitem:prelight,
+.menuitem:active,
+.menuitem:prelight,
+.menuitem:hover, 
+.menuitem:hover,
+.menu .menuitem:hover {
+    color: shade (@theme_selected_bg_color, 1.3);
+    text-shadow: 0px 1px @theme_selected_shadow_color;
+}
+
+.primary-toolbar .menuitem:insensitive,
+.toolbar .raised .button .menuitem:insensitive,
+.toolbar.menubar .button .menuitem:insensitive,
+.primary-toolbar .button .menuitem:insensitive,
+.toolbar .menuitem:insensitive,
+.menuitem:insensitive,
+.menuitem:insensitive {
+    /* contextual menu insensitive */
+    color: mix (@menu_fg_dark_color, @menu_bg_dark_color, 0.4);
+    text-shadow: none;
+}
+
+.menuitem.check,
+.menuitem.radio,
+.menuitem.check:hover,
+.menuitem.radio:hover,
+.menuitem.check:insensitive,
+.menuitem.radio:insensitive,
+.menuitem.check:active:insensitive,
+.menuitem.radio:active:insensitive,
+.menuitem.check:inconsistent:insensitive,
+.menuitem.radio:inconsistent:insensitive {
+    border-width: 0px;
+    border-style: none;
+    background-image: none;
+}
+
+.toolbar .raised .button .menuitem.check:inconsistent,
+.toolbar .raised .button .menuitem.radio:inconsistent,
+.menuitem.check:inconsistent,
+.menuitem.radio:inconsistent,
+.toolbar .raised .button .menuitem.check:active,
+.toolbar .raised .button .menuitem.radio:active,
+.menuitem.check:active,
+.menuitem.radio:active {
+    border-width: 0px;
+    border-style: none;
+    background-image: none;
+    background-color: @menu_bg_dark_color;
+    /* contextual menu check */
+    color: @menu_fg_dark_color;
+}
+
+.toolbar .raised .button .menuitem.check:inconsistent:hover,
+.toolbar .raised .button .menuitem.radio:inconsistent:hover,
+.menuitem.check:inconsistent:hover,
+.menuitem.radio:inconsistent:hover,
+.toolbar .raised .button .menuitem.check:active:hover,
+.toolbar .raised .button .menuitem.radio:active:hover,
+.menuitem.check:active:hover,
+.menuitem.radio:active:hover {
+    border-color: @theme_selected_fg_color;
+    color: @theme_selected_fg_color;
+}
+
+.menuitem.arrow:hover {
+    border-color: @theme_selected_fg_color;
+    color: shade (@theme_selected_bg_color, 1.6);
+}
+
+.menuitem.check:insensitive,
+.menuitem.radio:insensitive,
+.menuitem.check:active:insensitive,
+.menuitem.radio:active:insensitive,
+.menuitem.check:inconsistent:insensitive,
+.menuitem.radio:inconsistent:insensitive {
+    color: mix (@menu_fg_dark_color, @menu_bg_dark_color, 0.6);
+    text-shadow: none;
+}
+
+.menubar .menuitem GtkCalendar,
+.menubar .menuitem GtkCalendar.button,
+.menubar .menuitem GtkCalendar.header,
+.menubar .menuitem GtkCalendar.view,
+.primary-toolbar .menuitem GtkCalendar,
+.primary-toolbar .menuitem GtkCalendar.button,
+.primary-toolbar .menuitem GtkCalendar.header,
+.primary-toolbar .menuitem GtkCalendar.view {
+    background-color: @menu_bg_dark_color;
+    background-image: none;
+    border-radius: 0;
+    border-style: solid;
+    border-width: 0;
+    padding: 0;
+    color: @menu_fg_dark_color;
+}
+
+.menubar .menuitem GtkCalendar,
+.primary-toolbar .menuitem GtkCalendar {
+    background-color: shade (@menu_bg_dark_color, 1.3);
+    background-image: none;
+}
+
+.menubar .menuitem GtkScale.trough {
+    background-image: -gtk-gradient (linear,
+                                     left top,
+                                     left bottom,
+                                     from (shade(@menu_bg_dark_color, 0.80)),
+                                     color-stop (0.20, shade(@menu_bg_dark_color, 0.85)),
+                                     to   (shade(@menu_bg_dark_color, 0.96)));
+    border-style: none;
+    border-width: 0px;
+    border-radius: 8px;
+    box-shadow: inset  1px  1px alpha(#000, 0.08),
+                inset -1px -1px alpha(#000, 0.08);
+}
+
+
+Genericmenuitem .menuitem .accelerator,
+DbusmenuGtkMenu .menuitem .accelerator,
+.menubar .menuitem .accelerator,
+.primary-toolbar .menuitem .accelerator {
+    color: alpha (@menu_fg_dark_color, 0.8);
+}
+
+Genericmenuitem .menuitem .accelerator:hover,
+DbusmenuGtkMenu .menuitem .accelerator:hover,
+.menubar .menuitem .accelerator:hover,
+.primary-toolbar .menuitem .accelerator:hover {
+    color: alpha (@theme_selected_fg_color, 0.8);
+}
+
+Genericmenuitem .menuitem .accelerator:insensitive,
+DbusmenuGtkMenu .menuitem .accelerator:insensitive,
+.menubar .menuitem .accelerator:insensitive,
+.primary-toolbar .menuitem .accelerator:insensitive {
+    color: alpha (mix (@menu_fg_dark_color, @menu_bg_dark_color, 0.4), 0.8);
+    text-shadow: none;
+}
+
+.menuitem.separator {
+    -GtkMenuItem-horizontal-padding: 0;
+    -GtkWidget-separator-height: 1;
+    /* border-color: shade (@menu_bg_dark_color, 0.90);
+    -unico-inner-stroke-color: alpha (shade (@menu_bg_dark_color, 1.18), 0.6); */
+    border-image: -gtk-gradient (linear,
+                            left top, right top,
+                            from (alpha (#000, 0.00)),
+                            color-stop (0.25, alpha (#000, 0.03)),
+                            color-stop (0.85, alpha (#000, 0.03)),
+                            to (alpha (#000, 0.00))) 1;
+}
+
+/***************
+ * Menu Button *
+ ***************/
+.button.menuitem.menubar:active,
+.button.menuitem.menubar:active {
+    color: @menu_fg_dark_color;
+    background-image: none;
+    background-color: @menu_bg_dark_color;
+    border-radius: 5px 5px 0px 0px;
+    border-image: none;
+    border-width: 1px 1px 0px 1px;
+    border-color: shade(@button_border, 1.30);
+    border-style: solid;
+}
diff --git a/desktop-themes/Green-Submarine/gtk-3.0/other-applications.css b/desktop-themes/Green-Submarine/gtk-3.0/other-applications.css
new file mode 100644
index 00000000..873a33d8
--- /dev/null
+++ b/desktop-themes/Green-Submarine/gtk-3.0/other-applications.css
@@ -0,0 +1,353 @@
+/* nemo */
+
+NemoTrashBar.info,
+NemoXContentBar.info,
+NemoQueryEditor.info {
+    background-image: -gtk-gradient (linear,
+                                     left top, left bottom,
+                                     from (shade(@nautilus_cluebar_color, 1.00)),
+                                     to   (shade(@nautilus_cluebar_color, 1.00)));
+    border-radius: 0px;
+    border-width: 0px 0px 1px 0px;
+    border-style: solid;
+    border-color: alpha(#000, 0.00) @toolbar_gradient_base shade(@toolbar_gradient_base, 0.75);
+    box-shadow: inset  0px  1px alpha(#fff, 0.06),
+                inset  1px  0px alpha(#fff, 0.06),
+                inset -1px  0px alpha(#fff, 0.06),
+                inset  0px -1px alpha(#fff, 0.06);
+}
+
+NemoSearchBar {
+    padding: 0px;
+}
+
+NemoSearchBar .entry {
+    padding: 2px 8px;
+    border-width: 0px;
+    border-radius: 4px;
+    box-shadow: inset  0px  3px alpha(#000, 0.03),
+                inset  0px  2px alpha(#000, 0.05),
+                inset  2px  0px alpha(#000, 0.04),
+                inset -2px  0px alpha(#000, 0.04),
+                inset  0px -2px alpha(#000, 0.03),
+                inset  0px  1px shade(@toolbar_gradient_base, 0.70),
+                inset  1px  0px shade(@toolbar_gradient_base, 0.80),
+                inset -1px  0px shade(@toolbar_gradient_base, 0.80),
+                inset  0px -1px shade(@toolbar_gradient_base, 0.90);
+}
+
+NemoSearchBar .entry,
+NemoSearchBar .entry:focus {
+    -GtkEntry-inner-border: 1;
+}
+
+NemoSearchBar .entry.image {
+    color: shade(@nautilus_cluebar_color, 0.60);
+}
+
+.nemo-cluebar-label {
+    font: bold;
+    text-shadow: 0 1px @theme_shadow_color;
+}
+
+NemoWindow .sidebar .scrollbar {
+    background-image: none;
+    border-style: solid;
+    -GtkRange-stepper-size: 16;
+    -GtkRange-stepper-spacing: 0;
+    -GtkRange-trough-border: 1;
+    -GtkRange-arrow-scaling: 0.666;
+    -GtkRange-slider-width: 13;
+    -GtkRange-trough-under-steppers: 1;
+    -GtkScrollbar-has-backward-stepper: true;
+    -GtkScrollbar-has-forward-stepper: true;
+    -GtkScrollbar-activate-slider: 1;
+    -GtkScrollbar-min-slider-length: 31;
+    -GtkScrollbar-slider-width: 11;
+    -GtkScrolledWindow-scrollbar-spacing: 0;
+    -GtkScrolledWindow-scrollbars-within-bevel: 1;
+}
+
+NemoWindow .sidebar .scrollbar.trough.vertical {
+    border-radius: 0;
+    border-width: 0 0px 0 1px;
+    border-style: solid;
+    border-color: shade (@theme_bg_color, 0.96);
+}
+
+NemoWindow .sidebar .scrollbar.trough {
+    border-radius: 0;
+    border-width: 1px 0 0px 0;
+    border-style: solid;
+    border-color: shade (@theme_bg_color, 0.96);
+}
+
+/* the small line between sidebar and view */
+NemoWindow GtkPaned.horizontal {
+    border-color: shade(@theme_bg_color, 0.80);
+    border-style: solid;
+    border-width: 0px 1px 0px 0px;
+    -GtkPaned-handle-size: 4px;
+}
+
+NemoWindow .sidebar .frame {
+    border-width: 0px;
+    border-style: none;
+    border-top-width: 0;
+    border-bottom-width: 0;
+}
+
+/* disable shadow and radius for nemo, looks strange */
+NemoWindow .sidebar .view row:hover,
+NemoWindow .sidebar .view row:selected,
+NemoWindow .sidebar .view row:selected:hover {
+    border-radius: 0px;
+    box-shadow: none;
+}
+
+/* to avoid unexpected light backgrounds */
+NemoToolbar.vertical {
+    background-color: @theme_bg_dark_color;
+}
+
+NemoToolbar .linked .button,
+NemoToolbar .linked .button:first-child,
+NemoToolbar .linked .button:last-child,
+NemoToolbar .toolbar .raised .button,
+NemoToolbar .toolbar .raised .button:first-child,
+NemoToolbar .toolbar .raised .button:last-child,
+NemoToolbar .toolbar .raised .button:only-child {
+    padding: 4px;
+}
+
+/* Nemo statusbar */
+NemoWindow .toolbar {
+    background-image: none;
+    background-color: @theme_bg_color;
+    border-top-width: 0;
+    border-bottom-width: 0;
+    box-shadow: none;
+}
+
+NemoStatusBar.toolbar .button {
+    padding: 4px;
+}
+
+/* small buttons statusbar nemo */
+NemoWindow .toolbar .button GtkImage,
+NemoWindow .toolbar .button GtkImage:active,
+NemoWindow .toolbar .button GtkImage:active:hover,
+NemoWindow .toolbar .button GtkImage:hover {
+    color: @theme_fg_color;
+}
+
+NemoWindow .toolbar .button:hover,
+NemoWindow .toolbar .button:active,
+NemoWindow .toolbar .button:active:hover {
+    background-image: -gtk-gradient (linear,
+                                     left top, left bottom,
+                                     from (shade(@button_gradient1, 1.03)),
+                                     color-stop (0.48, shade(@button_gradient2, 1.03)),
+                                     color-stop (0.52, shade(@button_gradient3, 1.03)),
+                                     to   (shade(@button_gradient4, 1.01)));
+    border-color: transparent;
+    box-shadow: inset  0px  1px shade(@selected_bg_color, 1.05),
+                inset  1px  0px shade(@selected_bg_color, 0.97),
+                inset  0px -1px shade(@selected_bg_color, 0.93),
+                inset -1px  0px shade(@selected_bg_color, 0.93);
+}
+
+NemoWindow .primary-toolbar.toolbar .button GtkImage {
+    color: @theme_fg_dark_color;
+}
+
+NemoWindow .primary-toolbar.toolbar .entry {
+    padding: 3px 8px;
+}
+
+NemoWindow .primary-toolbar.toolbar .button,
+NemoWindow .primary-toolbar.toolbar .button:hover,
+NemoWindow .primary-toolbar.toolbar .button:active,
+NemoWindow .primary-toolbar.toolbar .button:active:hover {
+    border-width: 1px;
+    border-style: solid; 
+    border-radius: 5px;
+    border-image: none;
+    border-color: transparent;
+    color: @theme_fg_dark_color;
+    padding: 4px;
+}
+
+NemoWindow .primary-toolbar.toolbar .button:active,
+NemoWindow .primary-toolbar.toolbar .button:active:hover {
+    background-image: -gtk-gradient (linear,
+                                     left top, left bottom,
+                                     from (shade(@menu_bg_dark_color, 2.03)),
+                                     to   (shade(@menu_bg_dark_color, 1.17)));
+    box-shadow: inset  0px  1px shade(@selected_bg_color, 1.05),
+                inset  1px  0px shade(@selected_bg_color, 0.97),
+                inset  0px -1px shade(@selected_bg_color, 0.93),
+                inset -1px  0px shade(@selected_bg_color, 0.93);
+}
+
+NemoWindow .primary-toolbar.toolbar NemoPathbarButton,
+NemoWindow .primary-toolbar.toolbar NemoPathbarButton:first-child,
+NemoWindow .primary-toolbar.toolbar NemoPathbarButton:last-child {
+    background-image: -gtk-gradient (linear,
+                                     left top, left bottom,
+                                     from (@button_raised_gradient_color_a),
+                                     to (@button_raised_gradient_color_b));
+    background-color: transparent;
+    border-image: none;
+    border-style: solid;
+    border-radius: 5px;
+    border-width: 1px;
+    border-color: transparent;
+    color: @theme_fg_dark_color;
+    text-shadow: 0px 1px @theme_shadow_dark_color;
+    -GtkArrow-arrow-scaling: 0.7;
+    transition: all 400ms ease-out;
+    padding: 4px;
+}
+
+NemoWindow .primary-toolbar.toolbar NemoPathbarButton:hover,
+NemoWindow .primary-toolbar.toolbar NemoPathbarButton:active,
+NemoWindow .primary-toolbar.toolbar NemoPathbarButton:active:hover {
+    background-image: -gtk-gradient (linear,
+                                     left top, left bottom,
+                                     from (shade(@menu_bg_dark_color, 2.03)),
+                                     to   (shade(@menu_bg_dark_color, 1.17)));
+    box-shadow: inset  0px  1px shade(@selected_bg_color, 1.05),
+                inset  1px  0px shade(@selected_bg_color, 0.97),
+                inset  0px -1px shade(@selected_bg_color, 0.93),
+                inset -1px  0px shade(@selected_bg_color, 0.93);
+}
+
+NemoWindow .notebook {
+    -GtkNotebook-initial-gap: 0;
+    background-color: @theme_base_color;
+    background-image: -gtk-gradient (linear,
+                                     left top, left bottom,
+                                     from (shade(@theme_base_color, 1.00)),
+                                     to   (shade(@theme_base_color, 1.00)));
+    border-width: 0px;
+    border-style: none;
+    border-left-style: none;
+    border-right-style: none;
+    border-radius: 0px;
+    border-top-color: shade(@notebook_border, 1.00);
+    border-left-color: @transparent;
+    border-bottom-color: @transparent;
+    border-right-color: @transparent;
+    box-shadow: none;
+}
+
+/* Nemo notebook */
+GtkDialog.background .vertical.dialog-vbox .notebook .frame {
+    background-color: shade (@theme_bg_color, 1.1);
+}
+
+NemoWindow .notebook tab {
+    border-width: 0px 1px;
+    border-style: solid;
+    border-color:       shade(@notebook_border, 1.00);
+    background-image: -gtk-gradient (linear,
+                                     left top, left bottom,
+                                     from (shade(@sidebar_background, 0.90)),
+                                     color-stop (0.15, shade(@sidebar_background, 1.00)),
+                                     to   (shade(@sidebar_background, 1.00)));
+    box-shadow: inset  0px  1px alpha(#000, 0.08),
+                inset  1px  0px alpha(#000, 0.04),
+                inset -1px  0px alpha(#000, 0.04),
+                inset  0px -1px shade(@notebook_border, 1.00);
+}
+
+NemoWindow .notebook tab:active {
+    background-image: -gtk-gradient (linear,
+                                     left top, left bottom,
+                                     from (shade(@theme_base_color, 0.90)),
+                                     color-stop (0.15, shade(@theme_base_color, 1.00)),
+                                     to   (shade(@theme_base_color, 1.00)));
+    border-image: none;
+    border-left-color: shade(@notebook_border, 1.00);
+    border-right-color: shade(@notebook_border, 1.00);
+    box-shadow: inset  0px  1px alpha(#000, 0.08),
+                inset  1px  0px alpha(#fff, 0.04),
+                inset -1px  0px alpha(#fff, 0.04);
+}
+
+NemoWindow .notebook tab.top {
+    padding: 0px 6px;
+    border-radius: 0px;
+}
+
+NemoWindow .notebook tab:first-child,
+NemoWindow .notebook tab:first-child:active {
+    border-width: 0px 1px 0px 0px;
+    border-radius: 0px;
+}
+
+NemoWindow .notebook tab:last-child,
+NemoWindow .notebook tab:last-child:active {
+    border-width: 0px 0px 0px 1px;
+    border-radius: 0px;
+}
+
+NemoWindow .notebook tab GtkLabel {
+    padding: 0px;
+    color: @theme_text_color;
+    text-shadow: 0px 1px @theme_shadow_color;
+}
+
+NemoWindow .notebook tab .button GtkImage {
+    border-radius: 3px;
+    color: mix(@theme_fg_color, @sidebar_background, 0.30);
+    border-style: solid;
+    border-color: transparent;
+    border-width: 1px;
+    padding: 0;
+    icon-shadow: 1px 1px @theme_shadow_color;
+}
+
+NemoWindow .notebook tab .button GtkImage:hover {
+    color: @theme_fg_color; 
+    border-color: alpha(black, 0.1); 
+}
+
+NemoWindow .notebook tab .button GtkImage:active,
+NemoWindow .notebook tab .button GtkImage:active:hover,
+NemoWindow .notebook tab .button GtkImage:active:hover {
+    background-color: alpha(black, 0.15); 
+    color: shade(@theme_fg_color, 1.00);
+    icon-shadow: 0px 1px @theme_shadow_color;
+    border-color: alpha(black, 0.27) 
+                  alpha(black, 0.13) 
+                  alpha(black, 0.13) 
+                  alpha(black, 0.13); 
+}
+
+.nemo-canvas-item {
+    border-radius: 3px;
+}
+
+/* desktop mode */
+.nemo-desktop.nemo-canvas-item {
+    color: white;
+    text-shadow: 1px 1px black;
+}
+
+.nemo-desktop.nemo-canvas-item:active {
+    background-image: none;
+    color: @theme_text_color;
+}
+
+.nemo-desktop.nemo-canvas-item:selected {
+    color: @theme_selected_fg_color;
+}
+
+.nemo-desktop.nemo-canvas-item:active,
+.nemo-desktop.nemo-canvas-item:prelight,
+.nemo-desktop.nemo-canvas-item:selected {
+    text-shadow: none;
+}
+
diff --git a/desktop-themes/Green-Submarine/gtk-3.0/scrollbar.css b/desktop-themes/Green-Submarine/gtk-3.0/scrollbar.css
new file mode 100644
index 00000000..e8c79ac1
--- /dev/null
+++ b/desktop-themes/Green-Submarine/gtk-3.0/scrollbar.css
@@ -0,0 +1,250 @@
+/**************
+ * Scrollbars *
+ **************/
+
+.scrollbar {
+    background-image: none;
+    border-style: solid;
+    -GtkRange-stepper-size: 16;
+    -GtkRange-stepper-spacing: 0;
+    -GtkRange-trough-border: 0;
+    -GtkRange-arrow-scaling: 0.666;
+    -GtkRange-slider-width: 13;
+    -GtkRange-trough-under-steppers: 1;
+    -GtkScrollbar-has-backward-stepper: true;
+    -GtkScrollbar-has-forward-stepper: true;
+    -GtkScrollbar-activate-slider: 1;
+    -GtkScrollbar-min-slider-length: 31;
+    -GtkScrolledWindow-scrollbar-spacing: 0;
+    -GtkScrolledWindow-scrollbars-within-bevel: 1;
+}
+
+ /* the small square between scrollbars!!!
+     no borders with background-image */
+.scrollbars-junction {
+    background-image: linear-gradient(to bottom,
+                                      shade(@theme_bg_color, 1.05),
+                                      shade(@theme_bg_color, 1.05));
+    border-image: linear-gradient(to bottom,
+                                      shade(@theme_bg_color, 1.05),
+                                      shade(@theme_bg_color, 1.05));
+    background-color: transparent;
+    border-style: none;
+    border-width: 0;
+    box-shadow: none;
+}
+
+.scrollbar.trough,
+.scrollbar.trough.vertical {
+    background-image: -gtk-gradient (linear, left top, left bottom,
+                                     from (shade (@theme_bg_color, 0.98)),
+                                     to (shade (@theme_bg_color, 1.06)));
+    border-left-width: 1px;
+    border-right-width: 0px;
+    border-top-width: 0px;
+    border-bottom-width: 0px;
+    border-radius: 0;
+    border-color: shade(@button_border, 1.13);
+    border-style: solid;
+    box-shadow: none;
+}
+
+.scrollbar.trough.horizontal {
+    background-image: -gtk-gradient (linear, left top, right top,
+                                     from (shade (@theme_bg_color, 0.98)),
+                                     to (shade (@theme_bg_color, 1.06)));
+    border-left-width: 0px;
+    border-right-width: 0px;
+    border-top-width: 1px;
+    border-bottom-width: 0px;
+    border-radius: 0;
+    border-style: solid;
+    box-shadow: none;
+}
+
+/* Sliders and buttons */
+.scrollbar.slider.vertical {
+    background-image: -gtk-gradient (linear, left top, left bottom,
+                                     from (shade (@theme_bg_color, 0.95)),
+                                     to (shade (@theme_bg_color, 0.8)));
+    border-color: shade (@theme_bg_color, 0.65);
+    border-radius: 10px;
+    border-width: 1px;
+}
+
+.scrollbar.slider.vertical:hover,
+.scrollbar.slider.vertical:hover:active {
+    background-image: -gtk-gradient (linear, left top, left bottom,
+                                     from (shade (@theme_bg_color, 0.85)),
+                                     to (shade (@theme_bg_color, 0.7)));
+    border-color: shade (@theme_bg_color, 0.85);
+    border-width: 0 0 0 0;
+}
+
+.scrollbar.slider.horizontal {
+    background-image: -gtk-gradient (linear, left top, right top,
+                                     from (shade (@theme_bg_color, 0.95)),
+                                     to (shade (@theme_bg_color, 0.8)));
+    border-color: shade (@theme_bg_color, 0.65);
+    border-radius: 10px;
+    border-width: 1px;
+}
+
+.scrollbar.slider.horizontal:hover,
+.scrollbar.slider.horizontal:hover:active {
+    background-image: -gtk-gradient (linear, left top, right top,
+                                     from (shade (@theme_bg_color, 0.85)),
+                                     to (shade (@theme_bg_color, 0.7)));
+    border-color: shade (@theme_bg_color, 0.85);
+    border-width: 0 0 0 0;
+}
+
+.scrollbar.slider:insensitive {
+    background-color: shade (@theme_bg_color, 0.9);
+}
+
+.scrollbar.trough:insensitive {
+    background-color: shade (@theme_bg_color, 1.06);
+}
+
+.scrollbar.button,
+.scrollbar.button:active,
+.scrollbar.button:active:hover,
+.scrollbar.button:insensitive {
+    box-shadow: none;
+    border-style: none;
+    border-image: none;
+    border-radius: 0;
+    background-image: none;
+    background-color: transparent;
+}
+
+.scrollbar.button:active,
+.scrollbar.button:active:hover {
+    background-color: alpha(shade(@scrollbar_trough, 0.8), 0.5);
+    -gtk-image-effect: highlight;
+}
+
+.scrollbar.button.top:hover {
+    box-shadow: none;
+    -gtk-image-effect: highlight;
+}
+
+.scrollbar.button.bottom:hover {
+    box-shadow: none;
+    -gtk-image-effect: highlight;
+}
+
+.scrollbar.button.right:hover {
+    box-shadow: none;
+    -gtk-image-effect: highlight;
+}
+
+.scrollbar.button.left:hover {
+    box-shadow: none;
+    -gtk-image-effect: highlight;
+}
+
+.scrollbar.button {
+    color: @theme_fg_color;
+}
+
+.scrollbar.button:hover {
+    color: @theme_fg_color;
+}
+
+.scrollbar.button:insensitive {
+    color: @insensitive_fg_color;
+}
+
+.scrollbar.button:active {
+    color: @theme_fg_color;
+}
+
+.scrollbar.slider.fine-tune:prelight:active {
+    background-image: url("assets/slider_fine_horizontal.svg"),
+                      linear-gradient(to top,
+                                      shade(@scrollbar_slider, 0.9),
+                                      shade(@scrollbar_slider, 0.81) 55%,
+                                      shade(@scrollbar_slider, 0.6));
+    background-repeat: no-repeat;
+    background-position: center;
+    border-style: solid;
+    border-image: none;
+    border-color: shade(@scrollbar_slider, 0.65);
+    border-width: 1px;
+}
+
+.scrollbar.slider.vertical.fine-tune:prelight:active {
+    background-image: url("assets/slider_fine_vertical.svg"),
+                      linear-gradient(to left,
+                                      shade(@scrollbar_slider, 0.9),
+                                      shade(@scrollbar_slider, 0.81) 55%,
+                                      shade(@scrollbar_slider, 0.6));
+    background-repeat: no-repeat;
+    background-position: center;
+    border-style: solid;
+    border-image: none;
+    border-color: shade(@scrollbar_slider, 0.65);
+    border-width: 1px;
+}
+
+.scrollbar.slider.fine-tune:prelight:active {
+    background-image: url("assets/slider_fine_horizontal.svg"),
+                      linear-gradient(to top,
+                                      shade(@scrollbar_slider, 0.9),
+                                      shade(@scrollbar_slider, 0.81) 55%,
+                                      shade(@scrollbar_slider, 0.6));
+    background-repeat: no-repeat;
+    background-position: center;
+    border-style: solid;
+    border-image: none;
+    border-color: shade(@scrollbar_slider, 0.65);
+    border-width: 1px;
+}
+
+.scrollbar.slider.vertical.fine-tune:prelight:active {
+    background-image: url("assets/slider_fine_vertical.svg"),
+                      linear-gradient(to left,
+                                      shade(@scrollbar_slider, 0.9),
+                                      shade(@scrollbar_slider, 0.81) 55%,
+                                      shade(@scrollbar_slider, 0.6));
+    background-repeat: no-repeat;
+    background-position: center;
+    border-style: solid;
+    border-image: none;
+    border-color: shade(@scrollbar_slider, 0.65);
+    border-width: 1px;
+}
+
+/* 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 *
+ *******************/
+GtkScrolledWindow.frame {
+    border-top-color: shade (@theme_bg_color, 0.84);
+    border-right-color: shade (@theme_bg_color, 0.76);
+    border-bottom-color: shade (@theme_bg_color, 0.86);
+    border-left-color: shade (@theme_bg_color, 0.76);
+    border-radius: 0;
+    border-style: solid;
+}
diff --git a/desktop-themes/Green-Submarine/gtk-3.0/settings.ini b/desktop-themes/Green-Submarine/gtk-3.0/settings.ini
index 07f3aaec..3f33c4d8 100644
--- a/desktop-themes/Green-Submarine/gtk-3.0/settings.ini
+++ b/desktop-themes/Green-Submarine/gtk-3.0/settings.ini
@@ -1,3 +1,4 @@
 [Settings]
-gtk-color-scheme = "base_color:#FFF\nbg_color:#CBD9D4\ntooltip_bg_color:#DBFFF3\nselected_bg_color:#72B49D\ntext_color:#1A1A1A\nfg_color:#101010\ntooltip_fg_color:#000\nselected_fg_color:#FFF\nlink_color:#00CC85\nbg_color_dark:#1F2724\nfg_color_dark:#E6E6E6"
+gtk-color-scheme = "base_color:#FFF\nbg_color:#CBD9D4\ntooltip_bg_color:#DBFFF3\nselected_bg_color:#72B49D\ntext_color:#1A1A1A\nfg_color:#101010;\ntooltip_fg_color:#000000\nselected_fg_color:#ffffff\nlink_color:#00CC85\nbg_color_dark:#1F2724\nfg_color_dark:#E6E6E6"
 gtk-auto-mnemonics = 1
+
diff --git a/desktop-themes/Green-Submarine/gtk-3.0/sidebar.css b/desktop-themes/Green-Submarine/gtk-3.0/sidebar.css
new file mode 100644
index 00000000..da10e9bd
--- /dev/null
+++ b/desktop-themes/Green-Submarine/gtk-3.0/sidebar.css
@@ -0,0 +1,92 @@
+/***********
+ * Sidebar *
+ ***********/
+
+.sidebar {
+    -GtkTreeView-horizontal-separator: 6px;
+    -GtkTreeView-vertical-separator: 1px;
+}
+
+.sidebar,
+.sidebar.view,
+.sidebar .view,
+.sidebar.view:prelight,
+.sidebar .view:prelight {
+    border-radius: 0px;
+    color: @sidebar_fg_color;
+    text-shadow: 0px 1px @theme_shadow_color;
+    background-color: @sidebar_background;
+}
+
+.sidebar.view:selected,
+.sidebar .view:selected,
+.sidebar .view:selected:prelight {
+    border-style: solid;
+    border-width: 1px 0px 0px 0px;
+    border-color: shade (@sidebar_selected_bg, 0.90) #bbb shade (@sidebar_selected_bg, 1.05);
+    border-radius: 6px;
+    background-image: -gtk-gradient (linear,
+                                     left top,
+                                     left bottom,
+                                     from (shade(@sidebar_selected_bg, 0.90)),
+                                     color-stop (0.40, shade (@sidebar_selected_bg, 0.98)),
+                                     to   (shade(@sidebar_selected_bg, 1.05)));
+    color:  @theme_selected_fg_color;    
+    text-shadow: 0px 1px @theme_selected_shadow_color;
+}
+
+.sidebar row:hover,
+.sidebar .view row:hover,
+.sidebar GtkTreeView row:hover {
+    background-image: -gtk-gradient (linear,
+                                     left top,
+                                     left bottom,
+                                     from (shade(@theme_bg_color, 1.05)),
+                                     color-stop (0.40, shade (@theme_bg_color, 1.13)),
+                                     to (shade(@theme_bg_color, 1.10)));
+    box-shadow: inset  0px  1px shade (@theme_selected_bg_color, 1.0),
+                inset  1px  0px shade (@theme_selected_bg_color, 1.0),
+                inset -1px  0px shade (@theme_selected_bg_color, 1.0),
+                inset  0px -1px shade (@theme_selected_bg_color, 1.0);
+    color: shade (@theme_fg_color, 0.90);
+    border-radius: 6px;
+    text-shadow: none;
+}
+
+.sidebar .radio,
+.sidebar .radio:focus,
+.sidebar .radio:selected {
+    background-image: none;
+    background-color: alpha(@theme_base_color, 0.0);
+}
+
+GtkHCollapsablePaned,
+SourceList.pane-separator {
+    border-width: 0px;
+    -GtkPaned-handle-size: 2px;
+}
+
+GtkHCollapsablePaned .pane-separator,
+GtkHCollapsablePaned .pane-separator:prelight,
+GtkHCollapsablePaned .pane-separator:selected {
+    background-image: none;
+    background-color: @sidebar_background;
+    border-width: 0px 1px 0px 0px;
+    border-style: solid;
+    border-color: shade (@button_border, 0.90);
+}
+
+/* Marlin sidebar separator */
+VarkaWidgetsHCollapsiblePaned,
+VarkaWidgetsHCollapsiblePaned.pane-separator,
+VarkaWidgetsHCollapsiblePaned.pane-separator:prelight,
+VarkaWidgetsHCollapsiblePaned.pane-separator:selected {
+    border-width: 0px;
+    border-color: shade(@sidebar_background, 0.80);
+    background-image: -gtk-gradient(linear,
+                                    left top, right top,
+                                    from (@sidebar_background),
+                                    color-stop(0.50, @sidebar_background),
+                                    to   (#a9a9a9));
+}
+
author	raveit65 <[email protected]>	2015-08-18 20:22:05 +0200
committer	raveit65 <[email protected]>	2015-08-18 20:22:05 +0200
commit	81515074f71950e0b6707a876b77467291a5f12d (patch)
tree	ffdc900ccdf3d3878781f2481441b562b43116be
parent	3ef0c282b0fa27bcc6a37df704a0420a1abbcb77 (diff)
download	mate-themes-81515074f71950e0b6707a876b77467291a5f12d.tar.bz2 mate-themes-81515074f71950e0b6707a876b77467291a5f12d.tar.xz